arm: dts: k3-am654: remove duplicate vtt pinmux

With the Linux and U-Boot board dtb files unified, we now have a
duplicate vtt_pinmux node. Remove it

Tested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Bryan Brattlof <bb@ti.com>
Reviewed-by: Nishanth Menon <nm@ti.com>

diff --git a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
index 3647088c29e4b2e5b2dcd34117c2b13caeff68da..da6d4dffbf9d258bfa8908eec2c27f252cfd47bf 100644 (file)
--- a/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
+++ b/arch/arm/dts/k3-am654-base-board-u-boot.dtsi
@@ -93,7 +93,7 @@
        bootph-pre-ram;
 };
 
-&wkup_vtt_pins_default {
+&ddr_vtt_pins_default {
        bootph-pre-ram;
 };
 

diff --git a/arch/arm/dts/k3-am654-r5-base-board.dts b/arch/arm/dts/k3-am654-r5-base-board.dts
index 14bf1b4c8a462063ddeebb53487dabd364a80604..fb238adaea5b25ac84cfd71cb0c3fefad064941a 100644 (file)
--- a/arch/arm/dts/k3-am654-r5-base-board.dts
+++ b/arch/arm/dts/k3-am654-r5-base-board.dts
@@ -104,18 +104,8 @@
        vdd-supply-4 = <&vdd_mpu>;
 };
 
-&wkup_pmx0 {
-       wkup_vtt_pins_default: wkup_vtt_pins_default {
-               pinctrl-single,pins = <
-                       AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7)  /* WKUP_GPIO0_28 */
-               >;
-       };
-};
-
 &memorycontroller {
        vtt-supply = <&vtt_supply>;
-       pinctrl-names = "default";
-       pinctrl-0 = <&wkup_vtt_pins_default>;
 };
 
 /*