Skip to content

Commit 8f59ae0

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 few patches have come up since the merge window. The largest one is a rewrite of the PXA lubbock/mainstone IRQ handling. This was already broken in 2011 by a change to the GPIO code and only noticed now. The other changes contained here are: MAINTAINERS file updates: - Ray Jui and Scott Branden are now co-maintainers for some of the mach-bcm chips, while Christian Daudt and Marc Carino have stepped down. - Andrew Victor is no longer maintaining at91. Instead, Alexandre Belloni now becomes an official maintainer, after having done a bulk of the work for a while. - Baruch Siach, who added the mach-digicolor platform in 4.1 is now listed as maintainer - The git URL for mach-socfpga has changed Bug fixes: - Three bug fixes for new rockchip rk3288 code - A regression fix to make SD card support work on certain ux500 boards - multiple smaller dts fixes for imx, omap, mvebu, and shmobile - a regression fiix for omap3 power consumption - a fix for regression in the ARM CCI bus driver Configuration changes: - more imx platforms are now enabled in multi_v7_defconfig" * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits) MAINTAINERS: add Conexant Digicolor machines entry MAINTAINERS: socfpga: update the git repo for SoCFPGA ARM: multi_v7_defconfig: Select more FSL SoCs MAINTAINERS: replace an AT91 maintainer drivers: CCI: fix used_mask init in validate_group() bus: omap_l3_noc: Fix master id address decoding for OMAP5 bus: omap_l3_noc: Fix offset for DRA7 CLK1_HOST_CLK1_2 instance ARM: dts: dra7: Fix efuse register size for ABB ARM: dts: am57xx-beagle-x15: Switch GPIO fan number ARM: dts: am57xx-beagle-x15: Switch UART mux pins ARM: dts: am437x-sk: reduce col-scan-delay-us ARM: dts: am437x-sk: fix for new newhaven display module revision ARM: dts: am57xx-beagle-x15: Fix RTC aliases ARM: dts: am57xx-beagle-x15: Fix IRQ type for mcp7941x ARM: dts: omap3: Add #iommu-cells to isp and iva iommu ARM: omap2plus_defconfig: Enable EXTCON_USB_GPIO ARM: dts: OMAP3-N900: Add microphone bias voltages ARM: OMAP2+: Fix omap off idle power consumption creeping up MAINTAINERS: Update brcmstb entry MAINTAINERS: Remove Christian Daudt for mach-bcm ...
2 parents 51dfcb0 + c9d862c commit 8f59ae0

Some content is hidden

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

42 files changed

+480
-234
lines changed

‎CREDITS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3709,6 +3709,13 @@ N: Dirk Verworner
37093709
D: Co-author of German book ``Linux-Kernel-Programmierung''
37103710
D: Co-founder of Berlin Linux User Group
37113711

3712+
N: Andrew Victor
3713+
E: linux@maxim.org.za
3714+
W: http://maxim.org.za/at91_26.html
3715+
D: First maintainer of Atmel ARM-based SoC, aka AT91
3716+
D: Introduced support for at91rm9200, the first chip of AT91 family
3717+
S: South Africa
3718+
37123719
N: Riku Voipio
37133720
E: riku.voipio@iki.fi
37143721
D: Author of PCA9532 LED and Fintek f75375s hwmon driver

‎Documentation/devicetree/bindings/arm/omap/l3-noc.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ provided by Arteris.
66
Required properties:
77
- compatible : Should be "ti,omap3-l3-smx" for OMAP3 family
88
Should be "ti,omap4-l3-noc" for OMAP4 family
9+
Should be "ti,omap5-l3-noc" for OMAP5 family
910
Should be "ti,dra7-l3-noc" for DRA7 family
1011
Should be "ti,am4372-l3-noc" for AM43 family
1112
- reg: Contains L3 register address range for each noc domain.

