Commit fc444ada authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull SoC fixes from Arnd Bergmann:
 "The majority of these last fixes are for devicetree files.

  These address two important regressions for the Qualcomm SMMU and the
  Raspberry Pi 4 USB controller, as well as a larger number of patches
  fixing minor mistakes in board specific files for Rockchips, i.MX,
  starfive and broadcom.

  The non-DT changes are

   - A fix for an old boot regression on Renesas shmobile chips

   - Another boot time regression for for the Qualcomm PDR SoC driver,
     among a few other Qualcomm firmware driver fixes for efivars and
     tzmem

   - Minor Kconfig fixes for davinci and OMAP1

   - Minor code fixes for sparx5 reset controllers, OMAP memory
     controller, i.MX SCU, cpufreq and SoC drivers and a Hisilicon SoC
     driver

   - One more update to the Asahi maintainers, adding Neal Gompa as a
     reviewer"

* tag 'soc-fixes-6.14-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (35 commits)
  ARM: davinci: da850: fix selecting ARCH_DAVINCI_DA8XX
  soc: hisilicon: kunpeng_hccs: Fix incorrect string assembly
  memory: omap-gpmc: drop no compatible check
  reset: mchp: sparx5: Fix for lan966x
  ARM: shmobile: smp: Enforce shmobile_smp_* alignment
  MAINTAINERS: Add myself (Neal Gompa) as a reviewer for ARM Apple support
  MAINTAINERS: Add apple-spi driver & binding files
  arm64: dts: rockchip: slow down emmc freq for rock 5 itx
  ARM: dts: BCM5301X: Fix switch port labels of ASUS RT-AC3200
  ARM: dts: BCM5301X: Fix switch port labels of ASUS RT-AC5300
  ARM: dts: bcm2711: Don't mark timer regs unconfigured
  ARM: OMAP1: select CONFIG_GENERIC_IRQ_CHIP
  arm64: dts: rockchip: Add missing PCIe supplies to RockPro64 board dtsi
  arm64: dts: rockchip: Add avdd HDMI supplies to RockPro64 board dtsi
  arm64: dts: rockchip: Remove undocumented sdmmc property from lubancat-1
  arm64: dts: rockchip: fix pinmux of UART5 for PX30 Ringneck on Haikou
  arm64: dts: rockchip: fix pinmux of UART0 for PX30 Ringneck on Haikou
  arm64: dts: rockchip: fix u2phy1_host status for NanoPi R4S
  arm64: dts: bcm2712: PL011 UARTs are actually r1p5
  ARM: dts: bcm2711: PL011 UARTs are actually r1p5
  ...
parents 47c7efa4 45d5fe1c

MAINTAINERS

+3 −0
Original line number Diff line number Diff line
@@ -2213,6 +2213,7 @@ ARM/APPLE MACHINE SUPPORT 
M:	Sven Peter <sven@svenpeter.dev>

M:	Janne Grunau <j@jannau.net>

R:	Alyssa Rosenzweig <alyssa@rosenzweig.io>

R:	Neal Gompa <neal@gompa.dev>

L:	asahi@lists.linux.dev

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained
@@ -2237,6 +2238,7 @@ F: Documentation/devicetree/bindings/pci/apple,pcie.yaml 
F:	Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml

F:	Documentation/devicetree/bindings/power/apple*

F:	Documentation/devicetree/bindings/pwm/apple,s5l-fpwm.yaml

F:	Documentation/devicetree/bindings/spi/apple,spi.yaml

F:	Documentation/devicetree/bindings/watchdog/apple,wdt.yaml

F:	arch/arm64/boot/dts/apple/

F:	drivers/bluetooth/hci_bcm4377.c
@@ -2254,6 +2256,7 @@ F: drivers/nvmem/apple-efuses.c 
F:	drivers/pinctrl/pinctrl-apple-gpio.c

F:	drivers/pwm/pwm-apple.c

