Unverified Commit 27795c50 authored Aug 28, 2024 by Arnd Bergmann

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

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

i.MX fixes for 6.11:

- One imx8mp-beacon-kit change from Adam Ford to fix the broken WM8962
  audio support
- One pinctrl property typo fix for imx8mm-phygate
- One layerscape fix from Krzysztof Kozlowski to get thermal nodes
  correct name length
- A couple of imx93-tqma9352 fixes from Markus Niebel, one on CMA
  alloc-ranges and the other on SD-Card cd-gpios typo
- One change from Michal Vokáč to fix imx6dl-yapp43 LED current to match
  the HW design
- A couple of imx95 fixes from Peng Fan, one to correct a55 power
  domains and the other to correct L3Cache cache-sets
- One tqma9352 watchdog reset fix from Sascha Hauer
- One imx93 change from Shenwei Wang to fix the default value for STMMAC
  EQOS snps,clk-csr

* tag 'imx-fixes-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: imx8mm-phygate: fix typo pinctrcl-0
  arm64: dts: imx95: correct L3Cache cache-sets
  arm64: dts: imx95: correct a55 power-domains
  arm64: dts: freescale: imx93-tqma9352-mba93xxla: fix typo
  arm64: dts: freescale: imx93-tqma9352: fix CMA alloc-ranges
  ARM: dts: imx6dl-yapp43: Increase LED current to match the yapp4 HW design
  arm64: dts: imx93: update default value for snps,clk-csr
  arm64: dts: freescale: tqma9352: Fix watchdog reset
  arm64: dts: imx8mp-beacon-kit: Fix Stereo Audio on WM8962
  arm64: dts: layerscape: fix thermal node names length

Link: https://lore.kernel.org/r/ZrtsTO1+jXhJ6GSM@dragon


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 0351a984 f149be46

arch/arm/boot/dts/nxp/imx/imx6dl-yapp43-common.dtsi

+6 −6

Original line number	Diff line number	Diff line
		@@ -274,24 +274,24 @@ leds: led-controller@30 {

		led@0 {
		chan-name = "R";
		led-cur = /bits/ 8 <0x20>;
		max-cur = /bits/ 8 <0x60>;
		led-cur = /bits/ 8 <0x6e>;
		max-cur = /bits/ 8 <0xc8>;
		reg = <0>;
		color = <LED_COLOR_ID_RED>;
		};

		led@1 {
		chan-name = "G";
		led-cur = /bits/ 8 <0x20>;
		max-cur = /bits/ 8 <0x60>;
		led-cur = /bits/ 8 <0xbe>;
		max-cur = /bits/ 8 <0xc8>;
		reg = <1>;
		color = <LED_COLOR_ID_GREEN>;
		};

		led@2 {
		chan-name = "B";
		led-cur = /bits/ 8 <0x20>;
		max-cur = /bits/ 8 <0x60>;
		led-cur = /bits/ 8 <0xbe>;
		max-cur = /bits/ 8 <0xc8>;
		reg = <2>;
		color = <LED_COLOR_ID_BLUE>;
		};

arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ ddr-ctrler-crit {
		};
		};

		core-cluster-thermal {
		cluster-thermal {
		polling-delay-passive = <1000>;
		polling-delay = <5000>;
		thermal-sensors = <&tmu 1>;

arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -214,7 +214,7 @@ fman-crit {
		};
		};

		core-cluster-thermal {
		cluster-thermal {
		polling-delay-passive = <1000>;
		polling-delay = <5000>;
		thermal-sensors = <&tmu 3>;

arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -182,7 +182,7 @@ fman-crit {
		};
		};

		core-cluster-thermal {
		cluster-thermal {
		polling-delay-passive = <1000>;
		polling-delay = <5000>;
		thermal-sensors = <&tmu 3>;

arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ its: msi-controller@6020000 {
		};

		thermal-zones {
		core-cluster-thermal {
		cluster-thermal {
		polling-delay-passive = <1000>;
		polling-delay = <5000>;
		thermal-sensors = <&tmu 0>;