aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-06-14 19:54:27 -0400
committerOlof Johansson <olof@lixom.net>2013-06-14 19:54:27 -0400
commit9440bd234297d2ea664ebd36345533bc5d3d0b30 (patch)
treec51ac3644f40fd150fc94b870d1022830f70b8d7
parent9214cbe50fe74542f803dcc8d81f5e99c72918bf (diff)
parentd594224ae6bbc8b7e84b3309ce5e2697eb27fc8b (diff)
Merge tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt
From Linus Walleij: Device tree patches for ux500, basically trees and auxdata: - Fix for the thermal node to be contained in the PRCMU node - Add the DTS and auxdata needed to boot the U8540 platform - Various regulators added and renamed - Rename base SoC node - A bunch of DMA patches adding channels for DT boots - A bunch of crypto+hash patches adding config for DT boots - A bunch of patches fixing the ALSA SoC support to work - Register the LP5521 LEDs - Fix a number of typos and naming errors * tag 'ux500-dt-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson: (39 commits) ARM: ux500: drop any 0x prefix from I2C DT devices ARM: ux500: Allocate correct amount of memory for the u8540 in DT ARM: ux500: Provide auxdata to ux500 ASoC driver ARM: ux500: Add DT regulators for ab8500-codec ARM: ux500: Correct anamic2 typo in DT files ARM: ux500: Fix trivial typo in v-anamic1 comment ARM: ux500: Reduce PRCMU reg-names to shorter form for u8540 DT ARM: ux500: Add an auxdata entry for MUSB for clock-name look-up ARM: ux500: cut chip-select GPIOs from SSP device ARM: ux500: use symbolic names for interrupt flags ARM: ux500: use #include syntax to include *.dtsi. ARM: ux500: bump MMC/SD max frequency for DT boots ARM: ux500: Apply other compatible name to the u8540 DTS file pinctrl/nomadik: Standardise Pinctrl compat string for DBx5x based platforms ARM: ux500: Standardise Pinctrl compatible string for DBx5x based platforms ARM: ux500: Standardise DBx5x0 based Pinctrl compat string in the DTS crypto: ux500/hash - Enable DT probing of the driver crypto: ux500/cryp - Enable DT probing of the driver ARM: ux500: enable the crypto and hash on all dbx500 ARM: ux500: Provide an AUXDATA entry for ux500-hash ... Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat
-rw-r--r--Documentation/devicetree/bindings/mfd/ab8500.txt2
-rw-r--r--arch/arm/boot/dts/Makefile1
-rw-r--r--arch/arm/boot/dts/ccu8540.dts41
-rw-r--r--arch/arm/boot/dts/ccu9540.dts6
-rw-r--r--arch/arm/boot/dts/dbx5x0.dtsi226
-rw-r--r--arch/arm/boot/dts/href.dtsi61
-rw-r--r--arch/arm/boot/dts/hrefprev60.dts10
-rw-r--r--arch/arm/boot/dts/hrefv60plus.dts20
-rw-r--r--arch/arm/boot/dts/snowball.dts80
-rw-r--r--arch/arm/boot/dts/stuib.dtsi26
-rw-r--r--arch/arm/mach-ux500/cpu-db8500.c26
-rw-r--r--drivers/crypto/ux500/cryp/cryp_core.c6
-rw-r--r--drivers/crypto/ux500/hash/hash_core.c6
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c4
-rw-r--r--drivers/regulator/ab8500.c8
15 files changed, 359 insertions, 164 deletions
diff --git a/Documentation/devicetree/bindings/mfd/ab8500.txt b/Documentation/devicetree/bindings/mfd/ab8500.txt
index c3a14e0ad0ad..cd9e90c5d171 100644
--- a/Documentation/devicetree/bindings/mfd/ab8500.txt
+++ b/Documentation/devicetree/bindings/mfd/ab8500.txt
@@ -120,7 +120,7 @@ ab8500 {
120 "USB_LINK_STATUS", 120 "USB_LINK_STATUS",
121 "USB_ADP_PROBE_PLUG", 121 "USB_ADP_PROBE_PLUG",
122 "USB_ADP_PROBE_UNPLUG"; 122 "USB_ADP_PROBE_UNPLUG";
123 vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; 123 vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
124 v-ape-supply = <&db8500_vape_reg>; 124 v-ape-supply = <&db8500_vape_reg>;
125 musb_1v8-supply = <&db8500_vsmps2_reg>; 125 musb_1v8-supply = <&db8500_vsmps2_reg>;
126 }; 126 };
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index a1c7bb1313e7..4823c3121ee2 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -162,6 +162,7 @@ dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
162dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ 162dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
163 hrefprev60.dtb \ 163 hrefprev60.dtb \
164 hrefv60plus.dtb \ 164 hrefv60plus.dtb \
165 ccu8540.dtb \
165 ccu9540.dtb 166 ccu9540.dtb
166dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb 167dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
167dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 168dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ccu8540.dts
new file mode 100644
index 000000000000..48ff03441f5a
--- /dev/null
+++ b/arch/arm/boot/dts/ccu8540.dts
@@ -0,0 +1,41 @@
1/*
2 * Copyright 2013 ST-Ericsson AB
3 *
4 * The code contained herein is licensed under the GNU General Public
5 * License. You may obtain a copy of the GNU General Public License
6 * Version 2 or later at the following locations:
7 *
8 * http://www.opensource.org/licenses/gpl-license.html
9 * http://www.gnu.org/copyleft/gpl.html
10 */
11
12/dts-v1/;
13#include "dbx5x0.dtsi"
14
15/ {
16 model = "ST-Ericsson U8540 platform with Device Tree";
17 compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
18
19 memory@0 {
20 reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
21 };
22
23 soc {
24 prcmu@80157000 {
25 reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>;
26 reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
27 };
28
29 uart@80120000 {
30 status = "okay";
31 };
32
33 uart@80121000 {
34 status = "okay";
35 };
36
37 uart@80007000 {
38 status = "okay";
39 };
40 };
41};
diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ccu9540.dts
index 04305463f00d..ed29ec7288e4 100644
--- a/arch/arm/boot/dts/ccu9540.dts
+++ b/arch/arm/boot/dts/ccu9540.dts
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12/dts-v1/; 12/dts-v1/;
13/include/ "dbx5x0.dtsi" 13#include "dbx5x0.dtsi"
14 14
15/ { 15/ {
16 model = "ST-Ericsson CCU9540 platform with Device Tree"; 16 model = "ST-Ericsson CCU9540 platform with Device Tree";
@@ -20,7 +20,7 @@
20 reg = <0x00000000 0x20000000>; 20 reg = <0x00000000 0x20000000>;
21 }; 21 };
22 22
23 soc-u9500 { 23 soc {
24 uart@80120000 { 24 uart@80120000 {
25 status = "okay"; 25 status = "okay";
26 }; 26 };
@@ -52,7 +52,7 @@
52 // WLAN SDIO channel 52 // WLAN SDIO channel
53 sdi1_per2@80118000 { 53 sdi1_per2@80118000 {
54 arm,primecell-periphid = <0x10480180>; 54 arm,primecell-periphid = <0x10480180>;
55 max-frequency = <50000000>; 55 max-frequency = <100000000>;
56 bus-width = <4>; 56 bus-width = <4>;
57 57
58 status = "okay"; 58 status = "okay";
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/dbx5x0.dtsi
index b6bc4ff17f26..a082f0ba1ddb 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/dbx5x0.dtsi
@@ -9,10 +9,11 @@
9 * http://www.gnu.org/copyleft/gpl.html 9 * http://www.gnu.org/copyleft/gpl.html
10 */ 10 */
11 11
12/include/ "skeleton.dtsi" 12#include <dt-bindings/interrupt-controller/irq.h>
13#include "skeleton.dtsi"
13 14
14/ { 15/ {
15 soc-u9500 { 16 soc {
16 #address-cells = <1>; 17 #address-cells = <1>;
17 #size-cells = <1>; 18 #size-cells = <1>;
18 compatible = "stericsson,db8500"; 19 compatible = "stericsson,db8500";
@@ -31,33 +32,33 @@
31 L2: l2-cache { 32 L2: l2-cache {
32 compatible = "arm,pl310-cache"; 33 compatible = "arm,pl310-cache";
33 reg = <0xa0412000 0x1000>; 34 reg = <0xa0412000 0x1000>;
34 interrupts = <0 13 4>; 35 interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>;
35 cache-unified; 36 cache-unified;
36 cache-level = <2>; 37 cache-level = <2>;
37 }; 38 };
38 39
39 pmu { 40 pmu {
40 compatible = "arm,cortex-a9-pmu"; 41 compatible = "arm,cortex-a9-pmu";
41 interrupts = <0 7 0x4>; 42 interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
42 }; 43 };
43 44
44 timer@a0410600 { 45 timer@a0410600 {
45 compatible = "arm,cortex-a9-twd-timer"; 46 compatible = "arm,cortex-a9-twd-timer";
46 reg = <0xa0410600 0x20>; 47 reg = <0xa0410600 0x20>;
47 interrupts = <1 13 0x304>; 48 interrupts = <1 13 0x304>; /* IRQ level high per-CPU */
48 }; 49 };
49 50
50 rtc@80154000 { 51 rtc@80154000 {
51 compatible = "arm,rtc-pl031", "arm,primecell"; 52 compatible = "arm,rtc-pl031", "arm,primecell";
52 reg = <0x80154000 0x1000>; 53 reg = <0x80154000 0x1000>;
53 interrupts = <0 18 0x4>; 54 interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
54 }; 55 };
55 56
56 gpio0: gpio@8012e000 { 57 gpio0: gpio@8012e000 {
57 compatible = "stericsson,db8500-gpio", 58 compatible = "stericsson,db8500-gpio",
58 "st,nomadik-gpio"; 59 "st,nomadik-gpio";
59 reg = <0x8012e000 0x80>; 60 reg = <0x8012e000 0x80>;
60 interrupts = <0 119 0x4>; 61 interrupts = <0 119 IRQ_TYPE_LEVEL_HIGH>;
61 interrupt-controller; 62 interrupt-controller;
62 #interrupt-cells = <2>; 63 #interrupt-cells = <2>;
63 st,supports-sleepmode; 64 st,supports-sleepmode;
@@ -70,7 +71,7 @@
70 compatible = "stericsson,db8500-gpio", 71 compatible = "stericsson,db8500-gpio",
71 "st,nomadik-gpio"; 72 "st,nomadik-gpio";
72 reg = <0x8012e080 0x80>; 73 reg = <0x8012e080 0x80>;
73 interrupts = <0 120 0x4>; 74 interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>;
74 interrupt-controller; 75 interrupt-controller;
75 #interrupt-cells = <2>; 76 #interrupt-cells = <2>;
76 st,supports-sleepmode; 77 st,supports-sleepmode;
@@ -83,7 +84,7 @@
83 compatible = "stericsson,db8500-gpio", 84 compatible = "stericsson,db8500-gpio",
84 "st,nomadik-gpio"; 85 "st,nomadik-gpio";
85 reg = <0x8000e000 0x80>; 86 reg = <0x8000e000 0x80>;
86 interrupts = <0 121 0x4>; 87 interrupts = <0 121 IRQ_TYPE_LEVEL_HIGH>;
87 interrupt-controller; 88 interrupt-controller;
88 #interrupt-cells = <2>; 89 #interrupt-cells = <2>;
89 st,supports-sleepmode; 90 st,supports-sleepmode;
@@ -96,7 +97,7 @@
96 compatible = "stericsson,db8500-gpio", 97 compatible = "stericsson,db8500-gpio",
97 "st,nomadik-gpio"; 98 "st,nomadik-gpio";
98 reg = <0x8000e080 0x80>; 99 reg = <0x8000e080 0x80>;
99 interrupts = <0 122 0x4>; 100 interrupts = <0 122 IRQ_TYPE_LEVEL_HIGH>;
100 interrupt-controller; 101 interrupt-controller;
101 #interrupt-cells = <2>; 102 #interrupt-cells = <2>;
102 st,supports-sleepmode; 103 st,supports-sleepmode;
@@ -109,7 +110,7 @@
109 compatible = "stericsson,db8500-gpio", 110 compatible = "stericsson,db8500-gpio",
110 "st,nomadik-gpio"; 111 "st,nomadik-gpio";
111 reg = <0x8000e100 0x80>; 112 reg = <0x8000e100 0x80>;
112 interrupts = <0 123 0x4>; 113 interrupts = <0 123 IRQ_TYPE_LEVEL_HIGH>;
113 interrupt-controller; 114 interrupt-controller;
114 #interrupt-cells = <2>; 115 #interrupt-cells = <2>;
115 st,supports-sleepmode; 116 st,supports-sleepmode;
@@ -122,7 +123,7 @@
122 compatible = "stericsson,db8500-gpio", 123 compatible = "stericsson,db8500-gpio",
123 "st,nomadik-gpio"; 124 "st,nomadik-gpio";
124 reg = <0x8000e180 0x80>; 125 reg = <0x8000e180 0x80>;
125 interrupts = <0 124 0x4>; 126 interrupts = <0 124 IRQ_TYPE_LEVEL_HIGH>;
126 interrupt-controller; 127 interrupt-controller;
127 #interrupt-cells = <2>; 128 #interrupt-cells = <2>;
128 st,supports-sleepmode; 129 st,supports-sleepmode;
@@ -135,7 +136,7 @@
135 compatible = "stericsson,db8500-gpio", 136 compatible = "stericsson,db8500-gpio",
136 "st,nomadik-gpio"; 137 "st,nomadik-gpio";
137 reg = <0x8011e000 0x80>; 138 reg = <0x8011e000 0x80>;
138 interrupts = <0 125 0x4>; 139 interrupts = <0 125 IRQ_TYPE_LEVEL_HIGH>;
139 interrupt-controller; 140 interrupt-controller;
140 #interrupt-cells = <2>; 141 #interrupt-cells = <2>;
141 st,supports-sleepmode; 142 st,supports-sleepmode;
@@ -148,7 +149,7 @@
148 compatible = "stericsson,db8500-gpio", 149 compatible = "stericsson,db8500-gpio",
149 "st,nomadik-gpio"; 150 "st,nomadik-gpio";
150 reg = <0x8011e080 0x80>; 151 reg = <0x8011e080 0x80>;
151 interrupts = <0 126 0x4>; 152 interrupts = <0 126 IRQ_TYPE_LEVEL_HIGH>;
152 interrupt-controller; 153 interrupt-controller;
153 #interrupt-cells = <2>; 154 #interrupt-cells = <2>;
154 st,supports-sleepmode; 155 st,supports-sleepmode;
@@ -161,7 +162,7 @@
161 compatible = "stericsson,db8500-gpio", 162 compatible = "stericsson,db8500-gpio",
162 "st,nomadik-gpio"; 163 "st,nomadik-gpio";
163 reg = <0xa03fe000 0x80>; 164 reg = <0xa03fe000 0x80>;
164 interrupts = <0 127 0x4>; 165 interrupts = <0 127 IRQ_TYPE_LEVEL_HIGH>;
165 interrupt-controller; 166 interrupt-controller;
166 #interrupt-cells = <2>; 167 #interrupt-cells = <2>;
167 st,supports-sleepmode; 168 st,supports-sleepmode;
@@ -171,29 +172,61 @@
171 }; 172 };
172 173
173 pinctrl { 174 pinctrl {
174 compatible = "stericsson,nmk-pinctrl"; 175 compatible = "stericsson,db8500-pinctrl";
175 prcm = <&prcmu>; 176 prcm = <&prcmu>;
176 }; 177 };
177 178
178 usb@a03e0000 { 179 usb_per5@a03e0000 {
179 compatible = "stericsson,db8500-musb", 180 compatible = "stericsson,db8500-musb",
180 "mentor,musb"; 181 "mentor,musb";
181 reg = <0xa03e0000 0x10000>; 182 reg = <0xa03e0000 0x10000>;
182 interrupts = <0 23 0x4>; 183 interrupts = <0 23 IRQ_TYPE_LEVEL_HIGH>;
183 }; 184 interrupt-names = "mc";
184 185
185 dma-controller@801C0000 { 186 dr_mode = "otg";
186 compatible = "stericsson,db8500-dma40", 187
187 "stericsson,dma40"; 188 dmas = <&dma 38 0 0x2>, /* Logical - DevToMem */
189 <&dma 38 0 0x0>, /* Logical - MemToDev */
190 <&dma 37 0 0x2>, /* Logical - DevToMem */
191 <&dma 37 0 0x0>, /* Logical - MemToDev */
192 <&dma 36 0 0x2>, /* Logical - DevToMem */
193 <&dma 36 0 0x0>, /* Logical - MemToDev */
194 <&dma 19 0 0x2>, /* Logical - DevToMem */
195 <&dma 19 0 0x0>, /* Logical - MemToDev */
196 <&dma 18 0 0x2>, /* Logical - DevToMem */
197 <&dma 18 0 0x0>, /* Logical - MemToDev */
198 <&dma 17 0 0x2>, /* Logical - DevToMem */
199 <&dma 17 0 0x0>, /* Logical - MemToDev */
200 <&dma 16 0 0x2>, /* Logical - DevToMem */
201 <&dma 16 0 0x0>, /* Logical - MemToDev */
202 <&dma 39 0 0x2>, /* Logical - DevToMem */
203 <&dma 39 0 0x0>; /* Logical - MemToDev */
204
205 dma-names = "iep_1_9", "oep_1_9",
206 "iep_2_10", "oep_2_10",
207 "iep_3_11", "oep_3_11",
208 "iep_4_12", "oep_4_12",
209 "iep_5_13", "oep_5_13",
210 "iep_6_14", "oep_6_14",
211 "iep_7_15", "oep_7_15",
212 "iep_8", "oep_8";
213 };
214
215 dma: dma-controller@801C0000 {
216 compatible = "stericsson,db8500-dma40", "stericsson,dma40";
188 reg = <0x801C0000 0x1000 0x40010000 0x800>; 217 reg = <0x801C0000 0x1000 0x40010000 0x800>;
189 interrupts = <0 25 0x4>; 218 reg-names = "base", "lcpa";
219 interrupts = <0 25 IRQ_TYPE_LEVEL_HIGH>;
220
221 #dma-cells = <3>;
222 memcpy-channels = <56 57 58 59 60>;
190 }; 223 };
191 224
192 prcmu: prcmu@80157000 { 225 prcmu: prcmu@80157000 {
193 compatible = "stericsson,db8500-prcmu"; 226 compatible = "stericsson,db8500-prcmu";
194 reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>; 227 reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x1000>;
195 reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm"; 228 reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
196 interrupts = <0 47 0x4>; 229 interrupts = <0 47 IRQ_TYPE_LEVEL_HIGH>;
197 #address-cells = <1>; 230 #address-cells = <1>;
198 #size-cells = <1>; 231 #size-cells = <1>;
199 interrupt-controller; 232 interrupt-controller;
@@ -208,7 +241,8 @@
208 thermal@801573c0 { 241 thermal@801573c0 {
209 compatible = "stericsson,db8500-thermal"; 242 compatible = "stericsson,db8500-thermal";
210 reg = <0x801573c0 0x40>; 243 reg = <0x801573c0 0x40>;
211 interrupts = <21 0x4>, <22 0x4>; 244 interrupts = <21 IRQ_TYPE_LEVEL_HIGH>,
245 <22 IRQ_TYPE_LEVEL_HIGH>;
212 interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH"; 246 interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
213 status = "disabled"; 247 status = "disabled";
214 }; 248 };
@@ -322,21 +356,21 @@
322 ab8500 { 356 ab8500 {
323 compatible = "stericsson,ab8500"; 357 compatible = "stericsson,ab8500";
324 interrupt-parent = <&intc>; 358 interrupt-parent = <&intc>;
325 interrupts = <0 40 0x4>; 359 interrupts = <0 40 IRQ_TYPE_LEVEL_HIGH>;
326 interrupt-controller; 360 interrupt-controller;
327 #interrupt-cells = <2>; 361 #interrupt-cells = <2>;
328 362
329 ab8500-rtc { 363 ab8500-rtc {
330 compatible = "stericsson,ab8500-rtc"; 364 compatible = "stericsson,ab8500-rtc";
331 interrupts = <17 0x4 365 interrupts = <17 IRQ_TYPE_LEVEL_HIGH
332 18 0x4>; 366 18 IRQ_TYPE_LEVEL_HIGH>;
333 interrupt-names = "60S", "ALARM"; 367 interrupt-names = "60S", "ALARM";
334 }; 368 };
335 369
336 ab8500-gpadc { 370 ab8500-gpadc {
337 compatible = "stericsson,ab8500-gpadc"; 371 compatible = "stericsson,ab8500-gpadc";
338 interrupts = <32 0x4 372 interrupts = <32 IRQ_TYPE_LEVEL_HIGH
339 39 0x4>; 373 39 IRQ_TYPE_LEVEL_HIGH>;
340 interrupt-names = "HW_CONV_END", "SW_CONV_END"; 374 interrupt-names = "HW_CONV_END", "SW_CONV_END";
341 vddadc-supply = <&ab8500_ldo_tvout_reg>; 375 vddadc-supply = <&ab8500_ldo_tvout_reg>;
342 }; 376 };
@@ -369,13 +403,13 @@
369 403
370 ab8500_usb { 404 ab8500_usb {
371 compatible = "stericsson,ab8500-usb"; 405 compatible = "stericsson,ab8500-usb";
372 interrupts = < 90 0x4 406 interrupts = < 90 IRQ_TYPE_LEVEL_HIGH
373 96 0x4 407 96 IRQ_TYPE_LEVEL_HIGH
374 14 0x4 408 14 IRQ_TYPE_LEVEL_HIGH
375 15 0x4 409 15 IRQ_TYPE_LEVEL_HIGH
376 79 0x4 410 79 IRQ_TYPE_LEVEL_HIGH
377 74 0x4 411 74 IRQ_TYPE_LEVEL_HIGH
378 75 0x4>; 412 75 IRQ_TYPE_LEVEL_HIGH>;
379 interrupt-names = "ID_WAKEUP_R", 413 interrupt-names = "ID_WAKEUP_R",
380 "ID_WAKEUP_F", 414 "ID_WAKEUP_F",
381 "VBUS_DET_F", 415 "VBUS_DET_F",
@@ -383,15 +417,15 @@
383 "USB_LINK_STATUS", 417 "USB_LINK_STATUS",
384 "USB_ADP_PROBE_PLUG", 418 "USB_ADP_PROBE_PLUG",
385 "USB_ADP_PROBE_UNPLUG"; 419 "USB_ADP_PROBE_UNPLUG";
386 vddulpivio18-supply = <&ab8500_ldo_initcore_reg>; 420 vddulpivio18-supply = <&ab8500_ldo_intcore_reg>;
387 v-ape-supply = <&db8500_vape_reg>; 421 v-ape-supply = <&db8500_vape_reg>;
388 musb_1v8-supply = <&db8500_vsmps2_reg>; 422 musb_1v8-supply = <&db8500_vsmps2_reg>;
389 }; 423 };
390 424
391 ab8500-ponkey { 425 ab8500-ponkey {
392 compatible = "stericsson,ab8500-poweron-key"; 426 compatible = "stericsson,ab8500-poweron-key";
393 interrupts = <6 0x4 427 interrupts = <6 IRQ_TYPE_LEVEL_HIGH
394 7 0x4>; 428 7 IRQ_TYPE_LEVEL_HIGH>;
395 interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; 429 interrupt-names = "ONKEY_DBF", "ONKEY_DBR";
396 }; 430 };
397 431
@@ -410,6 +444,11 @@
410 codec: ab8500-codec { 444 codec: ab8500-codec {
411 compatible = "stericsson,ab8500-codec"; 445 compatible = "stericsson,ab8500-codec";
412 446
447 V-AUD-supply = <&ab8500_ldo_audio_reg>;
448 V-AMIC1-supply = <&ab8500_ldo_anamic1_reg>;
449 V-AMIC2-supply = <&ab8500_ldo_anamic2_reg>;
450 V-DMIC-supply = <&ab8500_ldo_dmic_reg>;
451
413 stericsson,earpeice-cmv = <950>; /* Units in mV. */ 452 stericsson,earpeice-cmv = <950>; /* Units in mV. */
414 }; 453 };
415 454
@@ -441,8 +480,8 @@
441 }; 480 };
442 481
443 // supply for v-intcore12; VINTCORE12 LDO 482 // supply for v-intcore12; VINTCORE12 LDO
444 ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 483 ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
445 regulator-compatible = "ab8500_ldo_initcore"; 484 regulator-compatible = "ab8500_ldo_intcore";
446 }; 485 };
447 486
448 // supply for tvout; gpadc; TVOUT LDO 487 // supply for tvout; gpadc; TVOUT LDO
@@ -460,14 +499,14 @@
460 regulator-compatible = "ab8500_ldo_audio"; 499 regulator-compatible = "ab8500_ldo_audio";
461 }; 500 };
462 501
463 // supply for v-anamic1 VAMic1-LDO 502 // supply for v-anamic1 VAMIC1 LDO
464 ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 { 503 ab8500_ldo_anamic1_reg: ab8500_ldo_anamic1 {
465 regulator-compatible = "ab8500_ldo_anamic1"; 504 regulator-compatible = "ab8500_ldo_anamic1";
466 }; 505 };
467 506
468 // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1 507 // supply for v-amic2; VAMIC2 LDO; reuse constants for AMIC1
469 ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { 508 ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
470 regulator-compatible = "ab8500_ldo_amamic2"; 509 regulator-compatible = "ab8500_ldo_anamic2";
471 }; 510 };
472 511
473 // supply for v-dmic; VDMIC LDO 512 // supply for v-dmic; VDMIC LDO
@@ -486,7 +525,7 @@
486 i2c@80004000 { 525 i2c@80004000 {
487 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 526 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
488 reg = <0x80004000 0x1000>; 527 reg = <0x80004000 0x1000>;
489 interrupts = <0 21 0x4>; 528 interrupts = <0 21 IRQ_TYPE_LEVEL_HIGH>;
490 arm,primecell-periphid = <0x180024>; 529 arm,primecell-periphid = <0x180024>;
491 530
492 #address-cells = <1>; 531 #address-cells = <1>;
@@ -499,7 +538,7 @@
499 i2c@80122000 { 538 i2c@80122000 {
500 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 539 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
501 reg = <0x80122000 0x1000>; 540 reg = <0x80122000 0x1000>;
502 interrupts = <0 22 0x4>; 541 interrupts = <0 22 IRQ_TYPE_LEVEL_HIGH>;
503 arm,primecell-periphid = <0x180024>; 542 arm,primecell-periphid = <0x180024>;
504 543
505 #address-cells = <1>; 544 #address-cells = <1>;
@@ -512,7 +551,7 @@
512 i2c@80128000 { 551 i2c@80128000 {
513 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 552 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
514 reg = <0x80128000 0x1000>; 553 reg = <0x80128000 0x1000>;
515 interrupts = <0 55 0x4>; 554 interrupts = <0 55 IRQ_TYPE_LEVEL_HIGH>;
516 arm,primecell-periphid = <0x180024>; 555 arm,primecell-periphid = <0x180024>;
517 556
518 #address-cells = <1>; 557 #address-cells = <1>;
@@ -525,7 +564,7 @@
525 i2c@80110000 { 564 i2c@80110000 {
526 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 565 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
527 reg = <0x80110000 0x1000>; 566 reg = <0x80110000 0x1000>;
528 interrupts = <0 12 0x4>; 567 interrupts = <0 12 IRQ_TYPE_LEVEL_HIGH>;
529 arm,primecell-periphid = <0x180024>; 568 arm,primecell-periphid = <0x180024>;
530 569
531 #address-cells = <1>; 570 #address-cells = <1>;
@@ -538,7 +577,7 @@
538 i2c@8012a000 { 577 i2c@8012a000 {
539 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell"; 578 compatible = "stericsson,db8500-i2c", "st,nomadik-i2c", "arm,primecell";
540 reg = <0x8012a000 0x1000>; 579 reg = <0x8012a000 0x1000>;
541 interrupts = <0 51 0x4>; 580 interrupts = <0 51 IRQ_TYPE_LEVEL_HIGH>;
542 arm,primecell-periphid = <0x180024>; 581 arm,primecell-periphid = <0x180024>;
543 582
544 #address-cells = <1>; 583 #address-cells = <1>;
@@ -551,82 +590,114 @@
551 ssp@80002000 { 590 ssp@80002000 {
552 compatible = "arm,pl022", "arm,primecell"; 591 compatible = "arm,pl022", "arm,primecell";
553 reg = <0x80002000 0x1000>; 592 reg = <0x80002000 0x1000>;
554 interrupts = <0 14 0x4>; 593 interrupts = <0 14 IRQ_TYPE_LEVEL_HIGH>;
555 #address-cells = <1>; 594 #address-cells = <1>;
556 #size-cells = <0>; 595 #size-cells = <0>;
557 status = "disabled"; 596 status = "disabled";
558
559 // Add one of these for each child device
560 cs-gpios = <&gpio0 31 0x4 &gpio4 14 0x4 &gpio4 16 0x4
561 &gpio6 22 0x4 &gpio7 0 0x4>;
562
563 }; 597 };
564 598
565 uart@80120000 { 599 uart@80120000 {
566 compatible = "arm,pl011", "arm,primecell"; 600 compatible = "arm,pl011", "arm,primecell";
567 reg = <0x80120000 0x1000>; 601 reg = <0x80120000 0x1000>;
568 interrupts = <0 11 0x4>; 602 interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
603
604 dmas = <&dma 13 0 0x2>, /* Logical - DevToMem */
605 <&dma 13 0 0x0>; /* Logical - MemToDev */
606 dma-names = "rx", "tx";
607
569 status = "disabled"; 608 status = "disabled";
570 }; 609 };
610
571 uart@80121000 { 611 uart@80121000 {
572 compatible = "arm,pl011", "arm,primecell"; 612 compatible = "arm,pl011", "arm,primecell";
573 reg = <0x80121000 0x1000>; 613 reg = <0x80121000 0x1000>;
574 interrupts = <0 19 0x4>; 614 interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
615
616 dmas = <&dma 12 0 0x2>, /* Logical - DevToMem */
617 <&dma 12 0 0x0>; /* Logical - MemToDev */
618 dma-names = "rx", "tx";
619
575 status = "disabled"; 620 status = "disabled";
576 }; 621 };
622
577 uart@80007000 { 623 uart@80007000 {
578 compatible = "arm,pl011", "arm,primecell"; 624 compatible = "arm,pl011", "arm,primecell";
579 reg = <0x80007000 0x1000>; 625 reg = <0x80007000 0x1000>;
580 interrupts = <0 26 0x4>; 626 interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;
627
628 dmas = <&dma 11 0 0x2>, /* Logical - DevToMem */
629 <&dma 11 0 0x0>; /* Logical - MemToDev */
630 dma-names = "rx", "tx";
631
581 status = "disabled"; 632 status = "disabled";
582 }; 633 };
583 634
584 sdi0_per1@80126000 { 635 sdi0_per1@80126000 {
585 compatible = "arm,pl18x", "arm,primecell"; 636 compatible = "arm,pl18x", "arm,primecell";
586 reg = <0x80126000 0x1000>; 637 reg = <0x80126000 0x1000>;
587 interrupts = <0 60 0x4>; 638 interrupts = <0 60 IRQ_TYPE_LEVEL_HIGH>;
639
640 dmas = <&dma 29 0 0x2>, /* Logical - DevToMem */
641 <&dma 29 0 0x0>; /* Logical - MemToDev */
642 dma-names = "rx", "tx";
643
588 status = "disabled"; 644 status = "disabled";
589 }; 645 };
590 646
591 sdi1_per2@80118000 { 647 sdi1_per2@80118000 {
592 compatible = "arm,pl18x", "arm,primecell"; 648 compatible = "arm,pl18x", "arm,primecell";
593 reg = <0x80118000 0x1000>; 649 reg = <0x80118000 0x1000>;
594 interrupts = <0 50 0x4>; 650 interrupts = <0 50 IRQ_TYPE_LEVEL_HIGH>;
651
652 dmas = <&dma 32 0 0x2>, /* Logical - DevToMem */
653 <&dma 32 0 0x0>; /* Logical - MemToDev */
654 dma-names = "rx", "tx";
655
595 status = "disabled"; 656 status = "disabled";
596 }; 657 };
597 658
598 sdi2_per3@80005000 { 659 sdi2_per3@80005000 {
599 compatible = "arm,pl18x", "arm,primecell"; 660 compatible = "arm,pl18x", "arm,primecell";
600 reg = <0x80005000 0x1000>; 661 reg = <0x80005000 0x1000>;
601 interrupts = <0 41 0x4>; 662 interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;
663
664 dmas = <&dma 28 0 0x2>, /* Logical - DevToMem */
665 <&dma 28 0 0x0>; /* Logical - MemToDev */
666 dma-names = "rx", "tx";
667
602 status = "disabled"; 668 status = "disabled";
603 }; 669 };
604 670
605 sdi3_per2@80119000 { 671 sdi3_per2@80119000 {
606 compatible = "arm,pl18x", "arm,primecell"; 672 compatible = "arm,pl18x", "arm,primecell";
607 reg = <0x80119000 0x1000>; 673 reg = <0x80119000 0x1000>;
608 interrupts = <0 59 0x4>; 674 interrupts = <0 59 IRQ_TYPE_LEVEL_HIGH>;
609 status = "disabled"; 675 status = "disabled";
610 }; 676 };
611 677
612 sdi4_per2@80114000 { 678 sdi4_per2@80114000 {
613 compatible = "arm,pl18x", "arm,primecell"; 679 compatible = "arm,pl18x", "arm,primecell";
614 reg = <0x80114000 0x1000>; 680 reg = <0x80114000 0x1000>;
615 interrupts = <0 99 0x4>; 681 interrupts = <0 99 IRQ_TYPE_LEVEL_HIGH>;
682
683 dmas = <&dma 42 0 0x2>, /* Logical - DevToMem */
684 <&dma 42 0 0x0>; /* Logical - MemToDev */
685 dma-names = "rx", "tx";
686
616 status = "disabled"; 687 status = "disabled";
617 }; 688 };
618 689
619 sdi5_per3@80008000 { 690 sdi5_per3@80008000 {
620 compatible = "arm,pl18x", "arm,primecell"; 691 compatible = "arm,pl18x", "arm,primecell";
621 reg = <0x80008000 0x1000>; 692 reg = <0x80008000 0x1000>;
622 interrupts = <0 100 0x4>; 693 interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
623 status = "disabled"; 694 status = "disabled";
624 }; 695 };
625 696
626 msp0: msp@80123000 { 697 msp0: msp@80123000 {
627 compatible = "stericsson,ux500-msp-i2s"; 698 compatible = "stericsson,ux500-msp-i2s";
628 reg = <0x80123000 0x1000>; 699 reg = <0x80123000 0x1000>;
629 interrupts = <0 31 0x4>; 700 interrupts = <0 31 IRQ_TYPE_LEVEL_HIGH>;
630 v-ape-supply = <&db8500_vape_reg>; 701 v-ape-supply = <&db8500_vape_reg>;
631 status = "disabled"; 702 status = "disabled";
632 }; 703 };
@@ -634,7 +705,7 @@
634 msp1: msp@80124000 { 705 msp1: msp@80124000 {
635 compatible = "stericsson,ux500-msp-i2s"; 706 compatible = "stericsson,ux500-msp-i2s";
636 reg = <0x80124000 0x1000>; 707 reg = <0x80124000 0x1000>;
637 interrupts = <0 62 0x4>; 708 interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
638 v-ape-supply = <&db8500_vape_reg>; 709 v-ape-supply = <&db8500_vape_reg>;
639 status = "disabled"; 710 status = "disabled";
640 }; 711 };
@@ -643,7 +714,7 @@
643 msp2: msp@80117000 { 714 msp2: msp@80117000 {
644 compatible = "stericsson,ux500-msp-i2s"; 715 compatible = "stericsson,ux500-msp-i2s";
645 reg = <0x80117000 0x1000>; 716 reg = <0x80117000 0x1000>;
646 interrupts = <0 98 0x4>; 717 interrupts = <0 98 IRQ_TYPE_LEVEL_HIGH>;
647 v-ape-supply = <&db8500_vape_reg>; 718 v-ape-supply = <&db8500_vape_reg>;
648 status = "disabled"; 719 status = "disabled";
649 }; 720 };
@@ -651,7 +722,7 @@
651 msp3: msp@80125000 { 722 msp3: msp@80125000 {
652 compatible = "stericsson,ux500-msp-i2s"; 723 compatible = "stericsson,ux500-msp-i2s";
653 reg = <0x80125000 0x1000>; 724 reg = <0x80125000 0x1000>;
654 interrupts = <0 62 0x4>; 725 interrupts = <0 62 IRQ_TYPE_LEVEL_HIGH>;
655 v-ape-supply = <&db8500_vape_reg>; 726 v-ape-supply = <&db8500_vape_reg>;
656 status = "disabled"; 727 status = "disabled";
657 }; 728 };
@@ -686,5 +757,20 @@
686 757
687 status = "disabled"; 758 status = "disabled";
688 }; 759 };
760
761 cryp@a03cb000 {
762 compatible = "stericsson,ux500-cryp";
763 reg = <0xa03cb000 0x1000>;
764 interrupts = <0 15 IRQ_TYPE_LEVEL_HIGH>;
765
766 v-ape-supply = <&db8500_vape_reg>;
767 };
768
769 hash@a03c2000 {
770 compatible = "stericsson,ux500-hash";
771 reg = <0xa03c2000 0x1000>;
772
773 v-ape-supply = <&db8500_vape_reg>;
774 };
689 }; 775 };
690}; 776};
diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/href.dtsi
index c0bc426952ea..9db41b9d8358 100644
--- a/arch/arm/boot/dts/href.dtsi
+++ b/arch/arm/boot/dts/href.dtsi
@@ -9,7 +9,8 @@
9 * http://www.gnu.org/copyleft/gpl.html 9 * http://www.gnu.org/copyleft/gpl.html
10 */ 10 */
11 11
12/include/ "dbx5x0.dtsi" 12#include <dt-bindings/interrupt-controller/irq.h>
13#include "dbx5x0.dtsi"
13 14
14/ { 15/ {
15 memory { 16 memory {
@@ -27,7 +28,7 @@
27 }; 28 };
28 }; 29 };
29 30
30 soc-u9500 { 31 soc {
31 uart@80120000 { 32 uart@80120000 {
32 status = "okay"; 33 status = "okay";
33 }; 34 };
@@ -45,14 +46,14 @@
45 compatible = "tc3589x"; 46 compatible = "tc3589x";
46 reg = <0x42>; 47 reg = <0x42>;
47 interrupt-parent = <&gpio6>; 48 interrupt-parent = <&gpio6>;
48 interrupts = <25 0x1>; 49 interrupts = <25 IRQ_TYPE_EDGE_RISING>;
49 50
50 interrupt-controller; 51 interrupt-controller;
51 #interrupt-cells = <2>; 52 #interrupt-cells = <2>;
52 53
53 tc3589x_gpio: tc3589x_gpio { 54 tc3589x_gpio: tc3589x_gpio {
54 compatible = "tc3589x-gpio"; 55 compatible = "tc3589x-gpio";
55 interrupts = <0 0x1>; 56 interrupts = <0 IRQ_TYPE_EDGE_RISING>;
56 57
57 interrupt-controller; 58 interrupt-controller;
58 #interrupt-cells = <2>; 59 #interrupt-cells = <2>;
@@ -63,17 +64,43 @@
63 }; 64 };
64 65
65 i2c@80128000 { 66 i2c@80128000 {
66 lp5521@0x33 { 67 lp5521@33 {
67 compatible = "lp5521"; 68 compatible = "national,lp5521";
68 reg = <0x33>; 69 reg = <0x33>;
70 label = "lp5521_pri";
71 clock-mode = /bits/ 8 <2>;
72 chan0 {
73 led-cur = /bits/ 8 <0x2f>;
74 max-cur = /bits/ 8 <0x5f>;
75 };
76 chan1 {
77 led-cur = /bits/ 8 <0x2f>;
78 max-cur = /bits/ 8 <0x5f>;
79 };
80 chan2 {
81 led-cur = /bits/ 8 <0x2f>;
82 max-cur = /bits/ 8 <0x5f>;
83 };
69 }; 84 };
70 85 lp5521@34 {
71 lp5521@0x34 { 86 compatible = "national,lp5521";
72 compatible = "lp5521";
73 reg = <0x34>; 87 reg = <0x34>;
88 label = "lp5521_sec";
89 clock-mode = /bits/ 8 <2>;
90 chan0 {
91 led-cur = /bits/ 8 <0x2f>;
92 max-cur = /bits/ 8 <0x5f>;
93 };
94 chan1 {
95 led-cur = /bits/ 8 <0x2f>;
96 max-cur = /bits/ 8 <0x5f>;
97 };
98 chan2 {
99 led-cur = /bits/ 8 <0x2f>;
100 max-cur = /bits/ 8 <0x5f>;
101 };
74 }; 102 };
75 103 bh1780@29 {
76 bh1780@0x29 {
77 compatible = "rohm,bh1780gli"; 104 compatible = "rohm,bh1780gli";
78 reg = <0x33>; 105 reg = <0x33>;
79 }; 106 };
@@ -82,7 +109,7 @@
82 // External Micro SD slot 109 // External Micro SD slot
83 sdi0_per1@80126000 { 110 sdi0_per1@80126000 {
84 arm,primecell-periphid = <0x10480180>; 111 arm,primecell-periphid = <0x10480180>;
85 max-frequency = <50000000>; 112 max-frequency = <100000000>;
86 bus-width = <4>; 113 bus-width = <4>;
87 mmc-cap-sd-highspeed; 114 mmc-cap-sd-highspeed;
88 mmc-cap-mmc-highspeed; 115 mmc-cap-mmc-highspeed;
@@ -97,7 +124,7 @@
97 // WLAN SDIO channel 124 // WLAN SDIO channel
98 sdi1_per2@80118000 { 125 sdi1_per2@80118000 {
99 arm,primecell-periphid = <0x10480180>; 126 arm,primecell-periphid = <0x10480180>;
100 max-frequency = <50000000>; 127 max-frequency = <100000000>;
101 bus-width = <4>; 128 bus-width = <4>;
102 129
103 status = "okay"; 130 status = "okay";
@@ -106,7 +133,7 @@
106 // PoP:ed eMMC 133 // PoP:ed eMMC
107 sdi2_per3@80005000 { 134 sdi2_per3@80005000 {
108 arm,primecell-periphid = <0x10480180>; 135 arm,primecell-periphid = <0x10480180>;
109 max-frequency = <50000000>; 136 max-frequency = <100000000>;
110 bus-width = <8>; 137 bus-width = <8>;
111 mmc-cap-mmc-highspeed; 138 mmc-cap-mmc-highspeed;
112 139
@@ -116,7 +143,7 @@
116 // On-board eMMC 143 // On-board eMMC
117 sdi4_per2@80114000 { 144 sdi4_per2@80114000 {
118 arm,primecell-periphid = <0x10480180>; 145 arm,primecell-periphid = <0x10480180>;
119 max-frequency = <50000000>; 146 max-frequency = <100000000>;
120 bus-width = <8>; 147 bus-width = <8>;
121 mmc-cap-mmc-highspeed; 148 mmc-cap-mmc-highspeed;
122 vmmc-supply = <&ab8500_ldo_aux2_reg>; 149 vmmc-supply = <&ab8500_ldo_aux2_reg>;
@@ -236,7 +263,7 @@
236 regulator-name = "V-MMC-SD"; 263 regulator-name = "V-MMC-SD";
237 }; 264 };
238 265
239 ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 266 ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
240 regulator-name = "V-INTCORE"; 267 regulator-name = "V-INTCORE";
241 }; 268 };
242 269
@@ -256,7 +283,7 @@
256 regulator-name = "V-AMIC1"; 283 regulator-name = "V-AMIC1";
257 }; 284 };
258 285
259 ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { 286 ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
260 regulator-name = "V-AMIC2"; 287 regulator-name = "V-AMIC2";
261 }; 288 };
262 289
diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/hrefprev60.dts
index c2d274815923..c6bb07df2d1d 100644
--- a/arch/arm/boot/dts/hrefprev60.dts
+++ b/arch/arm/boot/dts/hrefprev60.dts
@@ -10,9 +10,9 @@
10 */ 10 */
11 11
12/dts-v1/; 12/dts-v1/;
13/include/ "dbx5x0.dtsi" 13#include "dbx5x0.dtsi"
14/include/ "href.dtsi" 14#include "href.dtsi"
15/include/ "stuib.dtsi" 15#include "stuib.dtsi"
16 16
17/ { 17/ {
18 model = "ST-Ericsson HREF (pre-v60) platform with Device Tree"; 18 model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
@@ -24,7 +24,7 @@
24 }; 24 };
25 }; 25 };
26 26
27 soc-u9500 { 27 soc {
28 prcmu@80157000 { 28 prcmu@80157000 {
29 ab8500@5 { 29 ab8500@5 {
30 ab8500-gpio { 30 ab8500-gpio {
@@ -41,7 +41,7 @@
41 }; 41 };
42 42
43 i2c@80110000 { 43 i2c@80110000 {
44 bu21013_tp@0x5c { 44 bu21013_tp@5c {
45 reset-gpio = <&tc3589x_gpio 13 0x4>; 45 reset-gpio = <&tc3589x_gpio 13 0x4>;
46 }; 46 };
47 }; 47 };
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts
index 2b587a74b813..3d580d6447f9 100644
--- a/arch/arm/boot/dts/hrefv60plus.dts
+++ b/arch/arm/boot/dts/hrefv60plus.dts
@@ -10,9 +10,9 @@
10 */ 10 */
11 11
12/dts-v1/; 12/dts-v1/;
13/include/ "dbx5x0.dtsi" 13#include "dbx5x0.dtsi"
14/include/ "href.dtsi" 14#include "href.dtsi"
15/include/ "stuib.dtsi" 15#include "stuib.dtsi"
16 16
17/ { 17/ {
18 model = "ST-Ericsson HREF (v60+) platform with Device Tree"; 18 model = "ST-Ericsson HREF (v60+) platform with Device Tree";
@@ -24,7 +24,7 @@
24 }; 24 };
25 }; 25 };
26 26
27 soc-u9500 { 27 soc {
28 i2c@80110000 { 28 i2c@80110000 {
29 bu21013_tp@0x5c { 29 bu21013_tp@0x5c {
30 reset-gpio = <&gpio4 15 0x4>; 30 reset-gpio = <&gpio4 15 0x4>;
@@ -34,7 +34,7 @@
34 // External Micro SD slot 34 // External Micro SD slot
35 sdi0_per1@80126000 { 35 sdi0_per1@80126000 {
36 arm,primecell-periphid = <0x10480180>; 36 arm,primecell-periphid = <0x10480180>;
37 max-frequency = <50000000>; 37 max-frequency = <100000000>;
38 bus-width = <4>; 38 bus-width = <4>;
39 mmc-cap-sd-highspeed; 39 mmc-cap-sd-highspeed;
40 mmc-cap-mmc-highspeed; 40 mmc-cap-mmc-highspeed;
@@ -48,7 +48,7 @@
48 // WLAN SDIO channel 48 // WLAN SDIO channel
49 sdi1_per2@80118000 { 49 sdi1_per2@80118000 {
50 arm,primecell-periphid = <0x10480180>; 50 arm,primecell-periphid = <0x10480180>;
51 max-frequency = <50000000>; 51 max-frequency = <100000000>;
52 bus-width = <4>; 52 bus-width = <4>;
53 53
54 status = "okay"; 54 status = "okay";
@@ -57,7 +57,7 @@
57 // PoP:ed eMMC 57 // PoP:ed eMMC
58 sdi2_per3@80005000 { 58 sdi2_per3@80005000 {
59 arm,primecell-periphid = <0x10480180>; 59 arm,primecell-periphid = <0x10480180>;
60 max-frequency = <50000000>; 60 max-frequency = <100000000>;
61 bus-width = <8>; 61 bus-width = <8>;
62 mmc-cap-mmc-highspeed; 62 mmc-cap-mmc-highspeed;
63 63
@@ -67,7 +67,7 @@
67 // On-board eMMC 67 // On-board eMMC
68 sdi4_per2@80114000 { 68 sdi4_per2@80114000 {
69 arm,primecell-periphid = <0x10480180>; 69 arm,primecell-periphid = <0x10480180>;
70 max-frequency = <50000000>; 70 max-frequency = <100000000>;
71 bus-width = <8>; 71 bus-width = <8>;
72 mmc-cap-mmc-highspeed; 72 mmc-cap-mmc-highspeed;
73 vmmc-supply = <&ab8500_ldo_aux2_reg>; 73 vmmc-supply = <&ab8500_ldo_aux2_reg>;
@@ -172,7 +172,7 @@
172 regulator-name = "V-MMC-SD"; 172 regulator-name = "V-MMC-SD";
173 }; 173 };
174 174
175 ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 175 ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
176 regulator-name = "V-INTCORE"; 176 regulator-name = "V-INTCORE";
177 }; 177 };
178 178
@@ -192,7 +192,7 @@
192 regulator-name = "V-AMIC1"; 192 regulator-name = "V-AMIC1";
193 }; 193 };
194 194
195 ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { 195 ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
196 regulator-name = "V-AMIC2"; 196 regulator-name = "V-AMIC2";
197 }; 197 };
198 198
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index db5db24fd544..fb9dce529da6 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/snowball.dts
@@ -10,7 +10,7 @@
10 */ 10 */
11 11
12/dts-v1/; 12/dts-v1/;
13/include/ "dbx5x0.dtsi" 13#include "dbx5x0.dtsi"
14 14
15/ { 15/ {
16 model = "Calao Systems Snowball platform with device tree"; 16 model = "Calao Systems Snowball platform with device tree";
@@ -82,7 +82,7 @@
82 }; 82 };
83 }; 83 };
84 84
85 soc-u9500 { 85 soc {
86 86
87 sound { 87 sound {
88 compatible = "stericsson,snd-soc-mop500"; 88 compatible = "stericsson,snd-soc-mop500";
@@ -99,40 +99,13 @@
99 status = "okay"; 99 status = "okay";
100 }; 100 };
101 101
102 prcmu@80157000 {
103 thermal@801573c0 {
104 num-trips = <4>;
105
106 trip0-temp = <70000>;
107 trip0-type = "active";
108 trip0-cdev-num = <1>;
109 trip0-cdev-name0 = "thermal-cpufreq-0";
110
111 trip1-temp = <75000>;
112 trip1-type = "active";
113 trip1-cdev-num = <1>;
114 trip1-cdev-name0 = "thermal-cpufreq-0";
115
116 trip2-temp = <80000>;
117 trip2-type = "active";
118 trip2-cdev-num = <1>;
119 trip2-cdev-name0 = "thermal-cpufreq-0";
120
121 trip3-temp = <85000>;
122 trip3-type = "critical";
123 trip3-cdev-num = <0>;
124
125 status = "okay";
126 };
127 };
128
129 external-bus@50000000 { 102 external-bus@50000000 {
130 status = "okay"; 103 status = "okay";
131 104
132 ethernet@0 { 105 ethernet@0 {
133 compatible = "smsc,lan9115"; 106 compatible = "smsc,lan9115";
134 reg = <0 0x10000>; 107 reg = <0 0x10000>;
135 interrupts = <12 0x1>; 108 interrupts = <12 IRQ_TYPE_EDGE_RISING>;
136 interrupt-parent = <&gpio4>; 109 interrupt-parent = <&gpio4>;
137 vdd33a-supply = <&en_3v3_reg>; 110 vdd33a-supply = <&en_3v3_reg>;
138 vddvario-supply = <&db8500_vape_reg>; 111 vddvario-supply = <&db8500_vape_reg>;
@@ -146,13 +119,21 @@
146 }; 119 };
147 }; 120 };
148 121
122 vmmci: regulator-gpio {
123 gpios = <&gpio6 25 0x4>;
124 enable-gpio = <&gpio7 4 0x4>;
125
126 status = "okay";
127 };
128
149 // External Micro SD slot 129 // External Micro SD slot
150 sdi0_per1@80126000 { 130 sdi0_per1@80126000 {
151 arm,primecell-periphid = <0x10480180>; 131 arm,primecell-periphid = <0x10480180>;
152 max-frequency = <50000000>; 132 max-frequency = <100000000>;
153 bus-width = <4>; 133 bus-width = <4>;
154 mmc-cap-mmc-highspeed; 134 mmc-cap-mmc-highspeed;
155 vmmc-supply = <&ab8500_ldo_aux3_reg>; 135 vmmc-supply = <&ab8500_ldo_aux3_reg>;
136 vqmmc-supply = <&vmmci>;
156 137
157 cd-gpios = <&gpio6 26 0x4>; // 218 138 cd-gpios = <&gpio6 26 0x4>; // 218
158 cd-inverted; 139 cd-inverted;
@@ -163,7 +144,7 @@
163 // On-board eMMC 144 // On-board eMMC
164 sdi4_per2@80114000 { 145 sdi4_per2@80114000 {
165 arm,primecell-periphid = <0x10480180>; 146 arm,primecell-periphid = <0x10480180>;
166 max-frequency = <50000000>; 147 max-frequency = <100000000>;
167 bus-width = <8>; 148 bus-width = <8>;
168 mmc-cap-mmc-highspeed; 149 mmc-cap-mmc-highspeed;
169 vmmc-supply = <&ab8500_ldo_aux2_reg>; 150 vmmc-supply = <&ab8500_ldo_aux2_reg>;
@@ -197,15 +178,15 @@
197 }; 178 };
198 179
199 i2c@80128000 { 180 i2c@80128000 {
200 lp5521@0x33 { 181 lp5521@33 {
201 // compatible = "lp5521"; 182 // compatible = "lp5521";
202 reg = <0x33>; 183 reg = <0x33>;
203 }; 184 };
204 lp5521@0x34 { 185 lp5521@34 {
205 // compatible = "lp5521"; 186 // compatible = "lp5521";
206 reg = <0x34>; 187 reg = <0x34>;
207 }; 188 };
208 bh1780@0x29 { 189 bh1780@29 {
209 // compatible = "rohm,bh1780gli"; 190 // compatible = "rohm,bh1780gli";
210 reg = <0x33>; 191 reg = <0x33>;
211 }; 192 };
@@ -298,6 +279,31 @@
298 }; 279 };
299 }; 280 };
300 281
282 thermal@801573c0 {
283 num-trips = <4>;
284
285 trip0-temp = <70000>;
286 trip0-type = "active";
287 trip0-cdev-num = <1>;
288 trip0-cdev-name0 = "thermal-cpufreq-0";
289
290 trip1-temp = <75000>;
291 trip1-type = "active";
292 trip1-cdev-num = <1>;
293 trip1-cdev-name0 = "thermal-cpufreq-0";
294
295 trip2-temp = <80000>;
296 trip2-type = "active";
297 trip2-cdev-num = <1>;
298 trip2-cdev-name0 = "thermal-cpufreq-0";
299
300 trip3-temp = <85000>;
301 trip3-type = "critical";
302 trip3-cdev-num = <0>;
303
304 status = "okay";
305 };
306
301 ab8500 { 307 ab8500 {
302 ab8500-gpio { 308 ab8500-gpio {
303 compatible = "stericsson,ab8500-gpio"; 309 compatible = "stericsson,ab8500-gpio";
@@ -316,7 +322,7 @@
316 regulator-name = "V-MMC-SD"; 322 regulator-name = "V-MMC-SD";
317 }; 323 };
318 324
319 ab8500_ldo_initcore_reg: ab8500_ldo_initcore { 325 ab8500_ldo_intcore_reg: ab8500_ldo_intcore {
320 regulator-name = "V-INTCORE"; 326 regulator-name = "V-INTCORE";
321 }; 327 };
322 328
@@ -336,7 +342,7 @@
336 regulator-name = "V-AMIC1"; 342 regulator-name = "V-AMIC1";
337 }; 343 };
338 344
339 ab8500_ldo_amamic2_reg: ab8500_ldo_amamic2 { 345 ab8500_ldo_anamic2_reg: ab8500_ldo_anamic2 {
340 regulator-name = "V-AMIC2"; 346 regulator-name = "V-AMIC2";
341 }; 347 };
342 348
diff --git a/arch/arm/boot/dts/stuib.dtsi b/arch/arm/boot/dts/stuib.dtsi
index 615392a75676..524e33240ad4 100644
--- a/arch/arm/boot/dts/stuib.dtsi
+++ b/arch/arm/boot/dts/stuib.dtsi
@@ -9,13 +9,15 @@
9 * http://www.gnu.org/copyleft/gpl.html 9 * http://www.gnu.org/copyleft/gpl.html
10 */ 10 */
11 11
12#include <dt-bindings/interrupt-controller/irq.h>
13
12/ { 14/ {
13 soc-u9500 { 15 soc {
14 i2c@80004000 { 16 i2c@80004000 {
15 stmpe1601: stmpe1601@40 { 17 stmpe1601: stmpe1601@40 {
16 compatible = "st,stmpe1601"; 18 compatible = "st,stmpe1601";
17 reg = <0x40>; 19 reg = <0x40>;
18 interrupts = <26 0x2>; 20 interrupts = <26 IRQ_TYPE_EDGE_FALLING>;
19 interrupt-parent = <&gpio6>; 21 interrupt-parent = <&gpio6>;
20 interrupt-controller; 22 interrupt-controller;
21 23
@@ -52,26 +54,26 @@
52 }; 54 };
53 55
54 i2c@80110000 { 56 i2c@80110000 {
55 bu21013_tp@0x5c { 57 bu21013_tp@5c {
56 compatible = "rhom,bu21013_tp"; 58 compatible = "rohm,bu21013_tp";
57 reg = <0x5c>; 59 reg = <0x5c>;
58 touch-gpio = <&gpio2 20 0x4>; 60 touch-gpio = <&gpio2 20 0x4>;
59 avdd-supply = <&ab8500_ldo_aux1_reg>; 61 avdd-supply = <&ab8500_ldo_aux1_reg>;
60 62
61 rhom,touch-max-x = <384>; 63 rohm,touch-max-x = <384>;
62 rhom,touch-max-y = <704>; 64 rohm,touch-max-y = <704>;
63 rhom,flip-y; 65 rohm,flip-y;
64 }; 66 };
65 67
66 bu21013_tp@0x5d { 68 bu21013_tp@5d {
67 compatible = "rhom,bu21013_tp"; 69 compatible = "rohm,bu21013_tp";
68 reg = <0x5d>; 70 reg = <0x5d>;
69 touch-gpio = <&gpio2 20 0x4>; 71 touch-gpio = <&gpio2 20 0x4>;
70 avdd-supply = <&ab8500_ldo_aux1_reg>; 72 avdd-supply = <&ab8500_ldo_aux1_reg>;
71 73
72 rhom,touch-max-x = <384>; 74 rohm,touch-max-x = <384>;
73 rhom,touch-max-y = <704>; 75 rohm,touch-max-y = <704>;
74 rhom,flip-y; 76 rohm,flip-y;
75 }; 77 };
76 }; 78 };
77 }; 79 };
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 46cca52890bc..7669a49fb6fb 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -274,11 +274,16 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
274 OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL), 274 OF_DEV_AUXDATA("st,nomadik-i2c", 0x80128000, "nmk-i2c.2", NULL),
275 OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), 275 OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL),
276 OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), 276 OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL),
277 OF_DEV_AUXDATA("stericsson,db8500-musb", 0xa03e0000, "musb-ux500.0", NULL),
277 OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", 278 OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",
278 &db8500_prcmu_pdata), 279 &db8500_prcmu_pdata),
279 OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL), 280 OF_DEV_AUXDATA("smsc,lan9115", 0x50000000, "smsc911x.0", NULL),
281 OF_DEV_AUXDATA("stericsson,ux500-cryp", 0xa03cb000, "cryp1", NULL),
282 OF_DEV_AUXDATA("stericsson,ux500-hash", 0xa03c2000, "hash1", NULL),
283 OF_DEV_AUXDATA("stericsson,snd-soc-mop500", 0, "snd-soc-mop500.0",
284 NULL),
280 /* Requires device name bindings. */ 285 /* Requires device name bindings. */
281 OF_DEV_AUXDATA("stericsson,nmk-pinctrl", U8500_PRCMU_BASE, 286 OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE,
282 "pinctrl-db8500", NULL), 287 "pinctrl-db8500", NULL),
283 /* Requires clock name and DMA bindings. */ 288 /* Requires clock name and DMA bindings. */
284 OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, 289 OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000,
@@ -292,6 +297,16 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
292 {}, 297 {},
293}; 298};
294 299
300static struct of_dev_auxdata u8540_auxdata_lookup[] __initdata = {
301 /* Requires DMA bindings. */
302 OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", NULL),
303 OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL),
304 OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL),
305 OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu",
306 &db8500_prcmu_pdata),
307 {},
308};
309
295static const struct of_device_id u8500_local_bus_nodes[] = { 310static const struct of_device_id u8500_local_bus_nodes[] = {
296 /* only create devices below soc node */ 311 /* only create devices below soc node */
297 { .compatible = "stericsson,db8500", }, 312 { .compatible = "stericsson,db8500", },
@@ -318,8 +333,13 @@ static void __init u8500_init_machine(void)
318 /* TODO: Export SoC, USB, cpu-freq and DMA40 */ 333 /* TODO: Export SoC, USB, cpu-freq and DMA40 */
319 parent = u8500_of_init_devices(); 334 parent = u8500_of_init_devices();
320 335
321 /* automatically probe child nodes of db8500 device */ 336 /* automatically probe child nodes of dbx5x0 devices */
322 of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); 337 if (of_machine_is_compatible("st-ericsson,u8540"))
338 of_platform_populate(NULL, u8500_local_bus_nodes,
339 u8540_auxdata_lookup, parent);
340 else
341 of_platform_populate(NULL, u8500_local_bus_nodes,
342 u8500_auxdata_lookup, parent);
323} 343}
324 344
325static const char * stericsson_dt_platform_compat[] = { 345static const char * stericsson_dt_platform_compat[] = {
diff --git a/drivers/crypto/ux500/cryp/cryp_core.c b/drivers/crypto/ux500/cryp/cryp_core.c
index 32f480622b97..8c2777cf02f6 100644
--- a/drivers/crypto/ux500/cryp/cryp_core.c
+++ b/drivers/crypto/ux500/cryp/cryp_core.c
@@ -1743,6 +1743,11 @@ static int ux500_cryp_resume(struct device *dev)
1743 1743
1744static SIMPLE_DEV_PM_OPS(ux500_cryp_pm, ux500_cryp_suspend, ux500_cryp_resume); 1744static SIMPLE_DEV_PM_OPS(ux500_cryp_pm, ux500_cryp_suspend, ux500_cryp_resume);
1745 1745
1746static const struct of_device_id ux500_cryp_match[] = {
1747 { .compatible = "stericsson,ux500-cryp" },
1748 { },
1749};
1750
1746static struct platform_driver cryp_driver = { 1751static struct platform_driver cryp_driver = {
1747 .probe = ux500_cryp_probe, 1752 .probe = ux500_cryp_probe,
1748 .remove = ux500_cryp_remove, 1753 .remove = ux500_cryp_remove,
@@ -1750,6 +1755,7 @@ static struct platform_driver cryp_driver = {
1750 .driver = { 1755 .driver = {
1751 .owner = THIS_MODULE, 1756 .owner = THIS_MODULE,
1752 .name = "cryp1", 1757 .name = "cryp1",
1758 .of_match_table = ux500_cryp_match,
1753 .pm = &ux500_cryp_pm, 1759 .pm = &ux500_cryp_pm,
1754 } 1760 }
1755}; 1761};
diff --git a/drivers/crypto/ux500/hash/hash_core.c b/drivers/crypto/ux500/hash/hash_core.c
index cf5508967539..3b8f661d0edf 100644
--- a/drivers/crypto/ux500/hash/hash_core.c
+++ b/drivers/crypto/ux500/hash/hash_core.c
@@ -1961,6 +1961,11 @@ static int ux500_hash_resume(struct device *dev)
1961 1961
1962static SIMPLE_DEV_PM_OPS(ux500_hash_pm, ux500_hash_suspend, ux500_hash_resume); 1962static SIMPLE_DEV_PM_OPS(ux500_hash_pm, ux500_hash_suspend, ux500_hash_resume);
1963 1963
1964static const struct of_device_id ux500_hash_match[] = {
1965 { .compatible = "stericsson,ux500-hash" },
1966 { },
1967};
1968
1964static struct platform_driver hash_driver = { 1969static struct platform_driver hash_driver = {
1965 .probe = ux500_hash_probe, 1970 .probe = ux500_hash_probe,
1966 .remove = ux500_hash_remove, 1971 .remove = ux500_hash_remove,
@@ -1968,6 +1973,7 @@ static struct platform_driver hash_driver = {
1968 .driver = { 1973 .driver = {
1969 .owner = THIS_MODULE, 1974 .owner = THIS_MODULE,
1970 .name = "hash1", 1975 .name = "hash1",
1976 .of_match_table = ux500_hash_match,
1971 .pm = &ux500_hash_pm, 1977 .pm = &ux500_hash_pm,
1972 } 1978 }
1973}; 1979};
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 34281754b629..7c44f1a57e7c 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -2108,11 +2108,11 @@ static const struct of_device_id nmk_pinctrl_match[] = {
2108 .data = (void *)PINCTRL_NMK_STN8815, 2108 .data = (void *)PINCTRL_NMK_STN8815,
2109 }, 2109 },
2110 { 2110 {
2111 .compatible = "stericsson,nmk-pinctrl", 2111 .compatible = "stericsson,db8500-pinctrl",
2112 .data = (void *)PINCTRL_NMK_DB8500, 2112 .data = (void *)PINCTRL_NMK_DB8500,
2113 }, 2113 },
2114 { 2114 {
2115 .compatible = "stericsson,nmk-pinctrl-db8540", 2115 .compatible = "stericsson,db8540-pinctrl",
2116 .data = (void *)PINCTRL_NMK_DB8540, 2116 .data = (void *)PINCTRL_NMK_DB8540,
2117 }, 2117 },
2118 {}, 2118 {},
diff --git a/drivers/regulator/ab8500.c b/drivers/regulator/ab8500.c
index f6656b8c28b6..a19045ee0ec4 100644
--- a/drivers/regulator/ab8500.c
+++ b/drivers/regulator/ab8500.c
@@ -2901,7 +2901,7 @@ static struct of_regulator_match ab8500_regulator_match[] = {
2901 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, }, 2901 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8500_LDO_TVOUT, },
2902 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, }, 2902 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8500_LDO_AUDIO, },
2903 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, }, 2903 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8500_LDO_ANAMIC1, },
2904 { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, }, 2904 { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8500_LDO_ANAMIC2, },
2905 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, }, 2905 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8500_LDO_DMIC, },
2906 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, }, 2906 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8500_LDO_ANA, },
2907}; 2907};
@@ -2917,7 +2917,7 @@ static struct of_regulator_match ab8505_regulator_match[] = {
2917 { .name = "ab8500_ldo_adc", .driver_data = (void *) AB8505_LDO_ADC, }, 2917 { .name = "ab8500_ldo_adc", .driver_data = (void *) AB8505_LDO_ADC, },
2918 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8505_LDO_AUDIO, }, 2918 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8505_LDO_AUDIO, },
2919 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8505_LDO_ANAMIC1, }, 2919 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8505_LDO_ANAMIC1, },
2920 { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8505_LDO_ANAMIC2, }, 2920 { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8505_LDO_ANAMIC2, },
2921 { .name = "ab8500_ldo_aux8", .driver_data = (void *) AB8505_LDO_AUX8, }, 2921 { .name = "ab8500_ldo_aux8", .driver_data = (void *) AB8505_LDO_AUX8, },
2922 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8505_LDO_ANA, }, 2922 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8505_LDO_ANA, },
2923}; 2923};
@@ -2933,7 +2933,7 @@ static struct of_regulator_match ab8540_regulator_match[] = {
2933 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8540_LDO_TVOUT, }, 2933 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB8540_LDO_TVOUT, },
2934 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8540_LDO_AUDIO, }, 2934 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB8540_LDO_AUDIO, },
2935 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8540_LDO_ANAMIC1, }, 2935 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB8540_LDO_ANAMIC1, },
2936 { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB8540_LDO_ANAMIC2, }, 2936 { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB8540_LDO_ANAMIC2, },
2937 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8540_LDO_DMIC, }, 2937 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB8540_LDO_DMIC, },
2938 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8540_LDO_ANA, }, 2938 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB8540_LDO_ANA, },
2939 { .name = "ab8500_ldo_sdio", .driver_data = (void *) AB8540_LDO_SDIO, }, 2939 { .name = "ab8500_ldo_sdio", .driver_data = (void *) AB8540_LDO_SDIO, },
@@ -2948,7 +2948,7 @@ static struct of_regulator_match ab9540_regulator_match[] = {
2948 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB9540_LDO_TVOUT, }, 2948 { .name = "ab8500_ldo_tvout", .driver_data = (void *) AB9540_LDO_TVOUT, },
2949 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB9540_LDO_AUDIO, }, 2949 { .name = "ab8500_ldo_audio", .driver_data = (void *) AB9540_LDO_AUDIO, },
2950 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB9540_LDO_ANAMIC1, }, 2950 { .name = "ab8500_ldo_anamic1", .driver_data = (void *) AB9540_LDO_ANAMIC1, },
2951 { .name = "ab8500_ldo_amamic2", .driver_data = (void *) AB9540_LDO_ANAMIC2, }, 2951 { .name = "ab8500_ldo_anamic2", .driver_data = (void *) AB9540_LDO_ANAMIC2, },
2952 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB9540_LDO_DMIC, }, 2952 { .name = "ab8500_ldo_dmic", .driver_data = (void *) AB9540_LDO_DMIC, },
2953 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB9540_LDO_ANA, }, 2953 { .name = "ab8500_ldo_ana", .driver_data = (void *) AB9540_LDO_ANA, },
2954}; 2954};
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 05:46:46 -0400