diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 09:53:24 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-05-16 09:53:24 -0400 |
commit | 6d49d53552b60be2caaa853c814662bc4e24428e (patch) | |
tree | 0cb814af7646e30022d8024fcbf7d8cacdb98f5b /arch/arm/boot | |
parent | a551204badbea5119a84ee4f03faefce9f2c0543 (diff) | |
parent | 380c3a545f7de096c0f84344ba70ea4cfd1a059f (diff) |
Merge branch 'next/devel-exynos5250-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/soc2
* 'next/devel-exynos5250-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add AUXDATA for i2c controllers
ARM: dts: Update device tree source files for EXYNOS5250
ARM: EXYNOS: Add device tree support for interrupt combiner
ARM: EXYNOS: Add irq_domain support for interrupt combiner
ARM: EXYNOS: Remove a new bus_type instance for EXYNOS5
ARM: EXYNOS: update irqs for EXYNOS5250 SoC
ARM: EXYNOS: Add pre-divider and fout mux clocks for bpll and mpll
ARM: EXYNOS: add GPC4 bank instance
ARM: EXYNOS: Redefine IRQ_MCT_L0,1 definition
ARM: EXYNOS: Modify the GIC physical address for static io-mapping
ARM: EXYNOS: Add watchdog timer clock instance
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/exynos5250-smdk5250.dts | 48 | ||||
-rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 60 |
2 files changed, 77 insertions, 31 deletions
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts index 399d17b231d2..49945cc1bc7d 100644 --- a/arch/arm/boot/dts/exynos5250-smdk5250.dts +++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts | |||
@@ -23,4 +23,52 @@ | |||
23 | chosen { | 23 | chosen { |
24 | bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200"; | 24 | bootargs = "root=/dev/ram0 rw ramdisk=8192 console=ttySAC1,115200"; |
25 | }; | 25 | }; |
26 | |||
27 | i2c@12C60000 { | ||
28 | samsung,i2c-sda-delay = <100>; | ||
29 | samsung,i2c-max-bus-freq = <20000>; | ||
30 | gpios = <&gpb3 0 2 3 0>, | ||
31 | <&gpb3 1 2 3 0>; | ||
32 | |||
33 | eeprom@50 { | ||
34 | compatible = "samsung,s524ad0xd1"; | ||
35 | reg = <0x50>; | ||
36 | }; | ||
37 | }; | ||
38 | |||
39 | i2c@12C70000 { | ||
40 | samsung,i2c-sda-delay = <100>; | ||
41 | samsung,i2c-max-bus-freq = <20000>; | ||
42 | gpios = <&gpb3 2 2 3 0>, | ||
43 | <&gpb3 3 2 3 0>; | ||
44 | |||
45 | eeprom@51 { | ||
46 | compatible = "samsung,s524ad0xd1"; | ||
47 | reg = <0x51>; | ||
48 | }; | ||
49 | }; | ||
50 | |||
51 | i2c@12C80000 { | ||
52 | status = "disabled"; | ||
53 | }; | ||
54 | |||
55 | i2c@12C90000 { | ||
56 | status = "disabled"; | ||
57 | }; | ||
58 | |||
59 | i2c@12CA0000 { | ||
60 | status = "disabled"; | ||
61 | }; | ||
62 | |||
63 | i2c@12CB0000 { | ||
64 | status = "disabled"; | ||
65 | }; | ||
66 | |||
67 | i2c@12CC0000 { | ||
68 | status = "disabled"; | ||
69 | }; | ||
70 | |||
71 | i2c@12CD0000 { | ||
72 | status = "disabled"; | ||
73 | }; | ||
26 | }; | 74 | }; |
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index dfc433599436..5ca0cdb76413 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi | |||
@@ -23,11 +23,11 @@ | |||
23 | compatible = "samsung,exynos5250"; | 23 | compatible = "samsung,exynos5250"; |
24 | interrupt-parent = <&gic>; | 24 | interrupt-parent = <&gic>; |
25 | 25 | ||
26 | gic:interrupt-controller@10490000 { | 26 | gic:interrupt-controller@10481000 { |
27 | compatible = "arm,cortex-a9-gic"; | 27 | compatible = "arm,cortex-a9-gic"; |
28 | #interrupt-cells = <3>; | 28 | #interrupt-cells = <3>; |
29 | interrupt-controller; | 29 | interrupt-controller; |
30 | reg = <0x10490000 0x1000>, <0x10480000 0x100>; | 30 | reg = <0x10481000 0x1000>, <0x10482000 0x2000>; |
31 | }; | 31 | }; |
32 | 32 | ||
33 | watchdog { | 33 | watchdog { |
@@ -42,30 +42,6 @@ | |||
42 | interrupts = <0 43 0>, <0 44 0>; | 42 | interrupts = <0 43 0>, <0 44 0>; |
43 | }; | 43 | }; |
44 | 44 | ||
45 | sdhci@12200000 { | ||
46 | compatible = "samsung,exynos4210-sdhci"; | ||
47 | reg = <0x12200000 0x100>; | ||
48 | interrupts = <0 75 0>; | ||
49 | }; | ||
50 | |||
51 | sdhci@12210000 { | ||
52 | compatible = "samsung,exynos4210-sdhci"; | ||
53 | reg = <0x12210000 0x100>; | ||
54 | interrupts = <0 76 0>; | ||
55 | }; | ||
56 | |||
57 | sdhci@12220000 { | ||
58 | compatible = "samsung,exynos4210-sdhci"; | ||
59 | reg = <0x12220000 0x100>; | ||
60 | interrupts = <0 77 0>; | ||
61 | }; | ||
62 | |||
63 | sdhci@12230000 { | ||
64 | compatible = "samsung,exynos4210-sdhci"; | ||
65 | reg = <0x12230000 0x100>; | ||
66 | interrupts = <0 78 0>; | ||
67 | }; | ||
68 | |||
69 | serial@12C00000 { | 45 | serial@12C00000 { |
70 | compatible = "samsung,exynos4210-uart"; | 46 | compatible = "samsung,exynos4210-uart"; |
71 | reg = <0x12C00000 0x100>; | 47 | reg = <0x12C00000 0x100>; |
@@ -94,48 +70,64 @@ | |||
94 | compatible = "samsung,s3c2440-i2c"; | 70 | compatible = "samsung,s3c2440-i2c"; |
95 | reg = <0x12C60000 0x100>; | 71 | reg = <0x12C60000 0x100>; |
96 | interrupts = <0 56 0>; | 72 | interrupts = <0 56 0>; |
73 | #address-cells = <1>; | ||
74 | #size-cells = <0>; | ||
97 | }; | 75 | }; |
98 | 76 | ||
99 | i2c@12C70000 { | 77 | i2c@12C70000 { |
100 | compatible = "samsung,s3c2440-i2c"; | 78 | compatible = "samsung,s3c2440-i2c"; |
101 | reg = <0x12C70000 0x100>; | 79 | reg = <0x12C70000 0x100>; |
102 | interrupts = <0 57 0>; | 80 | interrupts = <0 57 0>; |
81 | #address-cells = <1>; | ||
82 | #size-cells = <0>; | ||
103 | }; | 83 | }; |
104 | 84 | ||
105 | i2c@12C80000 { | 85 | i2c@12C80000 { |
106 | compatible = "samsung,s3c2440-i2c"; | 86 | compatible = "samsung,s3c2440-i2c"; |
107 | reg = <0x12C80000 0x100>; | 87 | reg = <0x12C80000 0x100>; |
108 | interrupts = <0 58 0>; | 88 | interrupts = <0 58 0>; |
89 | #address-cells = <1>; | ||
90 | #size-cells = <0>; | ||
109 | }; | 91 | }; |
110 | 92 | ||
111 | i2c@12C90000 { | 93 | i2c@12C90000 { |
112 | compatible = "samsung,s3c2440-i2c"; | 94 | compatible = "samsung,s3c2440-i2c"; |
113 | reg = <0x12C90000 0x100>; | 95 | reg = <0x12C90000 0x100>; |
114 | interrupts = <0 59 0>; | 96 | interrupts = <0 59 0>; |
97 | #address-cells = <1>; | ||
98 | #size-cells = <0>; | ||
115 | }; | 99 | }; |
116 | 100 | ||
117 | i2c@12CA0000 { | 101 | i2c@12CA0000 { |
118 | compatible = "samsung,s3c2440-i2c"; | 102 | compatible = "samsung,s3c2440-i2c"; |
119 | reg = <0x12CA0000 0x100>; | 103 | reg = <0x12CA0000 0x100>; |
120 | interrupts = <0 60 0>; | 104 | interrupts = <0 60 0>; |
105 | #address-cells = <1>; | ||
106 | #size-cells = <0>; | ||
121 | }; | 107 | }; |
122 | 108 | ||
123 | i2c@12CB0000 { | 109 | i2c@12CB0000 { |
124 | compatible = "samsung,s3c2440-i2c"; | 110 | compatible = "samsung,s3c2440-i2c"; |
125 | reg = <0x12CB0000 0x100>; | 111 | reg = <0x12CB0000 0x100>; |
126 | interrupts = <0 61 0>; | 112 | interrupts = <0 61 0>; |
113 | #address-cells = <1>; | ||
114 | #size-cells = <0>; | ||
127 | }; | 115 | }; |
128 | 116 | ||
129 | i2c@12CC0000 { | 117 | i2c@12CC0000 { |
130 | compatible = "samsung,s3c2440-i2c"; | 118 | compatible = "samsung,s3c2440-i2c"; |
131 | reg = <0x12CC0000 0x100>; | 119 | reg = <0x12CC0000 0x100>; |
132 | interrupts = <0 62 0>; | 120 | interrupts = <0 62 0>; |
121 | #address-cells = <1>; | ||
122 | #size-cells = <0>; | ||
133 | }; | 123 | }; |
134 | 124 | ||
135 | i2c@12CD0000 { | 125 | i2c@12CD0000 { |
136 | compatible = "samsung,s3c2440-i2c"; | 126 | compatible = "samsung,s3c2440-i2c"; |
137 | reg = <0x12CD0000 0x100>; | 127 | reg = <0x12CD0000 0x100>; |
138 | interrupts = <0 63 0>; | 128 | interrupts = <0 63 0>; |
129 | #address-cells = <1>; | ||
130 | #size-cells = <0>; | ||
139 | }; | 131 | }; |
140 | 132 | ||
141 | amba { | 133 | amba { |
@@ -157,13 +149,13 @@ | |||
157 | interrupts = <0 35 0>; | 149 | interrupts = <0 35 0>; |
158 | }; | 150 | }; |
159 | 151 | ||
160 | mdma0: pdma@10800000 { | 152 | mdma0: mdma@10800000 { |
161 | compatible = "arm,pl330", "arm,primecell"; | 153 | compatible = "arm,pl330", "arm,primecell"; |
162 | reg = <0x10800000 0x1000>; | 154 | reg = <0x10800000 0x1000>; |
163 | interrupts = <0 33 0>; | 155 | interrupts = <0 33 0>; |
164 | }; | 156 | }; |
165 | 157 | ||
166 | mdma1: pdma@11C10000 { | 158 | mdma1: mdma@11C10000 { |
167 | compatible = "arm,pl330", "arm,primecell"; | 159 | compatible = "arm,pl330", "arm,primecell"; |
168 | reg = <0x11C10000 0x1000>; | 160 | reg = <0x11C10000 0x1000>; |
169 | interrupts = <0 124 0>; | 161 | interrupts = <0 124 0>; |
@@ -242,6 +234,12 @@ | |||
242 | #gpio-cells = <4>; | 234 | #gpio-cells = <4>; |
243 | }; | 235 | }; |
244 | 236 | ||
237 | gpc4: gpio-controller@114002E0 { | ||
238 | compatible = "samsung,exynos4-gpio"; | ||
239 | reg = <0x114002E0 0x20>; | ||
240 | #gpio-cells = <4>; | ||
241 | }; | ||
242 | |||
245 | gpd0: gpio-controller@11400160 { | 243 | gpd0: gpio-controller@11400160 { |
246 | compatible = "samsung,exynos4-gpio"; | 244 | compatible = "samsung,exynos4-gpio"; |
247 | reg = <0x11400160 0x20>; | 245 | reg = <0x11400160 0x20>; |
@@ -388,19 +386,19 @@ | |||
388 | 386 | ||
389 | gpv2: gpio-controller@10D10040 { | 387 | gpv2: gpio-controller@10D10040 { |
390 | compatible = "samsung,exynos4-gpio"; | 388 | compatible = "samsung,exynos4-gpio"; |
391 | reg = <0x10D10040 0x20>; | 389 | reg = <0x10D10060 0x20>; |
392 | #gpio-cells = <4>; | 390 | #gpio-cells = <4>; |
393 | }; | 391 | }; |
394 | 392 | ||
395 | gpv3: gpio-controller@10D10060 { | 393 | gpv3: gpio-controller@10D10060 { |
396 | compatible = "samsung,exynos4-gpio"; | 394 | compatible = "samsung,exynos4-gpio"; |
397 | reg = <0x10D10060 0x20>; | 395 | reg = <0x10D10080 0x20>; |
398 | #gpio-cells = <4>; | 396 | #gpio-cells = <4>; |
399 | }; | 397 | }; |
400 | 398 | ||
401 | gpv4: gpio-controller@10D10080 { | 399 | gpv4: gpio-controller@10D10080 { |
402 | compatible = "samsung,exynos4-gpio"; | 400 | compatible = "samsung,exynos4-gpio"; |
403 | reg = <0x10D10080 0x20>; | 401 | reg = <0x10D100C0 0x20>; |
404 | #gpio-cells = <4>; | 402 | #gpio-cells = <4>; |
405 | }; | 403 | }; |
406 | 404 | ||