mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

i.MX drivers change for 6.2:

Browse source 
- Improve imx8m-blk-ctrl driver to allow deferred probe in case that
   'bus' genpd is not yet ready.
 - Add missing USB_1_PHY PD for i.MX scu-pd firmware driver.
 - Add GENPD_FLAG_ACTIVE_WAKEUP flag for i.MX8MM/N in GPCv2 driver, so
   that the power domain remains on if USB remote wakeup is enabled.
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCgAyFiEEFmJXigPl4LoGSz08UFdYWoewfM4FAmN4ijcUHHNoYXduZ3Vv
 QGtlcm5lbC5vcmcACgkQUFdYWoewfM5lRgf+ODRyVDspNDTrazYtvVgr7YVutIBu
 TMjlNPkUKiDtOEjwwCvm30vdKVeI/pWOFoBWCFfrzAcaMc6EGgNaPeO5LvN6NVHI
 ZIzr+gJEVfxbuF+oWpXxdKRl+iEbHy+d9952amhgHwG9Wo5dgEh6I5cCMmyvtJWm
 VBE1qZz6h8Nsj6dlWWPxh1U7aQoLSZeM7i0Dc/7JQfRPeohT5r6IZzNqbW4l40wP
 78ZE8jETMUsfjBKqAmgFqQs+NxGjxwTlPbpx5ZpL23Zj9CeB+C841aweIW0ZqCeX
 fYVqsxVKT5rVYlwZkKaMCtiJQGASPoTz4ZZtAsGoBsecxe/H8dpKF81EHA==
 =5Hgd
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmN7dQYACgkQmmx57+YA
 GNmuZw/9E9SstLZNBAossQOw/WnAgope6//f7RhsPHtDnvm2f826FkJwG6VAcvJS
 ctK8IlvjAHm9q4VVDW86R38aS5W7kyjnrwiNON0X/YW8dNPEciS7mSZzp+H5zw2a
 B0VDrSD0Eojt4ouHANQoLoDbjmz844K6X/N+CQsSr95u9elBy0SAx0QwXK3PM4Px
 sNSXcU6S1QU3WQ/tO0Wyl5yUYpv4Ow4nmTtQA+FqIA8Hz8ZC9+NEsnEWaVVNv9EA
 R1bCX4V39kfm7UyBp9adSAKSOLrbaSObiWSgM1zPmoxNPRkrAW4f3vIoNOjjuz9t
 ukwYpl5fpjT/FmMIuY9Ano+GSyPLTmeGSWXmtCggao/p29hHxoscMn+q2/Du/ZkJ
 HQBM8Qil7udQSzFyUaYjJ6QrX7LQReDpf0t/RQJSKldgSDYQM4qysJWqwOBsEq6r
 gcXrQ9/bHq+sQuHy8Jo0nDxgey/DTAhhsBPRWuqLcFjwR/BebuDWBbNyyBbjOa+v
 OVCi1oW8hF9GChV6ParELY+yAa3pxLTGsCfX9c5NcJZIGixvD5iOwSy+IlgudVni
 lBy7J39dHZTpDL+grPH63ijyL9Wct71SNx8WnYx1w1+EZcs/LBmWwXgXrbDm86Yg
 o3KWJqOFiXy325BF+rhzcNkLyNq1IjUPHkPCzqqI5W3NvZ66NU8=
 =8euY
 -----END PGP SIGNATURE-----

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

i.MX drivers change for 6.2:

- Improve imx8m-blk-ctrl driver to allow deferred probe in case that
  'bus' genpd is not yet ready.
- Add missing USB_1_PHY PD for i.MX scu-pd firmware driver.
- Add GENPD_FLAG_ACTIVE_WAKEUP flag for i.MX8MM/N in GPCv2 driver, so
  that the power domain remains on if USB remote wakeup is enabled.

* tag 'imx-drivers-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  soc: imx: gpcv2: add GENPD_FLAG_ACTIVE_WAKEUP flag for usb of imx8mm/n
  firmware: imx: scu-pd: add missed USB_1_PHY pd
  soc: imx: imx8m-blk-ctrl: Defer probe if 'bus' genpd is not yet ready

Link: https://lore.kernel.org/r/20221119125733.32719-1-shawnguo@kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-11-21 13:54:29 +01:00
commit 26a1200241
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/firmware/imx/scu-pd.c
View file

@ -108,6 +108,7 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = {
/* CONN SS */
{ "usb", IMX_SC_R_USB_0, 2, true, 0 },
{ "usb0phy", IMX_SC_R_USB_0_PHY, 1, false, 0 },
{ "usb1phy", IMX_SC_R_USB_1_PHY, 1, false, 0},
{ "usb2", IMX_SC_R_USB_2, 1, false, 0 },
{ "usb2phy", IMX_SC_R_USB_2_PHY, 1, false, 0 },
{ "sdhc", IMX_SC_R_SDHC_0, 3, true, 0 },

3
drivers/soc/imx/gpcv2.c
View file

@ -755,6 +755,7 @@ static const struct imx_pgc_domain imx8mm_pgc_domains[] = {
[IMX8MM_POWER_DOMAIN_OTG1] = {
.genpd = {
.name = "usb-otg1",
.flags = GENPD_FLAG_ACTIVE_WAKEUP,
},
.bits = {
.pxx = IMX8MM_OTG1_SW_Pxx_REQ,
@ -766,6 +767,7 @@ static const struct imx_pgc_domain imx8mm_pgc_domains[] = {
[IMX8MM_POWER_DOMAIN_OTG2] = {
.genpd = {
.name = "usb-otg2",
.flags = GENPD_FLAG_ACTIVE_WAKEUP,
},
.bits = {
.pxx = IMX8MM_OTG2_SW_Pxx_REQ,
@ -1232,6 +1234,7 @@ static const struct imx_pgc_domain imx8mn_pgc_domains[] = {
[IMX8MN_POWER_DOMAIN_OTG1] = {
.genpd = {
.name = "usb-otg1",
.flags = GENPD_FLAG_ACTIVE_WAKEUP,
},
.bits = {
.pxx = IMX8MN_OTG1_SW_Pxx_REQ,

11
drivers/soc/imx/imx8m-blk-ctrl.c
View file

@ -210,9 +210,14 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
return -ENOMEM;
bc->bus_power_dev = genpd_dev_pm_attach_by_name(dev, "bus");
if (IS_ERR(bc->bus_power_dev))
return dev_err_probe(dev, PTR_ERR(bc->bus_power_dev),
"failed to attach power domain \"bus\"\n");
if (IS_ERR(bc->bus_power_dev)) {
if (PTR_ERR(bc->bus_power_dev) == -ENODEV)
return dev_err_probe(dev, -EPROBE_DEFER,
"failed to attach power domain \"bus\"\n");
else
return dev_err_probe(dev, PTR_ERR(bc->bus_power_dev),
"failed to attach power domain \"bus\"\n");
}
for (i = 0; i < bc_data->num_domains; i++) {
const struct imx8m_blk_ctrl_domain_data *data = &bc_data->domains[i];