‎Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ dma_apbx: dma-apbx@80024000 {
3838
80 81 68 69
3939
70 71 72 73
4040
74 75 76 77>;
41-
interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",
41+
interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",
4242
"saif0", "saif1", "i2c0", "i2c1",
4343
"auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
4444
"auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

‎MAINTAINERS

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -892,11 +892,10 @@ S: Maintained
892892
F: arch/arm/mach-alpine/
893893

894894
ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES
895-
M: Andrew Victor <linux@maxim.org.za>
896895
M: Nicolas Ferre <nicolas.ferre@atmel.com>
896+
M: Alexandre Belloni <alexandre.belloni@free-electrons.com>
897897
M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>
898898
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
899-
W: http://maxim.org.za/at91_26.html
900899
W: http://www.linux4sam.org
901900
S: Supported
902901
F: arch/arm/mach-at91/
@@ -990,6 +989,12 @@ F: drivers/clocksource/timer-prima2.c
990989
F: drivers/clocksource/timer-atlas7.c
991990
N: [^a-z]sirf
992991

992+
ARM/CONEXANT DIGICOLOR MACHINE SUPPORT
993+
M: Baruch Siach <baruch@tkos.co.il>
994+
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
995+
S: Maintained
996+
N: digicolor
997+
993998
ARM/EBSA110 MACHINE SUPPORT
994999
M: Russell King <linux@arm.linux.org.uk>
9951000
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -1439,9 +1444,10 @@ ARM/SOCFPGA ARCHITECTURE
14391444
M: Dinh Nguyen <dinguyen@opensource.altera.com>
14401445
S: Maintained
14411446
F: arch/arm/mach-socfpga/
1447+
F: arch/arm/boot/dts/socfpga*
1448+
F: arch/arm/configs/socfpga_defconfig
14421449
W: http://www.rocketboards.org
1443-
T: git://git.rocketboards.org/linux-socfpga.git
1444-
T: git://git.rocketboards.org/linux-socfpga-next.git
1450+
T: git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
14451451

14461452
ARM/SOCFPGA CLOCK FRAMEWORK SUPPORT
14471453
M: Dinh Nguyen <dinguyen@opensource.altera.com>
@@ -2116,8 +2122,9 @@ S: Supported
21162122
F: drivers/net/ethernet/broadcom/bnx2x/
21172123

21182124
BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE
2119-
M: Christian Daudt <bcm@fixthebug.org>
21202125
M: Florian Fainelli <f.fainelli@gmail.com>
2126+
M: Ray Jui <rjui@broadcom.com>
2127+
M: Scott Branden <sbranden@broadcom.com>
21212128
L: bcm-kernel-feedback-list@broadcom.com
21222129
T: git git://github.com/broadcom/mach-bcm
21232130
S: Maintained
@@ -2168,7 +2175,6 @@ S: Maintained
21682175
F: drivers/usb/gadget/udc/bcm63xx_udc.*
21692176

21702177
BROADCOM BCM7XXX ARM ARCHITECTURE
2171-
M: Marc Carino <marc.ceeeee@gmail.com>
21722178
M: Brian Norris <computersforpeace@gmail.com>
21732179
M: Gregory Fong <gregory.0xf0@gmail.com>
21742180
M: Florian Fainelli <f.fainelli@gmail.com>

‎arch/arm/boot/dts/am437x-sk-evm.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
pinctrl-0 = <&matrix_keypad_pins>;
5050

5151
debounce-delay-ms = <5>;
52-
col-scan-delay-us = <1500>;
52+
col-scan-delay-us = <5>;
5353

5454
row-gpios = <&gpio5 5 GPIO_ACTIVE_HIGH /* Bank5, pin5 */
5555
&gpio5 6 GPIO_ACTIVE_HIGH>; /* Bank5, pin6 */
@@ -473,7 +473,7 @@
473473
interrupt-parent = <&gpio0>;
474474
interrupts = <31 0>;
475475

476-
wake-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
476+
reset-gpios = <&gpio1 28 GPIO_ACTIVE_LOW>;
477477

478478
touchscreen-size-x = <480>;
479479
touchscreen-size-y = <272>;

‎arch/arm/boot/dts/am57xx-beagle-x15.dts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
aliases {
1919
rtc0 = &mcp_rtc;
2020
rtc1 = &tps659038_rtc;
21+
rtc2 = &rtc;
2122
};
2223

2324
memory {
@@ -83,7 +84,7 @@
8384
gpio_fan: gpio_fan {
8485
/* Based on 5v 500mA AFB02505HHB */
8586
compatible = "gpio-fan";
86-
gpios = <&tps659038_gpio 1 GPIO_ACTIVE_HIGH>;
87+
gpios = <&tps659038_gpio 2 GPIO_ACTIVE_HIGH>;
8788
gpio-fan,speed-map = <0 0>,
8889
<13000 1>;
8990
#cooling-cells = <2>;
@@ -130,8 +131,8 @@
130131

131132
uart3_pins_default: uart3_pins_default {
132133
pinctrl-single,pins = <
133-
0x248 (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_rxd.rxd */
134-
0x24c (PIN_INPUT_SLEW | MUX_MODE0) /* uart3_txd.txd */
134+
0x3f8 (PIN_INPUT_SLEW | MUX_MODE2) /* uart2_ctsn.uart3_rxd */
135+
0x3fc (PIN_INPUT_SLEW | MUX_MODE1) /* uart2_rtsn.uart3_txd */
135136
>;
136137
};
137138

@@ -455,7 +456,7 @@
455456
mcp_rtc: rtc@6f {
456457
compatible = "microchip,mcp7941x";
457458
reg = <0x6f>;
458-
interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_LOW>; /* IRQ_SYS_1N */
459+
interrupts = <GIC_SPI 2 IRQ_TYPE_EDGE_RISING>; /* IRQ_SYS_1N */
459460

460461
pinctrl-names = "default";
461462
pinctrl-0 = <&mcp79410_pins_default>;
@@ -478,7 +479,7 @@
478479
&uart3 {
479480
status = "okay";
480481
interrupts-extended = <&crossbar_mpu GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,
481-
<&dra7_pmx_core 0x248>;
482+
<&dra7_pmx_core 0x3f8>;
482483

483484
pinctrl-names = "default";
484485
pinctrl-0 = <&uart3_pins_default>;

‎arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@
105105
};
106106

107107
internal-regs {
108+
rtc@10300 {
109+
/* No crystal connected to the internal RTC */
110+
status = "disabled";
111+
};
108112
serial@12000 {
109113
status = "okay";
110114
};

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@
911911
ti,clock-cycles = <16>;
912912

913913
reg = <0x4ae07ddc 0x4>, <0x4ae07de0 0x4>,
914-
<0x4ae06014 0x4>, <0x4a003b20 0x8>,
914+
<0x4ae06014 0x4>, <0x4a003b20 0xc>,
915915
<0x4ae0c158 0x4>;
916916
reg-names = "setup-address", "control-address",
917917
"int-address", "efuse-address",
@@ -944,7 +944,7 @@
944944
ti,clock-cycles = <16>;
945945

946946
reg = <0x4ae07e34 0x4>, <0x4ae07e24 0x4>,
947-
<0x4ae06010 0x4>, <0x4a0025cc 0x8>,
947+
<0x4ae06010 0x4>, <0x4a0025cc 0xc>,
948948
<0x4a002470 0x4>;
949949
reg-names = "setup-address", "control-address",
950950
"int-address", "efuse-address",
@@ -977,7 +977,7 @@
977977
ti,clock-cycles = <16>;
978978

979979
reg = <0x4ae07e30 0x4>, <0x4ae07e20 0x4>,
980-
<0x4ae06010 0x4>, <0x4a0025e0 0x8>,
980+
<0x4ae06010 0x4>, <0x4a0025e0 0xc>,
981981
<0x4a00246c 0x4>;
982982
reg-names = "setup-address", "control-address",
983983
"int-address", "efuse-address",
@@ -1010,7 +1010,7 @@
10101010
ti,clock-cycles = <16>;
10111011

10121012
reg = <0x4ae07de4 0x4>, <0x4ae07de8 0x4>,
1013-
<0x4ae06010 0x4>, <0x4a003b08 0x8>,
1013+
<0x4ae06010 0x4>, <0x4a003b08 0xc>,
10141014
<0x4ae0c154 0x4>;
10151015
reg-names = "setup-address", "control-address",
10161016
"int-address", "efuse-address",
@@ -1203,7 +1203,7 @@
12031203
status = "disabled";
12041204
};
12051205

1206-
rtc@48838000 {
1206+
rtc: rtc@48838000 {
12071207
compatible = "ti,am3352-rtc";
12081208
reg = <0x48838000 0x100>;
12091209
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm/boot/dts/imx23-olinuxino.dts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
*/
1313

1414
/dts-v1/;
15+
#include <dt-bindings/gpio/gpio.h>
1516
#include "imx23.dtsi"
1617

1718
/ {
@@ -93,6 +94,7 @@
9394

9495
ahb@80080000 {
9596
usb0: usb@80080000 {
97+
dr_mode = "host";
9698
vbus-supply = <&reg_usb0_vbus>;
9799
status = "okay";
98100
};
@@ -122,7 +124,7 @@
122124

123125
user {
124126
label = "green";
125-
gpios = <&gpio2 1 1>;
127+
gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
126128
};
127129
};
128130
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@
428428

429429
pwm4: pwm@53fc8000 {
430430
compatible = "fsl,imx25-pwm", "fsl,imx27-pwm";
431+
#pwm-cells = <2>;
431432
reg = <0x53fc8000 0x4000>;
432433
clocks = <&clks 108>, <&clks 52>;
433434
clock-names = "ipg", "per";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@
913913
80 81 68 69
914914
70 71 72 73
915915
74 75 76 77>;
916-
interrupt-names = "auart4-rx", "aurat4-tx", "spdif-tx", "empty",
916+
interrupt-names = "auart4-rx", "auart4-tx", "spdif-tx", "empty",
917917
"saif0", "saif1", "i2c0", "i2c1",
918918
"auart0-rx", "auart0-tx", "auart1-rx", "auart1-tx",
919919
"auart2-rx", "auart2-tx", "auart3-rx", "auart3-tx";

‎arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
regulator-min-microvolt = <5000000>;
3232
regulator-max-microvolt = <5000000>;
3333
gpio = <&gpio4 15 0>;
34+
enable-active-high;
3435
};
3536

3637
reg_usb_h1_vbus: regulator@1 {
@@ -40,6 +41,7 @@
4041
regulator-min-microvolt = <5000000>;
4142
regulator-max-microvolt = <5000000>;
4243
gpio = <&gpio1 0 0>;
44+
enable-active-high;
4345
};
4446
};
4547

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,6 @@
185185
&i2c3 {
186186
pinctrl-names = "default";
187187
pinctrl-0 = <&pinctrl_i2c3>;
188-
pinctrl-assert-gpios = <&gpio5 4 GPIO_ACTIVE_HIGH>;
189188
status = "okay";
190189

191190
max7310_a: gpio@30 {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,8 @@
498498
DRVDD-supply = <&vmmc2>;
499499
IOVDD-supply = <&vio>;
500500
DVDD-supply = <&vio>;
501+
502+
ai3x-micbias-vg = <1>;
501503
};
502504

503505
tlv320aic3x_aux: tlv320aic3x@19 {
@@ -509,6 +511,8 @@
509511
DRVDD-supply = <&vmmc2>;
510512
IOVDD-supply = <&vio>;
511513
DVDD-supply = <&vio>;
514+
515+
ai3x-micbias-vg = <2>;
512516
};
513517

514518
tsl2563: tsl2563@29 {

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,6 +456,7 @@
456456
};
457457

458458
mmu_isp: mmu@480bd400 {
459+
#iommu-cells = <0>;
459460
compatible = "ti,omap2-iommu";
460461
reg = <0x480bd400 0x80>;
461462
interrupts = <24>;
@@ -464,6 +465,7 @@
464465
};
465466

466467
mmu_iva: mmu@5d000000 {
468+
#iommu-cells = <0>;
467469
compatible = "ti,omap2-iommu";
468470
reg = <0x5d000000 0x80>;
469471
interrupts = <28>;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@
128128
* hierarchy.
129129
*/
130130
ocp {
131-
compatible = "ti,omap4-l3-noc", "simple-bus";
131+
compatible = "ti,omap5-l3-noc", "simple-bus";
132132
#address-cells = <1>;
133133
#size-cells = <1>;
134134
ranges;

‎arch/arm/boot/dts/r8a7791-koelsch.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -545,7 +545,7 @@
545545
compatible = "adi,adv7511w";
546546
reg = <0x39>;
547547
interrupt-parent = <&gpio3>;
548-
interrupts = <29 IRQ_TYPE_EDGE_FALLING>;
548+
interrupts = <29 IRQ_TYPE_LEVEL_LOW>;
549549

550550
adi,input-depth = <8>;
551551
adi,input-colorspace = "rgb";

‎arch/arm/boot/dts/ste-dbx5x0.dtsi

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,23 +1017,6 @@
10171017
status = "disabled";
10181018
};
10191019

1020-
vmmci: regulator-gpio {
1021-
compatible = "regulator-gpio";
1022-
1023-
regulator-min-microvolt = <1800000>;
1024-
regulator-max-microvolt = <2900000>;
1025-
regulator-name = "mmci-reg";
1026-
regulator-type = "voltage";
1027-
1028-
startup-delay-us = <100>;
1029-
enable-active-high;
1030-
1031-
states = <1800000 0x1
1032-
2900000 0x0>;
1033-
1034-
status = "disabled";
1035-
};
1036-
10371020
mcde@a0350000 {
10381021
compatible = "stericsson,mcde";
10391022
reg = <0xa0350000 0x1000>, /* MCDE */

‎arch/arm/boot/dts/ste-href.dtsi

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,21 @@
111111
pinctrl-1 = <&i2c3_sleep_mode>;
112112
};
113113

114+
vmmci: regulator-gpio {
115+
compatible = "regulator-gpio";
116+
117+
regulator-min-microvolt = <1800000>;
118+
regulator-max-microvolt = <2900000>;
119+
regulator-name = "mmci-reg";
120+
regulator-type = "voltage";
121+
122+
startup-delay-us = <100>;
123+
enable-active-high;
124+
125+
states = <1800000 0x1
126+
2900000 0x0>;
127+
};
128+
114129
// External Micro SD slot
115130
sdi0_per1@80126000 {
116131
arm,primecell-periphid = <0x10480180>;

‎arch/arm/boot/dts/ste-snowball.dts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,21 @@
146146
};
147147

148148
vmmci: regulator-gpio {
149+
compatible = "regulator-gpio";
150+
149151
gpios = <&gpio7 4 0x4>;
150152
enable-gpio = <&gpio6 25 0x4>;
153+
154+
regulator-min-microvolt = <1800000>;
155+
regulator-max-microvolt = <2900000>;
156+
regulator-name = "mmci-reg";
157+
regulator-type = "voltage";
158+
159+
startup-delay-us = <100>;
160+
enable-active-high;
161+
162+
states = <1800000 0x1
163+
2900000 0x0>;
151164
};
152165

153166
// External Micro SD slot

0 commit comments

Comments
 (0)