Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson:
"By far most of the fixes here are updates to DTS files to deal with
some mostly minor bugs.
There's also a fix to deal with non-PM kernel configs on i.MX, a
regression fix for ethernet on PXA platforms and a dependency fix for
OMAP"
* tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
ARM: keystone: dts: rename pcie nodes to help override status
ARM: keystone: dts: fix dt bindings for PCIe
ARM: pxa: fix dm9000 platform data regression
ARM: dts: Correct audio input route & set mic bias for am335x-pepper
ARM: OMAP2+: Add HAVE_ARM_SCU for AM43XX
MAINTAINERS: digicolor: add dts files
ARM: ux500: fix MMC/SD card regression
ARM: ux500: define serial port aliases
ARM: dts: OMAP5: Add #iommu-cells property to IOMMUs
ARM: dts: OMAP4: Add #iommu-cells property to IOMMUs
ARM: dts: Fix frequency scaling on Gumstix Pepper
ARM: dts: configure regulators for Gumstix Pepper
ARM: dts: omap3: overo: Update LCD panel names
ARM: dts: cros-ec-keyboard: Add support for some Japanese keys
ARM: imx6: gpc: always enable PU domain if CONFIG_PM is not set
ARM: dts: imx53-qsb: fix TVE entry
ARM: dts: mx23: fix iio-hwmon support
ARM: dts: imx27: Adjust the GPT compatible string
ARM: socfpga: dts: Fix entries order
ARM: socfpga: dts: Fix adxl34x formating and compatible string
+182
-60
+1
MAINTAINERS
+1
MAINTAINERS
+13
-3
arch/arm/boot/dts/am335x-pepper.dts
+13
-3
arch/arm/boot/dts/am335x-pepper.dts
···
74
74
audio_codec: tlv320aic3106@1b {
75
75
compatible = "ti,tlv320aic3106";
76
76
reg = <0x1b>;
77
+
ai3x-micbias-vg = <0x2>;
77
78
};
78
79
79
80
accel: lis331dlh@1d {
···
154
153
ti,audio-routing =
155
154
"Headphone Jack", "HPLOUT",
156
155
"Headphone Jack", "HPROUT",
157
-
"LINE1L", "Line In";
156
+
"MIC3L", "Mic3L Switch";
158
157
};
159
158
160
159
&mcasp0 {
···
439
438
regulators {
440
439
dcdc1_reg: regulator@0 {
441
440
/* VDD_1V8 system supply */
441
+
regulator-always-on;
442
442
};
443
443
444
444
dcdc2_reg: regulator@1 {
445
445
/* VDD_CORE voltage limits 0.95V - 1.26V with +/-4% tolerance */
446
446
regulator-name = "vdd_core";
447
447
regulator-min-microvolt = <925000>;
448
-
regulator-max-microvolt = <1325000>;
448
+
regulator-max-microvolt = <1150000>;
449
449
regulator-boot-on;
450
+
regulator-always-on;
450
451
};
451
452
452
453
dcdc3_reg: regulator@2 {
453
454
/* VDD_MPU voltage limits 0.95V - 1.1V with +/-4% tolerance */
454
455
regulator-name = "vdd_mpu";
455
456
regulator-min-microvolt = <925000>;
456
-
regulator-max-microvolt = <1150000>;
457
+
regulator-max-microvolt = <1325000>;
457
458
regulator-boot-on;
459
+
regulator-always-on;
458
460
};
459
461
460
462
ldo1_reg: regulator@3 {
461
463
/* VRTC 1.8V always-on supply */
464
+
regulator-name = "vrtc,vdds";
462
465
regulator-always-on;
463
466
};
464
467
465
468
ldo2_reg: regulator@4 {
466
469
/* 3.3V rail */
470
+
regulator-name = "vdd_3v3aux";
471
+
regulator-always-on;
467
472
};
468
473
469
474
ldo3_reg: regulator@5 {
470
475
/* VDD_3V3A 3.3V rail */
476
+
regulator-name = "vdd_3v3a";
471
477
regulator-min-microvolt = <3300000>;
472
478
regulator-max-microvolt = <3300000>;
473
479
};
474
480
475
481
ldo4_reg: regulator@6 {
476
482
/* VDD_3V3B 3.3V rail */
483
+
regulator-name = "vdd_3v3b";
484
+
regulator-always-on;
477
485
};
478
486
};
479
487
};
+4
arch/arm/boot/dts/cros-ec-keyboard.dtsi
+4
arch/arm/boot/dts/cros-ec-keyboard.dtsi
···
22
22
MATRIX_KEY(0x00, 0x02, KEY_F1)
23
23
MATRIX_KEY(0x00, 0x03, KEY_B)
24
24
MATRIX_KEY(0x00, 0x04, KEY_F10)
25
+
MATRIX_KEY(0x00, 0x05, KEY_RO)
25
26
MATRIX_KEY(0x00, 0x06, KEY_N)
26
27
MATRIX_KEY(0x00, 0x08, KEY_EQUAL)
27
28
MATRIX_KEY(0x00, 0x0a, KEY_RIGHTALT)
···
35
34
MATRIX_KEY(0x01, 0x08, KEY_APOSTROPHE)
36
35
MATRIX_KEY(0x01, 0x09, KEY_F9)
37
36
MATRIX_KEY(0x01, 0x0b, KEY_BACKSPACE)
37
+
MATRIX_KEY(0x01, 0x0c, KEY_HENKAN)
38
38
39
39
MATRIX_KEY(0x02, 0x00, KEY_LEFTCTRL)
40
40
MATRIX_KEY(0x02, 0x01, KEY_TAB)
···
47
45
MATRIX_KEY(0x02, 0x07, KEY_102ND)
48
46
MATRIX_KEY(0x02, 0x08, KEY_LEFTBRACE)
49
47
MATRIX_KEY(0x02, 0x09, KEY_F8)
48
+
MATRIX_KEY(0x02, 0x0a, KEY_YEN)
50
49
51
50
MATRIX_KEY(0x03, 0x01, KEY_GRAVE)
52
51
MATRIX_KEY(0x03, 0x02, KEY_F2)
···
56
53
MATRIX_KEY(0x03, 0x06, KEY_6)
57
54
MATRIX_KEY(0x03, 0x08, KEY_MINUS)
58
55
MATRIX_KEY(0x03, 0x0b, KEY_BACKSLASH)
56
+
MATRIX_KEY(0x03, 0x0c, KEY_MUHENKAN)
59
57
60
58
MATRIX_KEY(0x04, 0x00, KEY_RIGHTCTRL)
61
59
MATRIX_KEY(0x04, 0x01, KEY_A)
+1
arch/arm/boot/dts/imx23.dtsi
+1
arch/arm/boot/dts/imx23.dtsi
+6
-6
arch/arm/boot/dts/imx27.dtsi
+6
-6
arch/arm/boot/dts/imx27.dtsi
···
108
108
};
109
109
110
110
gpt1: timer@10003000 {
111
-
compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
111
+
compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";
112
112
reg = <0x10003000 0x1000>;
113
113
interrupts = <26>;
114
114
clocks = <&clks IMX27_CLK_GPT1_IPG_GATE>,
···
117
117
};
118
118
119
119
gpt2: timer@10004000 {
120
-
compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
120
+
compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";
121
121
reg = <0x10004000 0x1000>;
122
122
interrupts = <25>;
123
123
clocks = <&clks IMX27_CLK_GPT2_IPG_GATE>,
···
126
126
};
127
127
128
128
gpt3: timer@10005000 {
129
-
compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
129
+
compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";
130
130
reg = <0x10005000 0x1000>;
131
131
interrupts = <24>;
132
132
clocks = <&clks IMX27_CLK_GPT3_IPG_GATE>,
···
376
376
};
377
377
378
378
gpt4: timer@10019000 {
379
-
compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
379
+
compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";
380
380
reg = <0x10019000 0x1000>;
381
381
interrupts = <4>;
382
382
clocks = <&clks IMX27_CLK_GPT4_IPG_GATE>,
···
385
385
};
386
386
387
387
gpt5: timer@1001a000 {
388
-
compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
388
+
compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";
389
389
reg = <0x1001a000 0x1000>;
390
390
interrupts = <3>;
391
391
clocks = <&clks IMX27_CLK_GPT5_IPG_GATE>,
···
436
436
};
437
437
438
438
gpt6: timer@1001f000 {
439
-
compatible = "fsl,imx27-gpt", "fsl,imx1-gpt";
439
+
compatible = "fsl,imx27-gpt", "fsl,imx21-gpt";
440
440
reg = <0x1001f000 0x1000>;
441
441
interrupts = <2>;
442
442
clocks = <&clks IMX27_CLK_GPT6_IPG_GATE>,
+3
-2
arch/arm/boot/dts/imx53-qsb-common.dtsi
+3
-2
arch/arm/boot/dts/imx53-qsb-common.dtsi
···
295
295
&tve {
296
296
pinctrl-names = "default";
297
297
pinctrl-0 = <&pinctrl_vga_sync>;
298
+
ddc-i2c-bus = <&i2c2>;
298
299
fsl,tve-mode = "vga";
299
-
fsl,hsync-pin = <4>;
300
-
fsl,vsync-pin = <6>;
300
+
fsl,hsync-pin = <7>; /* IPU DI1 PIN7 via EIM_OE */
301
+
fsl,vsync-pin = <8>; /* IPU DI1 PIN8 via EIM_RW */
301
302
status = "okay";
302
303
};
303
304
+2
-1
arch/arm/boot/dts/k2e.dtsi
+2
-1
arch/arm/boot/dts/k2e.dtsi
···
86
86
gpio,syscon-dev = <&devctrl 0x240>;
87
87
};
88
88
89
-
pcie@21020000 {
89
+
pcie1: pcie@21020000 {
90
90
compatible = "ti,keystone-pcie","snps,dw-pcie";
91
91
clocks = <&clkpcie1>;
92
92
clock-names = "pcie";
···
96
96
ranges = <0x81000000 0 0 0x23260000 0x4000 0x4000
97
97
0x82000000 0 0x60000000 0x60000000 0 0x10000000>;
98
98
99
+
status = "disabled";
99
100
device_type = "pci";
100
101
num-lanes = <2>;
101
102
+2
-1
arch/arm/boot/dts/keystone.dtsi
+2
-1
arch/arm/boot/dts/keystone.dtsi
···
286
286
ti,syscon-dev = <&devctrl 0x2a0>;
287
287
};
288
288
289
-
pcie@21800000 {
289
+
pcie0: pcie@21800000 {
290
290
compatible = "ti,keystone-pcie", "snps,dw-pcie";
291
291
clocks = <&clkpcie>;
292
292
clock-names = "pcie";
···
296
296
ranges = <0x81000000 0 0 0x23250000 0 0x4000
297
297
0x82000000 0 0x50000000 0x50000000 0 0x10000000>;
298
298
299
+
status = "disabled";
299
300
device_type = "pci";
300
301
num-lanes = <2>;
301
302
+1
-1
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
+1
-1
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
+1
-1
arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
+1
-1
arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi
+2
arch/arm/boot/dts/omap4.dtsi
+2
arch/arm/boot/dts/omap4.dtsi
···
551
551
reg = <0x4a066000 0x100>;
552
552
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
553
553
ti,hwmods = "mmu_dsp";
554
+
#iommu-cells = <0>;
554
555
};
555
556
556
557
mmu_ipu: mmu@55082000 {
···
559
558
reg = <0x55082000 0x100>;
560
559
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
561
560
ti,hwmods = "mmu_ipu";
561
+
#iommu-cells = <0>;
562
562
ti,iommu-bus-err-back;
563
563
};
564
564
+2
arch/arm/boot/dts/omap5.dtsi
+2
arch/arm/boot/dts/omap5.dtsi
···
612
612
reg = <0x4a066000 0x100>;
613
613
interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
614
614
ti,hwmods = "mmu_dsp";
615
+
#iommu-cells = <0>;
615
616
};
616
617
617
618
mmu_ipu: mmu@55082000 {
···
620
619
reg = <0x55082000 0x100>;
621
620
interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
622
621
ti,hwmods = "mmu_ipu";
622
+
#iommu-cells = <0>;
623
623
ti,iommu-bus-err-back;
624
624
};
625
625
+16
-16
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
+16
-16
arch/arm/boot/dts/socfpga_cyclone5_sockit.dts
···
60
60
rxc-skew-ps = <2000>;
61
61
};
62
62
63
+
&gpio2 {
64
+
status = "okay";
65
+
};
66
+
67
+
&i2c1 {
68
+
status = "okay";
69
+
70
+
accel1: accelerometer@53 {
71
+
compatible = "adi,adxl345";
72
+
reg = <0x53>;
73
+
74
+
interrupt-parent = <&portc>;
75
+
interrupts = <3 2>;
76
+
};
77
+
};
78
+
63
79
&mmc0 {
64
80
vmmc-supply = <®ulator_3_3v>;
65
81
vqmmc-supply = <®ulator_3_3v>;
···
83
67
84
68
&usb1 {
85
69
status = "okay";
86
-
};
87
-
88
-
&gpio2 {
89
-
status = "okay";
90
-
};
91
-
92
-
&i2c1{
93
-
status = "okay";
94
-
95
-
accel1: accel1@53{
96
-
compatible = "adxl34x";
97
-
reg = <0x53>;
98
-
99
-
interrupt-parent = < &portc >;
100
-
interrupts = <3 2>;
101
-
};
102
70
};
+7
arch/arm/boot/dts/ste-ccu8540.dts
+7
arch/arm/boot/dts/ste-ccu8540.dts
···
17
17
model = "ST-Ericsson U8540 platform with Device Tree";
18
18
compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
19
19
20
+
/* This stablilizes the serial port enumeration */
21
+
aliases {
22
+
serial0 = &ux500_serial0;
23
+
serial1 = &ux500_serial1;
24
+
serial2 = &ux500_serial2;
25
+
};
26
+
20
27
memory@0 {
21
28
device_type = "memory";
22
29
reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
+7
arch/arm/boot/dts/ste-ccu9540.dts
+7
arch/arm/boot/dts/ste-ccu9540.dts
···
16
16
model = "ST-Ericsson CCU9540 platform with Device Tree";
17
17
compatible = "st-ericsson,ccu9540", "st-ericsson,u9540";
18
18
19
+
/* This stablilizes the serial port enumeration */
20
+
aliases {
21
+
serial0 = &ux500_serial0;
22
+
serial1 = &ux500_serial1;
23
+
serial2 = &ux500_serial2;
24
+
};
25
+
19
26
memory {
20
27
reg = <0x00000000 0x20000000>;
21
28
};
+3
-3
arch/arm/boot/dts/ste-dbx5x0.dtsi
+3
-3
arch/arm/boot/dts/ste-dbx5x0.dtsi
···
971
971
power-domains = <&pm_domains DOMAIN_VAPE>;
972
972
};
973
973
974
-
uart@80120000 {
974
+
ux500_serial0: uart@80120000 {
975
975
compatible = "arm,pl011", "arm,primecell";
976
976
reg = <0x80120000 0x1000>;
977
977
interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;
···
986
986
status = "disabled";
987
987
};
988
988
989
-
uart@80121000 {
989
+
ux500_serial1: uart@80121000 {
990
990
compatible = "arm,pl011", "arm,primecell";
991
991
reg = <0x80121000 0x1000>;
992
992
interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>;
···
1001
1001
status = "disabled";
1002
1002
};
1003
1003
1004
-
uart@80007000 {
1004
+
ux500_serial2: uart@80007000 {
1005
1005
compatible = "arm,pl011", "arm,primecell";
1006
1006
reg = <0x80007000 0x1000>;
1007
1007
interrupts = <0 26 IRQ_TYPE_LEVEL_HIGH>;
+1
-1
arch/arm/boot/dts/ste-href.dtsi
+1
-1
arch/arm/boot/dts/ste-href.dtsi
+7
arch/arm/boot/dts/ste-hrefprev60-stuib.dts
+7
arch/arm/boot/dts/ste-hrefprev60-stuib.dts
···
17
17
model = "ST-Ericsson HREF (pre-v60) and ST UIB";
18
18
compatible = "st-ericsson,mop500", "st-ericsson,u8500";
19
19
20
+
/* This stablilizes the serial port enumeration */
21
+
aliases {
22
+
serial0 = &ux500_serial0;
23
+
serial1 = &ux500_serial1;
24
+
serial2 = &ux500_serial2;
25
+
};
26
+
20
27
soc {
21
28
/* Reset line for the BU21013 touchscreen */
22
29
i2c@80110000 {
+7
arch/arm/boot/dts/ste-hrefprev60-tvk.dts
+7
arch/arm/boot/dts/ste-hrefprev60-tvk.dts
···
16
16
/ {
17
17
model = "ST-Ericsson HREF (pre-v60) and TVK1281618 UIB";
18
18
compatible = "st-ericsson,mop500", "st-ericsson,u8500";
19
+
20
+
/* This stablilizes the serial port enumeration */
21
+
aliases {
22
+
serial0 = &ux500_serial0;
23
+
serial1 = &ux500_serial1;
24
+
serial2 = &ux500_serial2;
25
+
};
19
26
};
+5
arch/arm/boot/dts/ste-hrefprev60.dtsi
+5
arch/arm/boot/dts/ste-hrefprev60.dtsi
+7
arch/arm/boot/dts/ste-hrefv60plus-stuib.dts
+7
arch/arm/boot/dts/ste-hrefv60plus-stuib.dts
···
19
19
model = "ST-Ericsson HREF (v60+) and ST UIB";
20
20
compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
21
21
22
+
/* This stablilizes the serial port enumeration */
23
+
aliases {
24
+
serial0 = &ux500_serial0;
25
+
serial1 = &ux500_serial1;
26
+
serial2 = &ux500_serial2;
27
+
};
28
+
22
29
soc {
23
30
/* Reset line for the BU21013 touchscreen */
24
31
i2c@80110000 {
+7
arch/arm/boot/dts/ste-hrefv60plus-tvk.dts
+7
arch/arm/boot/dts/ste-hrefv60plus-tvk.dts
···
18
18
/ {
19
19
model = "ST-Ericsson HREF (v60+) and TVK1281618 UIB";
20
20
compatible = "st-ericsson,hrefv60+", "st-ericsson,u8500";
21
+
22
+
/* This stablilizes the serial port enumeration */
23
+
aliases {
24
+
serial0 = &ux500_serial0;
25
+
serial1 = &ux500_serial1;
26
+
serial2 = &ux500_serial2;
27
+
};
21
28
};
+23
-2
arch/arm/boot/dts/ste-hrefv60plus.dtsi
+23
-2
arch/arm/boot/dts/ste-hrefv60plus.dtsi
···
43
43
<&vaudio_hf_hrefv60_mode>,
44
44
<&gbf_hrefv60_mode>,
45
45
<&hdtv_hrefv60_mode>,
46
-
<&touch_hrefv60_mode>;
46
+
<&touch_hrefv60_mode>,
47
+
<&gpios_hrefv60_mode>;
47
48
48
49
sdi0 {
49
-
/* SD card detect GPIO pin, extend default state */
50
50
sdi0_default_mode: sdi0_default {
51
+
/* SD card detect GPIO pin, extend default state */
51
52
default_hrefv60_cfg1 {
52
53
pins = "GPIO95_E8";
53
54
ste,config = <&gpio_in_pu>;
55
+
};
56
+
/* VMMCI level-shifter enable */
57
+
default_hrefv60_cfg2 {
58
+
pins = "GPIO169_D22";
59
+
ste,config = <&gpio_out_lo>;
60
+
};
61
+
/* VMMCI level-shifter voltage select */
62
+
default_hrefv60_cfg3 {
63
+
pins = "GPIO5_AG6";
64
+
ste,config = <&gpio_out_hi>;
54
65
};
55
66
};
56
67
};
···
221
210
hrefv60_cfg2 {
222
211
pins ="GPIO66_G3";
223
212
ste,config = <&gpio_out_lo>;
213
+
};
214
+
};
215
+
};
216
+
gpios {
217
+
/* Dangling GPIO pins */
218
+
gpios_hrefv60_mode: gpios_hrefv60 {
219
+
default_cfg1 {
220
+
/* Normally UART1 RXD, now dangling */
221
+
pins = "GPIO4_AH6";
222
+
ste,config = <&in_pu>;
224
223
};
225
224
};
226
225
};
+23
-2
arch/arm/boot/dts/ste-snowball.dts
+23
-2
arch/arm/boot/dts/ste-snowball.dts
···
18
18
model = "Calao Systems Snowball platform with device tree";
19
19
compatible = "calaosystems,snowball-a9500", "st-ericsson,u9500";
20
20
21
+
/* This stablilizes the serial port enumeration */
22
+
aliases {
23
+
serial0 = &ux500_serial0;
24
+
serial1 = &ux500_serial1;
25
+
serial2 = &ux500_serial2;
26
+
};
27
+
21
28
memory {
22
29
reg = <0x00000000 0x20000000>;
23
30
};
···
230
223
status = "okay";
231
224
};
232
225
226
+
/* This UART is unused and thus left disabled */
233
227
uart@80121000 {
234
228
pinctrl-names = "default", "sleep";
235
229
pinctrl-0 = <&uart1_default_mode>;
236
230
pinctrl-1 = <&uart1_sleep_mode>;
237
-
status = "okay";
238
231
};
239
232
240
233
uart@80007000 {
···
459
452
pins = "GPIO21_AB3"; /* DAT31DIR */
460
453
ste,config = <&out_hi>;
461
454
};
462
-
455
+
/* SD card detect GPIO pin, extend default state */
456
+
snowball_cfg2 {
457
+
pins = "GPIO218_AH11";
458
+
ste,config = <&gpio_in_pu>;
459
+
};
460
+
/* VMMCI level-shifter enable */
461
+
snowball_cfg3 {
462
+
pins = "GPIO217_AH12";
463
+
ste,config = <&gpio_out_lo>;
464
+
};
465
+
/* VMMCI level-shifter voltage select */
466
+
snowball_cfg4 {
467
+
pins = "GPIO228_AJ6";
468
+
ste,config = <&gpio_out_hi>;
469
+
};
463
470
};
464
471
};
465
472
ssp0 {
+6
-21
arch/arm/mach-imx/gpc.c
+6
-21
arch/arm/mach-imx/gpc.c
···
291
291
}
292
292
}
293
293
294
-
#ifdef CONFIG_PM_GENERIC_DOMAINS
295
-
296
294
static void _imx6q_pm_pu_power_off(struct generic_pm_domain *genpd)
297
295
{
298
296
int iso, iso2sw;
···
397
399
static int imx_gpc_genpd_init(struct device *dev, struct regulator *pu_reg)
398
400
{
399
401
struct clk *clk;
400
-
bool is_off;
401
402
int i;
402
403
403
404
imx6q_pu_domain.reg = pu_reg;
···
413
416
}
414
417
imx6q_pu_domain.num_clks = i;
415
418
416
-
is_off = IS_ENABLED(CONFIG_PM);
417
-
if (is_off) {
418
-
_imx6q_pm_pu_power_off(&imx6q_pu_domain.base);
419
-
} else {
420
-
/*
421
-
* Enable power if compiled without CONFIG_PM in case the
422
-
* bootloader disabled it.
423
-
*/
424
-
imx6q_pm_pu_power_on(&imx6q_pu_domain.base);
425
-
}
419
+
/* Enable power always in case bootloader disabled it. */
420
+
imx6q_pm_pu_power_on(&imx6q_pu_domain.base);
426
421
427
-
pm_genpd_init(&imx6q_pu_domain.base, NULL, is_off);
422
+
if (!IS_ENABLED(CONFIG_PM_GENERIC_DOMAINS))
423
+
return 0;
424
+
425
+
pm_genpd_init(&imx6q_pu_domain.base, NULL, false);
428
426
return of_genpd_add_provider_onecell(dev->of_node,
429
427
&imx_gpc_onecell_data);
430
428
···
428
436
clk_put(imx6q_pu_domain.clk[i]);
429
437
return -EINVAL;
430
438
}
431
-
432
-
#else
433
-
static inline int imx_gpc_genpd_init(struct device *dev, struct regulator *reg)
434
-
{
435
-
return 0;
436
-
}
437
-
#endif /* CONFIG_PM_GENERIC_DOMAINS */
438
439
439
440
static int imx_gpc_probe(struct platform_device *pdev)
440
441
{
+1
arch/arm/mach-omap2/Kconfig
+1
arch/arm/mach-omap2/Kconfig
+3
arch/arm/mach-pxa/capc7117.c
+3
arch/arm/mach-pxa/capc7117.c
···
24
24
#include <linux/ata_platform.h>
25
25
#include <linux/serial_8250.h>
26
26
#include <linux/gpio.h>
27
+
#include <linux/regulator/machine.h>
27
28
28
29
#include <asm/mach-types.h>
29
30
#include <asm/mach/arch.h>
···
145
144
146
145
capc7117_uarts_init();
147
146
capc7117_ide_init();
147
+
148
+
regulator_has_full_constraints();
148
149
}
149
150
150
151
MACHINE_START(CAPC7117,
+3
arch/arm/mach-pxa/cm-x2xx.c
+3
arch/arm/mach-pxa/cm-x2xx.c
···
13
13
#include <linux/syscore_ops.h>
14
14
#include <linux/irq.h>
15
15
#include <linux/gpio.h>
16
+
#include <linux/regulator/machine.h>
16
17
17
18
#include <linux/dm9000.h>
18
19
#include <linux/leds.h>
···
467
466
cmx2xx_init_ac97();
468
467
cmx2xx_init_touchscreen();
469
468
cmx2xx_init_leds();
469
+
470
+
regulator_has_full_constraints();
470
471
}
471
472
472
473
static void __init cmx2xx_init_irq(void)
+2
arch/arm/mach-pxa/cm-x300.c
+2
arch/arm/mach-pxa/cm-x300.c
+3
arch/arm/mach-pxa/colibri-pxa270.c
+3
arch/arm/mach-pxa/colibri-pxa270.c
···
18
18
#include <linux/mtd/partitions.h>
19
19
#include <linux/mtd/physmap.h>
20
20
#include <linux/platform_device.h>
21
+
#include <linux/regulator/machine.h>
21
22
#include <linux/ucb1400.h>
22
23
23
24
#include <asm/mach/arch.h>
···
295
294
printk(KERN_ERR "Illegal colibri_pxa270_baseboard type %d\n",
296
295
colibri_pxa270_baseboard);
297
296
}
297
+
298
+
regulator_has_full_constraints();
298
299
}
299
300
300
301
/* The "Income s.r.o. SH-Dmaster PXA270 SBC" board can be booted either
+2
arch/arm/mach-pxa/em-x270.c
+2
arch/arm/mach-pxa/em-x270.c
+3
arch/arm/mach-pxa/icontrol.c
+3
arch/arm/mach-pxa/icontrol.c
···
26
26
#include <linux/spi/spi.h>
27
27
#include <linux/spi/pxa2xx_spi.h>
28
28
#include <linux/can/platform/mcp251x.h>
29
+
#include <linux/regulator/machine.h>
29
30
30
31
#include "generic.h"
31
32
···
186
185
mxm_8x10_mmc_init();
187
186
188
187
icontrol_can_init();
188
+
189
+
regulator_has_full_constraints();
189
190
}
190
191
191
192
MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
+3
arch/arm/mach-pxa/trizeps4.c
+3
arch/arm/mach-pxa/trizeps4.c
···
26
26
#include <linux/dm9000.h>
27
27
#include <linux/mtd/physmap.h>
28
28
#include <linux/mtd/partitions.h>
29
+
#include <linux/regulator/machine.h>
29
30
#include <linux/i2c/pxa-i2c.h>
30
31
31
32
#include <asm/types.h>
···
535
534
536
535
BCR_writew(trizeps_conxs_bcr);
537
536
board_backlight_power(1);
537
+
538
+
regulator_has_full_constraints();
538
539
}
539
540
540
541
static void __init trizeps4_map_io(void)
+3
arch/arm/mach-pxa/vpac270.c
+3
arch/arm/mach-pxa/vpac270.c
···
24
24
#include <linux/dm9000.h>
25
25
#include <linux/ucb1400.h>
26
26
#include <linux/ata_platform.h>
27
+
#include <linux/regulator/machine.h>
27
28
#include <linux/regulator/max1586.h>
28
29
#include <linux/i2c/pxa-i2c.h>
29
30
···
712
711
vpac270_ts_init();
713
712
vpac270_rtc_init();
714
713
vpac270_ide_init();
714
+
715
+
regulator_has_full_constraints();
715
716
}
716
717
717
718
MACHINE_START(VPAC270, "Voipac PXA270")
+2
arch/arm/mach-pxa/zeus.c
+2
arch/arm/mach-pxa/zeus.c
···
868
868
i2c_register_board_info(0, ARRAY_AND_SIZE(zeus_i2c_devices));
869
869
pxa2xx_set_spi_info(3, &pxa2xx_spi_ssp3_master_info);
870
870
spi_register_board_info(zeus_spi_board_info, ARRAY_SIZE(zeus_spi_board_info));
871
+
872
+
regulator_has_full_constraints();
871
873
}
872
874
873
875
static struct map_desc zeus_io_desc[] __initdata = {