Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4cf6e1f0 authored by Vignesh R's avatar Vignesh R Committed by Santosh Shilimkar
Browse files

ARM: dts: keystone-k2g-evm: Fix botched up merge 



spi1 and ecap0 pinmuxes ended up under root node instead of k2g_pinctrl
node. Fix this by moving them under k2g_pinctrl node.

Signed-off-by: default avatarVignesh R <vigneshr@ti.com>
Signed-off-by: default avatarSantosh Shilimkar <santosh.shilimkar@oracle.com>
parent 13fc30c7

arch/arm/boot/dts/keystone-k2g-evm.dts

+14 −16
Original line number Diff line number Diff line
@@ -45,22 +45,6 @@ 
		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	ecap0_pins: ecap0_pins {

		pinctrl-single,pins = <

			K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | MUX_MODE4)	/* pr1_mdio_data.ecap0_in_apwm0_out */

		>;

	};



	spi1_pins: pinmux_spi1_pins {

		pinctrl-single,pins = <

			K2G_CORE_IOPAD(0x11a4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* spi1_scs0.spi1_scs0 */

			K2G_CORE_IOPAD(0x11ac) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* spi1_clk.spi1_clk */

			K2G_CORE_IOPAD(0x11b0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* spi1_miso.spi1_miso */

			K2G_CORE_IOPAD(0x11b4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* spi1_mosi.spi1_mosi */

		>;

	};



};



&k2g_pinctrl {
@@ -105,6 +89,20 @@ 
		>;

	};



	ecap0_pins: ecap0_pins {

		pinctrl-single,pins = <

			K2G_CORE_IOPAD(0x1374) (BUFFER_CLASS_B | MUX_MODE4)	/* pr1_mdio_data.ecap0_in_apwm0_out */

		>;

	};



	spi1_pins: pinmux_spi1_pins {

		pinctrl-single,pins = <

			K2G_CORE_IOPAD(0x11a4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* spi1_scs0.spi1_scs0 */

			K2G_CORE_IOPAD(0x11ac) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* spi1_clk.spi1_clk */

			K2G_CORE_IOPAD(0x11b0) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* spi1_miso.spi1_miso */

			K2G_CORE_IOPAD(0x11b4) (BUFFER_CLASS_B | PULL_DISABLE | MUX_MODE0)	/* spi1_mosi.spi1_mosi */

		>;

	};

};



&uart0 {