Skip to content

Commit 19ed3eb

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 Olof Johansson: "Here's the weekly batch of fixes from arm-soc. The delta is a largeish negative delta, due to revert of SMP support for Broadcom's STB SoC -- it was accidentally merged before some issues had been addressed, so they will make a new attempt for 3.18. I didn't see a need for a full revert of the whole platform due to this, we're keeping the rest enabled. The rest is mostly: - a handful of DT fixes for i.MX (Hummingboard/Cubox-i in particular) - some MTD/NAND fixes for OMAP - minor DT fixes for shmobile - warning fix for UP builds on vexpress/spc There's also a couple of patches that wires up hwmod on TI's DRA7 SoC so it can boot. Drivers and the rest had landed for 3.17, and it's small and isolated so it made sense to pick up now even if it's not a bugfix" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits) vexpress/spc: fix a build warning on array bounds ARM: DRA7: hwmod: Add dra74x and dra72x specific ocp interface lists ARM: DRA7: Add support for soc_is_dra74x() and soc_is_dra72x() variants MAINTAINERS: catch special Rockchip code locations ARM: dts: microsom-ar8035: MDIO pad must be set open drain ARM: dts: omap54xx-clocks: Fix the l3 and l4 clock rates ARM: brcmstb: revert SMP support ARM: OMAP2+: hwmod: Rearm wake-up interrupts for DT when MUSB is idled ARM: dts: Enable UART wake-up events for beagleboard ARM: dts: Remove twl6030 clk32g "regulator" ARM: OMAP2+: omap_device: remove warning that clk alias already exists ARM: OMAP: fix %d confusingly prefixed with 0x in format string ARM: dts: DRA7: fix interrupt-cells for GPIO mtd: nand: omap: Fix 1-bit Hamming code scheme, omap_calculate_ecc() ARM: dts: omap3430-sdp: Revert to using software ECC for NAND ARM: OMAP2+: GPMC: Support Software ECC scheme via DT mtd: nand: omap: Revert to using software ECC by default ARM: dts: hummingboard/cubox-i: change SPDIF output to be more descriptive ARM: dts: hummingboard/cubox-i: add USB OC pinctrl configuration ARM: shmobile: r8a7791: add missing 0x0100 for SDCKCR ...
2 parents 81bbadc + e160cc1 commit 19ed3eb

29 files changed

+133
-464
lines changed

‎Documentation/devicetree/bindings/mtd/gpmc-nand.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Optional properties:
2222
width of 8 is assumed.
2323

2424
- ti,nand-ecc-opt: A string setting the ECC layout to use. One of:
25-
"sw" <deprecated> use "ham1" instead
25+
"sw" 1-bit Hamming ecc code via software
2626
"hw" <deprecated> use "ham1" instead
2727
"hw-romcode" <deprecated> use "ham1" instead
2828
"ham1" 1-bit Hamming ecc code

