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

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

Pull arm and RISC-V SoC fixes from Arnd Bergmann:
 "The Rockchip and IMX8 platforms get a number of fixes for dts files in
  order to address some misconfigurations, including a regression for
  USB-C support on some boards.

  The other dts fixes are part of a series by Rob Herring to clean up
  another class of dtc compiler warnings across all platforms, with a
  few others helping out as well. With this, we can enable the warning
  for the coming merge window without introducing regressions.

  Conor Dooley has collected fixes for RISC-V platforms, both for the
  dts files and for platofrm specific drivers.

  The ep93xx platform gets a regression for for its gpio descriptors"

* tag 'arm-fixes-6.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (28 commits)
  ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes
  cache: ax45mp_cache: Align end size to cache boundary in ax45mp_dma_cache_wback()
  arm64: dts: qcom: Fix interrupt-map cell sizes
  arm: dts: Fix dtc interrupt_map warnings
  arm64: dts: Fix dtc interrupt_provider warnings
  arm: dts: Fix dtc interrupt_provider warnings
  arm64: dts: freescale: Disable interrupt_map check
  ARM: ep93xx: Add terminator to gpiod_lookup_table
  riscv: dts: sifive: add missing #interrupt-cells to pmic
  arm64: dts: rockchip: Correct Indiedroid Nova GPIO Names
  arm64: dts: rockchip: Drop interrupts property from rk3328 pwm-rockchip node
  arm64: dts: rockchip: set num-cs property for spi on px30
  arm64: dts: rockchip: minor rk3588 whitespace cleanup
  riscv: dts: starfive: replace underscores in node names
  bus: imx-weim: fix valid range check
  Revert "arm64: dts: imx8mn-var-som-symphony: Describe the USB-C connector"
  Revert "arm64: dts: imx8mp-dhcom-pdk3: Describe the USB-C connector"
  arm64: dts: tqma8mpql: fix audio codec iov-supply
  arm64: dts: rockchip: drop unneeded status from rk3588-jaguar gpio-leds
  ARM: dts: rockchip: Drop interrupts property from pwm-rockchip nodes
  ...
parents 86f01602 dcb8e53e

