Commit 42c78a5b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "The majority of bugfixes is once more for the NXP i.MX platform,
  addressing issue with i.MX8M (UART, watchdog and ethernet) as well as
  imx8dxl power button and the USB modem on an imx7 board.

  The reason that i.MX always shows up here is obviously not that they
  are more buggy than the others, but they have the most boards and are
  good about getting fixes in quickly.

  The other DT fixes are for the Nuvoton wpcm450 flash controller and
  the i2c mux on an ASpeed board.

  Lastly, there are updates to the MAINTAINERS entries for Mediatek,
  AMD/Seattle and NXP SoCs, as well as a lone code fix for error
  handling in the allwinner 'rsb' bus driver"

* tag 'soc-fixes-6.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: wpcm450: Add nuvoton,shm = <&shm> to FIU node
  MAINTAINERS: Update entry for MediaTek SoC support
  MAINTAINERS: amd: drop inactive Brijesh Singh
  ARM: dts: imx7d-smegw01: Fix USB host over-current polarity
  arm64: dts: imx8mm-verdin: Do not power down eth-phy
  MAINTAINERS: match freescale ARM64 DT directory in i.MX entry
  arm64: dts: imx8mm: Fix pad control for UART1_DTE_RX
  ARM: dts: aspeed: Fix pca9849 compatible
  arm64: dts: freescale: imx8dxl: fix sc_pwrkey's property name linux,keycode
  arm64: dts: imx8m-venice: Remove incorrect 'uart-has-rtscts'
  arm64: dts: imx8mm: Reinstate GPIO watchdog always-running property on eDM SBC
  bus: sunxi-rsb: Fix error handling in sunxi_rsb_init()
parents addfba11 5efb6480

MAINTAINERS

+8 −3
Original line number Diff line number Diff line
@@ -1097,7 +1097,6 @@ S: Maintained 
F:	drivers/dma/ptdma/









AMD SEATTLE DEVICE TREE SUPPORT









M:	Brijesh Singh <brijeshkumar.singh@amd.com>









M:	Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>









M:	Tom Lendacky <thomas.lendacky@amd.com>









S:	Supported








@@ -2212,6 +2211,9 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)







S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git









X:	drivers/media/i2c/









F:	arch/arm64/boot/dts/freescale/









X:	arch/arm64/boot/dts/freescale/fsl-*









X:	arch/arm64/boot/dts/freescale/qoriq-*









N:	imx









N:	mxs
















@@ -2450,11 +2452,14 @@ F:	drivers/rtc/rtc-mt7622.c















ARM/Mediatek SoC support









M:	Matthias Brugger <matthias.bgg@gmail.com>









R:	AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>









L:	linux-kernel@vger.kernel.org









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









W:	https://mtk.wiki.kernel.org/









C:	irc://chat.freenode.net/linux-mediatek









C:	irc://irc.libera.chat/linux-mediatek









F:	arch/arm/boot/dts/mt2*









F:	arch/arm/boot/dts/mt6*









F:	arch/arm/boot/dts/mt7*









F:	arch/arm/boot/dts/mt8*








@@ -2462,7 +2467,7 @@ F:	arch/arm/mach-mediatek/







F:	arch/arm64/boot/dts/mediatek/









F:	drivers/soc/mediatek/









N:	mtk









N:	mt[678]









N:	mt[2678]









K:	mediatek

















ARM/Mediatek USB3 PHY DRIVER
































arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts



+1
−1






























Original line number
Diff line number
Diff line







@@ -751,7 +751,7 @@







	};



















	pca9849@75 {









		compatible = "nxp,pca849";









		compatible = "nxp,pca9849";









		reg = <0x75>;









		#address-cells = <1>;









		#size-cells = <0>;
































arch/arm/boot/dts/imx7d-smegw01.dts



+2
−1






























Original line number
Diff line number
Diff line







@@ -198,6 +198,7 @@







&usbotg2 {









	pinctrl-names = "default";









	pinctrl-0 = <&pinctrl_usbotg2>;









	over-current-active-low;









	dr_mode = "host";









	status = "okay";









};








@@ -374,7 +375,7 @@

















	pinctrl_usbotg2: usbotg2grp {









		fsl,pins = <









			MX7D_PAD_UART3_RTS_B__USB_OTG2_OC	0x04









			MX7D_PAD_UART3_RTS_B__USB_OTG2_OC	0x5c









		>;









	};










































arch/arm/boot/dts/nuvoton-wpcm450.dtsi



+1
−0






























Original line number
Diff line number
Diff line







@@ -480,6 +480,7 @@







			reg = <0xc8000000 0x1000>, <0xc0000000 0x4000000>;









			reg-names = "control", "memory";









			clocks = <&clk 0>;









			nuvoton,shm = <&shm>;









			status = "disabled";









		};










































arch/arm64/boot/dts/freescale/imx8dxl.dtsi



+1
−1






























Original line number
Diff line number
Diff line







@@ -164,7 +164,7 @@

















		sc_pwrkey: keys {









			compatible = "fsl,imx8qxp-sc-key", "fsl,imx-sc-key";









			linux,keycode = <KEY_POWER>;









			linux,keycodes = <KEY_POWER>;









			wakeup-source;









		};