‎MAINTAINERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1279,8 +1279,13 @@ M: Heiko Stuebner <heiko@sntech.de>
12791279
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
12801280
L: linux-rockchip@lists.infradead.org
12811281
S: Maintained
1282+
F: arch/arm/boot/dts/rk3*
12821283
F: arch/arm/mach-rockchip/
1284+
F: drivers/clk/rockchip/
1285+
F: drivers/i2c/busses/i2c-rk3x.c
12831286
F: drivers/*/*rockchip*
1287+
F: drivers/*/*/*rockchip*
1288+
F: sound/soc/rockchip/
12841289

12851290
ARM/SAMSUNG ARM ARCHITECTURES
12861291
M: Ben Dooks <ben-linux@fluff.org>

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@
245245
gpio-controller;
246246
#gpio-cells = <2>;
247247
interrupt-controller;
248-
#interrupt-cells = <1>;
248+
#interrupt-cells = <2>;
249249
};
250250

251251
gpio2: gpio@48055000 {
@@ -256,7 +256,7 @@
256256
gpio-controller;
257257
#gpio-cells = <2>;
258258
interrupt-controller;
259-
#interrupt-cells = <1>;
259+
#interrupt-cells = <2>;
260260
};
261261

262262
gpio3: gpio@48057000 {
@@ -267,7 +267,7 @@
267267
gpio-controller;
268268
#gpio-cells = <2>;
269269
interrupt-controller;
270-
#interrupt-cells = <1>;
270+
#interrupt-cells = <2>;
271271
};
272272

273273
gpio4: gpio@48059000 {
@@ -278,7 +278,7 @@
278278
gpio-controller;
279279
#gpio-cells = <2>;
280280
interrupt-controller;
281-
#interrupt-cells = <1>;
281+
#interrupt-cells = <2>;
282282
};
283283

284284
gpio5: gpio@4805b000 {
@@ -289,7 +289,7 @@
289289
gpio-controller;
290290
#gpio-cells = <2>;
291291
interrupt-controller;
292-
#interrupt-cells = <1>;
292+
#interrupt-cells = <2>;
293293
};
294294

295295
gpio6: gpio@4805d000 {
@@ -300,7 +300,7 @@
300300
gpio-controller;
301301
#gpio-cells = <2>;
302302
interrupt-controller;
303-
#interrupt-cells = <1>;
303+
#interrupt-cells = <2>;
304304
};
305305

306306
gpio7: gpio@48051000 {
@@ -311,7 +311,7 @@
311311
gpio-controller;
312312
#gpio-cells = <2>;
313313
interrupt-controller;
314-
#interrupt-cells = <1>;
314+
#interrupt-cells = <2>;
315315
};
316316

317317
gpio8: gpio@48053000 {
@@ -322,7 +322,7 @@
322322
gpio-controller;
323323
#gpio-cells = <2>;
324324
interrupt-controller;
325-
#interrupt-cells = <1>;
325+
#interrupt-cells = <2>;
326326
};
327327

328328
uart1: serial@4806a000 {

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,12 @@
2828
MX53_PAD_CSI0_DAT9__I2C1_SCL 0x400001ec
2929
>;
3030
};
31+
32+
pinctrl_pmic: pmicgrp {
33+
fsl,pins = <
34+
MX53_PAD_CSI0_DAT5__GPIO5_23 0x1e4 /* IRQ */
35+
>;
36+
};
3137
};
3238
};
3339

@@ -38,6 +44,8 @@
3844

