Sync Device tree nodes with Linux v6.11-rc3.
[ upstream commit: ba50141137fae205a731005e70687f4a52289050 ]
Signed-off-by: Chintan Vankar c-vankar@ti.com ---
Link to v3: - This link is for the patch which was equivalent to this patch, from this version the node is moved to DT file equivalent to Linux as a part of DT sync. https://lore.kernel.org/r/20240705045030.1141934-11-c-vankar@ti.com/
Changes from v3 to v4: - Updated this patch by syncing "k3-am62x-sk-common.dtsi" file with Linux v6.11-rc3 compared to previous version.
.../src/arm64/ti/k3-am62x-sk-common.dtsi | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/dts/upstream/src/arm64/ti/k3-am62x-sk-common.dtsi b/dts/upstream/src/arm64/ti/k3-am62x-sk-common.dtsi index 3c45782ab2..44ff67b6bf 100644 --- a/dts/upstream/src/arm64/ti/k3-am62x-sk-common.dtsi +++ b/dts/upstream/src/arm64/ti/k3-am62x-sk-common.dtsi @@ -48,6 +48,14 @@ pmsg-size = <0x8000>; };
+ /* global cma region */ + linux,cma { + compatible = "shared-dma-pool"; + reusable; + size = <0x00 0x8000000>; + linux,cma-default; + }; + secure_tfa_ddr: tfa@9e780000 { reg = <0x00 0x9e780000 0x00 0x80000>; alignment = <0x1000>; @@ -128,6 +136,10 @@ }; };
+&phy_gmii_sel { + bootph-all; +}; + &main_pmx0 { /* First pad number is ALW package and second is AMC package */ main_uart0_pins_default: main-uart0-default-pins { @@ -156,6 +168,7 @@ };
main_i2c1_pins_default: main-i2c1-default-pins { + bootph-all; pinctrl-single,pins = < AM62X_IOPAD(0x1e8, PIN_INPUT_PULLUP, 0) /* (B17/A17) I2C1_SCL */ AM62X_IOPAD(0x1ec, PIN_INPUT_PULLUP, 0) /* (A17/A16) I2C1_SDA */ @@ -335,15 +348,9 @@ self-powered; data-role = "dual"; power-role = "sink"; - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usb_con_hs: endpoint { - remote-endpoint = <&usb0_hs_ep>; - }; + port { + usb_con_hs: endpoint { + remote-endpoint = <&usb0_hs_ep>; }; }; }; @@ -470,12 +477,9 @@
&usb0 { bootph-all; - #address-cells = <1>; - #size-cells = <0>; usb-role-switch;
- port@0 { - reg = <0>; + port { usb0_hs_ep: endpoint { remote-endpoint = <&usb_con_hs>; }; @@ -504,8 +508,6 @@ 0 0 0 0 0 0 0 0 >; - tx-num-evt = <32>; - rx-num-evt = <32>; };
&dss {