Skip to content

Commit 1dffab5

Browse files
torvaldstorvalds
committed
Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC fixes from Olof Johansson: "The usual batch; most of them are DT tweaks to fix misdescribed hardware. Beyond that: - A bugfix for MMP2 CPU detection, it's been there quite a while but makes sense to fix now anyway. - Some power management tweaks: + disabling of CPU idle power state on Marvell Armada 7K/8K (Macchiatobin et al) + Increase of minimum voltage on BananaPi M3 + Tweak of power ramp time for DVFS on NXP/Freescale i.MX7SX - A couple of MAINTAINER updates: + MMP has a new volunteer to look after it + Mediatek adds a few keywords, IRC channel and wiki URL" * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: dts: imx7d-nitrogen7: Fix the description of the Wifi clock ARM: imx: update the cpu power up timing setting on i.mx6sx Revert "arm64: dts: marvell: add CPU Idle power state support on Armada 7K/8K" ARM: dts: imx7d-pico: Describe the Wifi clock ARM: dts: realview: Fix some more duplicate regulator nodes MAINTAINERS: update entry for MMP platform ARM: mmp/mmp2: fix cpu_is_mmp2() on mmp2-dt MAINTAINERS: mediatek: Update SoC entry ARM: dts: bcm2837: Fix polarity of wifi reset GPIOs arm64: dts: mt7622: Drop the general purpose timer node arm64: dts: mt7622: fix no more console output on BPI-R64 board arm64: dts: mt7622: fix no more console output on rfb1 ARM: dts: sun8i: a83t: bananapi-m3: increase vcc-pd voltage to 3.3V
2 parents 40e020c + 0603a9a commit 1dffab5

16 files changed

+67
-62
lines changed

‎CREDITS

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2541,6 +2541,10 @@ S: Ormond
25412541
S: Victoria 3163
25422542
S: Australia
25432543

2544+
N: Eric Miao
2545+
E: eric.y.miao@gmail.com
2546+
D: MMP support
2547+
25442548
N: Pauline Middelink
25452549
E: middelin@polyware.nl
25462550
D: General low-level bug fixes, /proc fixes, identd support
@@ -4115,6 +4119,10 @@ S: 1507 145th Place SE #B5
41154119
S: Bellevue, Washington 98007
41164120
S: USA
41174121

4122+
N: Haojian Zhuang
4123+
E: haojian.zhuang@gmail.com
4124+
D: MMP support
4125+
41184126
N: Richard Zidlicky
41194127
E: rz@linux-m68k.org, rdzidlic@geocities.com
41204128
W: http://www.geocities.com/rdzidlic

‎MAINTAINERS

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1739,13 +1739,17 @@ ARM/Mediatek SoC support
17391739
M: Matthias Brugger <matthias.bgg@gmail.com>
17401740
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
17411741
L: linux-mediatek@lists.infradead.org (moderated for non-subscribers)
1742+
W: https://mtk.bcnfs.org/
1743+
C: irc://chat.freenode.net/linux-mediatek
17421744
S: Maintained
17431745
F: arch/arm/boot/dts/mt6*
17441746
F: arch/arm/boot/dts/mt7*
17451747
F: arch/arm/boot/dts/mt8*
17461748
F: arch/arm/mach-mediatek/
17471749
F: arch/arm64/boot/dts/mediatek/
1750+
F: drivers/soc/mediatek/
17481751
N: mtk
1752+
N: mt[678]
17491753
K: mediatek
17501754

17511755
ARM/Mediatek USB3 PHY DRIVER
@@ -10005,12 +10009,9 @@ S: Odd Fixes
1000510009
F: drivers/media/radio/radio-miropcm20*
1000610010

1000710011
MMP SUPPORT
10008-
M: Eric Miao <eric.y.miao@gmail.com>
10009-
M: Haojian Zhuang <haojian.zhuang@gmail.com>
10012+
R: Lubomir Rintel <lkundrak@v3.sk>
1001010013
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
10011-
T: git git://github.com/hzhuang1/linux.git
10012-
T: git git://git.linaro.org/people/ycmiao/pxa-linux.git
10013-
S: Maintained
10014+
S: Odd Fixes
1001410015
F: arch/arm/boot/dts/mmp*
1001510016
F: arch/arm/mach-mmp/
1001610017

‎arch/arm/boot/dts/arm-realview-pb1176.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@
4545
};
4646

