Skip to content

Commit 456febd

Browse files
torvaldstorvalds
committed
Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Arnd Bergmann: "A new set of bug fixes for 3.16, containing patches for seven platforms: at91: - drivers/misc fix for Kconfig PWM symbol - correction of several values in DT after conversion to CCF - fix at91sam9261/at91sam9261ek mistake in slow crystal vs. slow RC osc imx: - Use GPIO for card CD/WP on imx51-babbage and eukrea-mbimxsd51, because controller base CD/WP is not working in esdhc driver due to runtime PM support - A couple of random ventana gw5xxx board fixes - Add IMX_IPUV3_CORE back to defconfig, which gets lost when moving IPUv3 driver out of staging tree - Fix enet/fec clock selection on imx6sl - Fix display node on imx53-m53evk board - A couple of Cubox-i updates from Russell, which were omitted from the merge window due to dependency integrator: - fix an OF-related regression against 3.15 mvebu: - mvebu (v7) - Fix broken SoC ID detection - Select ARM_CPU_SUSPEND for v7 - Remove armada38x compatible string (no users yet) - Enable Dove SoC in mvebu_v7_defconfig - kirkwood - Fix phy-connection-type on GuruPlug board qcom: - enable gsbi driver in defconfig - fix section mismatch warning in serial driver samsung: - use WFI macro in platform_do_lowpower because exynos cpuhotplug includes a hardcoded WFI instruction and it causes compile error in Thumb-2 mode. - fix GIC reg sizes for exynos4 SoCs - remove reset timer counter value during boot and resume for mct to fix a big jump in printk timestamps - fix pm code to check cortex-A9 for another exynos SoCs - don't rely on firmware's secondary_cpu_start for mcpm sti: - Ethernet clocks were wrongly defined for STiH415/416 platforms - STiH416 B2020 revision E DTS file name contained uppercase, change to lowercase" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (33 commits) ARM: at91/dt: sam9261: remove slow RC osc ARM: at91/dt: define sam9261ek slow crystal frequency ARM: at91/dt: sam9261: correctly define mainck ARM: at91/dt: sam9n12: correct PLLA ICPLL and OUT values ARM: at91/dt: sam9x5: correct PLLA ICPLL and OUT values misc: atmel_pwm: fix Kconfig symbols ARM: integrator: fix OF-related regression ARM: mvebu: Fix the improper use of the compatible string armada38x using a wildcard ARM: dts: kirkwood: fix phy-connection-type for Guruplug ARM: EXYNOS: Don't rely on firmware's secondary_cpu_start for mcpm ARM: dts: imx51-eukrea-mbimxsd51-baseboard: unbreak esdhc. ARM: dts: imx51-babbage: Fix esdhc setup ARM: dts: mx5: Move the display out of soc {} node ARM: dts: mx5: Fix IPU port node placement ARM: mvebu: select ARM_CPU_SUSPEND for Marvell EBU v7 platforms ARM: mvebu: Fix broken SoC ID detection ARM: imx_v6_v7_defconfig: Enable CONFIG_IMX_IPUV3_CORE ARM: multi_v7_defconfig: Add QCOM GSBI driver ARM: stih41x: Rename stih416-b2020-revE.dts to stih416-b2020e.dts tty: serial: msm: Fix section mismatch warning ...
2 parents 15e52d9 + 6c9d161 commit 456febd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+158
-147
lines changed

‎Documentation/devicetree/bindings/arm/armada-38x.txt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,15 @@ following property:
66

77
Required root node property:
88

9-
- compatible: must contain either "marvell,armada380" or
10-
"marvell,armada385" depending on the variant of the SoC being used.
9+
- compatible: must contain "marvell,armada380"
10+
11+
In addition, boards using the Marvell Armada 385 SoC shall have the
12+
following property before the previous one:
13+
14+
Required root node property:
15+
16+
compatible: must contain "marvell,armada385"
17+
18+
Example:
19+
20+
compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";

‎arch/arm/boot/dts/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ dtb-$(CONFIG_ARCH_STI)+= stih407-b2120.dtb \
357357
stih415-b2020.dtb \
358358
stih416-b2000.dtb \
359359
stih416-b2020.dtb \
360-
stih416-b2020-revE.dtb
360+
stih416-b2020e.dtb
361361
dtb-$(CONFIG_MACH_SUN4I) += \
362362
sun4i-a10-a1000.dtb \
363363
sun4i-a10-cubieboard.dtb \

