Commit 850f7a5c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "These are a couple of build fixes from randconfig testing, plus a set
  of Mediatek SoC specific fixes, all trivial"

* tag 'soc-fixes-6.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  soc: tegra: fix CPU_BIG_ENDIAN dependencies
  ARM: disallow pre-ARMv5 builds with ld.lld
  ARM: pxa: fix building with clang
  MAINTAINERS: add related dts to IXP4xx
  ARM: dts: spear: drop 0x from unit address
  arm64: dts: mt8183: Fix Mali GPU clock
  arm64: dts: mediatek: mt8195-demo: fix the memory size of node secmon
  soc: mediatek: pm-domains: Fix the power glitch issue
parents 6feb57c2 6f85602d

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2330,6 +2330,7 @@ F: Documentation/devicetree/bindings/bus/intel,ixp4xx-expansion-bus-controller.y 
F:	Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt

F:	Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml

F:	Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml

F:	arch/arm/boot/dts/intel-ixp*

F:	arch/arm/mach-ixp4xx/

F:	drivers/bus/intel-ixp4xx-eb.c

F:	drivers/clocksource/timer-ixp4xx.c

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -345,12 +345,14 @@ comment "CPU Core family selection" 
config ARCH_MULTI_V4

	bool "ARMv4 based platforms (FA526, StrongARM)"

	depends on !ARCH_MULTI_V6_V7

	depends on !LD_IS_LLD

	select ARCH_MULTI_V4_V5

	select CPU_FA526 if !(CPU_SA110 || CPU_SA1100)



config ARCH_MULTI_V4T

	bool "ARMv4T based platforms (ARM720T, ARM920T, ...)"

	depends on !ARCH_MULTI_V6_V7

	depends on !LD_IS_LLD

	select ARCH_MULTI_V4_V5

	select CPU_ARM920T if !(CPU_ARM7TDMI || CPU_ARM720T || \

		CPU_ARM740T || CPU_ARM9TDMI || CPU_ARM922T || \

arch/arm/boot/dts/spear300.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
			status = "disabled";

		};



		shirq: interrupt-controller@0x50000000 {

		shirq: interrupt-controller@50000000 {

			compatible = "st,spear300-shirq";

			reg = <0x50000000 0x1000>;

			interrupts = <28>;

arch/arm/boot/dts/spear310.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
			status = "disabled";

		};



		shirq: interrupt-controller@0xb4000000 {

		shirq: interrupt-controller@b4000000 {

			compatible = "st,spear310-shirq";

			reg = <0xb4000000 0x1000>;

			interrupts = <28 29 30 1>;

arch/arm/boot/dts/spear320.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
			status = "disabled";

		};



		shirq: interrupt-controller@0xb3000000 {

		shirq: interrupt-controller@b3000000 {

			compatible = "st,spear320-shirq";

			reg = <0xb3000000 0x1000>;

			interrupts = <30 28 29 1>;