Merge tag 'imx-fixes-4.13-2' of... (64c2c372) · Commits · 戴 / test

Merge tag 'imx-fixes-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes Pull "i.MX fixes for 4.13, round 2" from Shawn Guo: - Add missing 'ranges' property for i.MX25 device tree TSCADC node, so that it's child nodes ADC and TSC device can be probed by kernel. - Fix i.MX GPCv2 power domain driver to request regulator after power domain initialization, since regulator could defer probing and therefore cause power domain initialized twice. * tag 'imx-fixes-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: i.MX25: add ranges to tscadc soc: imx: gpcv2: fix regulator deferred probe

arch/arm/boot/dts/imx25.dtsi

+1 −0

Original line number	Diff line number	Diff line
		@@ -297,6 +297,7 @@
		#address-cells = <1>;
		#size-cells = <1>;
		status = "disabled";
		ranges;

		adc: adc@50030800 {
		compatible = "fsl,imx25-gcq";

drivers/soc/imx/gpcv2.c

+8 −7

Original line number	Diff line number	Diff line
		@@ -200,15 +200,10 @@ static int imx7_pgc_domain_probe(struct platform_device *pdev)

		domain->dev = &pdev->dev;

		ret = pm_genpd_init(&domain->genpd, NULL, true);
		if (ret) {
		dev_err(domain->dev, "Failed to init power domain\n");
		return ret;
		}

		domain->regulator = devm_regulator_get_optional(domain->dev, "power");
		if (IS_ERR(domain->regulator)) {
		if (PTR_ERR(domain->regulator) != -ENODEV) {
		if (PTR_ERR(domain->regulator) != -EPROBE_DEFER)
		dev_err(domain->dev, "Failed to get domain's regulator\n");
		return PTR_ERR(domain->regulator);
		}
		@@ -217,6 +212,12 @@ static int imx7_pgc_domain_probe(struct platform_device *pdev)
		domain->voltage, domain->voltage);
		}

		ret = pm_genpd_init(&domain->genpd, NULL, true);
		if (ret) {
		dev_err(domain->dev, "Failed to init power domain\n");
		return ret;
		}

		ret = of_genpd_add_provider_simple(domain->dev->of_node,
		&domain->genpd);
		if (ret) {

Admin message