Skip to content

Commit 303bc93

Browse files
torvaldstorvalds
committed
Merge tag 'arm-soc-fixes-v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
Pull ARM SoC fixes from Arnd Bergmann: "Another set of patches for devicetree files and Arm SoC specific drivers: - A fix for OP-TEE shared memory on non-SMP systems - multiple code fixes for the OMAP platform, including one regression for the CPSW network driver and a few runtime warning fixes - Some DT patches for the Rockchip RK3399 platform, in particular fixing the MMC device ordering that recently became nondeterministic with async probe. - Multiple DT fixes for the Tegra platform, including a regression fix for suspend/resume on TX2 - A regression fix for a user-triggered fault in the NXP dpio driver - A regression fix for a bug caused by an earlier bug fix in the xilinx firmware driver - Two more DTC warning fixes - Sylvain Lemieux steps down as maintainer for the NXP LPC32xx platform" * tag 'arm-soc-fixes-v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits) arm64: tegra: Fix Tegra234 VDK node names arm64: tegra: Wrong AON HSP reg property size arm64: tegra: Fix USB_VBUS_EN0 regulator on Jetson TX1 arm64: tegra: Correct the UART for Jetson Xavier NX arm64: tegra: Disable the ACONNECT for Jetson TX2 optee: add writeback to valid memory type firmware: xilinx: Use hash-table for api feature check firmware: xilinx: Fix SD DLL node reset issue soc: fsl: dpio: Get the cpumask through cpumask_of(cpu) ARM: dts: dra76x: m_can: fix order of clocks bus: ti-sysc: suppress err msg for timers used as clockevent/source MAINTAINERS: Remove myself as LPC32xx maintainers arm64: dts: qcom: clear the warnings caused by empty dma-ranges arm64: dts: broadcom: clear the warnings caused by empty dma-ranges ARM: dts: am437x-l4: fix compatible for cpsw switch dt node arm64: dts: rockchip: Reorder LED triggers from mmc devices on rk3399-roc-pc. arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399 boards. arm64: dts: rockchip: Remove system-power-controller from pmic on Odroid Go Advance arm64: dts: rockchip: fix NanoPi R2S GMAC clock name ARM: OMAP2+: Manage MPU state properly for omap_enter_idle_coupled() ...
2 parents 79c0c1f + ae59756 commit 303bc93

22 files changed

Lines changed: 150 additions & 119 deletions

File tree

‎MAINTAINERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1995,7 +1995,6 @@ N: lpc18xx
19951995

19961996
ARM/LPC32XX SOC SUPPORT
19971997
M: Vladimir Zapolskiy <vz@mleia.com>
1998-
M: Sylvain Lemieux <slemieux.tyco@gmail.com>
19991998
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
20001999
S: Maintained
20012000
T: git git://github.com/vzapolskiy/linux-lpc32xx.git

‎arch/arm/boot/dts/am437x-l4.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@
521521
ranges = <0x0 0x100000 0x8000>;
522522

523523
mac_sw: switch@0 {
524-
compatible = "ti,am4372-cpsw","ti,cpsw-switch";
524+
compatible = "ti,am4372-cpsw-switch", "ti,cpsw-switch";
525525
reg = <0x0 0x4000>;
526526
ranges = <0 0 0x4000>;
527527
clocks = <&cpsw_125mhz_gclk>, <&dpll_clksel_mac_clk>;

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
3333
<GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
3434
interrupt-names = "int0", "int1";
35-
clocks = <&mcan_clk>, <&l3_iclk_div>;
36-
clock-names = "cclk", "hclk";
35+
clocks = <&l3_iclk_div>, <&mcan_clk>;
36+
clock-names = "hclk", "cclk";
3737
bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;
3838
};
3939
};

‎arch/arm/mach-omap2/Kconfig‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ config ARCH_OMAP2
77
depends on ARCH_MULTI_V6
88
select ARCH_OMAP2PLUS
99
select CPU_V6
10-
select PM_GENERIC_DOMAINS if PM
1110
select SOC_HAS_OMAP2_SDRC
1211

1312
config ARCH_OMAP3
@@ -106,6 +105,8 @@ config ARCH_OMAP2PLUS
106105
select OMAP_DM_TIMER
107106
select OMAP_GPMC
108107
select PINCTRL
108+
select PM_GENERIC_DOMAINS if PM
109+
select PM_GENERIC_DOMAINS_OF if PM
109110
select RESET_CONTROLLER
110111
select SOC_BUS
111112
select TI_SYSC

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,16 +175,18 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,
175175
if (mpuss_can_lose_context) {
176176
error = cpu_cluster_pm_enter();
177177
if (error) {
178-
omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);
179-
goto cpu_cluster_pm_out;
178+
index = 0;
179+
cx = state_ptr + index;
180+
pwrdm_set_logic_retst(mpu_pd, cx->mpu_logic_state);
181+
omap_set_pwrdm_state(mpu_pd, cx->mpu_state);
182+
mpuss_can_lose_context = 0;
180183
}
181184
}
182185
}
183186

184187
omap4_enter_lowpower(dev->cpu, cx->cpu_state);
185188
cpu_done[dev->cpu] = true;
186189

