Commit 630c183b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "This time there are a number of actual code fixes, plus a small set of
  device tree issues getting addressed:

  Renesas:

    - one defconfig cleanup to allow a later Kconfig change

  Intel socfpga:

    - enable QSPI devices on some machines

    - fix DTC validation warnings

  TI OMAP:

    - Two DEBUG_ATOMIC_SLEEP fixes for ti-sysc interconnect target
      module driver

    - A regression fix for ti-sysc no-idle handling that caused issues
      compared to earlier platform data based booting

    - A fix for memory leak for omap_hwmod_allocate_module

    - Fix d_can driver probe for am437x

  NXP i.MX:

    - A couple of fixes on i.MX platform device registration code to
      stop the use of invalid IRQ 0.

    - Fix a regression seen on ls1021a platform, caused by commit
      52102a3b ("soc: imx: move cpu code to drivers/soc/imx").

    - Fix a misconfiguration of audio SSI on imx6qdl-gw551x board.

  Amlogic Meson:

    - misc DT fixes

    - SoC ID fixes to detect all chips correctly"

* tag 'arm-fixes-5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: spcfpga: Align GIC, NAND and UART nodenames with dtschema
  ARM: dts: socfpga: Align L2 cache-controller nodename with dtschema
  arm64: dts: stratix10: increase QSPI reg address in nand dts file
  arm64: dts: stratix10: add status to qspi dts node
  arm64: dts: agilex: add status to qspi dts node
  ARM: dts: Fix dcan driver probe failed on am437x platform
  ARM: OMAP2+: Fix possible memory leak in omap_hwmod_allocate_module
  arm64: defconfig: Enable CONFIG_PCIE_RCAR_HOST
  soc: imx: check ls1021a
  ARM: imx: Remove imx_add_imx_dma() unused irq_err argument
  ARM: imx: Provide correct number of resources when registering gpio devices
  ARM: dts: imx6qdl-gw551x: fix audio SSI
  bus: ti-sysc: Do not disable on suspend for no-idle
  bus: ti-sysc: Fix sleeping function called from invalid context for RTC quirk
  bus: ti-sysc: Fix wakeirq sleeping function called from invalid context
  ARM: dts: meson: Align L2 cache-controller nodename with dtschema
  arm64: dts: meson-gxl-s805x: reduce initial Mali450 core frequency
  arm64: dts: meson: add missing gxl rng clock
  soc: amlogic: meson-gx-socinfo: Fix S905X3 and S905D3 ID's
parents a570f419 2648298a

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

+10 −4
Original line number Diff line number Diff line
@@ -1540,8 +1540,9 @@ 
			reg = <0xcc020 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN0_CLKCTRL 0>;

			clock-names = "fck";

			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN0_CLKCTRL 0>,

			<&dcan0_fck>;

			clock-names = "fck", "osc";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xcc000 0x2000>;
@@ -1549,6 +1550,8 @@ 
			dcan0: can@0 {

				compatible = "ti,am4372-d_can", "ti,am3352-d_can";

				reg = <0x0 0x2000>;

				clocks = <&dcan0_fck>;

				clock-names = "fck";

				syscon-raminit = <&scm_conf 0x644 0>;

				interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";
@@ -1560,8 +1563,9 @@ 
			reg = <0xd0020 0x4>;

			reg-names = "rev";

			/* Domains (P, C): per_pwrdm, l4ls_clkdm */

			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN1_CLKCTRL 0>;

			clock-names = "fck";

			clocks = <&l4ls_clkctrl AM4_L4LS_D_CAN1_CLKCTRL 0>,

			<&dcan1_fck>;

			clock-names = "fck", "osc";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges = <0x0 0xd0000 0x2000>;
@@ -1569,6 +1573,8 @@ 
			dcan1: can@0 {

				compatible = "ti,am4372-d_can", "ti,am3352-d_can";

				reg = <0x0 0x2000>;

				clocks = <&dcan1_fck>;

				clock-name = "fck";

				syscon-raminit = <&scm_conf 0x644 1>;

				interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;

				status = "disabled";

arch/arm/boot/dts/imx6qdl-gw551x.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ 
		simple-audio-card,frame-master = <&sound_codec>;



		sound_cpu: simple-audio-card,cpu {

			sound-dai = <&ssi2>;

			sound-dai = <&ssi1>;

		};



		sound_codec: simple-audio-card,codec {

arch/arm/boot/dts/meson.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
	#size-cells = <1>;

	interrupt-parent = <&gic>;



	L2: l2-cache-controller@c4200000 {

	L2: cache-controller@c4200000 {

		compatible = "arm,pl310-cache";

		reg = <0xc4200000 0x1000>;

		cache-unified;

arch/arm/boot/dts/socfpga.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -726,7 +726,7 @@ 
			};

		};



		L2: l2-cache@fffef000 {

		L2: cache-controller@fffef000 {

			compatible = "arm,pl310-cache";

			reg = <0xfffef000 0x1000>;

			interrupts = <0 38 0x04>;

arch/arm/boot/dts/socfpga_arria10.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ 
			reg = <0xffcfb100 0x80>;

		};



		L2: l2-cache@fffff000 {

		L2: cache-controller@fffff000 {

			compatible = "arm,pl310-cache";

			reg = <0xfffff000 0x1000>;

			interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;

CRA Git | Maintained and supported by SUSTech CRA and CCSE