Skip to content

Commit 08f41f7

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "The latest and greatest fixes for ARM platform code. Worth pointing out are: - Lines-wise, largest is a PXA fix for dealing with interrupts on DT that was quite broken. It's still newish code so while we could have held this off, it seemed appropriate to include now - Some GPIO fixes for OMAP platforms added a few lines. This was also fixes for code recently added (this release). - Small OMAP timer fix to behave better with partially upstreamed platforms, which is quite welcome. - Allwinner fixes about operating point control, reducing overclocking in some cases for better stability. plus a handful of other smaller fixes across the map" * tag 'armsoc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm64: juno: Fix misleading name of UART reference clock ARM: dts: sunxi: Remove overclocked/overvoltaged OPP ARM: dts: sun4i: a10-lime: Override and remove 1008MHz OPP setting ARM: socfpga: dts: fix spi1 interrupt ARM: dts: Fix gpio interrupts for dm816x ARM: dts: dra7: remove ti,hwmod property from pcie phy ARM: OMAP: dmtimer: disable pm runtime on remove ARM: OMAP: dmtimer: check for pm_runtime_get_sync() failure ARM: OMAP2+: Fix socbus family info for AM33xx devices ARM: dts: omap3: Add missing dmas for crypto ARM: dts: rockchip: disable gmac by default in rk3288.dtsi MAINTAINERS: add rockchip regexp to the ARM/Rockchip entry ARM: pxa: fix pxa interrupts handling in DT ARM: pxa: Fix typo in zeus.c ARM: sunxi: Have ARCH_SUNXI select RESET_CONTROLLER for clock driver usage
2 parents 7fc377e + 4550bdb commit 08f41f7

File tree

18 files changed

+128
-85
lines changed

18 files changed

+128
-85
lines changed

‎MAINTAINERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1362,6 +1362,7 @@ F: drivers/i2c/busses/i2c-rk3x.c
13621362
F: drivers/*/*rockchip*
13631363
F: drivers/*/*/*rockchip*
13641364
F: sound/soc/rockchip/
1365+
N: rockchip
13651366

13661367
ARM/SAMSUNG EXYNOS ARM ARCHITECTURES
13671368
M: Kukjin Kim <kgene@kernel.org>

‎arch/arm/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,7 @@ config ARCH_PXA
619619
select GENERIC_CLOCKEVENTS
620620
select GPIO_PXA
621621
select HAVE_IDE
622+
select IRQ_DOMAIN
622623
select MULTI_IRQ_HANDLER
623624
select PLAT_PXA
624625
select SPARSE_IRQ

‎arch/arm/boot/dts/dm8168-evm.dts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,20 @@
3636
>;
3737
};
3838

39+
mmc_pins: pinmux_mmc_pins {
40+
pinctrl-single,pins = <
41+
DM816X_IOPAD(0x0a70, MUX_MODE0) /* SD_POW */
42+
DM816X_IOPAD(0x0a74, MUX_MODE0) /* SD_CLK */
43+
DM816X_IOPAD(0x0a78, MUX_MODE0) /* SD_CMD */
44+
DM816X_IOPAD(0x0a7C, MUX_MODE0) /* SD_DAT0 */
45+
DM816X_IOPAD(0x0a80, MUX_MODE0) /* SD_DAT1 */
46+
DM816X_IOPAD(0x0a84, MUX_MODE0) /* SD_DAT2 */
47+
DM816X_IOPAD(0x0a88, MUX_MODE0) /* SD_DAT2 */
48+
DM816X_IOPAD(0x0a8c, MUX_MODE2) /* GP1[7] */
49+
DM816X_IOPAD(0x0a90, MUX_MODE2) /* GP1[8] */
50+
>;
51+
};
52+
3953
usb0_pins: pinmux_usb0_pins {
4054
pinctrl-single,pins = <
4155
DM816X_IOPAD(0x0d00, MUX_MODE0) /* USB0_DRVVBUS */
@@ -137,7 +151,12 @@
137151
};
138152

139153
&mmc1 {
154+
pinctrl-names = "default";
155+
pinctrl-0 = <&mmc_pins>;
140156
vmmc-supply = <&vmmcsd_fixed>;
157+
bus-width = <4>;
158+
cd-gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
159+
wp-gpios = <&gpio2 8 GPIO_ACTIVE_LOW>;
141160
};
142161

143162
/* At least dm8168-evm rev c won't support multipoint, later may */

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

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -150,17 +150,27 @@
150150
};
151151

152152
gpio1: gpio@48032000 {
153-
compatible = "ti,omap3-gpio";
153+
compatible = "ti,omap4-gpio";
154154
ti,hwmods = "gpio1";
155+
ti,gpio-always-on;
155156
reg = <0x48032000 0x1000>;
156-
interrupts = <97>;
157+
interrupts = <96>;
158+
gpio-controller;
159+
#gpio-cells = <2>;
160+
interrupt-controller;
161+
#interrupt-cells = <2>;
157162
};
158163

