Unverified Commit 0d11b39d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 6.14:

- A tqma8mpql board fix from Alexander Stein to correct vqmmc-supply for
  usdhc3
- A change from Joe Hattori to fix OF node leak in imx-scu driver probe
- A soc-imx8m driver fix from Peng Fan unregister cpufreq and soc device
  in cleanup path
- A couple of changes from Stefan Eichenberger to fix iMX6 Apalis
  poweroff and iMX8M verdin-dahlia sound-card descriptions

* tag 'imx-fixes-6.14' of https://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: dts: freescale: imx8mm-verdin-dahlia: add Microphone Jack to sound card
  arm64: dts: freescale: imx8mp-verdin-dahlia: add Microphone Jack to sound card
  soc: imx8m: Unregister cpufreq and soc dev in cleanup path
  ARM: dts: imx6qdl-apalis: Fix poweroff on Apalis iMX6
  arm64: dts: freescale: tqma8mpql: Fix vqmmc-supply
  firmware: imx-scu: fix OF node leak in .probe()

Link: https://lore.kernel.org/r/Z8A+rihFV4K3l8QR@dragon


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

arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -108,6 +108,11 @@ lvds_panel_in: endpoint { 
		};

	};



	poweroff {

		compatible = "regulator-poweroff";

		cpu-supply = <&vgen2_reg>;

	};



	reg_module_3v3: regulator-module-3v3 {

		compatible = "regulator-fixed";

		regulator-always-on;
@@ -236,10 +241,6 @@ &can2 { 
	status = "disabled";

};



&clks {

	fsl,pmic-stby-poweroff;

};



/* Apalis SPI1 */

&ecspi1 {

	cs-gpios = <&gpio5 25 GPIO_ACTIVE_LOW>;
@@ -527,7 +528,6 @@ &i2c2 { 


	pmic: pmic@8 {

		compatible = "fsl,pfuze100";

		fsl,pmic-stby-poweroff;

		reg = <0x08>;



		regulators {

arch/arm64/boot/dts/freescale/imx8mm-verdin-dahlia.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ sound_card: sound-card { 
			"Headphone Jack", "HPOUTR",

			"IN2L", "Line In Jack",

			"IN2R", "Line In Jack",

			"Headphone Jack", "MICBIAS",

			"IN1L", "Headphone Jack";

			"Microphone Jack", "MICBIAS",

			"IN1L", "Microphone Jack";

		simple-audio-card,widgets =

			"Microphone", "Headphone Jack",

			"Microphone", "Microphone Jack",

			"Headphone", "Headphone Jack",

			"Line", "Line In Jack";

arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi

+4 −12
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright 2021-2022 TQ-Systems GmbH

 * Author: Alexander Stein <alexander.stein@tq-group.com>

 * Copyright 2021-2025 TQ-Systems GmbH <linux@ew.tq-group.com>,

 * D-82229 Seefeld, Germany.

 * Author: Alexander Stein

 */



#include "imx8mp.dtsi"
@@ -23,15 +24,6 @@ reg_vcc3v3: regulator-vcc3v3 { 
		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	/* e-MMC IO, needed for HS modes */

	reg_vcc1v8: regulator-vcc1v8 {

		compatible = "regulator-fixed";

		regulator-name = "VCC1V8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		regulator-always-on;

	};

};



&A53_0 {
@@ -197,7 +189,7 @@ &usdhc3 { 
	no-sd;

	no-sdio;

	vmmc-supply = <&reg_vcc3v3>;

	vqmmc-supply = <&reg_vcc1v8>;

	vqmmc-supply = <&buck5_reg>;

	status = "okay";

};

arch/arm64/boot/dts/freescale/imx8mp-verdin-dahlia.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -28,10 +28,10 @@ sound { 
			"Headphone Jack", "HPOUTR",

			"IN2L", "Line In Jack",

			"IN2R", "Line In Jack",

			"Headphone Jack", "MICBIAS",

			"IN1L", "Headphone Jack";

			"Microphone Jack", "MICBIAS",

			"IN1L", "Microphone Jack";

		simple-audio-card,widgets =

			"Microphone", "Headphone Jack",

			"Microphone", "Microphone Jack",

			"Headphone", "Headphone Jack",

			"Line", "Line In Jack";

drivers/firmware/imx/imx-scu.c

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ static int imx_scu_probe(struct platform_device *pdev) 
		return ret;



	sc_ipc->fast_ipc = of_device_is_compatible(args.np, "fsl,imx8-mu-scu");

	of_node_put(args.np);



	num_channel = sc_ipc->fast_ipc ? 2 : SCU_MU_CHAN_NUM;

	for (i = 0; i < num_channel; i++) {