Commit 10d916c8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull ARM SoC fixes from Arnd Bergmann:
 "There are not a lot of important fixes for the soc tree yet this time,
  but it's time to upstream what I got so far:

   - DT Fixes for Arm Juno and ST-Ericsson Ux500 to add missing critical
     temperature points

   - A number of fixes for the Arm SCMI firmware, addressing correctness
     issues in the code, in particular error handling and resource
     leaks.

   - One error handling fix for the new i.MX93 power domain driver

   - Several devicetree fixes for NXP i.MX6/8/9 and Layerscape chips,
     fixing incorrect or missing DT properties for MDIO controller
     nodes, CPLD, USB and regulators for various boards, as well as some
     fixes for DT schema checks.

   - MAINTAINERS file updates for HiSilicon LPC Bus and Broadcom git
     URLs"

* tag 'soc-fixes-6.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (26 commits)
  arm64: dts: juno: Add thermal critical trip points
  firmware: arm_scmi: Fix deferred_tx_wq release on error paths
  firmware: arm_scmi: Fix devres allocation device in virtio transport
  firmware: arm_scmi: Make Rx chan_setup fail on memory errors
  firmware: arm_scmi: Make tx_prepare time out eventually
  firmware: arm_scmi: Suppress the driver's bind attributes
  firmware: arm_scmi: Cleanup the core driver removal callback
  MAINTAINERS: Update HiSilicon LPC BUS Driver maintainer
  ARM: dts: ux500: Add trips to battery thermal zones
  arm64: dts: ls208xa: specify clock frequencies for the MDIO controllers
  arm64: dts: ls1088a: specify clock frequencies for the MDIO controllers
  arm64: dts: lx2160a: specify clock frequencies for the MDIO controllers
  soc: imx: imx93-pd: Fix the error handling path of imx93_pd_probe()
  arm64: dts: imx93: correct gpio-ranges
  arm64: dts: imx93: correct s4mu interrupt names
  dt-bindings: power: gpcv2: add power-domains property
  arm64: dts: imx8: correct clock order
  ARM: dts: imx6dl-yapp4: Do not allow PM to switch PU regulator off on Q/QP
  ARM: dts: imx6qdl-gw59{10,13}: fix user pushbutton GPIO offset
  arm64: dts: imx8mn: Correct the usb power domain
  ...
parents fde25beb 5449cabd

Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ properties: 


          power-supply: true



          power-domains:

            maxItems: 1



          resets:

            description: |

              A number of phandles to resets that need to be asserted during

MAINTAINERS

+8 −8
Original line number Diff line number Diff line
@@ -3984,7 +3984,7 @@ M: Rafał Miłecki <rafal@milecki.pl> 
R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>

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

S:	Maintained

T:	git git://github.com/broadcom/stblinux.git

T:	git https://github.com/broadcom/stblinux.git

F:	Documentation/devicetree/bindings/arm/bcm/brcm,bcmbca.yaml

F:	arch/arm64/boot/dts/broadcom/bcmbca/*

N:	bcmbca
@@ -4009,7 +4009,7 @@ R: Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com> 
L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)

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

S:	Maintained

T:	git git://github.com/broadcom/stblinux.git

T:	git https://github.com/broadcom/stblinux.git

F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml

F:	drivers/pci/controller/pcie-brcmstb.c

F:	drivers/staging/vc04_services
@@ -4023,7 +4023,7 @@ M: Ray Jui <rjui@broadcom.com> 
M:	Scott Branden <sbranden@broadcom.com>

R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>

S:	Maintained

T:	git git://github.com/broadcom/mach-bcm

T:	git https://github.com/broadcom/mach-bcm

F:	arch/arm/mach-bcm/

N:	bcm281*

N:	bcm113*
@@ -4088,7 +4088,7 @@ M: Florian Fainelli <f.fainelli@gmail.com> 
R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>

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

S:	Maintained

T:	git git://github.com/broadcom/stblinux.git

T:	git https://github.com/broadcom/stblinux.git

F:	Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml

F:	arch/arm/boot/dts/bcm7*.dts*

F:	arch/arm/include/asm/hardware/cache-b15-rac.h
@@ -4121,7 +4121,7 @@ M: Florian Fainelli <f.fainelli@gmail.com> 
R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>

L:	linux-mips@vger.kernel.org

S:	Maintained

T:	git git://github.com/broadcom/stblinux.git

T:	git https://github.com/broadcom/stblinux.git

F:	arch/mips/bmips/*

F:	arch/mips/boot/dts/brcm/bcm*.dts*

F:	arch/mips/include/asm/mach-bmips/*
@@ -4262,7 +4262,7 @@ M: Scott Branden <sbranden@broadcom.com> 
R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>

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

S:	Maintained

T:	git git://github.com/broadcom/stblinux.git

T:	git https://github.com/broadcom/stblinux.git

F:	arch/arm64/boot/dts/broadcom/northstar2/*

F:	arch/arm64/boot/dts/broadcom/stingray/*

F:	drivers/clk/bcm/clk-ns*
@@ -4332,7 +4332,7 @@ M: Florian Fainelli <f.fainelli@gmail.com> 
R:	Broadcom internal kernel review list <bcm-kernel-feedback-list@broadcom.com>

L:	linux-pm@vger.kernel.org

S:	Maintained

T:	git git://github.com/broadcom/stblinux.git

T:	git https://github.com/broadcom/stblinux.git

F:	drivers/soc/bcm/bcm63xx/bcm-pmb.c

F:	include/dt-bindings/soc/bcm-pmb.h








@@ -9217,7 +9217,7 @@ W:	https://www.hisilicon.com







F:	drivers/i2c/busses/i2c-hisi.c

















HISILICON LPC BUS DRIVER









M:	john.garry@huawei.com









M:	Jay Fang <f.fangjian@huawei.com>









S:	Maintained









W:	http://www.hisilicon.com









F:	Documentation/devicetree/bindings/arm/hisilicon/low-pin-count.yaml
































arch/arm/boot/dts/imx6q-yapp4-crux.dts



+4
−0






























Original line number
Diff line number
Diff line







@@ -33,6 +33,10 @@







	status = "okay";









};



















&reg_pu {









	regulator-always-on;









};



















&reg_usb_h1_vbus {









	status = "okay";









};
































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



+1
−1






























Original line number
Diff line number
Diff line







@@ -29,7 +29,7 @@

















		user-pb {









			label = "user_pb";









			gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;









			gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;









			linux,code = <BTN_0>;









		};










































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



+1
−1






























Original line number
Diff line number
Diff line







@@ -26,7 +26,7 @@

















		user-pb {









			label = "user_pb";









			gpios = <&gsc_gpio 0 GPIO_ACTIVE_LOW>;









			gpios = <&gsc_gpio 2 GPIO_ACTIVE_LOW>;









			linux,code = <BTN_0>;









		};