187-
cpu_cluster_pm_out:
188190
/* Wakeup CPU1 only if it is not offlined */
189191
if (dev->cpu == 0 && cpumask_test_cpu(1, cpu_online_mask)) {
190192

‎arch/arm64/boot/dts/broadcom/stingray/stingray-usb.dtsi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
usb {
66
compatible = "simple-bus";
77
dma-ranges;
8-
#address-cells = <1>;
9-
#size-cells = <1>;
10-
ranges = <0x0 0x0 0x68500000 0x00400000>;
8+
#address-cells = <2>;
9+
#size-cells = <2>;
10+
ranges = <0x0 0x0 0x0 0x68500000 0x0 0x00400000>;
1111

1212
usbphy0: usb-phy@0 {
1313
compatible = "brcm,sr-usb-combo-phy";
14-
reg = <0x00000000 0x100>;
14+
reg = <0x0 0x00000000 0x0 0x100>;
1515
#phy-cells = <1>;
1616
status = "disabled";
1717
};
1818

1919
xhci0: usb@1000 {
2020
compatible = "generic-xhci";
21-
reg = <0x00001000 0x1000>;
21+
reg = <0x0 0x00001000 0x0 0x1000>;
2222
interrupts = <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>;
2323
phys = <&usbphy0 1>, <&usbphy0 0>;
2424
phy-names = "phy0", "phy1";
@@ -28,7 +28,7 @@
2828

2929
bdc0: usb@2000 {
3030
compatible = "brcm,bdc-v0.16";
31-
reg = <0x00002000 0x1000>;
31+
reg = <0x0 0x00002000 0x0 0x1000>;
3232
interrupts = <GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>;
3333
phys = <&usbphy0 0>, <&usbphy0 1>;
3434
phy-names = "phy0", "phy1";
@@ -38,21 +38,21 @@
3838

3939
usbphy1: usb-phy@10000 {
4040
compatible = "brcm,sr-usb-combo-phy";
41-
reg = <0x00010000 0x100>;
41+
reg = <0x0 0x00010000 0x0 0x100>;
4242
#phy-cells = <1>;
4343
status = "disabled";
4444
};
4545

4646
usbphy2: usb-phy@20000 {
4747
compatible = "brcm,sr-usb-hs-phy";
48-
reg = <0x00020000 0x100>;
48+
reg = <0x0 0x00020000 0x0 0x100>;
4949
#phy-cells = <0>;
5050
status = "disabled";
5151
};
5252

5353
xhci1: usb@11000 {
5454
compatible = "generic-xhci";
55-
reg = <0x00011000 0x1000>;
55+
reg = <0x0 0x00011000 0x0 0x1000>;
5656
interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
5757
phys = <&usbphy1 1>, <&usbphy2>, <&usbphy1 0>;
5858
phy-names = "phy0", "phy1", "phy2";
@@ -62,7 +62,7 @@
6262

6363
bdc1: usb@21000 {
6464
compatible = "brcm,bdc-v0.16";
65-
reg = <0x00021000 0x1000>;
65+
reg = <0x0 0x00021000 0x0 0x1000>;
6666
interrupts = <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>;
6767
phys = <&usbphy2>;
6868
phy-names = "phy0";

‎arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,6 @@
1010
model = "NVIDIA Jetson TX2 Developer Kit";
1111
compatible = "nvidia,p2771-0000", "nvidia,tegra186";
1212

13-
aconnect {
14-
status = "okay";
15-
16-
dma-controller@2930000 {
17-
status = "okay";
18-
};
19-
20-
interrupt-controller@2a40000 {
21-
status = "okay";
22-
};
23-
};
24-
2513
i2c@3160000 {
2614
power-monitor@42 {
2715
compatible = "ti,ina3221";

‎arch/arm64/boot/dts/nvidia/tegra194-p3668-0000.dtsi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
status = "okay";
5555
};
5656

57-
serial@c280000 {
57+
serial@3100000 {
5858
status = "okay";
5959
};
6060

‎arch/arm64/boot/dts/nvidia/tegra194.dtsi‎

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

11621162
hsp_aon: hsp@c150000 {
11631163
compatible = "nvidia,tegra194-hsp", "nvidia,tegra186-hsp";
1164-
reg = <0x0c150000 0xa0000>;
1164+
reg = <0x0c150000 0x90000>;
11651165
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>,
11661166
<GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>,
11671167
<GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>,

‎arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1663,16 +1663,6 @@
16631663
vin-supply = <&vdd_5v0_sys>;
16641664
};
16651665

1666-
vdd_usb_vbus_otg: regulator@11 {
1667-
compatible = "regulator-fixed";
1668-
regulator-name = "USB_VBUS_EN0";
1669-
regulator-min-microvolt = <5000000>;
1670-
regulator-max-microvolt = <5000000>;
1671-
gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;
1672-
enable-active-high;
1673-
vin-supply = <&vdd_5v0_sys>;
1674-
};
1675-
16761666
vdd_hdmi: regulator@10 {
16771667
compatible = "regulator-fixed";
16781668
regulator-name = "VDD_HDMI_5V0";
@@ -1712,4 +1702,14 @@
17121702
enable-active-high;
17131703
vin-supply = <&vdd_3v3_sys>;
17141704
};
1705+
1706+
vdd_usb_vbus_otg: regulator@14 {
1707+
compatible = "regulator-fixed";
1708+
regulator-name = "USB_VBUS_EN0";
1709+
regulator-min-microvolt = <5000000>;
1710+
regulator-max-microvolt = <5000000>;
1711+
gpio = <&gpio TEGRA_GPIO(CC, 4) GPIO_ACTIVE_HIGH>;
1712+
enable-active-high;
1713+
vin-supply = <&vdd_5v0_sys>;
1714+
};
17151715
};

0 commit comments

Comments
 (0)