aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-29 12:28:59 -0500
committerOlof Johansson <olof@lixom.net>2013-01-29 12:28:59 -0500
commit7734a93bf7553042a339748dad6e4961d94cfa28 (patch)
treea44542fcf8ea3116a127f40981e6e75ce4b7a00a /arch/arm
parent949db153b6466c6f7cad5a427ecea94985927311 (diff)
parent1661636d362b6d1a6c2bab210f2ab363a69deccc (diff)
Merge tag 'davinci-for-v3.9/dt' of git://gitorious.org/linux-davinci/linux-davinci into next/dt
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
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/boot/dts/da850-evm.dts11
-rw-r--r--arch/arm/boot/dts/da850.dtsi51
-rw-r--r--arch/arm/configs/da8xx_omapl_defconfig1
-rw-r--r--arch/arm/mach-davinci/Kconfig1
4 files changed, 61 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index 37dc5a3243b8..fa04152b24bf 100644
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -15,6 +15,9 @@
15 model = "DA850/AM1808/OMAP-L138 EVM"; 15 model = "DA850/AM1808/OMAP-L138 EVM";
16 16
17 soc { 17 soc {
18 pmx_core: pinmux@1c14120 {
19 status = "okay";
20 };
18 serial0: serial@1c42000 { 21 serial0: serial@1c42000 {
19 status = "okay"; 22 status = "okay";
20 }; 23 };
@@ -24,5 +27,13 @@
24 serial2: serial@1d0d000 { 27 serial2: serial@1d0d000 {
25 status = "okay"; 28 status = "okay";
26 }; 29 };
30 rtc0: rtc@1c23000 {
31 status = "okay";
32 };
33 };
34 nand_cs3@62000000 {
35 status = "okay";
36 pinctrl-names = "default";
37 pinctrl-0 = <&nand_cs3_pins>;
27 }; 38 };
28}; 39};
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index 640ab75c20db..8dd15c0426a8 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -28,14 +28,41 @@
28 #address-cells = <1>; 28 #address-cells = <1>;
29 #size-cells = <1>; 29 #size-cells = <1>;
30 ranges = <0x0 0x01c00000 0x400000>; 30 ranges = <0x0 0x01c00000 0x400000>;
31 interrupt-parent = <&intc>;
31 32
33 pmx_core: pinmux@1c14120 {
34 compatible = "pinctrl-single";
35 reg = <0x14120 0x50>;
36 #address-cells = <1>;
37 #size-cells = <0>;
38 pinctrl-single,bit-per-mux;
39 pinctrl-single,register-width = <32>;
40 pinctrl-single,function-mask = <0xffffffff>;
41 status = "disabled";
42
43 nand_cs3_pins: pinmux_nand_pins {
44 pinctrl-single,bits = <
45 /* EMA_OE, EMA_WE */
46 0x1c 0x00110000 0x00ff0000
47 /* EMA_CS[4],EMA_CS[3]*/
48 0x1c 0x00000110 0x00000ff0
49 /*
50 * EMA_D[0], EMA_D[1], EMA_D[2],
51 * EMA_D[3], EMA_D[4], EMA_D[5],
52 * EMA_D[6], EMA_D[7]
53 */
54 0x24 0x11111111 0xffffffff
55 /* EMA_A[1], EMA_A[2] */
56 0x30 0x01100000 0x0ff00000
57 >;
58 };
59 };
32 serial0: serial@1c42000 { 60 serial0: serial@1c42000 {
33 compatible = "ns16550a"; 61 compatible = "ns16550a";
34 reg = <0x42000 0x100>; 62 reg = <0x42000 0x100>;
35 clock-frequency = <150000000>; 63 clock-frequency = <150000000>;
36 reg-shift = <2>; 64 reg-shift = <2>;
37 interrupts = <25>; 65 interrupts = <25>;
38 interrupt-parent = <&intc>;
39 status = "disabled"; 66 status = "disabled";
40 }; 67 };
41 serial1: serial@1d0c000 { 68 serial1: serial@1d0c000 {
@@ -44,7 +71,6 @@
44 clock-frequency = <150000000>; 71 clock-frequency = <150000000>;
45 reg-shift = <2>; 72 reg-shift = <2>;
46 interrupts = <53>; 73 interrupts = <53>;
47 interrupt-parent = <&intc>;
48 status = "disabled"; 74 status = "disabled";
49 }; 75 };
50 serial2: serial@1d0d000 { 76 serial2: serial@1d0d000 {
@@ -53,8 +79,27 @@
53 clock-frequency = <150000000>; 79 clock-frequency = <150000000>;
54 reg-shift = <2>; 80 reg-shift = <2>;
55 interrupts = <61>; 81 interrupts = <61>;
56 interrupt-parent = <&intc>;
57 status = "disabled"; 82 status = "disabled";
58 }; 83 };
84 rtc0: rtc@1c23000 {
85 compatible = "ti,da830-rtc";
86 reg = <0x23000 0x1000>;
87 interrupts = <19
88 19>;
89 status = "disabled";
90 };
91 };
92 nand_cs3@62000000 {
93 compatible = "ti,davinci-nand";
94 reg = <0x62000000 0x807ff
95 0x68000000 0x8000>;
96 ti,davinci-chipselect = <1>;
97 ti,davinci-mask-ale = <0>;
98 ti,davinci-mask-cle = <0>;
99 ti,davinci-mask-chipsel = <0>;
100 ti,davinci-ecc-mode = "hw";
101 ti,davinci-ecc-bits = <4>;
102 ti,davinci-nand-use-bbt;
103 status = "disabled";
59 }; 104 };
60}; 105};
diff --git a/arch/arm/configs/da8xx_omapl_defconfig b/arch/arm/configs/da8xx_omapl_defconfig
index f29223954af8..0892db4346e9 100644
--- a/arch/arm/configs/da8xx_omapl_defconfig
+++ b/arch/arm/configs/da8xx_omapl_defconfig
@@ -81,6 +81,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
81CONFIG_I2C=y 81CONFIG_I2C=y
82CONFIG_I2C_CHARDEV=y 82CONFIG_I2C_CHARDEV=y
83CONFIG_I2C_DAVINCI=y 83CONFIG_I2C_DAVINCI=y
84CONFIG_PINCTRL_SINGLE=y
84# CONFIG_HWMON is not set 85# CONFIG_HWMON is not set
85CONFIG_WATCHDOG=y 86CONFIG_WATCHDOG=y
86CONFIG_REGULATOR=y 87CONFIG_REGULATOR=y
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 0153950f6068..a075b3e0c5c7 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -62,6 +62,7 @@ config MACH_DA8XX_DT
62 bool "Support DA8XX platforms using device tree" 62 bool "Support DA8XX platforms using device tree"
63 default y 63 default y
64 depends on ARCH_DAVINCI_DA8XX 64 depends on ARCH_DAVINCI_DA8XX
65 select PINCTRL
65 help 66 help
66 Say y here to include support for TI DaVinci DA850 based using 67 Say y here to include support for TI DaVinci DA850 based using
67 Flattened Device Tree. More information at Documentation/devicetree 68 Flattened Device Tree. More information at Documentation/devicetree
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-14 22:18:20 -0400