Merge tag 'davinci-for-v3.9/dt' of git://gitorious.org/linux-davinci/linux-davinci...

From Sekhar Nori:
DaVinci DT changes for v3.9

This pull requests adds support for pinctrl, NAND
and RTC support when DA850 is booting using DT.

* tag 'davinci-for-v3.9/dt' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: da850: add RTC DT entries
  ARM: davinci: da850: move interrupt-parent property to soc node
  ARM: davinci: da8xx defconfig: enable pinctrl config option
  ARM: davinci: da850: add NAND driver DT entries
  ARM: davinci: da850: add pinctrl driver DT entries

diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index 37dc5a3243b87017ecb8614c29c33dcbb8f1ca69..fa04152b24bfca219d48c10ad0e1137ba37cea21 100644 (file)
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -15,6 +15,9 @@
        model = "DA850/AM1808/OMAP-L138 EVM";
 
        soc {
+               pmx_core: pinmux@1c14120 {
+                       status = "okay";
+               };
                serial0: serial@1c42000 {
                        status = "okay";
                };
@@ -24,5 +27,13 @@
                serial2: serial@1d0d000 {
                        status = "okay";
                };
+               rtc0: rtc@1c23000 {
+                       status = "okay";
+               };
+       };
+       nand_cs3@62000000 {
+               status = "okay";
+               pinctrl-names = "default";
+               pinctrl-0 = <&nand_cs3_pins>;
        };
 };

diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 640ab75c20db201e3a7061fb959cf68d2b226f8a..8dd15c0426a871c0a53f79db1b80fbcd0c0fda3e 100644 (file)
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -28,14 +28,41 @@
                #address-cells = <1>;
                #size-cells = <1>;
                ranges = <0x0 0x01c00000 0x400000>;
+               interrupt-parent = <&intc>;
 
+               pmx_core: pinmux@1c14120 {
+                       compatible = "pinctrl-single";
+                       reg = <0x14120 0x50>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       pinctrl-single,bit-per-mux;
+                       pinctrl-single,register-width = <32>;
+                       pinctrl-single,function-mask = <0xffffffff>;
+                       status = "disabled";
+
+                       nand_cs3_pins: pinmux_nand_pins {
+                               pinctrl-single,bits = <
+                                       /* EMA_OE, EMA_WE */
+                                       0x1c 0x00110000  0x00ff0000
+                                       /* EMA_CS[4],EMA_CS[3]*/
+                                       0x1c 0x00000110  0x00000ff0
+                                       /*
+                                        * EMA_D[0], EMA_D[1], EMA_D[2],
+                                        * EMA_D[3], EMA_D[4], EMA_D[5],
+                                        * EMA_D[6], EMA_D[7]
+                                        */
+                                       0x24 0x11111111  0xffffffff
+                                       /* EMA_A[1], EMA_A[2] */
+                                       0x30 0x01100000  0x0ff00000
+                               >;
+                       };
+               };
                serial0: serial@1c42000 {
                        compatible = "ns16550a";
                        reg = <0x42000 0x100>;
                        clock-frequency = <150000000>;
                        reg-shift = <2>;
                        interrupts = <25>;
-                       interrupt-parent = <&intc>;
                        status = "disabled";
                };
                serial1: serial@1d0c000 {
@@ -44,7 +71,6 @@
                        clock-frequency = <150000000>;
                        reg-shift = <2>;
                        interrupts = <53>;
-                       interrupt-parent = <&intc>;
                        status = "disabled";
                };
                serial2: serial@1d0d000 {
@@ -53,8 +79,27 @@
                        clock-frequency = <150000000>;
                        reg-shift = <2>;
                        interrupts = <61>;
-                       interrupt-parent = <&intc>;
                        status = "disabled";
                };
+               rtc0: rtc@1c23000 {
+                       compatible = "ti,da830-rtc";
+                       reg = <0x23000 0x1000>;
+                       interrupts = <19
+                                     19>;
+                       status = "disabled";
+               };
+       };
+       nand_cs3@62000000 {
+               compatible = "ti,davinci-nand";
+               reg = <0x62000000 0x807ff
+                      0x68000000 0x8000>;
+               ti,davinci-chipselect = <1>;
+               ti,davinci-mask-ale = <0>;
+               ti,davinci-mask-cle = <0>;
+               ti,davinci-mask-chipsel = <0>;
+               ti,davinci-ecc-mode = "hw";
+               ti,davinci-ecc-bits = <4>;
+               ti,davinci-nand-use-bbt;
+               status = "disabled";
        };
 };

diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig
index f29223954af89a6b8eb5f5a163a5be91e3b31359..0892db4346e93d4a1c73ed4f6564a50d9226a75a 100644 (file)
--- a/arch/arm/configs/da8xx_omapl_defconfig
+++ b/arch/arm/configs/da8xx_omapl_defconfig
@@ -81,6 +81,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_DAVINCI=y
+CONFIG_PINCTRL_SINGLE=y
 # CONFIG_HWMON is not set
 CONFIG_WATCHDOG=y
 CONFIG_REGULATOR=y

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 0153950f606806e77eca03b622c2961438221129..a075b3e0c5c7a5229aa87163e732d9c6b49a7a50 100644 (file)
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -62,6 +62,7 @@ config MACH_DA8XX_DT
        bool "Support DA8XX platforms using device tree"
        default y
        depends on ARCH_DAVINCI_DA8XX
+       select PINCTRL
        help
          Say y here to include support for TI DaVinci DA850 based using
          Flattened Device Tree. More information at Documentation/devicetree