summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/am335x-chiliboard.dts
diff options
context:
space:
mode:
authorMarcin Niestroj <m.niestroj@grinn-global.com>2016-04-13 10:44:15 +0200
committerTony Lindgren <tony@atomide.com>2016-04-14 13:39:34 -0700
commit71815b1825d64c15ca25d4aa3cbad10b02d3981e (patch)
treecf3541a8e9fb8789447ca8f46f88bf07da4fb88a /arch/arm/boot/dts/am335x-chiliboard.dts
parent8010f13a40d3920d30c824e4b3ee0c6d298a7a8a (diff)
downloadblackbird-obmc-linux-71815b1825d64c15ca25d4aa3cbad10b02d3981e.tar.gz
blackbird-obmc-linux-71815b1825d64c15ca25d4aa3cbad10b02d3981e.zip
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: Marcin Niestroj <m.niestroj@grinn-global.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/boot/dts/am335x-chiliboard.dts')
-rw-r--r--arch/arm/boot/dts/am335x-chiliboard.dts14
1 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/am335x-chiliboard.dts b/arch/arm/boot/dts/am335x-chiliboard.dts
index 15d47ab28865..4aae702fae03 100644
--- a/arch/arm/boot/dts/am335x-chiliboard.dts
+++ b/arch/arm/boot/dts/am335x-chiliboard.dts
@@ -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>;
OpenPOWER on IntegriCloud