Commit 3a229812 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "Most of the changes again are devicetree fixes, but there are also
  five trivial build fixes for issues I found when test building with
  gcc-11 or when running 'make W=1', and some OMAP platform specific
  code fixups.

  Broadcom:
   - One revert for a Raspberry pi interrupt controller change that
     caused a regression.

  TI OMAP:
   - Remove unused duplicate sha2md5_fck clock node that can race with
     the OMAP4_SHA2MD5_CLKCTRL clock node for disable for unused clocks

   - Add aliases for omap4/5 mmc to put the slots back into the right
     order again

   - Fix typo for bionic voltage controllers that accidentally use mpu
     for all instances instead of mpu, core and iva

   - Fix random hangs for droid4 caused by missing fix from TI Android
     kernel tree to do a dummy smc call on cpuidle wakeup path

  NXP i.MX:
   - Fix a system failure on imx6qdl-phytec-pfla02 board when booting
     from SD, by adding missing vmmc supply for SD interfaces.

   - Fix address typo in i.MX8MM/Q IOMUXC_SD1_DATA0_GPIO2_IO2
     definition.

  Marvell mvebu:
   - Fix storm interrupt on Turris Omnia

   - Enable hardware buffer management as it should be

  ... and build fixes for PXA, Freescale, Marvell, OMAP1 and Keystone"

* tag 'arm-fixes-5.11-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: turris-omnia: configure LED[2]/INTn pin as interrupt pin
  ARM: dts: turris-omnia: fix hardware buffer management
  Revert "arm64: dts: marvell: armada-cp110: Switch to per-port SATA interrupts"
  ARM: mvebu: avoid clang -Wtautological-constant warning
  ARM: pxa: mainstone: avoid -Woverride-init warning
  ARM: omap1: fix building with clang IAS
  soc/fsl: qbman: fix conflicting alignment attributes
  ARM: keystone: fix integer overflow warning
  ARM: dts: imx6: pbab01: Set vmmc supply for both SD interfaces
  arm64: dts: imx8mm/q: Fix pad control of SD1_DATA0
  ARM: OMAP4: PM: update ROM return address for OSWR and OFF
  ARM: OMAP4: Fix PMIC voltage domains for bionic
  ARM: dts: Fix moving mmc devices with aliases for omap4 & 5
  ARM: dts: Drop duplicate sha2md5_fck to fix clk_disable race
  Revert "ARM: dts: bcm2711: Add the BSC interrupt controller"
parents dbaa5d1c 1180042d

arch/arm/boot/dts/armada-385-turris-omnia.dts

+3 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ 
		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000

			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000

			  MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000

			  MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000>;

			  MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000

			  MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;



		internal-regs {
@@ -389,6 +390,7 @@ 
	phy1: ethernet-phy@1 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <1>;

		marvell,reg-init = <3 18 0 0x4985>;



		/* irq is connected to &pcawan pin 7 */

	};

arch/arm/boot/dts/bcm2711.dtsi

+0 −12
Original line number Diff line number Diff line
@@ -308,14 +308,6 @@ 
			#reset-cells = <1>;

		};



		bsc_intr: interrupt-controller@7ef00040 {

			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";

			reg = <0x7ef00040 0x30>;

			interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-controller;

			#interrupt-cells = <1>;

		};



		aon_intr: interrupt-controller@7ef00100 {

			compatible = "brcm,bcm2711-l2-intc", "brcm,l2-intc";

			reg = <0x7ef00100 0x30>;
@@ -362,8 +354,6 @@ 
			reg = <0x7ef04500 0x100>, <0x7ef00b00 0x300>;

			reg-names = "bsc", "auto-i2c";

			clock-frequency = <97500>;

			interrupt-parent = <&bsc_intr>;

			interrupts = <0>;

			status = "disabled";

		};
@@ -405,8 +395,6 @@ 
			reg = <0x7ef09500 0x100>, <0x7ef05b00 0x300>;

			reg-names = "bsc", "auto-i2c";

			clock-frequency = <97500>;

			interrupt-parent = <&bsc_intr>;

			interrupts = <1>;

			status = "disabled";

		};

	};

arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -433,6 +433,7 @@ 
	pinctrl-0 = <&pinctrl_usdhc2>;

	cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;

	vmmc-supply = <&vdd_sd1_reg>;

	status = "disabled";

};
@@ -442,5 +443,6 @@ 
		     &pinctrl_usdhc3_cdwp>;

	cd-gpios = <&gpio1 27 GPIO_ACTIVE_LOW>;

	wp-gpios = <&gpio1 29 GPIO_ACTIVE_HIGH>;

	vmmc-supply = <&vdd_sd0_reg>;

	status = "disabled";

};

arch/arm/boot/dts/omap4.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ 
		i2c1 = &i2c2;

		i2c2 = &i2c3;

		i2c3 = &i2c4;

		mmc0 = &mmc1;

		mmc1 = &mmc2;

		mmc2 = &mmc3;

		mmc3 = &mmc4;

		mmc4 = &mmc5;

		serial0 = &uart1;

		serial1 = &uart2;

		serial2 = &uart3;

arch/arm/boot/dts/omap44xx-clocks.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -770,14 +770,6 @@ 
		ti,max-div = <2>;

	};



	sha2md5_fck: sha2md5_fck@15c8 {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";

		clocks = <&l3_div_ck>;

		ti,bit-shift = <1>;

		reg = <0x15c8>;

	};



	usb_phy_cm_clk32k: usb_phy_cm_clk32k@640 {

		#clock-cells = <0>;

		compatible = "ti,gate-clock";