ARM: dts: AM3XXX: Use #include for all device trees

[deliverable/linux.git] / arch / arm / boot / dts / am335x-bone.dts

diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 5302f79c05b719e3317bb0e3431c144073691724..0365e56e02b57ed132d8362a22e64120fbfaaf26 100644 (file)
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -7,7 +7,7 @@
  */
 /dts-v1/;
 
-/include/ "am33xx.dtsi"
+#include "am33xx.dtsi"
 
 / {
        model = "TI AM335x BeagleBone";
@@ -26,7 +26,7 @@
 
        am33xx_pinmux: pinmux@44e10800 {
                pinctrl-names = "default";
-               pinctrl-0 = <&user_leds_s0>;
+               pinctrl-0 = <&clkout2_pin>;
 
                user_leds_s0: user_leds_s0 {
                        pinctrl-single,pins = <
@@ -36,14 +36,40 @@
                                0x60 0x17       /* gpmc_a8.gpio1_24, OUTPUT_PULLUP | MODE7 */
                        >;
                };
+
+               i2c0_pins: pinmux_i2c0_pins {
+                       pinctrl-single,pins = <
+                               0x188 0x30      /* i2c0_sda.i2c0_sda PULLUP | INPUTENABLE | MODE0 */
+                               0x18c 0x30      /* i2c0_scl.i2c0_scl PULLUP | INPUTENABLE | MODE0 */
+                       >;
+               };
+
+               uart0_pins: pinmux_uart0_pins {
+                       pinctrl-single,pins = <
+                               0x170 0x30      /* uart0_rxd.uart0_rxd PULLUP | INPUTENABLE | MODE0 */
+                               0x174 0x00      /* uart0_txd.uart0_txd PULLDOWN | MODE0 */
+                       >;
+               };
+
+               clkout2_pin: pinmux_clkout2_pin {
+                       pinctrl-single,pins = <
+                               0x1b4 0x03      /* xdma_event_intr1.clkout2 OMAP_MUX_MODE3 | AM33XX_PIN_OUTPUT */
+                       >;
+               };
        };
 
        ocp {
-               uart1: serial@44e09000 {
+               uart0: serial@44e09000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&uart0_pins>;
+
                        status = "okay";
                };
 
                i2c0: i2c@44e0b000 {
+                       pinctrl-names = "default";
+                       pinctrl-0 = <&i2c0_pins>;
+
                        status = "okay";
                        clock-frequency = <400000>;
 
@@ -55,6 +81,9 @@
        };
 
        leds {
+               pinctrl-names = "default";
+               pinctrl-0 = <&user_leds_s0>;
+
                compatible = "gpio-leds";
 
                led@2 {