‎arch/arm/boot/dts/armada-380.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/ {
1818
model = "Marvell Armada 380 family SoC";
19-
compatible = "marvell,armada380", "marvell,armada38x";
19+
compatible = "marvell,armada380";
2020

2121
cpus {
2222
#address-cells = <1>;

‎arch/arm/boot/dts/armada-385-db.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/ {
1818
model = "Marvell Armada 385 Development Board";
19-
compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada38x";
19+
compatible = "marvell,a385-db", "marvell,armada385", "marvell,armada380";
2020

2121
chosen {
2222
bootargs = "console=ttyS0,115200 earlyprintk";

‎arch/arm/boot/dts/armada-385-rd.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
/ {
1919
model = "Marvell Armada 385 Reference Design";
20-
compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada38x";
20+
compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";
2121

2222
chosen {
2323
bootargs = "console=ttyS0,115200 earlyprintk";

‎arch/arm/boot/dts/armada-385.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/ {
1818
model = "Marvell Armada 385 family SoC";
19-
compatible = "marvell,armada385", "marvell,armada38x";
19+
compatible = "marvell,armada385", "marvell,armada380";
2020

2121
cpus {
2222
#address-cells = <1>;

‎arch/arm/boot/dts/armada-38x.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
/ {
2222
model = "Marvell Armada 38x family SoC";
23-
compatible = "marvell,armada38x";
23+
compatible = "marvell,armada380";
2424

2525
aliases {
2626
gpio0 = &gpio0;

‎arch/arm/boot/dts/at91sam9261.dtsi

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -568,24 +568,17 @@
568568
#size-cells = <0>;
569569
#interrupt-cells = <1>;
570570

571-
slow_rc_osc: slow_rc_osc {
572-
compatible = "fixed-clock";
571+
main_osc: main_osc {
572+
compatible = "atmel,at91rm9200-clk-main-osc";
573573
#clock-cells = <0>;
574-
clock-frequency = <32768>;
575-
clock-accuracy = <50000000>;
576-
};
577-
578-
clk32k: slck {
579-
compatible = "atmel,at91sam9260-clk-slow";
580-
#clock-cells = <0>;
581-
clocks = <&slow_rc_osc &slow_xtal>;
574+
interrupts-extended = <&pmc AT91_PMC_MOSCS>;
575+
clocks = <&main_xtal>;
582576
};
583577

584578
main: mainck {
585579
compatible = "atmel,at91rm9200-clk-main";
586580
#clock-cells = <0>;
587-
interrupts-extended = <&pmc AT91_PMC_MOSCS>;
588-
clocks = <&main_xtal>;
581+
clocks = <&main_osc>;
589582
};
590583

591584
plla: pllack {
@@ -615,7 +608,7 @@
615608
compatible = "atmel,at91rm9200-clk-master";
616609
#clock-cells = <0>;
617610
interrupts-extended = <&pmc AT91_PMC_MCKRDY>;
618-
clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
611+
clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
619612
atmel,clk-output-range = <0 94000000>;
620613
atmel,clk-divisors = <1 2 4 0>;
621614
};
@@ -632,7 +625,7 @@
632625
#address-cells = <1>;
633626
#size-cells = <0>;
634627
interrupt-parent = <&pmc>;
635-
clocks = <&clk32k>, <&main>, <&plla>, <&pllb>;
628+
clocks = <&slow_xtal>, <&main>, <&plla>, <&pllb>;
636629

637630
prog0: prog0 {
638631
#clock-cells = <0>;

‎arch/arm/boot/dts/at91sam9261ek.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
reg = <0x20000000 0x4000000>;
2121
};
2222

23+
slow_xtal {
24+
clock-frequency = <32768>;
25+
};
26+
2327
main_xtal {
2428
clock-frequency = <18432000>;
2529
};

‎arch/arm/boot/dts/at91sam9n12.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@
132132
<595000000 650000000 3 0>,
133133
<545000000 600000000 0 1>,
134134
<495000000 555000000 1 1>,
135-
<445000000 500000000 1 2>,
136-
<400000000 450000000 1 3>;
135+
<445000000 500000000 2 1>,
136+
<400000000 450000000 3 1>;
137137
};
138138

139139
plladiv: plladivck {

‎arch/arm/boot/dts/at91sam9x5.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@
140140
595000000 650000000 3 0
141141
545000000 600000000 0 1
142142
495000000 555000000 1 1
143-
445000000 500000000 1 2
144-
400000000 450000000 1 3>;
143+
445000000 500000000 2 1
144+
400000000 450000000 3 1>;
145145
};
146146

147147
plladiv: plladivck {

‎arch/arm/boot/dts/exynos4.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
compatible = "arm,cortex-a9-gic";
114114
#interrupt-cells = <3>;
115115
interrupt-controller;
116-
reg = <0x10490000 0x1000>, <0x10480000 0x100>;
116+
reg = <0x10490000 0x10000>, <0x10480000 0x10000>;
117117
};
118118

119119
combiner: interrupt-controller@10440000 {

‎arch/arm/boot/dts/imx51-babbage.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,15 @@
315315
&esdhc1 {
316316
pinctrl-names = "default";
317317
pinctrl-0 = <&pinctrl_esdhc1>;
318-
fsl,cd-controller;
319-
fsl,wp-controller;
318+
cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
319+
wp-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
320320
status = "okay";
321321
};
322322

323323
&esdhc2 {
324324
pinctrl-names = "default";
325325
pinctrl-0 = <&pinctrl_esdhc2>;
326-
cd-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
326+
cd-gpios = <&gpio1 6 GPIO_ACTIVE_LOW>;
327327
wp-gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
328328
status = "okay";
329329
};
@@ -468,8 +468,8 @@
468468
MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
469469
MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
470470
MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
471-
MX51_PAD_GPIO1_0__SD1_CD 0x20d5
472-
MX51_PAD_GPIO1_1__SD1_WP 0x20d5
471+
MX51_PAD_GPIO1_0__GPIO1_0 0x100
472+
MX51_PAD_GPIO1_1__GPIO1_1 0x100
473473
>;
474474
};
475475

‎arch/arm/boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
&esdhc1 {
108108
pinctrl-names = "default";
109109
pinctrl-0 = <&pinctrl_esdhc1 &pinctrl_esdhc1_cd>;
110-
fsl,cd-controller;
110+
cd-gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
111111
status = "okay";
112112
};
113113

@@ -206,7 +206,7 @@
206206

207207
pinctrl_esdhc1_cd: esdhc1_cd {
208208
fsl,pins = <
209-
MX51_PAD_GPIO1_0__SD1_CD 0x20d5
209+
MX51_PAD_GPIO1_0__GPIO1_0 0xd5
210210
>;
211211
};
212212

‎arch/arm/boot/dts/imx53-m53evk.dts

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,27 +21,25 @@
2121
<0xb0000000 0x20000000>;
2222
};
2323

24-
soc {
25-
display1: display@di1 {
26-
compatible = "fsl,imx-parallel-display";
27-
interface-pix-fmt = "bgr666";
28-
pinctrl-names = "default";
29-
pinctrl-0 = <&pinctrl_ipu_disp1>;
30-
31-
display-timings {
32-
800x480p60 {
33-
native-mode;
34-
clock-frequency = <31500000>;
35-
hactive = <800>;
36-
vactive = <480>;
37-
hfront-porch = <40>;
38-
hback-porch = <88>;
39-
hsync-len = <128>;
40-
vback-porch = <33>;
41-
vfront-porch = <9>;
42-
vsync-len = <3>;
43-
vsync-active = <1>;
44-
};
24+
display1: display@di1 {
25+
compatible = "fsl,imx-parallel-display";
26+
interface-pix-fmt = "bgr666";
27+
pinctrl-names = "default";
28+
pinctrl-0 = <&pinctrl_ipu_disp1>;
29+
30+
display-timings {
31+
800x480p60 {
32+
native-mode;
33+
clock-frequency = <31500000>;
34+
hactive = <800>;
35+
vactive = <480>;
36+
hfront-porch = <40>;
37+
hback-porch = <88>;
38+
hsync-len = <128>;
39+
vback-porch = <33>;
40+
vfront-porch = <9>;
41+
vsync-len = <3>;
42+
vsync-active = <1>;
4543
};
4644
};
4745

‎arch/arm/boot/dts/imx6dl-hummingboard.dts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,14 @@
143143
fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x1b0b0>;
144144
};
145145

146+
pinctrl_hummingboard_usbotg_id: hummingboard-usbotg-id {
147+
/*
148+
* Similar to pinctrl_usbotg_2, but we want it
149+
* pulled down for a fixed host connection.
150+
*/
151+
fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
152+
};
153+
146154
pinctrl_hummingboard_usbotg_vbus: hummingboard-usbotg-vbus {
147155
fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x1b0b0>;
148156
};
@@ -178,6 +186,8 @@
178186
};
179187

180188
&usbotg {
189+
pinctrl-names = "default";
190+
pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
181191
vbus-supply = <&reg_usbotg_vbus>;
182192
status = "okay";
183193
};

‎arch/arm/boot/dts/imx6q-gw51xx.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
/dts-v1/;
1313
#include "imx6q.dtsi"
14-
#include "imx6qdl-gw54xx.dtsi"
14+
#include "imx6qdl-gw51xx.dtsi"
1515

1616
/ {
1717
model = "Gateworks Ventana i.MX6 Quad GW51XX";

‎arch/arm/boot/dts/imx6qdl-cubox-i.dtsi

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,19 @@
1212
pinctrl-0 = <&pinctrl_cubox_i_ir>;
1313
};
1414

15+
pwmleds {
16+
compatible = "pwm-leds";
17+
pinctrl-names = "default";
18+
pinctrl-0 = <&pinctrl_cubox_i_pwm1>;
19+
20+
front {
21+
active-low;
22+
label = "imx6:red:front";
23+
max-brightness = <248>;
24+
pwms = <&pwm1 0 50000>;
25+
};
26+
};
27+
1528
regulators {
1629
compatible = "simple-bus";
1730

@@ -109,6 +122,10 @@
109122
>;
110123
};
111124

125+
pinctrl_cubox_i_pwm1: cubox-i-pwm1-front-led {
126+
fsl,pins = <MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b0>;
127+
};
128+
112129
pinctrl_cubox_i_spdif: cubox-i-spdif {
113130
fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
114131
};
@@ -117,6 +134,14 @@
117134
fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;
118135
};
119136

137+
pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {
138+
/*
139+
* The Cubox-i pulls this low, but as it's pointless
140+
* leaving it as a pull-up, even if it is just 10uA.
141+
*/
142+
fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
143+
};
144+
120145
pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {
121146
fsl,pins = <MX6QDL_PAD_EIM_D22__GPIO3_IO22 0x4001b0b0>;
122147
};
@@ -153,6 +178,8 @@
153178
};
154179

155180
&usbotg {
181+
pinctrl-names = "default";
182+
pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;
156183
vbus-supply = <&reg_usbotg_vbus>;
157184
status = "okay";
158185
};

‎arch/arm/boot/dts/imx6qdl-gw51xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
status = "okay";
162162

163163
pmic: ltc3676@3c {
164-
compatible = "ltc,ltc3676";
164+
compatible = "lltc,ltc3676";
165165
reg = <0x3c>;
166166

167167
regulators {

‎arch/arm/boot/dts/imx6qdl-gw52xx.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
};
221221

222222
pmic: ltc3676@3c {
223-
compatible = "ltc,ltc3676";
223+
compatible = "lltc,ltc3676";
224224
reg = <0x3c>;
225225

226226
regulators {
@@ -288,7 +288,7 @@
288288
codec: sgtl5000@0a {
289289
compatible = "fsl,sgtl5000";
290290
reg = <0x0a>;
291-
clocks = <&clks 169>;
291+
clocks = <&clks 201>;
292292
VDDA-supply = <&reg_1p8v>;
293293
VDDIO-supply = <&reg_3p3v>;
294294
};

‎arch/arm/boot/dts/imx6qdl-gw53xx.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@
234234
};
235235

236236
pmic: ltc3676@3c {
237-
compatible = "ltc,ltc3676";
237+
compatible = "lltc,ltc3676";
238238
reg = <0x3c>;
239239

240240
regulators {

0 commit comments

Comments
 (0)