4747
/* The voltage to the MMC card is hardwired at 3.3V */
48-
vmmc: fixedregulator@0 {
48+
vmmc: regulator-vmmc {
4949
compatible = "regulator-fixed";
5050
regulator-name = "vmmc";
5151
regulator-min-microvolt = <3300000>;
5252
regulator-max-microvolt = <3300000>;
5353
regulator-boot-on;
5454
};
5555

56-
veth: fixedregulator@0 {
56+
veth: regulator-veth {
5757
compatible = "regulator-fixed";
5858
regulator-name = "veth";
5959
regulator-min-microvolt = <3300000>;

‎arch/arm/boot/dts/arm-realview-pb11mp.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@
145145
};
146146

147147
/* The voltage to the MMC card is hardwired at 3.3V */
148-
vmmc: fixedregulator@0 {
148+
vmmc: regulator-vmmc {
149149
compatible = "regulator-fixed";
150150
regulator-name = "vmmc";
151151
regulator-min-microvolt = <3300000>;
152152
regulator-max-microvolt = <3300000>;
153153
regulator-boot-on;
154154
};
155155

156-
veth: fixedregulator@0 {
156+
veth: regulator-veth {
157157
compatible = "regulator-fixed";
158158
regulator-name = "veth";
159159
regulator-min-microvolt = <3300000>;

‎arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts

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

3232
wifi_pwrseq: wifi-pwrseq {
3333
compatible = "mmc-pwrseq-simple";
34-
reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
34+
reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
3535
};
3636
};
3737

‎arch/arm/boot/dts/bcm2837-rpi-3-b.dts

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

2727
wifi_pwrseq: wifi-pwrseq {
2828
compatible = "mmc-pwrseq-simple";
29-
reset-gpios = <&expgpio 1 GPIO_ACTIVE_HIGH>;
29+
reset-gpios = <&expgpio 1 GPIO_ACTIVE_LOW>;
3030
};
3131
};
3232

‎arch/arm/boot/dts/imx7d-nitrogen7.dts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,17 @@
8686
compatible = "regulator-fixed";
8787
regulator-min-microvolt = <3300000>;
8888
regulator-max-microvolt = <3300000>;
89-
clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;
90-
clock-names = "slow";
9189
regulator-name = "reg_wlan";
9290
startup-delay-us = <70000>;
9391
gpio = <&gpio4 21 GPIO_ACTIVE_HIGH>;
9492
enable-active-high;
9593
};
94+
95+
usdhc2_pwrseq: usdhc2_pwrseq {
96+
compatible = "mmc-pwrseq-simple";
97+
clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;
98+
clock-names = "ext_clock";
99+
};
96100
};
97101

98102
&adc1 {
@@ -375,6 +379,7 @@
375379
bus-width = <4>;
376380
non-removable;
377381
vmmc-supply = <&reg_wlan>;
382+
mmc-pwrseq = <&usdhc2_pwrseq>;
378383
cap-power-off-card;
379384
keep-power-in-suspend;
380385
status = "okay";

‎arch/arm/boot/dts/imx7d-pico.dtsi

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,19 @@
100100
regulator-min-microvolt = <1800000>;
101101
regulator-max-microvolt = <1800000>;
102102
};
103+
104+
usdhc2_pwrseq: usdhc2_pwrseq {
105+
compatible = "mmc-pwrseq-simple";
106+
clocks = <&clks IMX7D_CLKO2_ROOT_DIV>;
107+
clock-names = "ext_clock";
108+
};
109+
};
110+
111+
&clks {
112+
assigned-clocks = <&clks IMX7D_CLKO2_ROOT_SRC>,
113+
<&clks IMX7D_CLKO2_ROOT_DIV>;
114+
assigned-clock-parents = <&clks IMX7D_CKIL>;
115+
assigned-clock-rates = <0>, <32768>;
103116
};
104117

105118
&i2c4 {
@@ -199,12 +212,13 @@
199212

200213
&usdhc2 { /* Wifi SDIO */
201214
pinctrl-names = "default";
202-
pinctrl-0 = <&pinctrl_usdhc2>;
215+
pinctrl-0 = <&pinctrl_usdhc2 &pinctrl_wifi_clk>;
203216
no-1-8-v;
204217
non-removable;
205218
keep-power-in-suspend;
206219
wakeup-source;
207220
vmmc-supply = <&reg_ap6212>;
221+
mmc-pwrseq = <&usdhc2_pwrseq>;
208222
status = "okay";
209223
};
210224

@@ -301,6 +315,12 @@
301315
};
302316