F:	drivers/soc/apple/*

F:	drivers/spi/spi-apple.c

F:	drivers/watchdog/apple_wdt.c

F:	include/dt-bindings/interrupt-controller/apple-aic.h

F:	include/dt-bindings/pinctrl/apple.h

arch/arm/boot/dts/broadcom/bcm2711-rpi.dtsi

+0 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include "bcm2835-rpi.dtsi"



#include <dt-bindings/power/raspberrypi-power.h>

#include <dt-bindings/reset/raspberrypi,firmware-reset.h>



/ {
@@ -101,7 +100,3 @@ &v3d { 
&vchiq {

	interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

};
 


&xhci {

	power-domains = <&power RPI_POWER_DOMAIN_USB>;

};

arch/arm/boot/dts/broadcom/bcm2711.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ uart2: serial@7e201400 { 
			clocks = <&clocks BCM2835_CLOCK_UART>,

				 <&clocks BCM2835_CLOCK_VPU>;

			clock-names = "uartclk", "apb_pclk";

			arm,primecell-periphid = <0x00241011>;

			arm,primecell-periphid = <0x00341011>;

			status = "disabled";

		};
@@ -145,7 +145,7 @@ uart3: serial@7e201600 { 
			clocks = <&clocks BCM2835_CLOCK_UART>,

				 <&clocks BCM2835_CLOCK_VPU>;

			clock-names = "uartclk", "apb_pclk";

			arm,primecell-periphid = <0x00241011>;

			arm,primecell-periphid = <0x00341011>;

			status = "disabled";

		};
@@ -156,7 +156,7 @@ uart4: serial@7e201800 { 
			clocks = <&clocks BCM2835_CLOCK_UART>,

				 <&clocks BCM2835_CLOCK_VPU>;

			clock-names = "uartclk", "apb_pclk";

			arm,primecell-periphid = <0x00241011>;

			arm,primecell-periphid = <0x00341011>;

			status = "disabled";

		};
@@ -167,7 +167,7 @@ uart5: serial@7e201a00 { 
			clocks = <&clocks BCM2835_CLOCK_UART>,

				 <&clocks BCM2835_CLOCK_VPU>;

			clock-names = "uartclk", "apb_pclk";

			arm,primecell-periphid = <0x00241011>;

			arm,primecell-periphid = <0x00341011>;

			status = "disabled";

		};
@@ -451,8 +451,6 @@ IRQ_TYPE_LEVEL_LOW)>, 
					  IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) |

					  IRQ_TYPE_LEVEL_LOW)>;

		/* This only applies to the ARMv7 stub */

		arm,cpu-registers-not-fw-configured;

	};



	cpus: cpus {
@@ -610,6 +608,7 @@ xhci: usb@7e9c0000 { 
			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <GIC_SPI 176 IRQ_TYPE_LEVEL_HIGH>;

			power-domains = <&pm BCM2835_POWER_DOMAIN_USB>;

			/* DWC2 and this IP block share the same USB PHY,

			 * enabling both at the same time results in lockups.

			 * So keep this node disabled and let the bootloader
@@ -1177,6 +1176,7 @@ &txp { 
};



&uart0 {

	arm,primecell-periphid = <0x00341011>;

	interrupts = <GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>;

};

arch/arm/boot/dts/broadcom/bcm4709-asus-rt-ac3200.dts

+4 −4
Original line number Diff line number Diff line
@@ -124,19 +124,19 @@ port@0 { 
		};



		port@1 {

			label = "lan1";

			label = "lan4";

		};



		port@2 {

			label = "lan2";

			label = "lan3";

		};



		port@3 {

			label = "lan3";

			label = "lan2";

		};



		port@4 {

			label = "lan4";

			label = "lan1";

		};

	};

};

arch/arm/boot/dts/broadcom/bcm47094-asus-rt-ac5300.dts

+4 −4
Original line number Diff line number Diff line
@@ -126,11 +126,11 @@ &srab { 


	ports {

		port@0 {

			label = "lan4";

			label = "wan";

		};



		port@1 {

			label = "lan3";

			label = "lan1";

		};



		port@2 {
@@ -138,11 +138,11 @@ port@2 { 
		};



		port@3 {

			label = "lan1";

			label = "lan3";

		};



		port@4 {

			label = "wan";

			label = "lan4";

		};

	};

};