diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:28:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:28:38 -0500 |
commit | dfc1ebe76663d582a01c9dc572395cf8086d01de (patch) | |
tree | 54a5ac91214a90f82c27b6e38099a4470837729e /arch/arm/boot | |
parent | acc952c1f373bf3f66cc7a10680eee1762bed40b (diff) | |
parent | b001befe58691ef3627458cd814e8cee7f845c5f (diff) |
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Device tree conversions for samsung and tegra
Both platforms had some initial device tree support, but this adds
much more to actually make it usable.
* tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (45 commits)
ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN
ARM: EXYNOS: Add Exynos4 device tree enabled board file
rtc: rtc-s3c: Add device tree support
input: samsung-keypad: Add device tree support
ARM: S5PV210: Modify platform data for pl330 driver
ARM: S5PC100: Modify platform data for pl330 driver
ARM: S5P64x0: Modify platform data for pl330 driver
ARM: EXYNOS: Add a alias for pdma clocks
ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build
ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers
DMA: PL330: Add device tree support
ARM: EXYNOS: Modify platform data for pl330 driver
DMA: PL330: Infer transfer direction from transfer request instead of platform data
DMA: PL330: move filter function into driver
serial: samsung: Fix build for non-Exynos4210 devices
serial: samsung: add device tree support
serial: samsung: merge probe() function from all SoC specific extensions
serial: samsung: merge all SoC specific port reset functions
ARM: SAMSUNG: register uart clocks to clock lookup list
serial: samsung: remove all uses of get_clksrc and set_clksrc
...
Fix up fairly trivial conflicts in arch/arm/mach-s3c2440/clock.c and
drivers/tty/serial/Kconfig both due to just adding code close to
changes.
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/exynos4210-origen.dts | 137 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4210-smdkv310.dts | 182 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos4210.dtsi | 397 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-harmony.dts | 29 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-paz00.dts | 77 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-seaboard.dts | 74 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-trimslice.dts | 65 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra-ventana.dts | 45 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 71 | ||||
-rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 127 |
10 files changed, 1164 insertions, 40 deletions
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts new file mode 100644 index 000000000000..b8c476384eef --- /dev/null +++ b/arch/arm/boot/dts/exynos4210-origen.dts | |||
@@ -0,0 +1,137 @@ | |||
1 | /* | ||
2 | * Samsung's Exynos4210 based Origen board device tree source | ||
3 | * | ||
4 | * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. | ||
5 | * http://www.samsung.com | ||
6 | * Copyright (c) 2010-2011 Linaro Ltd. | ||
7 | * www.linaro.org | ||
8 | * | ||
9 | * Device tree source file for Insignal's Origen board which is based on | ||
10 | * Samsung's Exynos4210 SoC. | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or modify | ||
13 | * it under the terms of the GNU General Public License version 2 as | ||
14 | * published by the Free Software Foundation. | ||
15 | */ | ||
16 | |||
17 | /dts-v1/; | ||
18 | /include/ "exynos4210.dtsi" | ||
19 | |||
20 | / { | ||
21 | model = "Insignal Origen evaluation board based on Exynos4210"; | ||
22 | compatible = "insignal,origen", "samsung,exynos4210"; | ||
23 | |||
24 | memory { | ||
25 | reg = <0x40000000 0x40000000>; | ||
26 | }; | ||
27 | |||
28 | chosen { | ||
29 | bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; | ||
30 | }; | ||
31 | |||
32 | sdhci@12530000 { | ||
33 | samsung,sdhci-bus-width = <4>; | ||
34 | linux,mmc_cap_4_bit_data; | ||
35 | samsung,sdhci-cd-internal; | ||
36 | gpio-cd = <&gpk2 2 2 3 3>; | ||
37 | gpios = <&gpk2 0 2 0 3>, | ||
38 | <&gpk2 1 2 0 3>, | ||
39 | <&gpk2 3 2 3 3>, | ||
40 | <&gpk2 4 2 3 3>, | ||
41 | <&gpk2 5 2 3 3>, | ||
42 | <&gpk2 6 2 3 3>; | ||
43 | }; | ||
44 | |||
45 | sdhci@12510000 { | ||
46 | samsung,sdhci-bus-width = <4>; | ||
47 | linux,mmc_cap_4_bit_data; | ||
48 | samsung,sdhci-cd-internal; | ||
49 | gpio-cd = <&gpk0 2 2 3 3>; | ||
50 | gpios = <&gpk0 0 2 0 3>, | ||
51 | <&gpk0 1 2 0 3>, | ||
52 | <&gpk0 3 2 3 3>, | ||
53 | <&gpk0 4 2 3 3>, | ||
54 | <&gpk0 5 2 3 3>, | ||
55 | <&gpk0 6 2 3 3>; | ||
56 | }; | ||
57 | |||
58 | gpio_keys { | ||
59 | compatible = "gpio-keys"; | ||
60 | #address-cells = <1>; | ||
61 | #size-cells = <0>; | ||
62 | |||
63 | up { | ||
64 | label = "Up"; | ||
65 | gpios = <&gpx2 0 0 0 2>; | ||
66 | linux,code = <103>; | ||
67 | }; | ||
68 | |||
69 | down { | ||
70 | label = "Down"; | ||
71 | gpios = <&gpx2 1 0 0 2>; | ||
72 | linux,code = <108>; | ||
73 | }; | ||
74 | |||
75 | back { | ||
76 | label = "Back"; | ||
77 | gpios = <&gpx1 7 0 0 2>; | ||
78 | linux,code = <158>; | ||
79 | }; | ||
80 | |||
81 | home { | ||
82 | label = "Home"; | ||
83 | gpios = <&gpx1 6 0 0 2>; | ||
84 | linux,code = <102>; | ||
85 | }; | ||
86 | |||
87 | menu { | ||
88 | label = "Menu"; | ||
89 | gpios = <&gpx1 5 0 0 2>; | ||
90 | linux,code = <139>; | ||
91 | }; | ||
92 | }; | ||
93 | |||
94 | keypad@100A0000 { | ||
95 | status = "disabled"; | ||
96 | }; | ||
97 | |||
98 | sdhci@12520000 { | ||
99 | status = "disabled"; | ||
100 | }; | ||
101 | |||
102 | sdhci@12540000 { | ||
103 | status = "disabled"; | ||
104 | }; | ||
105 | |||
106 | i2c@13860000 { | ||
107 | status = "disabled"; | ||
108 | }; | ||
109 | |||
110 | i2c@13870000 { | ||
111 | status = "disabled"; | ||
112 | }; | ||
113 | |||
114 | i2c@13880000 { | ||
115 | status = "disabled"; | ||
116 | }; | ||
117 | |||
118 | i2c@13890000 { | ||
119 | status = "disabled"; | ||
120 | }; | ||
121 | |||
122 | i2c@138A0000 { | ||
123 | status = "disabled"; | ||
124 | }; | ||
125 | |||
126 | i2c@138B0000 { | ||
127 | status = "disabled"; | ||
128 | }; | ||
129 | |||
130 | i2c@138C0000 { | ||
131 | status = "disabled"; | ||
132 | }; | ||
133 | |||
134 | i2c@138D0000 { | ||
135 | status = "disabled"; | ||
136 | }; | ||
137 | }; | ||
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts new file mode 100644 index 000000000000..27afc8e535ca --- /dev/null +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts | |||
@@ -0,0 +1,182 @@ | |||
1 | /* | ||
2 | * Samsung's Exynos4210 based SMDKV310 board device tree source | ||
3 | * | ||
4 | * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. | ||
5 | * http://www.samsung.com | ||
6 | * Copyright (c) 2010-2011 Linaro Ltd. | ||
7 | * www.linaro.org | ||
8 | * | ||
9 | * Device tree source file for Samsung's SMDKV310 board which is based on | ||
10 | * Samsung's Exynos4210 SoC. | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or modify | ||
13 | * it under the terms of the GNU General Public License version 2 as | ||
14 | * published by the Free Software Foundation. | ||
15 | */ | ||
16 | |||
17 | /dts-v1/; | ||
18 | /include/ "exynos4210.dtsi" | ||
19 | |||
20 | / { | ||
21 | model = "Samsung smdkv310 evaluation board based on Exynos4210"; | ||
22 | compatible = "samsung,smdkv310", "samsung,exynos4210"; | ||
23 | |||
24 | memory { | ||
25 | reg = <0x40000000 0x80000000>; | ||
26 | }; | ||
27 | |||
28 | chosen { | ||
29 | bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc"; | ||
30 | }; | ||
31 | |||
32 | sdhci@12530000 { | ||
33 | samsung,sdhci-bus-width = <4>; | ||
34 | linux,mmc_cap_4_bit_data; | ||
35 | samsung,sdhci-cd-internal; | ||
36 | gpio-cd = <&gpk2 2 2 3 3>; | ||
37 | gpios = <&gpk2 0 2 0 3>, | ||
38 | <&gpk2 1 2 0 3>, | ||
39 | <&gpk2 3 2 3 3>, | ||
40 | <&gpk2 4 2 3 3>, | ||
41 | <&gpk2 5 2 3 3>, | ||
42 | <&gpk2 6 2 3 3>; | ||
43 | }; | ||
44 | |||
45 | keypad@100A0000 { | ||
46 | samsung,keypad-num-rows = <2>; | ||
47 | samsung,keypad-num-columns = <8>; | ||
48 | linux,keypad-no-autorepeat; | ||
49 | linux,keypad-wakeup; | ||
50 | |||
51 | row-gpios = <&gpx2 0 3 3 0>, | ||
52 | <&gpx2 1 3 3 0>; | ||
53 | |||
54 | col-gpios = <&gpx1 0 3 0 0>, | ||
55 | <&gpx1 1 3 0 0>, | ||
56 | <&gpx1 2 3 0 0>, | ||
57 | <&gpx1 3 3 0 0>, | ||
58 | <&gpx1 4 3 0 0>, | ||
59 | <&gpx1 5 3 0 0>, | ||
60 | <&gpx1 6 3 0 0>, | ||
61 | <&gpx1 7 3 0 0>; | ||
62 | |||
63 | key_1 { | ||
64 | keypad,row = <0>; | ||
65 | keypad,column = <3>; | ||
66 | linux,code = <2>; | ||
67 | }; | ||
68 | |||
69 | key_2 { | ||
70 | keypad,row = <0>; | ||
71 | keypad,column = <4>; | ||
72 | linux,code = <3>; | ||
73 | }; | ||
74 | |||
75 | key_3 { | ||
76 | keypad,row = <0>; | ||
77 | keypad,column = <5>; | ||
78 | linux,code = <4>; | ||
79 | }; | ||
80 | |||
81 | key_4 { | ||
82 | keypad,row = <0>; | ||
83 | keypad,column = <6>; | ||
84 | linux,code = <5>; | ||
85 | }; | ||
86 | |||
87 | key_5 { | ||
88 | keypad,row = <0>; | ||
89 | keypad,column = <7>; | ||
90 | linux,code = <6>; | ||
91 | }; | ||
92 | |||
93 | key_a { | ||
94 | keypad,row = <1>; | ||
95 | keypad,column = <3>; | ||
96 | linux,code = <30>; | ||
97 | }; | ||
98 | |||
99 | key_b { | ||
100 | keypad,row = <1>; | ||
101 | keypad,column = <4>; | ||
102 | linux,code = <48>; | ||
103 | }; | ||
104 | |||
105 | key_c { | ||
106 | keypad,row = <1>; | ||
107 | keypad,column = <5>; | ||
108 | linux,code = <46>; | ||
109 | }; | ||
110 | |||
111 | key_d { | ||
112 | keypad,row = <1>; | ||
113 | keypad,column = <6>; | ||
114 | linux,code = <32>; | ||
115 | }; | ||
116 | |||
117 | key_e { | ||
118 | keypad,row = <1>; | ||
119 | keypad,column = <7>; | ||
120 | linux,code = <18>; | ||
121 | }; | ||
122 | }; | ||
123 | |||
124 | i2c@13860000 { | ||
125 | #address-cells = <1>; | ||
126 | #size-cells = <0>; | ||
127 | samsung,i2c-sda-delay = <100>; | ||
128 | samsung,i2c-max-bus-freq = <20000>; | ||
129 | gpios = <&gpd1 0 2 3 0>, | ||
130 | <&gpd1 1 2 3 0>; | ||
131 | |||
132 | eeprom@50 { | ||
133 | compatible = "samsung,24ad0xd1"; | ||
134 | reg = <0x50>; | ||
135 | }; | ||
136 | |||
137 | eeprom@52 { | ||
138 | compatible = "samsung,24ad0xd1"; | ||
139 | reg = <0x52>; | ||
140 | }; | ||
141 | }; | ||
142 | |||
143 | sdhci@12510000 { | ||
144 | status = "disabled"; | ||
145 | }; | ||
146 | |||
147 | sdhci@12520000 { | ||
148 | status = "disabled"; | ||
149 | }; | ||
150 | |||
151 | sdhci@12540000 { | ||
152 | status = "disabled"; | ||
153 | }; | ||
154 | |||
155 | i2c@13870000 { | ||
156 | status = "disabled"; | ||
157 | }; | ||
158 | |||
159 | i2c@13880000 { | ||
160 | status = "disabled"; | ||
161 | }; | ||
162 | |||
163 | i2c@13890000 { | ||
164 | status = "disabled"; | ||
165 | }; | ||
166 | |||
167 | i2c@138A0000 { | ||
168 | status = "disabled"; | ||
169 | }; | ||
170 | |||
171 | i2c@138B0000 { | ||
172 | status = "disabled"; | ||
173 | }; | ||
174 | |||
175 | i2c@138C0000 { | ||
176 | status = "disabled"; | ||
177 | }; | ||
178 | |||
179 | i2c@138D0000 { | ||
180 | status = "disabled"; | ||
181 | }; | ||
182 | }; | ||
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi new file mode 100644 index 000000000000..63d7578856c1 --- /dev/null +++ b/arch/arm/boot/dts/exynos4210.dtsi | |||
@@ -0,0 +1,397 @@ | |||
1 | /* | ||
2 | * Samsung's Exynos4210 SoC device tree source | ||
3 | * | ||
4 | * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd. | ||
5 | * http://www.samsung.com | ||
6 | * Copyright (c) 2010-2011 Linaro Ltd. | ||
7 | * www.linaro.org | ||
8 | * | ||
9 | * Samsung's Exynos4210 SoC device nodes are listed in this file. Exynos4210 | ||
10 | * based board files can include this file and provide values for board specfic | ||
11 | * bindings. | ||
12 | * | ||
13 | * Note: This file does not include device nodes for all the controllers in | ||
14 | * Exynos4210 SoC. As device tree coverage for Exynos4210 increases, additional | ||
15 | * nodes can be added to this file. | ||
16 | * | ||
17 | * This program is free software; you can redistribute it and/or modify | ||
18 | * it under the terms of the GNU General Public License version 2 as | ||
19 | * published by the Free Software Foundation. | ||
20 | */ | ||
21 | |||
22 | /include/ "skeleton.dtsi" | ||
23 | |||
24 | / { | ||
25 | compatible = "samsung,exynos4210"; | ||
26 | interrupt-parent = <&gic>; | ||
27 | |||
28 | gic:interrupt-controller@10490000 { | ||
29 | compatible = "arm,cortex-a9-gic"; | ||
30 | #interrupt-cells = <3>; | ||
31 | interrupt-controller; | ||
32 | reg = <0x10490000 0x1000>, <0x10480000 0x100>; | ||
33 | }; | ||
34 | |||
35 | watchdog@10060000 { | ||
36 | compatible = "samsung,s3c2410-wdt"; | ||
37 | reg = <0x10060000 0x100>; | ||
38 | interrupts = <0 43 0>; | ||
39 | }; | ||
40 | |||
41 | rtc@10070000 { | ||
42 | compatible = "samsung,s3c6410-rtc"; | ||
43 | reg = <0x10070000 0x100>; | ||
44 | interrupts = <0 44 0>, <0 45 0>; | ||
45 | }; | ||
46 | |||
47 | keypad@100A0000 { | ||
48 | compatible = "samsung,s5pv210-keypad"; | ||
49 | reg = <0x100A0000 0x100>; | ||
50 | interrupts = <0 109 0>; | ||
51 | }; | ||
52 | |||
53 | sdhci@12510000 { | ||
54 | compatible = "samsung,exynos4210-sdhci"; | ||
55 | reg = <0x12510000 0x100>; | ||
56 | interrupts = <0 73 0>; | ||
57 | }; | ||
58 | |||
59 | sdhci@12520000 { | ||
60 | compatible = "samsung,exynos4210-sdhci"; | ||
61 | reg = <0x12520000 0x100>; | ||
62 | interrupts = <0 74 0>; | ||
63 | }; | ||
64 | |||
65 | sdhci@12530000 { | ||
66 | compatible = "samsung,exynos4210-sdhci"; | ||
67 | reg = <0x12530000 0x100>; | ||
68 | interrupts = <0 75 0>; | ||
69 | }; | ||
70 | |||
71 | sdhci@12540000 { | ||
72 | compatible = "samsung,exynos4210-sdhci"; | ||
73 | reg = <0x12540000 0x100>; | ||
74 | interrupts = <0 76 0>; | ||
75 | }; | ||
76 | |||
77 | serial@13800000 { | ||
78 | compatible = "samsung,exynos4210-uart"; | ||
79 | reg = <0x13800000 0x100>; | ||
80 | interrupts = <0 52 0>; | ||
81 | }; | ||
82 | |||
83 | serial@13810000 { | ||
84 | compatible = "samsung,exynos4210-uart"; | ||
85 | reg = <0x13810000 0x100>; | ||
86 | interrupts = <0 53 0>; | ||
87 | }; | ||
88 | |||
89 | serial@13820000 { | ||
90 | compatible = "samsung,exynos4210-uart"; | ||
91 | reg = <0x13820000 0x100>; | ||
92 | interrupts = <0 54 0>; | ||
93 | }; | ||
94 | |||
95 | serial@13830000 { | ||
96 | compatible = "samsung,exynos4210-uart"; | ||
97 | reg = <0x13830000 0x100>; | ||
98 | interrupts = <0 55 0>; | ||
99 | }; | ||
100 | |||
101 | i2c@13860000 { | ||
102 | compatible = "samsung,s3c2440-i2c"; | ||
103 | reg = <0x13860000 0x100>; | ||
104 | interrupts = <0 58 0>; | ||
105 | }; | ||
106 | |||
107 | i2c@13870000 { | ||
108 | compatible = "samsung,s3c2440-i2c"; | ||
109 | reg = <0x13870000 0x100>; | ||
110 | interrupts = <0 59 0>; | ||
111 | }; | ||
112 | |||
113 | i2c@13880000 { | ||
114 | compatible = "samsung,s3c2440-i2c"; | ||
115 | reg = <0x13880000 0x100>; | ||
116 | interrupts = <0 60 0>; | ||
117 | }; | ||
118 | |||
119 | i2c@13890000 { | ||
120 | compatible = "samsung,s3c2440-i2c"; | ||
121 | reg = <0x13890000 0x100>; | ||
122 | interrupts = <0 61 0>; | ||
123 | }; | ||
124 | |||
125 | i2c@138A0000 { | ||
126 | compatible = "samsung,s3c2440-i2c"; | ||
127 | reg = <0x138A0000 0x100>; | ||
128 | interrupts = <0 62 0>; | ||
129 | }; | ||
130 | |||
131 | i2c@138B0000 { | ||
132 | compatible = "samsung,s3c2440-i2c"; | ||
133 | reg = <0x138B0000 0x100>; | ||
134 | interrupts = <0 63 0>; | ||
135 | }; | ||
136 | |||
137 | i2c@138C0000 { | ||
138 | compatible = "samsung,s3c2440-i2c"; | ||
139 | reg = <0x138C0000 0x100>; | ||
140 | interrupts = <0 64 0>; | ||
141 | }; | ||
142 | |||
143 | i2c@138D0000 { | ||
144 | compatible = "samsung,s3c2440-i2c"; | ||
145 | reg = <0x138D0000 0x100>; | ||
146 | interrupts = <0 65 0>; | ||
147 | }; | ||
148 | |||
149 | amba { | ||
150 | #address-cells = <1>; | ||
151 | #size-cells = <1>; | ||
152 | compatible = "arm,amba-bus"; | ||
153 | interrupt-parent = <&gic>; | ||
154 | ranges; | ||
155 | |||
156 | pdma0: pdma@12680000 { | ||
157 | compatible = "arm,pl330", "arm,primecell"; | ||
158 | reg = <0x12680000 0x1000>; | ||
159 | interrupts = <0 35 0>; | ||
160 | }; | ||
161 | |||
162 | pdma1: pdma@12690000 { | ||
163 | compatible = "arm,pl330", "arm,primecell"; | ||
164 | reg = <0x12690000 0x1000>; | ||
165 | interrupts = <0 36 0>; | ||
166 | }; | ||
167 | }; | ||
168 | |||
169 | gpio-controllers { | ||
170 | #address-cells = <1>; | ||
171 | #size-cells = <1>; | ||
172 | gpio-controller; | ||
173 | ranges; | ||
174 | |||
175 | gpa0: gpio-controller@11400000 { | ||
176 | compatible = "samsung,exynos4-gpio"; | ||
177 | reg = <0x11400000 0x20>; | ||
178 | #gpio-cells = <4>; | ||
179 | }; | ||
180 | |||
181 | gpa1: gpio-controller@11400020 { | ||
182 | compatible = "samsung,exynos4-gpio"; | ||
183 | reg = <0x11400020 0x20>; | ||
184 | #gpio-cells = <4>; | ||
185 | }; | ||
186 | |||
187 | gpb: gpio-controller@11400040 { | ||
188 | compatible = "samsung,exynos4-gpio"; | ||
189 | reg = <0x11400040 0x20>; | ||
190 | #gpio-cells = <4>; | ||
191 | }; | ||
192 | |||
193 | gpc0: gpio-controller@11400060 { | ||
194 | compatible = "samsung,exynos4-gpio"; | ||
195 | reg = <0x11400060 0x20>; | ||
196 | #gpio-cells = <4>; | ||
197 | }; | ||
198 | |||
199 | gpc1: gpio-controller@11400080 { | ||
200 | compatible = "samsung,exynos4-gpio"; | ||
201 | reg = <0x11400080 0x20>; | ||
202 | #gpio-cells = <4>; | ||
203 | }; | ||
204 | |||
205 | gpd0: gpio-controller@114000A0 { | ||
206 | compatible = "samsung,exynos4-gpio"; | ||
207 | reg = <0x114000A0 0x20>; | ||
208 | #gpio-cells = <4>; | ||
209 | }; | ||
210 | |||
211 | gpd1: gpio-controller@114000C0 { | ||
212 | compatible = "samsung,exynos4-gpio"; | ||
213 | reg = <0x114000C0 0x20>; | ||
214 | #gpio-cells = <4>; | ||
215 | }; | ||
216 | |||
217 | gpe0: gpio-controller@114000E0 { | ||
218 | compatible = "samsung,exynos4-gpio"; | ||
219 | reg = <0x114000E0 0x20>; | ||
220 | #gpio-cells = <4>; | ||
221 | }; | ||
222 | |||
223 | gpe1: gpio-controller@11400100 { | ||
224 | compatible = "samsung,exynos4-gpio"; | ||
225 | reg = <0x11400100 0x20>; | ||
226 | #gpio-cells = <4>; | ||
227 | }; | ||
228 | |||
229 | gpe2: gpio-controller@11400120 { | ||
230 | compatible = "samsung,exynos4-gpio"; | ||
231 | reg = <0x11400120 0x20>; | ||
232 | #gpio-cells = <4>; | ||
233 | }; | ||
234 | |||
235 | gpe3: gpio-controller@11400140 { | ||
236 | compatible = "samsung,exynos4-gpio"; | ||
237 | reg = <0x11400140 0x20>; | ||
238 | #gpio-cells = <4>; | ||
239 | }; | ||
240 | |||
241 | gpe4: gpio-controller@11400160 { | ||
242 | compatible = "samsung,exynos4-gpio"; | ||
243 | reg = <0x11400160 0x20>; | ||
244 | #gpio-cells = <4>; | ||
245 | }; | ||
246 | |||
247 | gpf0: gpio-controller@11400180 { | ||
248 | compatible = "samsung,exynos4-gpio"; | ||
249 | reg = <0x11400180 0x20>; | ||
250 | #gpio-cells = <4>; | ||
251 | }; | ||
252 | |||
253 | gpf1: gpio-controller@114001A0 { | ||
254 | compatible = "samsung,exynos4-gpio"; | ||
255 | reg = <0x114001A0 0x20>; | ||
256 | #gpio-cells = <4>; | ||
257 | }; | ||
258 | |||
259 | gpf2: gpio-controller@114001C0 { | ||
260 | compatible = "samsung,exynos4-gpio"; | ||
261 | reg = <0x114001C0 0x20>; | ||
262 | #gpio-cells = <4>; | ||
263 | }; | ||
264 | |||
265 | gpf3: gpio-controller@114001E0 { | ||
266 | compatible = "samsung,exynos4-gpio"; | ||
267 | reg = <0x114001E0 0x20>; | ||
268 | #gpio-cells = <4>; | ||
269 | }; | ||
270 | |||
271 | gpj0: gpio-controller@11000000 { | ||
272 | compatible = "samsung,exynos4-gpio"; | ||
273 | reg = <0x11000000 0x20>; | ||
274 | #gpio-cells = <4>; | ||
275 | }; | ||
276 | |||
277 | gpj1: gpio-controller@11000020 { | ||
278 | compatible = "samsung,exynos4-gpio"; | ||
279 | reg = <0x11000020 0x20>; | ||
280 | #gpio-cells = <4>; | ||
281 | }; | ||
282 | |||
283 | gpk0: gpio-controller@11000040 { | ||
284 | compatible = "samsung,exynos4-gpio"; | ||
285 | reg = <0x11000040 0x20>; | ||
286 | #gpio-cells = <4>; | ||
287 | }; | ||
288 | |||
289 | gpk1: gpio-controller@11000060 { | ||
290 | compatible = "samsung,exynos4-gpio"; | ||
291 | reg = <0x11000060 0x20>; | ||
292 | #gpio-cells = <4>; | ||
293 | }; | ||
294 | |||
295 | gpk2: gpio-controller@11000080 { | ||
296 | compatible = "samsung,exynos4-gpio"; | ||
297 | reg = <0x11000080 0x20>; | ||
298 | #gpio-cells = <4>; | ||
299 | }; | ||
300 | |||
301 | gpk3: gpio-controller@110000A0 { | ||
302 | compatible = "samsung,exynos4-gpio"; | ||
303 | reg = <0x110000A0 0x20>; | ||
304 | #gpio-cells = <4>; | ||
305 | }; | ||
306 | |||
307 | gpl0: gpio-controller@110000C0 { | ||
308 | compatible = "samsung,exynos4-gpio"; | ||
309 | reg = <0x110000C0 0x20>; | ||
310 | #gpio-cells = <4>; | ||
311 | }; | ||
312 | |||
313 | gpl1: gpio-controller@110000E0 { | ||
314 | compatible = "samsung,exynos4-gpio"; | ||
315 | reg = <0x110000E0 0x20>; | ||
316 | #gpio-cells = <4>; | ||
317 | }; | ||
318 | |||
319 | gpl2: gpio-controller@11000100 { | ||
320 | compatible = "samsung,exynos4-gpio"; | ||
321 | reg = <0x11000100 0x20>; | ||
322 | #gpio-cells = <4>; | ||
323 | }; | ||
324 | |||
325 | gpy0: gpio-controller@11000120 { | ||
326 | compatible = "samsung,exynos4-gpio"; | ||
327 | reg = <0x11000120 0x20>; | ||
328 | #gpio-cells = <4>; | ||
329 | }; | ||
330 | |||
331 | gpy1: gpio-controller@11000140 { | ||
332 | compatible = "samsung,exynos4-gpio"; | ||
333 | reg = <0x11000140 0x20>; | ||
334 | #gpio-cells = <4>; | ||
335 | }; | ||
336 | |||
337 | gpy2: gpio-controller@11000160 { | ||
338 | compatible = "samsung,exynos4-gpio"; | ||
339 | reg = <0x11000160 0x20>; | ||
340 | #gpio-cells = <4>; | ||
341 | }; | ||
342 | |||
343 | gpy3: gpio-controller@11000180 { | ||
344 | compatible = "samsung,exynos4-gpio"; | ||
345 | reg = <0x11000180 0x20>; | ||
346 | #gpio-cells = <4>; | ||
347 | }; | ||
348 | |||
349 | gpy4: gpio-controller@110001A0 { | ||
350 | compatible = "samsung,exynos4-gpio"; | ||
351 | reg = <0x110001A0 0x20>; | ||
352 | #gpio-cells = <4>; | ||
353 | }; | ||
354 | |||
355 | gpy5: gpio-controller@110001C0 { | ||
356 | compatible = "samsung,exynos4-gpio"; | ||
357 | reg = <0x110001C0 0x20>; | ||
358 | #gpio-cells = <4>; | ||
359 | }; | ||
360 | |||
361 | gpy6: gpio-controller@110001E0 { | ||
362 | compatible = "samsung,exynos4-gpio"; | ||
363 | reg = <0x110001E0 0x20>; | ||
364 | #gpio-cells = <4>; | ||
365 | }; | ||
366 | |||
367 | gpx0: gpio-controller@11000C00 { | ||
368 | compatible = "samsung,exynos4-gpio"; | ||
369 | reg = <0x11000C00 0x20>; | ||
370 | #gpio-cells = <4>; | ||
371 | }; | ||
372 | |||
373 | gpx1: gpio-controller@11000C20 { | ||
374 | compatible = "samsung,exynos4-gpio"; | ||
375 | reg = <0x11000C20 0x20>; | ||
376 | #gpio-cells = <4>; | ||
377 | }; | ||
378 | |||
379 | gpx2: gpio-controller@11000C40 { | ||
380 | compatible = "samsung,exynos4-gpio"; | ||
381 | reg = <0x11000C40 0x20>; | ||
382 | #gpio-cells = <4>; | ||
383 | }; | ||
384 | |||
385 | gpx3: gpio-controller@11000C60 { | ||
386 | compatible = "samsung,exynos4-gpio"; | ||
387 | reg = <0x11000C60 0x20>; | ||
388 | #gpio-cells = <4>; | ||
389 | }; | ||
390 | |||
391 | gpz: gpio-controller@03860000 { | ||
392 | compatible = "samsung,exynos4-gpio"; | ||
393 | reg = <0x03860000 0x20>; | ||
394 | #gpio-cells = <4>; | ||
395 | }; | ||
396 | }; | ||
397 | }; | ||
diff --git a/arch/arm/boot/dts/tegra-harmony.dts b/arch/arm/boot/dts/tegra-harmony.dts index 0e225b86b652..80afa1b70b80 100644 --- a/arch/arm/boot/dts/tegra-harmony.dts +++ b/arch/arm/boot/dts/tegra-harmony.dts | |||
@@ -1,16 +1,11 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /memreserve/ 0x1c000000 0x04000000; | ||
4 | /include/ "tegra20.dtsi" | 3 | /include/ "tegra20.dtsi" |
5 | 4 | ||
6 | / { | 5 | / { |
7 | model = "NVIDIA Tegra2 Harmony evaluation board"; | 6 | model = "NVIDIA Tegra2 Harmony evaluation board"; |
8 | compatible = "nvidia,harmony", "nvidia,tegra20"; | 7 | compatible = "nvidia,harmony", "nvidia,tegra20"; |
9 | 8 | ||
10 | chosen { | ||
11 | bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk0p2 rw rootwait"; | ||
12 | }; | ||
13 | |||
14 | memory@0 { | 9 | memory@0 { |
15 | reg = < 0x00000000 0x40000000 >; | 10 | reg = < 0x00000000 0x40000000 >; |
16 | }; | 11 | }; |
@@ -52,16 +47,40 @@ | |||
52 | ext-mic-en-gpios = <&gpio 185 0>; | 47 | ext-mic-en-gpios = <&gpio 185 0>; |
53 | }; | 48 | }; |
54 | 49 | ||
50 | serial@70006000 { | ||
51 | status = "disable"; | ||
52 | }; | ||
53 | |||
54 | serial@70006040 { | ||
55 | status = "disable"; | ||
56 | }; | ||
57 | |||
58 | serial@70006200 { | ||
59 | status = "disable"; | ||
60 | }; | ||
61 | |||
55 | serial@70006300 { | 62 | serial@70006300 { |
56 | clock-frequency = < 216000000 >; | 63 | clock-frequency = < 216000000 >; |
57 | }; | 64 | }; |
58 | 65 | ||
66 | serial@70006400 { | ||
67 | status = "disable"; | ||
68 | }; | ||
69 | |||
70 | sdhci@c8000000 { | ||
71 | status = "disable"; | ||
72 | }; | ||
73 | |||
59 | sdhci@c8000200 { | 74 | sdhci@c8000200 { |
60 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 75 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
61 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 76 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
62 | power-gpios = <&gpio 155 0>; /* gpio PT3 */ | 77 | power-gpios = <&gpio 155 0>; /* gpio PT3 */ |
63 | }; | 78 | }; |
64 | 79 | ||
80 | sdhci@c8000400 { | ||
81 | status = "disable"; | ||
82 | }; | ||
83 | |||
65 | sdhci@c8000600 { | 84 | sdhci@c8000600 { |
66 | cd-gpios = <&gpio 58 0>; /* gpio PH2 */ | 85 | cd-gpios = <&gpio 58 0>; /* gpio PH2 */ |
67 | wp-gpios = <&gpio 59 0>; /* gpio PH3 */ | 86 | wp-gpios = <&gpio 59 0>; /* gpio PH3 */ |
diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts new file mode 100644 index 000000000000..1a1d7023b69b --- /dev/null +++ b/arch/arm/boot/dts/tegra-paz00.dts | |||
@@ -0,0 +1,77 @@ | |||
1 | /dts-v1/; | ||
2 | |||
3 | /include/ "tegra20.dtsi" | ||
4 | |||
5 | / { | ||
6 | model = "Toshiba AC100 / Dynabook AZ"; | ||
7 | compatible = "compal,paz00", "nvidia,tegra20"; | ||
8 | |||
9 | memory@0 { | ||
10 | reg = <0x00000000 0x20000000>; | ||
11 | }; | ||
12 | |||
13 | i2c@7000c000 { | ||
14 | clock-frequency = <400000>; | ||
15 | }; | ||
16 | |||
17 | i2c@7000c400 { | ||
18 | clock-frequency = <400000>; | ||
19 | }; | ||
20 | |||
21 | i2c@7000c500 { | ||
22 | status = "disable"; | ||
23 | }; | ||
24 | |||
25 | nvec@7000c500 { | ||
26 | #address-cells = <1>; | ||
27 | #size-cells = <0>; | ||
28 | compatible = "nvidia,nvec"; | ||
29 | reg = <0x7000C500 0x100>; | ||
30 | interrupts = <0 92 0x04>; | ||
31 | clock-frequency = <80000>; | ||
32 | request-gpios = <&gpio 170 0>; | ||
33 | slave-addr = <138>; | ||
34 | }; | ||
35 | |||
36 | i2c@7000d000 { | ||
37 | clock-frequency = <400000>; | ||
38 | }; | ||
39 | |||
40 | serial@70006000 { | ||
41 | clock-frequency = <216000000>; | ||
42 | }; | ||
43 | |||
44 | serial@70006040 { | ||
45 | status = "disable"; | ||
46 | }; | ||
47 | |||
48 | serial@70006200 { | ||
49 | status = "disable"; | ||
50 | }; | ||
51 | |||
52 | serial@70006300 { | ||
53 | clock-frequency = <216000000>; | ||
54 | }; | ||
55 | |||
56 | serial@70006400 { | ||
57 | status = "disable"; | ||
58 | }; | ||
59 | |||
60 | sdhci@c8000000 { | ||
61 | cd-gpios = <&gpio 173 0>; /* gpio PV5 */ | ||
62 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | ||
63 | power-gpios = <&gpio 155 0>; /* gpio PT3 */ | ||
64 | }; | ||
65 | |||
66 | sdhci@c8000200 { | ||
67 | status = "disable"; | ||
68 | }; | ||
69 | |||
70 | sdhci@c8000400 { | ||
71 | status = "disable"; | ||
72 | }; | ||
73 | |||
74 | sdhci@c8000600 { | ||
75 | support-8bit; | ||
76 | }; | ||
77 | }; | ||
diff --git a/arch/arm/boot/dts/tegra-seaboard.dts b/arch/arm/boot/dts/tegra-seaboard.dts index a72299b8e668..b55a02e34ba7 100644 --- a/arch/arm/boot/dts/tegra-seaboard.dts +++ b/arch/arm/boot/dts/tegra-seaboard.dts | |||
@@ -1,25 +1,65 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /memreserve/ 0x1c000000 0x04000000; | ||
4 | /include/ "tegra20.dtsi" | 3 | /include/ "tegra20.dtsi" |
5 | 4 | ||
6 | / { | 5 | / { |
7 | model = "NVIDIA Seaboard"; | 6 | model = "NVIDIA Seaboard"; |
8 | compatible = "nvidia,seaboard", "nvidia,tegra20"; | 7 | compatible = "nvidia,seaboard", "nvidia,tegra20"; |
9 | 8 | ||
10 | chosen { | ||
11 | bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/mmcblk1p3 rw rootwait"; | ||
12 | }; | ||
13 | |||
14 | memory { | 9 | memory { |
15 | device_type = "memory"; | 10 | device_type = "memory"; |
16 | reg = < 0x00000000 0x40000000 >; | 11 | reg = < 0x00000000 0x40000000 >; |
17 | }; | 12 | }; |
18 | 13 | ||
14 | i2c@7000c000 { | ||
15 | clock-frequency = <400000>; | ||
16 | }; | ||
17 | |||
18 | i2c@7000c400 { | ||
19 | clock-frequency = <400000>; | ||
20 | }; | ||
21 | |||
22 | i2c@7000c500 { | ||
23 | clock-frequency = <400000>; | ||
24 | }; | ||
25 | |||
26 | i2c@7000d000 { | ||
27 | clock-frequency = <400000>; | ||
28 | |||
29 | adt7461@4c { | ||
30 | compatible = "adt7461"; | ||
31 | reg = <0x4c>; | ||
32 | }; | ||
33 | }; | ||
34 | |||
35 | serial@70006000 { | ||
36 | status = "disable"; | ||
37 | }; | ||
38 | |||
39 | serial@70006040 { | ||
40 | status = "disable"; | ||
41 | }; | ||
42 | |||
43 | serial@70006200 { | ||
44 | status = "disable"; | ||
45 | }; | ||
46 | |||
19 | serial@70006300 { | 47 | serial@70006300 { |
20 | clock-frequency = < 216000000 >; | 48 | clock-frequency = < 216000000 >; |
21 | }; | 49 | }; |
22 | 50 | ||
51 | serial@70006400 { | ||
52 | status = "disable"; | ||
53 | }; | ||
54 | |||
55 | sdhci@c8000000 { | ||
56 | status = "disable"; | ||
57 | }; | ||
58 | |||
59 | sdhci@c8000200 { | ||
60 | status = "disable"; | ||
61 | }; | ||
62 | |||
23 | sdhci@c8000400 { | 63 | sdhci@c8000400 { |
24 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 64 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
25 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 65 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
@@ -29,4 +69,28 @@ | |||
29 | sdhci@c8000600 { | 69 | sdhci@c8000600 { |
30 | support-8bit; | 70 | support-8bit; |
31 | }; | 71 | }; |
72 | |||
73 | usb@c5000000 { | ||
74 | nvidia,vbus-gpio = <&gpio 24 0>; /* PD0 */ | ||
75 | }; | ||
76 | |||
77 | gpio-keys { | ||
78 | compatible = "gpio-keys"; | ||
79 | |||
80 | power { | ||
81 | label = "Power"; | ||
82 | gpios = <&gpio 170 1>; /* gpio PV2, active low */ | ||
83 | linux,code = <116>; /* KEY_POWER */ | ||
84 | gpio-key,wakeup; | ||
85 | }; | ||
86 | |||
87 | lid { | ||
88 | label = "Lid"; | ||
89 | gpios = <&gpio 23 0>; /* gpio PC7 */ | ||
90 | linux,input-type = <5>; /* EV_SW */ | ||
91 | linux,code = <0>; /* SW_LID */ | ||
92 | debounce-interval = <1>; | ||
93 | gpio-key,wakeup; | ||
94 | }; | ||
95 | }; | ||
32 | }; | 96 | }; |
diff --git a/arch/arm/boot/dts/tegra-trimslice.dts b/arch/arm/boot/dts/tegra-trimslice.dts new file mode 100644 index 000000000000..3b3ee7db99f3 --- /dev/null +++ b/arch/arm/boot/dts/tegra-trimslice.dts | |||
@@ -0,0 +1,65 @@ | |||
1 | /dts-v1/; | ||
2 | |||
3 | /include/ "tegra20.dtsi" | ||
4 | |||
5 | / { | ||
6 | model = "Compulab TrimSlice board"; | ||
7 | compatible = "compulab,trimslice", "nvidia,tegra20"; | ||
8 | |||
9 | memory@0 { | ||
10 | reg = < 0x00000000 0x40000000 >; | ||
11 | }; | ||
12 | |||
13 | i2c@7000c000 { | ||
14 | clock-frequency = <400000>; | ||
15 | }; | ||
16 | |||
17 | i2c@7000c400 { | ||
18 | clock-frequency = <400000>; | ||
19 | }; | ||
20 | |||
21 | i2c@7000c500 { | ||
22 | clock-frequency = <400000>; | ||
23 | }; | ||
24 | |||
25 | i2c@7000d000 { | ||
26 | status = "disable"; | ||
27 | }; | ||
28 | |||
29 | serial@70006000 { | ||
30 | clock-frequency = < 216000000 >; | ||
31 | }; | ||
32 | |||
33 | serial@70006040 { | ||
34 | status = "disable"; | ||
35 | }; | ||
36 | |||
37 | serial@70006200 { | ||
38 | status = "disable"; | ||
39 | }; | ||
40 | |||
41 | serial@70006300 { | ||
42 | status = "disable"; | ||
43 | }; | ||
44 | |||
45 | serial@70006400 { | ||
46 | status = "disable"; | ||
47 | }; | ||
48 | |||
49 | sdhci@c8000000 { | ||
50 | status = "disable"; | ||
51 | }; | ||
52 | |||
53 | sdhci@c8000200 { | ||
54 | status = "disable"; | ||
55 | }; | ||
56 | |||
57 | sdhci@c8000400 { | ||
58 | status = "disable"; | ||
59 | }; | ||
60 | |||
61 | sdhci@c8000600 { | ||
62 | cd-gpios = <&gpio 121 0>; | ||
63 | wp-gpios = <&gpio 122 0>; | ||
64 | }; | ||
65 | }; | ||
diff --git a/arch/arm/boot/dts/tegra-ventana.dts b/arch/arm/boot/dts/tegra-ventana.dts index 3f9abd6b6964..c7d3b87f29df 100644 --- a/arch/arm/boot/dts/tegra-ventana.dts +++ b/arch/arm/boot/dts/tegra-ventana.dts | |||
@@ -1,24 +1,59 @@ | |||
1 | /dts-v1/; | 1 | /dts-v1/; |
2 | 2 | ||
3 | /memreserve/ 0x1c000000 0x04000000; | ||
4 | /include/ "tegra20.dtsi" | 3 | /include/ "tegra20.dtsi" |
5 | 4 | ||
6 | / { | 5 | / { |
7 | model = "NVIDIA Tegra2 Ventana evaluation board"; | 6 | model = "NVIDIA Tegra2 Ventana evaluation board"; |
8 | compatible = "nvidia,ventana", "nvidia,tegra20"; | 7 | compatible = "nvidia,ventana", "nvidia,tegra20"; |
9 | 8 | ||
10 | chosen { | ||
11 | bootargs = "vmalloc=192M video=tegrafb console=ttyS0,115200n8 root=/dev/ram rdinit=/sbin/init"; | ||
12 | }; | ||
13 | |||
14 | memory { | 9 | memory { |
15 | reg = < 0x00000000 0x40000000 >; | 10 | reg = < 0x00000000 0x40000000 >; |
16 | }; | 11 | }; |
17 | 12 | ||
13 | i2c@7000c000 { | ||
14 | clock-frequency = <400000>; | ||
15 | }; | ||
16 | |||
17 | i2c@7000c400 { | ||
18 | clock-frequency = <400000>; | ||
19 | }; | ||
20 | |||
21 | i2c@7000c500 { | ||
22 | clock-frequency = <400000>; | ||
23 | }; | ||
24 | |||
25 | i2c@7000d000 { | ||
26 | clock-frequency = <400000>; | ||
27 | }; | ||
28 | |||
29 | serial@70006000 { | ||
30 | status = "disable"; | ||
31 | }; | ||
32 | |||
33 | serial@70006040 { | ||
34 | status = "disable"; | ||
35 | }; | ||
36 | |||
37 | serial@70006200 { | ||
38 | status = "disable"; | ||
39 | }; | ||
40 | |||
18 | serial@70006300 { | 41 | serial@70006300 { |
19 | clock-frequency = < 216000000 >; | 42 | clock-frequency = < 216000000 >; |
20 | }; | 43 | }; |
21 | 44 | ||
45 | serial@70006400 { | ||
46 | status = "disable"; | ||
47 | }; | ||
48 | |||
49 | sdhci@c8000000 { | ||
50 | status = "disable"; | ||
51 | }; | ||
52 | |||
53 | sdhci@c8000200 { | ||
54 | status = "disable"; | ||
55 | }; | ||
56 | |||
22 | sdhci@c8000400 { | 57 | sdhci@c8000400 { |
23 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ | 58 | cd-gpios = <&gpio 69 0>; /* gpio PI5 */ |
24 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ | 59 | wp-gpios = <&gpio 57 0>; /* gpio PH1 */ |
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi index 65d7e6a333eb..3da7afd45322 100644 --- a/arch/arm/boot/dts/tegra20.dtsi +++ b/arch/arm/boot/dts/tegra20.dtsi | |||
@@ -5,9 +5,9 @@ | |||
5 | interrupt-parent = <&intc>; | 5 | interrupt-parent = <&intc>; |
6 | 6 | ||
7 | intc: interrupt-controller@50041000 { | 7 | intc: interrupt-controller@50041000 { |
8 | compatible = "nvidia,tegra20-gic"; | 8 | compatible = "arm,cortex-a9-gic"; |
9 | interrupt-controller; | 9 | interrupt-controller; |
10 | #interrupt-cells = <1>; | 10 | #interrupt-cells = <3>; |
11 | reg = < 0x50041000 0x1000 >, | 11 | reg = < 0x50041000 0x1000 >, |
12 | < 0x50040100 0x0100 >; | 12 | < 0x50040100 0x0100 >; |
13 | }; | 13 | }; |
@@ -17,7 +17,7 @@ | |||
17 | #size-cells = <0>; | 17 | #size-cells = <0>; |
18 | compatible = "nvidia,tegra20-i2c"; | 18 | compatible = "nvidia,tegra20-i2c"; |
19 | reg = <0x7000C000 0x100>; | 19 | reg = <0x7000C000 0x100>; |
20 | interrupts = < 70 >; | 20 | interrupts = < 0 38 0x04 >; |
21 | }; | 21 | }; |
22 | 22 | ||
23 | i2c@7000c400 { | 23 | i2c@7000c400 { |
@@ -25,7 +25,7 @@ | |||
25 | #size-cells = <0>; | 25 | #size-cells = <0>; |
26 | compatible = "nvidia,tegra20-i2c"; | 26 | compatible = "nvidia,tegra20-i2c"; |
27 | reg = <0x7000C400 0x100>; | 27 | reg = <0x7000C400 0x100>; |
28 | interrupts = < 116 >; | 28 | interrupts = < 0 84 0x04 >; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | i2c@7000c500 { | 31 | i2c@7000c500 { |
@@ -33,38 +33,32 @@ | |||
33 | #size-cells = <0>; | 33 | #size-cells = <0>; |
34 | compatible = "nvidia,tegra20-i2c"; | 34 | compatible = "nvidia,tegra20-i2c"; |
35 | reg = <0x7000C500 0x100>; | 35 | reg = <0x7000C500 0x100>; |
36 | interrupts = < 124 >; | 36 | interrupts = < 0 92 0x04 >; |
37 | }; | 37 | }; |
38 | 38 | ||
39 | i2c@7000d000 { | 39 | i2c@7000d000 { |
40 | #address-cells = <1>; | 40 | #address-cells = <1>; |
41 | #size-cells = <0>; | 41 | #size-cells = <0>; |
42 | compatible = "nvidia,tegra20-i2c"; | 42 | compatible = "nvidia,tegra20-i2c-dvc"; |
43 | reg = <0x7000D000 0x200>; | 43 | reg = <0x7000D000 0x200>; |
44 | interrupts = < 85 >; | 44 | interrupts = < 0 53 0x04 >; |
45 | }; | 45 | }; |
46 | 46 | ||
47 | i2s@70002800 { | 47 | i2s@70002800 { |
48 | #address-cells = <1>; | ||
49 | #size-cells = <0>; | ||
50 | compatible = "nvidia,tegra20-i2s"; | 48 | compatible = "nvidia,tegra20-i2s"; |
51 | reg = <0x70002800 0x200>; | 49 | reg = <0x70002800 0x200>; |
52 | interrupts = < 45 >; | 50 | interrupts = < 0 13 0x04 >; |
53 | dma-channel = < 2 >; | 51 | dma-channel = < 2 >; |
54 | }; | 52 | }; |
55 | 53 | ||
56 | i2s@70002a00 { | 54 | i2s@70002a00 { |
57 | #address-cells = <1>; | ||
58 | #size-cells = <0>; | ||
59 | compatible = "nvidia,tegra20-i2s"; | 55 | compatible = "nvidia,tegra20-i2s"; |
60 | reg = <0x70002a00 0x200>; | 56 | reg = <0x70002a00 0x200>; |
61 | interrupts = < 35 >; | 57 | interrupts = < 0 3 0x04 >; |
62 | dma-channel = < 1 >; | 58 | dma-channel = < 1 >; |
63 | }; | 59 | }; |
64 | 60 | ||
65 | das@70000c00 { | 61 | das@70000c00 { |
66 | #address-cells = <1>; | ||
67 | #size-cells = <0>; | ||
68 | compatible = "nvidia,tegra20-das"; | 62 | compatible = "nvidia,tegra20-das"; |
69 | reg = <0x70000c00 0x80>; | 63 | reg = <0x70000c00 0x80>; |
70 | }; | 64 | }; |
@@ -72,7 +66,13 @@ | |||
72 | gpio: gpio@6000d000 { | 66 | gpio: gpio@6000d000 { |
73 | compatible = "nvidia,tegra20-gpio"; | 67 | compatible = "nvidia,tegra20-gpio"; |
74 | reg = < 0x6000d000 0x1000 >; | 68 | reg = < 0x6000d000 0x1000 >; |
75 | interrupts = < 64 65 66 67 87 119 121 >; | 69 | interrupts = < 0 32 0x04 |
70 | 0 33 0x04 | ||
71 | 0 34 0x04 | ||
72 | 0 35 0x04 | ||
73 | 0 55 0x04 | ||
74 | 0 87 0x04 | ||
75 | 0 89 0x04 >; | ||
76 | #gpio-cells = <2>; | 76 | #gpio-cells = <2>; |
77 | gpio-controller; | 77 | gpio-controller; |
78 | }; | 78 | }; |
@@ -89,59 +89,80 @@ | |||
89 | compatible = "nvidia,tegra20-uart"; | 89 | compatible = "nvidia,tegra20-uart"; |
90 | reg = <0x70006000 0x40>; | 90 | reg = <0x70006000 0x40>; |
91 | reg-shift = <2>; | 91 | reg-shift = <2>; |
92 | interrupts = < 68 >; | 92 | interrupts = < 0 36 0x04 >; |
93 | }; | 93 | }; |
94 | 94 | ||
95 | serial@70006040 { | 95 | serial@70006040 { |
96 | compatible = "nvidia,tegra20-uart"; | 96 | compatible = "nvidia,tegra20-uart"; |
97 | reg = <0x70006040 0x40>; | 97 | reg = <0x70006040 0x40>; |
98 | reg-shift = <2>; | 98 | reg-shift = <2>; |
99 | interrupts = < 69 >; | 99 | interrupts = < 0 37 0x04 >; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | serial@70006200 { | 102 | serial@70006200 { |
103 | compatible = "nvidia,tegra20-uart"; | 103 | compatible = "nvidia,tegra20-uart"; |
104 | reg = <0x70006200 0x100>; | 104 | reg = <0x70006200 0x100>; |
105 | reg-shift = <2>; | 105 | reg-shift = <2>; |
106 | interrupts = < 78 >; | 106 | interrupts = < 0 46 0x04 >; |
107 | }; | 107 | }; |
108 | 108 | ||
109 | serial@70006300 { | 109 | serial@70006300 { |
110 | compatible = "nvidia,tegra20-uart"; | 110 | compatible = "nvidia,tegra20-uart"; |
111 | reg = <0x70006300 0x100>; | 111 | reg = <0x70006300 0x100>; |
112 | reg-shift = <2>; | 112 | reg-shift = <2>; |
113 | interrupts = < 122 >; | 113 | interrupts = < 0 90 0x04 >; |
114 | }; | 114 | }; |
115 | 115 | ||
116 | serial@70006400 { | 116 | serial@70006400 { |
117 | compatible = "nvidia,tegra20-uart"; | 117 | compatible = "nvidia,tegra20-uart"; |
118 | reg = <0x70006400 0x100>; | 118 | reg = <0x70006400 0x100>; |
119 | reg-shift = <2>; | 119 | reg-shift = <2>; |
120 | interrupts = < 123 >; | 120 | interrupts = < 0 91 0x04 >; |
121 | }; | 121 | }; |
122 | 122 | ||
123 | sdhci@c8000000 { | 123 | sdhci@c8000000 { |
124 | compatible = "nvidia,tegra20-sdhci"; | 124 | compatible = "nvidia,tegra20-sdhci"; |
125 | reg = <0xc8000000 0x200>; | 125 | reg = <0xc8000000 0x200>; |
126 | interrupts = < 46 >; | 126 | interrupts = < 0 14 0x04 >; |
127 | }; | 127 | }; |
128 | 128 | ||
129 | sdhci@c8000200 { | 129 | sdhci@c8000200 { |
130 | compatible = "nvidia,tegra20-sdhci"; | 130 | compatible = "nvidia,tegra20-sdhci"; |
131 | reg = <0xc8000200 0x200>; | 131 | reg = <0xc8000200 0x200>; |
132 | interrupts = < 47 >; | 132 | interrupts = < 0 15 0x04 >; |
133 | }; | 133 | }; |
134 | 134 | ||
135 | sdhci@c8000400 { | 135 | sdhci@c8000400 { |
136 | compatible = "nvidia,tegra20-sdhci"; | 136 | compatible = "nvidia,tegra20-sdhci"; |
137 | reg = <0xc8000400 0x200>; | 137 | reg = <0xc8000400 0x200>; |
138 | interrupts = < 51 >; | 138 | interrupts = < 0 19 0x04 >; |
139 | }; | 139 | }; |
140 | 140 | ||
141 | sdhci@c8000600 { | 141 | sdhci@c8000600 { |
142 | compatible = "nvidia,tegra20-sdhci"; | 142 | compatible = "nvidia,tegra20-sdhci"; |
143 | reg = <0xc8000600 0x200>; | 143 | reg = <0xc8000600 0x200>; |
144 | interrupts = < 63 >; | 144 | interrupts = < 0 31 0x04 >; |
145 | }; | ||
146 | |||
147 | usb@c5000000 { | ||
148 | compatible = "nvidia,tegra20-ehci", "usb-ehci"; | ||
149 | reg = <0xc5000000 0x4000>; | ||
150 | interrupts = < 0 20 0x04 >; | ||
151 | phy_type = "utmi"; | ||
152 | }; | ||
153 | |||
154 | usb@c5004000 { | ||
155 | compatible = "nvidia,tegra20-ehci", "usb-ehci"; | ||
156 | reg = <0xc5004000 0x4000>; | ||
157 | interrupts = < 0 21 0x04 >; | ||
158 | phy_type = "ulpi"; | ||
159 | }; | ||
160 | |||
161 | usb@c5008000 { | ||
162 | compatible = "nvidia,tegra20-ehci", "usb-ehci"; | ||
163 | reg = <0xc5008000 0x4000>; | ||
164 | interrupts = < 0 97 0x04 >; | ||
165 | phy_type = "utmi"; | ||
145 | }; | 166 | }; |
146 | }; | 167 | }; |
147 | 168 | ||
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi new file mode 100644 index 000000000000..ee7db9892e02 --- /dev/null +++ b/arch/arm/boot/dts/tegra30.dtsi | |||
@@ -0,0 +1,127 @@ | |||
1 | /include/ "skeleton.dtsi" | ||
2 | |||
3 | / { | ||
4 | compatible = "nvidia,tegra30"; | ||
5 | interrupt-parent = <&intc>; | ||
6 | |||
7 | intc: interrupt-controller@50041000 { | ||
8 | compatible = "arm,cortex-a9-gic"; | ||
9 | interrupt-controller; | ||
10 | #interrupt-cells = <3>; | ||
11 | reg = < 0x50041000 0x1000 >, | ||
12 | < 0x50040100 0x0100 >; | ||
13 | }; | ||
14 | |||
15 | i2c@7000c000 { | ||
16 | #address-cells = <1>; | ||
17 | #size-cells = <0>; | ||
18 | compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c"; | ||
19 | reg = <0x7000C000 0x100>; | ||
20 | interrupts = < 0 38 0x04 >; | ||
21 | }; | ||
22 | |||
23 | i2c@7000c400 { | ||
24 | #address-cells = <1>; | ||
25 | #size-cells = <0>; | ||
26 | compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c"; | ||
27 | reg = <0x7000C400 0x100>; | ||
28 | interrupts = < 0 84 0x04 >; | ||
29 | }; | ||
30 | |||
31 | i2c@7000c500 { | ||
32 | #address-cells = <1>; | ||
33 | #size-cells = <0>; | ||
34 | compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c"; | ||
35 | reg = <0x7000C500 0x100>; | ||
36 | interrupts = < 0 92 0x04 >; | ||
37 | }; | ||
38 | |||
39 | i2c@7000c700 { | ||
40 | #address-cells = <1>; | ||
41 | #size-cells = <0>; | ||
42 | compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c"; | ||
43 | reg = <0x7000c700 0x100>; | ||
44 | interrupts = < 0 120 0x04 >; | ||
45 | }; | ||
46 | |||
47 | i2c@7000d000 { | ||
48 | #address-cells = <1>; | ||
49 | #size-cells = <0>; | ||
50 | compatible = "nvidia,tegra30-i2c", "nvidia,tegra20-i2c"; | ||
51 | reg = <0x7000D000 0x100>; | ||
52 | interrupts = < 0 53 0x04 >; | ||
53 | }; | ||
54 | |||
55 | gpio: gpio@6000d000 { | ||
56 | compatible = "nvidia,tegra30-gpio", "nvidia,tegra20-gpio"; | ||
57 | reg = < 0x6000d000 0x1000 >; | ||
58 | interrupts = < 0 32 0x04 0 33 0x04 0 34 0x04 0 35 0x04 0 55 0x04 0 87 0x04 0 89 0x04 >; | ||
59 | #gpio-cells = <2>; | ||
60 | gpio-controller; | ||
61 | }; | ||
62 | |||
63 | serial@70006000 { | ||
64 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | ||
65 | reg = <0x70006000 0x40>; | ||
66 | reg-shift = <2>; | ||
67 | interrupts = < 0 36 0x04 >; | ||
68 | }; | ||
69 | |||
70 | serial@70006040 { | ||
71 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | ||
72 | reg = <0x70006040 0x40>; | ||
73 | reg-shift = <2>; | ||
74 | interrupts = < 0 37 0x04 >; | ||
75 | }; | ||
76 | |||
77 | serial@70006200 { | ||
78 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | ||
79 | reg = <0x70006200 0x100>; | ||
80 | reg-shift = <2>; | ||
81 | interrupts = < 0 46 0x04 >; | ||
82 | }; | ||
83 | |||
84 | serial@70006300 { | ||
85 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | ||
86 | reg = <0x70006300 0x100>; | ||
87 | reg-shift = <2>; | ||
88 | interrupts = < 0 90 0x04 >; | ||
89 | }; | ||
90 | |||
91 | serial@70006400 { | ||
92 | compatible = "nvidia,tegra30-uart", "nvidia,tegra20-uart"; | ||
93 | reg = <0x70006400 0x100>; | ||
94 | reg-shift = <2>; | ||
95 | interrupts = < 0 91 0x04 >; | ||
96 | }; | ||
97 | |||
98 | sdhci@78000000 { | ||
99 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; | ||
100 | reg = <0x78000000 0x200>; | ||
101 | interrupts = < 0 14 0x04 >; | ||
102 | }; | ||
103 | |||
104 | sdhci@78000200 { | ||
105 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; | ||
106 | reg = <0x78000200 0x200>; | ||
107 | interrupts = < 0 15 0x04 >; | ||
108 | }; | ||
109 | |||
110 | sdhci@78000400 { | ||
111 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; | ||
112 | reg = <0x78000400 0x200>; | ||
113 | interrupts = < 0 19 0x04 >; | ||
114 | }; | ||
115 | |||
116 | sdhci@78000600 { | ||
117 | compatible = "nvidia,tegra30-sdhci", "nvidia,tegra20-sdhci"; | ||
118 | reg = <0x78000600 0x200>; | ||
119 | interrupts = < 0 31 0x04 >; | ||
120 | }; | ||
121 | |||
122 | pinmux: pinmux@70000000 { | ||
123 | compatible = "nvidia,tegra30-pinmux"; | ||
124 | reg = < 0x70000868 0xd0 /* Pad control registers */ | ||
125 | 0x70003000 0x3e0 >; /* Mux registers */ | ||
126 | }; | ||
127 | }; | ||