Unverified Commit c872f6ce authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-6.1' of... 

Merge tag 'imx-fixes-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 6.1:

- Fix imx93-pd driver to release resources when error occurs in probe.
- A series from Ioana Ciornei to add missing clock frequencies for MDIO
  controllers on LayerScape SoCs, so that the kernel driver can work
  independently from bootloader.
- A series from Li Jun to fix USB power domain setup in i.MX8MM/N device
  trees.
- Fix CPLD_Dn pull configuration for MX8Menlo board to avoid interfering
  with CPLD power off functionality.
- Fix ctrl_sleep_moci GPIO setup for verdin-imx8mp board.
- Fix DT schema check warnings on uSDHC clocks for imx8-ss-conn device
  tree.
- Fix up gpcv2 DT bindings to have an optional `power-domains` property.
- A couple of i.MX93 device tree fixes on S4MU interrupt and gpio-ranges
  of GPIO controllers.
- Keep PU regulator on for Quad and QuadPlus based imx6dl-yapp4 boards to
  work around a hardware design flaw in supply voltage distribution.
- Fix user push-button GPIO offset on imx6qdl-gw59 boards.

* tag 'imx-fixes-6.1' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  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
  arm64: dts: imx8mn: remove otg1 power domain dependency on hsio
  arm64: dts: imx8mm: correct usb power domains
  arm64: dts: imx8mm: remove otg1/2 power domain dependency on hsio
  arm64: dts: verdin-imx8mp: fix ctrl_sleep_moci
  arm64: dts: imx8mm: Enable CPLD_Dn pull down resistor on MX8Menlo

Link: https://lore.kernel.org/r/20221101031547.GB125525@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2a5dc663 d5c921a5

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

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>;

		};

arch/arm/boot/dts/imx6qp-yapp4-crux-plus.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";

};