159164
gpio2: gpio@4804c000 {
160-
compatible = "ti,omap3-gpio";
165+
compatible = "ti,omap4-gpio";
161166
ti,hwmods = "gpio2";
167+
ti,gpio-always-on;
162168
reg = <0x4804c000 0x1000>;
163-
interrupts = <99>;
169+
interrupts = <98>;
170+
gpio-controller;
171+
#gpio-cells = <2>;
172+
interrupt-controller;
173+
#interrupt-cells = <2>;
164174
};
165175

166176
gpmc: gpmc@50000000 {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,6 @@
11111111
"wkupclk", "refclk",
11121112
"div-clk", "phy-div";
11131113
#phy-cells = <0>;
1114-
ti,hwmods = "pcie1-phy";
11151114
};
11161115

11171116
pcie2_phy: pciephy@4a095000 {
@@ -1130,7 +1129,6 @@
11301129
"wkupclk", "refclk",
11311130
"div-clk", "phy-div";
11321131
#phy-cells = <0>;
1133-
ti,hwmods = "pcie2-phy";
11341132
status = "disabled";
11351133
};
11361134
};

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,8 @@
9292
ti,hwmods = "aes";
9393
reg = <0x480c5000 0x50>;
9494
interrupts = <0>;
95+
dmas = <&sdma 65 &sdma 66>;
96+
dma-names = "tx", "rx";
9597
};
9698

9799
prm: prm@48306000 {
@@ -550,6 +552,8 @@
550552
ti,hwmods = "sham";
551553
reg = <0x480c3000 0x64>;
552554
interrupts = <49>;
555+
dmas = <&sdma 69>;
556+
dma-names = "rx";
553557
};
554558

555559
smartreflex_core: smartreflex@480cb000 {

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@
411411
"mac_clk_rx", "mac_clk_tx",
412412
"clk_mac_ref", "clk_mac_refout",
413413
"aclk_mac", "pclk_mac";
414+
status = "disabled";
414415
};
415416

416417
usb_host0_ehci: usb@ff500000 {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -660,7 +660,7 @@
660660
#address-cells = <1>;
661661
#size-cells = <0>;
662662
reg = <0xfff01000 0x1000>;
663-
interrupts = <0 156 4>;
663+
interrupts = <0 155 4>;
664664
num-cs = <4>;
665665
clocks = <&spi_m_clk>;
666666
status = "disabled";

‎arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,22 @@
5656
model = "Olimex A10-OLinuXino-LIME";
5757
compatible = "olimex,a10-olinuxino-lime", "allwinner,sun4i-a10";
5858

59+
cpus {
60+
cpu0: cpu@0 {
61+
/*
62+
* The A10-Lime is known to be unstable
63+
* when running at 1008 MHz
64+
*/
65+
operating-points = <
66+
/* kHz uV */
67+
912000 1350000
68+
864000 1300000
69+
624000 1250000
70+
>;
71+
cooling-max-level = <2>;
72+
};
73+
};
74+
5975
soc@01c00000 {
6076
emac: ethernet@01c0b000 {
6177
pinctrl-names = "default";

‎arch/arm/boot/dts/sun4i-a10.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,14 @@
7575
clock-latency = <244144>; /* 8 32k periods */
7676
operating-points = <
7777
/* kHz uV */
78-
1056000 1500000
7978
1008000 1400000
8079
912000 1350000
8180
864000 1300000
8281
624000 1250000
8382
>;
8483
#cooling-cells = <2>;
8584
cooling-min-level = <0>;
86-
cooling-max-level = <4>;
85+
cooling-max-level = <3>;
8786
};
8887
};
8988

‎arch/arm/boot/dts/sun5i-a13.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@
4747
clock-latency = <244144>; /* 8 32k periods */
4848
operating-points = <
4949
/* kHz uV */
50-
1104000 1500000
5150
1008000 1400000
5251
912000 1350000
5352
864000 1300000
@@ -57,7 +56,7 @@
5756
>;
5857
#cooling-cells = <2>;
5958
cooling-min-level = <0>;
60-
cooling-max-level = <6>;
59+
cooling-max-level = <5>;
6160
};
6261
};
6362

‎arch/arm/boot/dts/sun7i-a20.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
clock-latency = <244144>; /* 8 32k periods */
106106
operating-points = <
107107
/* kHz uV */
108-
1008000 1450000
109108
960000 1400000
110109
912000 1400000
111110
864000 1300000
@@ -116,7 +115,7 @@
116115
>;
117116
#cooling-cells = <2>;
118117
cooling-min-level = <0>;
119-
cooling-max-level = <7>;
118+
cooling-max-level = <6>;
120119
};
121120

122121
cpu@1 {

‎arch/arm/mach-omap2/id.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,8 @@ static const char * __init omap_get_family(void)
720720
return kasprintf(GFP_KERNEL, "OMAP4");
721721
else if (soc_is_omap54xx())
722722
return kasprintf(GFP_KERNEL, "OMAP5");
723+
else if (soc_is_am33xx() || soc_is_am335x())
724+
return kasprintf(GFP_KERNEL, "AM33xx");
723725
else if (soc_is_am43xx())
724726
return kasprintf(GFP_KERNEL, "AM43xx");
725727
else if (soc_is_dra7xx())

0 commit comments

Comments
 (0)