Commit 42d3f7e8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

i.MX fixes for 5.8:

- Fix LDO1 and LDO2 voltage range for a couple of i.MX8M board device
  trees.
- Fix i.MX8MP UID fuse offset in i.MX8M SoC driver.
- Fix watchdog configuration in imx6ul-kontron device tree.
- Fix one build warning seen on building soc-imx8m driver with
  x86_64-randconfig.
- Add missing put_device() call for a couple of mach-imx PM functions.

* tag 'imx-fixes-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx8m: fix build warning
  ARM: imx6: add missing put_device() call in imx6q_suspend_init()
  ARM: imx5: add missing put_device() call in imx_suspend_alloc_ocram()
  soc: imx8m: Correct i.MX8MP UID fuse offset
  ARM: dts: imx6ul-kontron: Change WDOG_ANY signal from push-pull to open-drain
  ARM: dts: imx6ul-kontron: Move watchdog from Kontron i.MX6UL/ULL board to SoM
  arm64: dts: imx8mm-beacon: Fix voltages on LDO1 and LDO2
  arm64: dts: imx8mn-ddr4-evk: correct ldo1/ldo2 voltage range
  arm64: dts: imx8mm-evk: correct ldo1/ldo2 voltage range

Link: https://lore.kernel.org/r/20200624111725.GA24312@dragon


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 2596ce4b a7213214

arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi

+0 −13
Original line number Diff line number Diff line
@@ -232,13 +232,6 @@ 
	status = "okay";

};



&wdog1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_wdog>;

	fsl,ext-reset-output;

	status = "okay";

};



&iomuxc {

	pinctrl-0 = <&pinctrl_reset_out &pinctrl_gpio>;
@@ -409,10 +402,4 @@ 
			MX6UL_PAD_NAND_DATA03__USDHC2_DATA3	0x170f9

		>;

	};



	pinctrl_wdog: wdoggrp {

		fsl,pins = <

			MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY	0x30b0

		>;

	};

};

arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -57,6 +57,13 @@ 
	status = "okay";

};



&wdog1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_wdog>;

	fsl,ext-reset-output;

	status = "okay";

};



&iomuxc {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_reset_out>;
@@ -106,4 +113,10 @@ 
			MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09      0x1b0b0

		>;

	};



	pinctrl_wdog: wdoggrp {

		fsl,pins = <

			MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY    0x18b0

		>;

	};

};

arch/arm/mach-imx/pm-imx5.c

+4 −2
Original line number Diff line number Diff line
@@ -295,14 +295,14 @@ static int __init imx_suspend_alloc_ocram( 
	if (!ocram_pool) {

		pr_warn("%s: ocram pool unavailable!\n", __func__);

		ret = -ENODEV;

		goto put_node;

		goto put_device;

	}



	ocram_base = gen_pool_alloc(ocram_pool, size);

	if (!ocram_base) {

		pr_warn("%s: unable to alloc ocram!\n", __func__);

		ret = -ENOMEM;

		goto put_node;

		goto put_device;

	}



	phys = gen_pool_virt_to_phys(ocram_pool, ocram_base);
@@ -312,6 +312,8 @@ static int __init imx_suspend_alloc_ocram( 
	if (virt_out)

		*virt_out = virt;



put_device:

	put_device(&pdev->dev);

put_node:

	of_node_put(node);

arch/arm/mach-imx/pm-imx6.c

+6 −4
Original line number Diff line number Diff line
@@ -493,14 +493,14 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) 
	if (!ocram_pool) {

		pr_warn("%s: ocram pool unavailable!\n", __func__);

		ret = -ENODEV;

		goto put_node;

		goto put_device;

	}



	ocram_base = gen_pool_alloc(ocram_pool, MX6Q_SUSPEND_OCRAM_SIZE);

	if (!ocram_base) {

		pr_warn("%s: unable to alloc ocram!\n", __func__);

		ret = -ENOMEM;

		goto put_node;

		goto put_device;

	}



	ocram_pbase = gen_pool_virt_to_phys(ocram_pool, ocram_base);
@@ -523,7 +523,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) 
	ret = imx6_pm_get_base(&pm_info->mmdc_base, socdata->mmdc_compat);

	if (ret) {

		pr_warn("%s: failed to get mmdc base %d!\n", __func__, ret);

		goto put_node;

		goto put_device;

	}



	ret = imx6_pm_get_base(&pm_info->src_base, socdata->src_compat);
@@ -570,7 +570,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata) 
		&imx6_suspend,

		MX6Q_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));



	goto put_node;

	goto put_device;



pl310_cache_map_failed:

	iounmap(pm_info->gpc_base.vbase);
@@ -580,6 +580,8 @@ iomuxc_map_failed: 
	iounmap(pm_info->src_base.vbase);

src_map_failed:

	iounmap(pm_info->mmdc_base.vbase);

put_device:

	put_device(&pdev->dev);

put_node:

	of_node_put(node);

arch/arm64/boot/dts/freescale/imx8mm-beacon-som.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ 


			ldo1_reg: LDO1 {

				regulator-name = "LDO1";

				regulator-min-microvolt = <3000000>;

				regulator-min-microvolt = <1600000>;

				regulator-max-microvolt = <3300000>;

				regulator-boot-on;

				regulator-always-on;
@@ -144,7 +144,7 @@ 


			ldo2_reg: LDO2 {

				regulator-name = "LDO2";

				regulator-min-microvolt = <900000>;

				regulator-min-microvolt = <800000>;

				regulator-max-microvolt = <900000>;

				regulator-boot-on;

				regulator-always-on;

CRA Git | Maintained and supported by SUSTech CRA and CCSE