Merge tag 'arm-soc-fixes-v5.10-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc (303bc934) · Commits · 戴 / test

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() ...

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -1995,7 +1995,6 @@ N: lpc18xx

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

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -521,7 +521,7 @@
		ranges = <0x0 0x100000 0x8000>;

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

arch/arm/boot/dts/dra76x.dtsi

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,8 +32,8 @@
		interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>,
		<GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
		interrupt-names = "int0", "int1";
		clocks = <&mcan_clk>, <&l3_iclk_div>;
		clock-names = "cclk", "hclk";
		clocks = <&l3_iclk_div>, <&mcan_clk>;
		clock-names = "hclk", "cclk";
		bosch,mram-cfg = <0x0 0 0 32 0 0 1 1>;
		};
		};

arch/arm/mach-omap2/Kconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -7,7 +7,6 @@ config ARCH_OMAP2
		depends on ARCH_MULTI_V6
		select ARCH_OMAP2PLUS
		select CPU_V6
		select PM_GENERIC_DOMAINS if PM
		select SOC_HAS_OMAP2_SDRC

		config ARCH_OMAP3
		@@ -106,6 +105,8 @@ config ARCH_OMAP2PLUS
		select OMAP_DM_TIMER
		select OMAP_GPMC
		select PINCTRL
		select PM_GENERIC_DOMAINS if PM
		select PM_GENERIC_DOMAINS_OF if PM
		select RESET_CONTROLLER
		select SOC_BUS
		select TI_SYSC

arch/arm/mach-omap2/cpuidle44xx.c

+5 −3

Original line number	Diff line number	Diff line
		@@ -175,8 +175,11 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,
		if (mpuss_can_lose_context) {
		error = cpu_cluster_pm_enter();
		if (error) {
		omap_set_pwrdm_state(mpu_pd, PWRDM_POWER_ON);
		goto cpu_cluster_pm_out;
		index = 0;
		cx = state_ptr + index;
		pwrdm_set_logic_retst(mpu_pd, cx->mpu_logic_state);
		omap_set_pwrdm_state(mpu_pd, cx->mpu_state);
		mpuss_can_lose_context = 0;
		}
		}
		}
		@@ -184,7 +187,6 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,
		omap4_enter_lowpower(dev->cpu, cx->cpu_state);
		cpu_done[dev->cpu] = true;

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

Admin message