3945
pmic: mc34708@8 {
4046
compatible = "fsl,mc34708";
47+
pinctrl-names = "default";
48+
pinctrl-0 = <&pinctrl_pmic>;
4149
reg = <0x08>;
4250
interrupt-parent = <&gpio5>;
4351
interrupts = <23 0x8>;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858

5959
sound-spdif {
6060
compatible = "fsl,imx-audio-spdif";
61-
model = "imx-spdif";
61+
model = "On-board SPDIF";
6262
/* IMX6 doesn't implement this yet */
6363
spdif-controller = <&spdif>;
6464
spdif-out;
@@ -181,11 +181,13 @@
181181
};
182182

183183
&usbh1 {
184+
disable-over-current;
184185
vbus-supply = <&reg_usbh1_vbus>;
185186
status = "okay";
186187
};
187188

188189
&usbotg {
190+
disable-over-current;
189191
pinctrl-names = "default";
190192
pinctrl-0 = <&pinctrl_hummingboard_usbotg_id>;
191193
vbus-supply = <&reg_usbotg_vbus>;

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161

6262
sound-spdif {
6363
compatible = "fsl,imx-audio-spdif";
64-
model = "imx-spdif";
64+
model = "Integrated SPDIF";
6565
/* IMX6 doesn't implement this yet */
6666
spdif-controller = <&spdif>;
6767
spdif-out;
@@ -130,16 +130,23 @@
130130
fsl,pins = <MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x13091>;
131131
};
132132

133+
pinctrl_cubox_i_usbh1: cubox-i-usbh1 {
134+
fsl,pins = <MX6QDL_PAD_GPIO_3__USB_H1_OC 0x1b0b0>;
135+
};
136+
133137
pinctrl_cubox_i_usbh1_vbus: cubox-i-usbh1-vbus {
134138
fsl,pins = <MX6QDL_PAD_GPIO_0__GPIO1_IO00 0x4001b0b0>;
135139
};
136140

137-
pinctrl_cubox_i_usbotg_id: cubox-i-usbotg-id {
141+
pinctrl_cubox_i_usbotg: cubox-i-usbotg {
138142
/*
139-
* The Cubox-i pulls this low, but as it's pointless
143+
* The Cubox-i pulls ID low, but as it's pointless
140144
* leaving it as a pull-up, even if it is just 10uA.
141145
*/
142-
fsl,pins = <MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059>;
146+
fsl,pins = <
147+
MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x13059
148+
MX6QDL_PAD_KEY_COL4__USB_OTG_OC 0x1b0b0
149+
>;
143150
};
144151

145152
pinctrl_cubox_i_usbotg_vbus: cubox-i-usbotg-vbus {
@@ -173,13 +180,15 @@
173180
};
174181

175182
&usbh1 {
183+
pinctrl-names = "default";
184+
pinctrl-0 = <&pinctrl_cubox_i_usbh1>;
176185
vbus-supply = <&reg_usbh1_vbus>;
177186
status = "okay";
178187
};
179188

180189
&usbotg {
181190
pinctrl-names = "default";
182-
pinctrl-0 = <&pinctrl_cubox_i_usbotg_id>;
191+
pinctrl-0 = <&pinctrl_cubox_i_usbotg>;
183192
vbus-supply = <&reg_usbotg_vbus>;
184193
status = "okay";
185194
};

‎arch/arm/boot/dts/imx6qdl-microsom-ar8035.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
enet {
1818
pinctrl_microsom_enet_ar8035: microsom-enet-ar8035 {
1919
fsl,pins = <
20-
MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b0b0
20+
MX6QDL_PAD_ENET_MDIO__ENET_MDIO 0x1b8b0
2121
MX6QDL_PAD_ENET_MDC__ENET_MDC 0x1b0b0
2222
/* AR8035 reset */
2323
MX6QDL_PAD_KEY_ROW4__GPIO4_IO15 0x130b0

‎arch/arm/boot/dts/omap3-beagle.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,7 @@
292292
&uart3 {
293293
pinctrl-names = "default";
294294
pinctrl-0 = <&uart3_pins>;
295+
interrupts-extended = <&intc 74 &omap3_pmx_core OMAP3_UART3_RX>;
295296
};
296297

297298
&gpio1 {

‎arch/arm/boot/dts/omap3430-sdp.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@
107107
#address-cells = <1>;
108108
#size-cells = <1>;
109109
reg = <1 0 0x08000000>;
110-
ti,nand-ecc-opt = "ham1";
110+
ti,nand-ecc-opt = "sw";
111111
nand-bus-width = <8>;
112112
gpmc,cs-on-ns = <0>;
113113
gpmc,cs-rd-off-ns = <36>;

‎arch/arm/boot/dts/omap54xx-clocks.dtsi

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -367,10 +367,12 @@
367367

368368
l3_iclk_div: l3_iclk_div {
369369
#clock-cells = <0>;
370-
compatible = "fixed-factor-clock";
370+
compatible = "ti,divider-clock";
371+
ti,max-div = <2>;
372+
ti,bit-shift = <4>;
373+
reg = <0x100>;
371374
clocks = <&dpll_core_h12x2_ck>;
372-
clock-mult = <1>;
373-
clock-div = <1>;
375+
ti,index-power-of-two;
374376
};
375377

376378
gpu_l3_iclk: gpu_l3_iclk {
@@ -383,10 +385,12 @@
383385

384386
l4_root_clk_div: l4_root_clk_div {
385387
#clock-cells = <0>;
386-
compatible = "fixed-factor-clock";
388+
compatible = "ti,divider-clock";
389+
ti,max-div = <2>;
390+
ti,bit-shift = <8>;
391+
reg = <0x100>;
387392
clocks = <&l3_iclk_div>;
388-
clock-mult = <1>;
389-
clock-div = <1>;
393+
ti,index-power-of-two;
390394
};
391395

392396
slimbus1_slimbus_clk: slimbus1_slimbus_clk {

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@
8383
regulator-always-on;
8484
};
8585

86-
clk32kg: regulator-clk32kg {
87-
compatible = "ti,twl6030-clk32kg";
88-
};
89-
9086
twl_usb_comparator: usb-comparator {
9187
compatible = "ti,twl6030-usb";
9288
interrupts = <4>, <10>;

‎arch/arm/mach-bcm/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,5 +36,4 @@ obj-$(CONFIG_ARCH_BCM_5301X) += bcm_5301x.o
3636

3737
ifeq ($(CONFIG_ARCH_BRCMSTB),y)
3838
obj-y += brcmstb.o
39-
obj-$(CONFIG_SMP) += headsmp-brcmstb.o platsmp-brcmstb.o
4039
endif

‎arch/arm/mach-bcm/brcmstb.h

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎arch/arm/mach-bcm/headsmp-brcmstb.S

Lines changed: 0 additions & 33 deletions
This file was deleted.

0 commit comments

Comments
 (0)