arch/arm/boot/dts/amazon/alpine.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -167,7 +167,6 @@ pcie@fbc00000 { 
		msix: msix@fbe00000 {

			compatible = "al,alpine-msix";

			reg = <0x0 0xfbe00000 0x0 0x100000>;

			interrupt-controller;

			msi-controller;

			al,msi-base-spi = <96>;

			al,msi-num-spis = <64>;

arch/arm/boot/dts/aspeed/aspeed-g4.dtsi

+0 −14
Original line number Diff line number Diff line
@@ -466,7 +466,6 @@ i2c_ic: interrupt-controller@0 { 
	i2c0: i2c-bus@40 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x40 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -482,7 +481,6 @@ i2c0: i2c-bus@40 { 
	i2c1: i2c-bus@80 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x80 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -498,7 +496,6 @@ i2c1: i2c-bus@80 { 
	i2c2: i2c-bus@c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0xc0 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -515,7 +512,6 @@ i2c2: i2c-bus@c0 { 
	i2c3: i2c-bus@100 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x100 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -532,7 +528,6 @@ i2c3: i2c-bus@100 { 
	i2c4: i2c-bus@140 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x140 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -549,7 +544,6 @@ i2c4: i2c-bus@140 { 
	i2c5: i2c-bus@180 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x180 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -566,7 +560,6 @@ i2c5: i2c-bus@180 { 
	i2c6: i2c-bus@1c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x1c0 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -583,7 +576,6 @@ i2c6: i2c-bus@1c0 { 
	i2c7: i2c-bus@300 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x300 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -600,7 +592,6 @@ i2c7: i2c-bus@300 { 
	i2c8: i2c-bus@340 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x340 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -617,7 +608,6 @@ i2c8: i2c-bus@340 { 
	i2c9: i2c-bus@380 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x380 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -634,7 +624,6 @@ i2c9: i2c-bus@380 { 
	i2c10: i2c-bus@3c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x3c0 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -651,7 +640,6 @@ i2c10: i2c-bus@3c0 { 
	i2c11: i2c-bus@400 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x400 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -668,7 +656,6 @@ i2c11: i2c-bus@400 { 
	i2c12: i2c-bus@440 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x440 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";
@@ -685,7 +672,6 @@ i2c12: i2c-bus@440 { 
	i2c13: i2c-bus@480 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x480 0x40>;

		compatible = "aspeed,ast2400-i2c-bus";

arch/arm/boot/dts/aspeed/aspeed-g5.dtsi

+1 −14
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ sgpio: sgpio@1e780200 { 
				interrupts = <40>;

				reg = <0x1e780200 0x0100>;

				clocks = <&syscon ASPEED_CLK_APB>;

				#interrupt-cells = <2>;

				interrupt-controller;

				bus-frequency = <12000000>;

				pinctrl-names = "default";
@@ -594,7 +595,6 @@ i2c_ic: interrupt-controller@0 { 
	i2c0: i2c-bus@40 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x40 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -610,7 +610,6 @@ i2c0: i2c-bus@40 { 
	i2c1: i2c-bus@80 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x80 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -626,7 +625,6 @@ i2c1: i2c-bus@80 { 
	i2c2: i2c-bus@c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0xc0 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -643,7 +641,6 @@ i2c2: i2c-bus@c0 { 
	i2c3: i2c-bus@100 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x100 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -660,7 +657,6 @@ i2c3: i2c-bus@100 { 
	i2c4: i2c-bus@140 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x140 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -677,7 +673,6 @@ i2c4: i2c-bus@140 { 
	i2c5: i2c-bus@180 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x180 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -694,7 +689,6 @@ i2c5: i2c-bus@180 { 
	i2c6: i2c-bus@1c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x1c0 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -711,7 +705,6 @@ i2c6: i2c-bus@1c0 { 
	i2c7: i2c-bus@300 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x300 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -728,7 +721,6 @@ i2c7: i2c-bus@300 { 
	i2c8: i2c-bus@340 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x340 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -745,7 +737,6 @@ i2c8: i2c-bus@340 { 
	i2c9: i2c-bus@380 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x380 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -762,7 +753,6 @@ i2c9: i2c-bus@380 { 
	i2c10: i2c-bus@3c0 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x3c0 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -779,7 +769,6 @@ i2c10: i2c-bus@3c0 { 
	i2c11: i2c-bus@400 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x400 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -796,7 +785,6 @@ i2c11: i2c-bus@400 { 
	i2c12: i2c-bus@440 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x440 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";
@@ -813,7 +801,6 @@ i2c12: i2c-bus@440 { 
	i2c13: i2c-bus@480 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;



		reg = <0x480 0x40>;

		compatible = "aspeed,ast2500-i2c-bus";

arch/arm/boot/dts/aspeed/aspeed-g6.dtsi

+2 −16
Original line number Diff line number Diff line
@@ -474,6 +474,7 @@ sgpiom0: sgpiom@1e780500 { 
				reg = <0x1e780500 0x100>;

				interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&syscon ASPEED_CLK_APB2>;

				#interrupt-cells = <2>;

				interrupt-controller;

				bus-frequency = <12000000>;

				pinctrl-names = "default";
@@ -488,6 +489,7 @@ sgpiom1: sgpiom@1e780600 { 
				reg = <0x1e780600 0x100>;

				interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&syscon ASPEED_CLK_APB2>;

				#interrupt-cells = <2>;

				interrupt-controller;

				bus-frequency = <12000000>;

				pinctrl-names = "default";
@@ -902,7 +904,6 @@ &i2c { 
	i2c0: i2c-bus@80 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x80 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -917,7 +918,6 @@ i2c0: i2c-bus@80 { 
	i2c1: i2c-bus@100 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x100 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -932,7 +932,6 @@ i2c1: i2c-bus@100 { 
	i2c2: i2c-bus@180 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x180 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -947,7 +946,6 @@ i2c2: i2c-bus@180 { 
	i2c3: i2c-bus@200 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x200 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -962,7 +960,6 @@ i2c3: i2c-bus@200 { 
	i2c4: i2c-bus@280 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x280 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -977,7 +974,6 @@ i2c4: i2c-bus@280 { 
	i2c5: i2c-bus@300 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x300 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -992,7 +988,6 @@ i2c5: i2c-bus@300 { 
	i2c6: i2c-bus@380 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x380 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1007,7 +1002,6 @@ i2c6: i2c-bus@380 { 
	i2c7: i2c-bus@400 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x400 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1022,7 +1016,6 @@ i2c7: i2c-bus@400 { 
	i2c8: i2c-bus@480 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x480 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1037,7 +1030,6 @@ i2c8: i2c-bus@480 { 
	i2c9: i2c-bus@500 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x500 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1052,7 +1044,6 @@ i2c9: i2c-bus@500 { 
	i2c10: i2c-bus@580 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x580 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1067,7 +1058,6 @@ i2c10: i2c-bus@580 { 
	i2c11: i2c-bus@600 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x600 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1082,7 +1072,6 @@ i2c11: i2c-bus@600 { 
	i2c12: i2c-bus@680 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x680 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1097,7 +1086,6 @@ i2c12: i2c-bus@680 { 
	i2c13: i2c-bus@700 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x700 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1112,7 +1100,6 @@ i2c13: i2c-bus@700 { 
	i2c14: i2c-bus@780 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x780 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;
@@ -1127,7 +1114,6 @@ i2c14: i2c-bus@780 { 
	i2c15: i2c-bus@800 {

		#address-cells = <1>;

		#size-cells = <0>;

		#interrupt-cells = <1>;

		reg = <0x800 0x80>;

		compatible = "aspeed,ast2600-i2c-bus";

		clocks = <&syscon ASPEED_CLK_APB2>;

arch/arm/boot/dts/broadcom/bcm-cygnus.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ gpio_crmu: gpio@3024800 { 
			#gpio-cells = <2>;

			gpio-controller;

			interrupt-controller;

			#interrupt-cells = <2>;

			interrupt-parent = <&mailbox>;

			interrupts = <0>;

		};
@@ -247,6 +248,7 @@ gpio_ccm: gpio@1800a000 { 
			gpio-controller;

			interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-controller;

			#interrupt-cells = <2>;

		};



		i2c1: i2c@1800b000 {
@@ -518,6 +520,7 @@ gpio_asiu: gpio@180a5000 { 
			gpio-controller;



			interrupt-controller;

			#interrupt-cells = <2>;

			interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>;

			gpio-ranges = <&pinctrl 0 42 1>,

					<&pinctrl 1 44 3>,