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

Commit 71815b18 authored by Marcin Niestroj's avatar Marcin Niestroj Committed by Tony Lindgren
Browse files

ARM: dts: am335x-chili*: Move uart0 description from SOM to board 



uart0 configuration code has been in SOM. However, it is possible to
use all (or none) of 6 uart's of AM335x processor present on ChiliSOM.

This fix moves declaration of uart0 from ChiliSOM to ChiliBoard, because
use of uart is strictly board-specific.

Signed-off-by: default avatarMarcin Niestroj <m.niestroj@grinn-global.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 8010f13a

arch/arm/boot/dts/am335x-chiliboard.dts

+14 −0
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ 
};



&am33xx_pinmux {

	uart0_pins: pinmux_uart0_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */

			AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */

		>;

	};



	usb1_drvvbus: usb1_drvvbus {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0xa34, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* usb1_drvvbus.usb1_drvvbus */
@@ -61,6 +68,13 @@ 
	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins>;



	status = "okay";

};



&ldo4_reg {

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

arch/arm/boot/dts/am335x-chilisom.dtsi

+0 −14
Original line number Diff line number Diff line
@@ -35,13 +35,6 @@ 
		>;

	};



	uart0_pins: pinmux_uart0_pins {

		pinctrl-single,pins = <

			AM33XX_IOPAD(0x970, PIN_INPUT_PULLUP | MUX_MODE0)	/* uart0_rxd.uart0_rxd */

			AM33XX_IOPAD(0x974, PIN_OUTPUT_PULLDOWN | MUX_MODE0)	/* uart0_txd.uart0_txd */

		>;

	};



	cpsw_default: cpsw_default {

		pinctrl-single,pins = <

			/* Slave 1 */
@@ -109,13 +102,6 @@ 
	};

};



&uart0 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart0_pins>;



	status = "okay";

};



&i2c0 {

	pinctrl-names = "default";

	pinctrl-0 = <&i2c0_pins>;