Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9620135f authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-drivers-4.20' of... 

Merge tag 'imx-drivers-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers

i.MX drivers update for 4.20:
 - A couple of patches from Anson to update variable and macro naming
   in GPCv2 driver, as a preparation of reusing the driver on i.MX8.
 - Switch GPC/GPCv2 drivers to use SPDX identifier for licence claiming.
 - Clean up the unnecessary DT node name NULL pointer checking from
   imx-weim driver, since it can never be NULL at all.
 - A couple of improvements on GPC driver from Sven Schmitt to correct
   PDN register and use GPC_PGC_DOMAIN_* indexes for consistency.

* tag 'imx-drivers-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  soc: imx: gpcv2: Switch to SPDX identifier
  soc: imx: gpc: Switch to SPDX identifier
  bus: imx-weim: drop unnecessary DT node name NULL check
  soc: imx: gpcv2: make pgc driver more generic for other i.MX platforms
  soc: imx: gpcv2: use A_CORE instread of A7 for more i.MX platforms
  soc: imx: gpc: use GPC_PGC_DOMAIN_* indexes
  soc: imx: gpc: fix PDN delay

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 64d20b77 8d8e3b7d

drivers/bus/imx-weim.c

+0 −3
Original line number Diff line number Diff line
@@ -156,9 +156,6 @@ static int __init weim_parse_dt(struct platform_device *pdev, 
	}



	for_each_available_child_of_node(pdev->dev.of_node, child) {

		if (!child->name)

			continue;



		ret = weim_timing_setup(child, base, devtype);

		if (ret)

			dev_warn(&pdev->dev, "%pOF set timing failed.\n",

drivers/soc/imx/gpc.c

+12 −14
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright 2015-2017 Pengutronix, Lucas Stach <kernel@pengutronix.de>

 * Copyright 2011-2013 Freescale Semiconductor, Inc.

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



#include <linux/clk.h>
@@ -69,7 +63,7 @@ static int imx6_pm_domain_power_off(struct generic_pm_domain *genpd) 
	u32 val;



	/* Read ISO and ISO2SW power down delays */

	regmap_read(pd->regmap, pd->reg_offs + GPC_PGC_PUPSCR_OFFS, &val);

	regmap_read(pd->regmap, pd->reg_offs + GPC_PGC_PDNSCR_OFFS, &val);

	iso = val & 0x3f;

	iso2sw = (val >> 8) & 0x3f;
@@ -247,6 +241,7 @@ builtin_platform_driver(imx_pgc_power_domain_driver) 
#define GPC_PGC_DOMAIN_ARM	0

#define GPC_PGC_DOMAIN_PU	1

#define GPC_PGC_DOMAIN_DISPLAY	2

#define GPC_PGC_DOMAIN_PCI	3



static struct genpd_power_state imx6_pm_domain_pu_state = {

	.power_off_latency_ns = 25000,
@@ -254,12 +249,13 @@ static struct genpd_power_state imx6_pm_domain_pu_state = { 
};



static struct imx_pm_domain imx_gpc_domains[] = {

	{

	[GPC_PGC_DOMAIN_ARM] {

		.base = {

			.name = "ARM",

			.flags = GENPD_FLAG_ALWAYS_ON,

		},

	}, {

	},

	[GPC_PGC_DOMAIN_PU] {

		.base = {

			.name = "PU",

			.power_off = imx6_pm_domain_power_off,
@@ -269,7 +265,8 @@ static struct imx_pm_domain imx_gpc_domains[] = { 
		},

		.reg_offs = 0x260,

		.cntr_pdn_bit = 0,

	}, {

	},

	[GPC_PGC_DOMAIN_DISPLAY] {

		.base = {

			.name = "DISPLAY",

			.power_off = imx6_pm_domain_power_off,
@@ -277,7 +274,8 @@ static struct imx_pm_domain imx_gpc_domains[] = { 
		},

		.reg_offs = 0x240,

		.cntr_pdn_bit = 4,

	}, {

	},

	[GPC_PGC_DOMAIN_PCI] {

		.base = {

			.name = "PCI",

			.power_off = imx6_pm_domain_power_off,
@@ -348,8 +346,8 @@ static const struct regmap_config imx_gpc_regmap_config = { 
};



static struct generic_pm_domain *imx_gpc_onecell_domains[] = {

	&imx_gpc_domains[0].base,

	&imx_gpc_domains[1].base,

	&imx_gpc_domains[GPC_PGC_DOMAIN_ARM].base,

	&imx_gpc_domains[GPC_PGC_DOMAIN_PU].base,

};



static struct genpd_onecell_data imx_gpc_onecell_data = {

drivers/soc/imx/gpcv2.c

+54 −46
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+

/*

 * Copyright 2017 Impinj, Inc

 * Author: Andrey Smirnov <andrew.smirnov@gmail.com>
@@ -5,29 +6,23 @@ 
 * Based on the code of analogus driver:

 *

 * Copyright 2015-2017 Pengutronix, Lucas Stach <kernel@pengutronix.de>

 *

 * The code contained herein is licensed under the GNU General Public

 * License. You may obtain a copy of the GNU General Public License

 * Version 2 or later at the following locations:

 *

 * http://www.opensource.org/licenses/gpl-license.html

 * http://www.gnu.org/copyleft/gpl.html

 */



#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/pm_domain.h>

#include <linux/regmap.h>

#include <linux/regulator/consumer.h>

#include <dt-bindings/power/imx7-power.h>



#define GPC_LPCR_A7_BSC			0x000

#define GPC_LPCR_A_CORE_BSC			0x000



#define GPC_PGC_CPU_MAPPING		0x0ec

#define USB_HSIC_PHY_A7_DOMAIN		BIT(6)

#define USB_OTG2_PHY_A7_DOMAIN		BIT(5)

#define USB_OTG1_PHY_A7_DOMAIN		BIT(4)

#define PCIE_PHY_A7_DOMAIN		BIT(3)

#define MIPI_PHY_A7_DOMAIN		BIT(2)

#define USB_HSIC_PHY_A_CORE_DOMAIN		BIT(6)

#define USB_OTG2_PHY_A_CORE_DOMAIN		BIT(5)

#define USB_OTG1_PHY_A_CORE_DOMAIN		BIT(4)

#define PCIE_PHY_A_CORE_DOMAIN		BIT(3)

#define MIPI_PHY_A_CORE_DOMAIN		BIT(2)



#define GPC_PU_PGC_SW_PUP_REQ		0x0f8

#define GPC_PU_PGC_SW_PDN_REQ		0x104
@@ -53,7 +48,7 @@ 


#define GPC_PGC_CTRL_PCR		BIT(0)



struct imx7_pgc_domain {

struct imx_pgc_domain {

	struct generic_pm_domain genpd;

	struct regmap *regmap;

	struct regulator *regulator;
@@ -69,11 +64,16 @@ struct imx7_pgc_domain { 
	struct device *dev;

};



static int imx7_gpc_pu_pgc_sw_pxx_req(struct generic_pm_domain *genpd,

struct imx_pgc_domain_data {

	const struct imx_pgc_domain *domains;

	size_t domains_num;

};



static int imx_gpc_pu_pgc_sw_pxx_req(struct generic_pm_domain *genpd,

				      bool on)

{

	struct imx7_pgc_domain *domain = container_of(genpd,

						      struct imx7_pgc_domain,

	struct imx_pgc_domain *domain = container_of(genpd,

						      struct imx_pgc_domain,

						      genpd);

	unsigned int offset = on ?

		GPC_PU_PGC_SW_PUP_REQ : GPC_PU_PGC_SW_PDN_REQ;
@@ -150,24 +150,24 @@ static int imx7_gpc_pu_pgc_sw_pxx_req(struct generic_pm_domain *genpd, 
	return ret;

}



static int imx7_gpc_pu_pgc_sw_pup_req(struct generic_pm_domain *genpd)

static int imx_gpc_pu_pgc_sw_pup_req(struct generic_pm_domain *genpd)

{

	return imx7_gpc_pu_pgc_sw_pxx_req(genpd, true);

	return imx_gpc_pu_pgc_sw_pxx_req(genpd, true);

}



static int imx7_gpc_pu_pgc_sw_pdn_req(struct generic_pm_domain *genpd)

static int imx_gpc_pu_pgc_sw_pdn_req(struct generic_pm_domain *genpd)

{

	return imx7_gpc_pu_pgc_sw_pxx_req(genpd, false);

	return imx_gpc_pu_pgc_sw_pxx_req(genpd, false);

}



static const struct imx7_pgc_domain imx7_pgc_domains[] = {

static const struct imx_pgc_domain imx7_pgc_domains[] = {

	[IMX7_POWER_DOMAIN_MIPI_PHY] = {

		.genpd = {

			.name      = "mipi-phy",

		},

		.bits  = {

			.pxx = MIPI_PHY_SW_Pxx_REQ,

			.map = MIPI_PHY_A7_DOMAIN,

			.map = MIPI_PHY_A_CORE_DOMAIN,

		},

		.voltage   = 1000000,

		.pgc	   = PGC_MIPI,
@@ -179,7 +179,7 @@ static const struct imx7_pgc_domain imx7_pgc_domains[] = { 
		},

		.bits  = {

			.pxx = PCIE_PHY_SW_Pxx_REQ,

			.map = PCIE_PHY_A7_DOMAIN,

			.map = PCIE_PHY_A_CORE_DOMAIN,

		},

		.voltage   = 1000000,

		.pgc	   = PGC_PCIE,
@@ -191,16 +191,21 @@ static const struct imx7_pgc_domain imx7_pgc_domains[] = { 
		},

		.bits  = {

			.pxx = USB_HSIC_PHY_SW_Pxx_REQ,

			.map = USB_HSIC_PHY_A7_DOMAIN,

			.map = USB_HSIC_PHY_A_CORE_DOMAIN,

		},

		.voltage   = 1200000,

		.pgc	   = PGC_USB_HSIC,

	},

};



static int imx7_pgc_domain_probe(struct platform_device *pdev)

static const struct imx_pgc_domain_data imx7_pgc_domain_data = {

	.domains = imx7_pgc_domains,

	.domains_num = ARRAY_SIZE(imx7_pgc_domains),

};



static int imx_pgc_domain_probe(struct platform_device *pdev)

{

	struct imx7_pgc_domain *domain = pdev->dev.platform_data;

	struct imx_pgc_domain *domain = pdev->dev.platform_data;

	int ret;



	domain->dev = &pdev->dev;
@@ -233,9 +238,9 @@ static int imx7_pgc_domain_probe(struct platform_device *pdev) 
	return ret;

}



static int imx7_pgc_domain_remove(struct platform_device *pdev)

static int imx_pgc_domain_remove(struct platform_device *pdev)

{

	struct imx7_pgc_domain *domain = pdev->dev.platform_data;

	struct imx_pgc_domain *domain = pdev->dev.platform_data;



	of_genpd_del_provider(domain->dev->of_node);

	pm_genpd_remove(&domain->genpd);
@@ -243,25 +248,26 @@ static int imx7_pgc_domain_remove(struct platform_device *pdev) 
	return 0;

}



static const struct platform_device_id imx7_pgc_domain_id[] = {

	{ "imx7-pgc-domain", },

static const struct platform_device_id imx_pgc_domain_id[] = {

	{ "imx-pgc-domain", },

	{ },

};



static struct platform_driver imx7_pgc_domain_driver = {

static struct platform_driver imx_pgc_domain_driver = {

	.driver = {

		.name = "imx7-pgc",

		.name = "imx-pgc",

	},

	.probe    = imx7_pgc_domain_probe,

	.remove   = imx7_pgc_domain_remove,

	.id_table = imx7_pgc_domain_id,

	.probe    = imx_pgc_domain_probe,

	.remove   = imx_pgc_domain_remove,

	.id_table = imx_pgc_domain_id,

};

builtin_platform_driver(imx7_pgc_domain_driver)

builtin_platform_driver(imx_pgc_domain_driver)



static int imx_gpcv2_probe(struct platform_device *pdev)

{

	static const struct imx_pgc_domain_data *domain_data;

	static const struct regmap_range yes_ranges[] = {

		regmap_reg_range(GPC_LPCR_A7_BSC,

		regmap_reg_range(GPC_LPCR_A_CORE_BSC,

				 GPC_M4_PU_PDN_FLG),

		regmap_reg_range(GPC_PGC_CTRL(PGC_MIPI),

				 GPC_PGC_SR(PGC_MIPI)),
@@ -307,9 +313,11 @@ static int imx_gpcv2_probe(struct platform_device *pdev) 
		return ret;

	}



	domain_data = of_device_get_match_data(&pdev->dev);



	for_each_child_of_node(pgc_np, np) {

		struct platform_device *pd_pdev;

		struct imx7_pgc_domain *domain;

		struct imx_pgc_domain *domain;

		u32 domain_index;



		ret = of_property_read_u32(np, "reg", &domain_index);
@@ -319,14 +327,14 @@ static int imx_gpcv2_probe(struct platform_device *pdev) 
			return ret;

		}



		if (domain_index >= ARRAY_SIZE(imx7_pgc_domains)) {

		if (domain_index >= domain_data->domains_num) {

			dev_warn(dev,

				 "Domain index %d is out of bounds\n",

				 domain_index);

			continue;

		}



		pd_pdev = platform_device_alloc("imx7-pgc-domain",

		pd_pdev = platform_device_alloc("imx-pgc-domain",

						domain_index);

		if (!pd_pdev) {

			dev_err(dev, "Failed to allocate platform device\n");
@@ -335,8 +343,8 @@ static int imx_gpcv2_probe(struct platform_device *pdev) 
		}



		ret = platform_device_add_data(pd_pdev,

					       &imx7_pgc_domains[domain_index],

					       sizeof(imx7_pgc_domains[domain_index]));

					       &domain_data->domains[domain_index],

					       sizeof(domain_data->domains[domain_index]));

		if (ret) {

			platform_device_put(pd_pdev);

			of_node_put(np);
@@ -345,8 +353,8 @@ static int imx_gpcv2_probe(struct platform_device *pdev) 


		domain = pd_pdev->dev.platform_data;

		domain->regmap = regmap;

		domain->genpd.power_on  = imx7_gpc_pu_pgc_sw_pup_req;

		domain->genpd.power_off = imx7_gpc_pu_pgc_sw_pdn_req;

		domain->genpd.power_on  = imx_gpc_pu_pgc_sw_pup_req;

		domain->genpd.power_off = imx_gpc_pu_pgc_sw_pdn_req;



		pd_pdev->dev.parent = dev;

		pd_pdev->dev.of_node = np;
@@ -363,7 +371,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev) 
}



static const struct of_device_id imx_gpcv2_dt_ids[] = {

	{ .compatible = "fsl,imx7d-gpc" },

	{ .compatible = "fsl,imx7d-gpc", .data = &imx7_pgc_domain_data, },

	{ }

};