diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 19:55:52 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 19:55:52 +0300 |
| commit | ce3dc231daf3c43796ff783d8f65a85aa0032247 (patch) | |
| tree | c932db4603e97b835fed96fe4b5576126fb65c4d /drivers/soc | |
| parent | c8ac0b10fd941d31295eed01acc1564415390f39 (diff) | |
| parent | cfabb7921ccbede2968e5049d433ba3d0e0950af (diff) | |
| download | linux-ce3dc231daf3c43796ff783d8f65a85aa0032247.tar.xz | |
Merge tag 'imx-drivers-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/drivers
Pull "i.MX drivers update for 4.16" from Shawn Guo:
- Update i.MX GPC driver to support PCI power domain of i.MX6SX SoC.
* tag 'imx-drivers-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
soc: imx: gpc: Add i.MX6SX PCI power domain
Diffstat (limited to 'drivers/soc')
| -rw-r--r-- | drivers/soc/imx/gpc.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/soc/imx/gpc.c b/drivers/soc/imx/gpc.c index 47e7aa963dbb..53f7275d6cbd 100644 --- a/drivers/soc/imx/gpc.c +++ b/drivers/soc/imx/gpc.c @@ -273,7 +273,15 @@ static struct imx_pm_domain imx_gpc_domains[] = { }, .reg_offs = 0x240, .cntr_pdn_bit = 4, - } + }, { + .base = { + .name = "PCI", + .power_off = imx6_pm_domain_power_off, + .power_on = imx6_pm_domain_power_on, + }, + .reg_offs = 0x200, + .cntr_pdn_bit = 6, + }, }; struct imx_gpc_dt_data { @@ -296,10 +304,16 @@ static const struct imx_gpc_dt_data imx6sl_dt_data = { .err009619_present = false, }; +static const struct imx_gpc_dt_data imx6sx_dt_data = { + .num_domains = 4, + .err009619_present = false, +}; + static const struct of_device_id imx_gpc_dt_ids[] = { { .compatible = "fsl,imx6q-gpc", .data = &imx6q_dt_data }, { .compatible = "fsl,imx6qp-gpc", .data = &imx6qp_dt_data }, { .compatible = "fsl,imx6sl-gpc", .data = &imx6sl_dt_data }, + { .compatible = "fsl,imx6sx-gpc", .data = &imx6sx_dt_data }, { } }; |