diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2024-03-06 12:36:43 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2024-03-06 16:23:19 +0100 |
| commit | f37e9d3c05301bdc9bc7ee93c221ada7e1a7204e (patch) | |
| tree | b74346ce69a8241f6d97dbee6fe58cf9ca2d2a86 /arch/arm64/boot/dts/ti/k3-am62-main.dtsi | |
| parent | 278a5418c2bad6e63da7ee64df2d26af2bcaec19 (diff) | |
| parent | 0ccfdb3fe66551031a7a112f6ff668f9683ef725 (diff) | |
Merge tag '09.02.00.006' into toradex_ti-linux-6.1.y
RC Release 09.02.00.006
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Conflicts:
drivers/gpu/drm/bridge/lontium-lt8912b.c
drivers/gpu/drm/bridge/tc358768.c
drivers/usb/dwc3/dwc3-am62.c
Diffstat (limited to 'arch/arm64/boot/dts/ti/k3-am62-main.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi index 6f5092e1476c..e126fbde2d20 100644 --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi @@ -547,10 +547,9 @@ clock-names = "clk_ahb", "clk_xin"; assigned-clocks = <&k3_clks 57 6>; assigned-clock-parents = <&k3_clks 57 8>; + bus-width = <8>; mmc-ddr-1_8v; mmc-hs200-1_8v; - ti,trm-icp = <0x2>; - bus-width = <8>; ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x0>; ti,otap-del-sel-mmc-hs = <0x0>; @@ -568,7 +567,8 @@ power-domains = <&k3_pds 58 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 58 5>, <&k3_clks 58 6>; clock-names = "clk_ahb", "clk_xin"; - ti,trm-icp = <0x2>; + bus-width = <4>; + ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x8>; ti,otap-del-sel-sd-hs = <0x0>; ti,otap-del-sel-sdr12 = <0x0>; @@ -580,8 +580,6 @@ ti,itap-del-sel-sd-hs = <0x1>; ti,itap-del-sel-sdr12 = <0xa>; ti,itap-del-sel-sdr25 = <0x1>; - ti,clkbuf-sel = <0x7>; - bus-width = <4>; status = "disabled"; }; @@ -592,7 +590,8 @@ power-domains = <&k3_pds 184 TI_SCI_PD_EXCLUSIVE>; clocks = <&k3_clks 184 5>, <&k3_clks 184 6>; clock-names = "clk_ahb", "clk_xin"; - ti,trm-icp = <0x2>; + bus-width = <4>; + ti,clkbuf-sel = <0x7>; ti,otap-del-sel-legacy = <0x8>; ti,otap-del-sel-sd-hs = <0x0>; ti,otap-del-sel-sdr12 = <0x0>; @@ -604,7 +603,6 @@ ti,itap-del-sel-sd-hs = <0xa>; ti,itap-del-sel-sdr12 = <0xa>; ti,itap-del-sel-sdr25 = <0x1>; - ti,clkbuf-sel = <0x7>; status = "disabled"; }; |