303317
&iomuxc_lpsr {
318+
pinctrl_wifi_clk: wificlkgrp {
319+
fsl,pins = <
320+
MX7D_PAD_LPSR_GPIO1_IO03__CCM_CLKO2 0x7d
321+
>;
322+
};
323+
304324
pinctrl_wdog: wdoggrp {
305325
fsl,pins = <
306326
MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x74

‎arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,8 +314,8 @@
314314

315315
&reg_dldo3 {
316316
regulator-always-on;
317-
regulator-min-microvolt = <2500000>;
318-
regulator-max-microvolt = <2500000>;
317+
regulator-min-microvolt = <3300000>;
318+
regulator-max-microvolt = <3300000>;
319319
regulator-name = "vcc-pd";
320320
};
321321

‎arch/arm/mach-imx/cpuidle-imx6sx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ int __init imx6sx_cpuidle_init(void)
110110
* except for power up sw2iso which need to be
111111
* larger than LDO ramp up time.
112112
*/
113-
imx_gpc_set_arm_power_up_timing(2, 1);
113+
imx_gpc_set_arm_power_up_timing(0xf, 1);
114114
imx_gpc_set_arm_power_down_timing(1, 1);
115115

116116
return cpuidle_register(&imx6sx_cpuidle_driver, NULL);

‎arch/arm/mach-mmp/cputype.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,12 @@ static inline int cpu_is_pxa910(void)
4444
#define cpu_is_pxa910() (0)
4545
#endif
4646

47-
#ifdef CONFIG_CPU_MMP2
47+
#if defined(CONFIG_CPU_MMP2) || defined(CONFIG_MACH_MMP2_DT)
4848
static inline int cpu_is_mmp2(void)
4949
{
50-
return (((read_cpuid_id() >> 8) & 0xff) == 0x58);
50+
return (((read_cpuid_id() >> 8) & 0xff) == 0x58) &&
51+
(((mmp_chip_id & 0xfff) == 0x410) ||
52+
((mmp_chip_id & 0xfff) == 0x610));
5153
}
5254
#else
5355
#define cpu_is_mmp2() (0)

‎arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,28 +20,24 @@
2020
compatible = "arm,cortex-a72", "arm,armv8";
2121
reg = <0x000>;
2222
enable-method = "psci";
23-
cpu-idle-states = <&CPU_SLEEP_0>;
2423
};
2524
cpu1: cpu@1 {
2625
device_type = "cpu";
2726
compatible = "arm,cortex-a72", "arm,armv8";
2827
reg = <0x001>;
2928
enable-method = "psci";
30-
cpu-idle-states = <&CPU_SLEEP_0>;
3129
};
3230
cpu2: cpu@100 {
3331
device_type = "cpu";
3432
compatible = "arm,cortex-a72", "arm,armv8";
3533
reg = <0x100>;
3634
enable-method = "psci";
37-
cpu-idle-states = <&CPU_SLEEP_0>;
3835
};
3936
cpu3: cpu@101 {
4037
device_type = "cpu";
4138
compatible = "arm,cortex-a72", "arm,armv8";
4239
reg = <0x101>;
4340
enable-method = "psci";
44-
cpu-idle-states = <&CPU_SLEEP_0>;
4541
};
4642
};
4743
};

‎arch/arm64/boot/dts/marvell/armada-ap806.dtsi

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,33 +28,6 @@
2828
method = "smc";
2929
};
3030

31-
cpus {
32-
#address-cells = <1>;
33-
#size-cells = <0>;
34-
35-
idle_states {
36-
entry_method = "arm,pcsi";
37-
38-
CPU_SLEEP_0: cpu-sleep-0 {
39-
compatible = "arm,idle-state";
40-
local-timer-stop;
41-
arm,psci-suspend-param = <0x0010000>;
42-
entry-latency-us = <80>;
43-
exit-latency-us = <160>;
44-
min-residency-us = <320>;
45-
};
46-
47-
CLUSTER_SLEEP_0: cluster-sleep-0 {
48-
compatible = "arm,idle-state";
49-
local-timer-stop;
50-
arm,psci-suspend-param = <0x1010000>;
51-
entry-latency-us = <500>;
52-
exit-latency-us = <1000>;
53-
min-residency-us = <2500>;
54-
};
55-
};
56-
};
57-
5831
ap806 {
5932
#address-cells = <2>;
6033
#size-cells = <2>;

‎arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@
1616
model = "Bananapi BPI-R64";
1717
compatible = "bananapi,bpi-r64", "mediatek,mt7622";
1818

19+
aliases {
20+
serial0 = &uart0;
21+
};
22+
1923
chosen {
20-
bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";
24+
stdout-path = "serial0:115200n8";
25+
bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";
2126
};
2227

2328
cpus {

‎arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,13 @@
1717
model = "MediaTek MT7622 RFB1 board";
1818
compatible = "mediatek,mt7622-rfb1", "mediatek,mt7622";
1919

20+
aliases {
21+
serial0 = &uart0;
22+
};
23+
2024
chosen {
21-
bootargs = "earlycon=uart8250,mmio32,0x11002000 console=ttyS0,115200n1 swiotlb=512";
25+
stdout-path = "serial0:115200n8";
26+
bootargs = "earlycon=uart8250,mmio32,0x11002000 swiotlb=512";
2227
};
2328

2429
cpus {

‎arch/arm64/boot/dts/mediatek/mt7622.dtsi

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -227,16 +227,6 @@
227227
#reset-cells = <1>;
228228
};
229229

230-
timer: timer@10004000 {
231-
compatible = "mediatek,mt7622-timer",
232-
"mediatek,mt6577-timer";
233-
reg = <0 0x10004000 0 0x80>;
234-
interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_LOW>;
235-
clocks = <&infracfg CLK_INFRA_APXGPT_PD>,
236-
<&topckgen CLK_TOP_RTC>;
237-
clock-names = "system-clk", "rtc-clk";
238-
};
239-
240230
scpsys: scpsys@10006000 {
241231
compatible = "mediatek,mt7622-scpsys",
242232
"syscon";

0 commit comments

Comments
 (0)