Commit 53e99dcf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "These are the expected fixes for the SoC tree. I have let the patches
  pile up a little too long, so this is bigger than I would have liked.

   - Minor build fixes for Broadcom STB and NXP i.MX8M SoCs as well\ as
     TEE firmware

   - Updates to the MAINTAINERS file for the PolarFire SoC

   - Minor DT fixes for Renesas White Hawk and Arm Versatile and Juno
     platforms

   - A fix for a missing dependnecy in the NXP DPIO driver

   - Broadcom BCA fixes to the newly added devicetree files

   - Multiple fixes for Microchip AT91 based SoCs, dealing with
     self-refresh timings and regulator settings in DT

   - Several DT fixes for NXP i.MX platforms, dealing with incorrect
     GPIO settings, extraneous nodes, and a wrong clock setting"

* tag 'soc-fixes-6.0-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (45 commits)
  soc: fsl: select FSL_GUTS driver for DPIO
  ARM: dts: at91: sama5d2_icp: don't keep vdd_other enabled all the time
  ARM: dts: at91: sama5d27_wlsom1: don't keep ldo2 enabled all the time
  ARM: dts: at91: sama7g5ek: specify proper regulator output ranges
  ARM: dts: at91: sama5d2_icp: specify proper regulator output ranges
  ARM: dts: at91: sama5d27_wlsom1: specify proper regulator output ranges
  ARM: at91: pm: fix DDR recalibration when resuming from backup and self-refresh
  ARM: at91: pm: fix self-refresh for sama7g5
  soc: brcmstb: pm-arm: Fix refcount leak and __iomem leak bugs
  ARM: configs: at91: remove CONFIG_MICROCHIP_PIT64B
  ARM: ixp4xx: fix typos in comments
  arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number
  tee: fix compiler warning in tee_shm_register()
  arm64: dts: freescale: verdin-imx8mp: fix atmel_mxt_ts reset polarity
  arm64: dts: freescale: verdin-imx8mm: fix atmel_mxt_ts reset polarity
  arm64: dts: imx8mp: Fix I2C5 GPIO assignment on i.MX8M Plus DHCOM
  arm64: dts: imx8mm-venice-gw7901: fix port/phy validation
  arm64: dts: verdin-imx8mm: add otg2 pd to usbphy
  soc: imx: gpcv2: Assert reset before ungating clock
  arm64: dts: ls1028a-qds-65bb: don't use in-band autoneg for 2500base-x
  ...
parents 7e18e42e 12f09234

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -17532,9 +17532,19 @@ M: Conor Dooley <conor.dooley@microchip.com> 
M:	Daire McNamara <daire.mcnamara@microchip.com>

L:	linux-riscv@lists.infradead.org

S:	Supported

F:	Documentation/devicetree/bindings/clock/microchip,mpfs.yaml

F:	Documentation/devicetree/bindings/gpio/microchip,mpfs-gpio.yaml

F:	Documentation/devicetree/bindings/i2c/microchip,corei2c.yaml

F:	Documentation/devicetree/bindings/mailbox/microchip,mpfs-mailbox.yaml

F:	Documentation/devicetree/bindings/net/can/microchip,mpfs-can.yaml

F:	Documentation/devicetree/bindings/pwm/microchip,corepwm.yaml

F:	Documentation/devicetree/bindings/soc/microchip/microchip,mpfs-sys-controller.yaml

F:	Documentation/devicetree/bindings/spi/microchip,mpfs-spi.yaml

F:	Documentation/devicetree/bindings/usb/microchip,mpfs-musb.yaml

F:	arch/riscv/boot/dts/microchip/

F:	drivers/char/hw_random/mpfs-rng.c

F:	drivers/clk/microchip/clk-mpfs.c

F:	drivers/i2c/busses/i2c-microchip-core.c

F:	drivers/mailbox/mailbox-mpfs.c

F:	drivers/pci/controller/pcie-microchip-host.c

F:	drivers/rtc/rtc-mpfs.c

arch/arm/boot/dts/arm-realview-eb.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ 
			compatible = "arm,pl022", "arm,primecell";

			reg = <0x1000d000 0x1000>;

			clocks = <&sspclk>, <&pclk>;

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

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

		};



		wdog: watchdog@10010000 {

arch/arm/boot/dts/arm-realview-pb1176.dts

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ 
			interrupt-parent = <&intc_dc1176>;

			interrupts = <0 17 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&sspclk>, <&pclk>;

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

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

		};



		pb1176_serial0: serial@1010c000 {

arch/arm/boot/dts/arm-realview-pb11mp.dts

+1 −1
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ 
			interrupt-parent = <&intc_pb11mp>;

			interrupts = <0 11 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&sspclk>, <&pclk>;

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

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

		};



		watchdog@1000f000 {

arch/arm/boot/dts/arm-realview-pbx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ 
			compatible = "arm,pl022", "arm,primecell";

			reg = <0x1000d000 0x1000>;

			clocks = <&sspclk>, <&pclk>;

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

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

		};



		wdog0: watchdog@1000f000 {