phy: samsung-ufs: switch back to syscon_regmap_lookup_by_phandle()

[PATCH] phy: samsung-ufs: switch back to syscon_regmap_lookup_by_phandle()

Posted by Peter Griffin 3 weeks, 5 days ago

Now exynos-pmu can register its custom regmap for gs101 via
of_syscon_register_regmap() we can switch back to the standard
syscon_regmap_lookup_by_phandle() api for obtaining the regmap.

Additionally add a Kconfig dependency for MFD_SYSCON.

Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
---
 drivers/phy/samsung/Kconfig           | 1 +
 drivers/phy/samsung/phy-samsung-ufs.c | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/phy/samsung/Kconfig b/drivers/phy/samsung/Kconfig
index f10afa3d7ff5..e2330b0894d6 100644
--- a/drivers/phy/samsung/Kconfig
+++ b/drivers/phy/samsung/Kconfig
@@ -33,6 +33,7 @@ config PHY_SAMSUNG_UFS
 	tristate "Exynos SoC series UFS PHY driver"
 	depends on OF && (ARCH_EXYNOS || COMPILE_TEST)
 	select GENERIC_PHY
+	select MFD_SYSCON
 	help
 	  Enable this to support the Samsung Exynos SoC UFS PHY driver for
 	  Samsung Exynos SoCs. This driver provides the interface for UFS host
diff --git a/drivers/phy/samsung/phy-samsung-ufs.c b/drivers/phy/samsung/phy-samsung-ufs.c
index 6c5d41552649..8e9ccd39f97e 100644
--- a/drivers/phy/samsung/phy-samsung-ufs.c
+++ b/drivers/phy/samsung/phy-samsung-ufs.c
@@ -13,11 +13,11 @@
 #include <linux/of.h>
 #include <linux/io.h>
 #include <linux/iopoll.h>
+#include <linux/mfd/syscon.h>
 #include <linux/module.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
-#include <linux/soc/samsung/exynos-pmu.h>
 
 #include "phy-samsung-ufs.h"
 
@@ -268,8 +268,8 @@ static int samsung_ufs_phy_probe(struct platform_device *pdev)
 		goto out;
 	}
 
-	phy->reg_pmu = exynos_get_pmu_regmap_by_phandle(dev->of_node,
-							"samsung,pmu-syscon");
+	phy->reg_pmu = syscon_regmap_lookup_by_phandle(dev->of_node,
+						       "samsung,pmu-syscon");
 	if (IS_ERR(phy->reg_pmu)) {
 		err = PTR_ERR(phy->reg_pmu);
 		dev_err(dev, "failed syscon remap for pmu\n");
-- 
2.47.0.163.g1226f6d8fa-goog

Re: [PATCH] phy: samsung-ufs: switch back to syscon_regmap_lookup_by_phandle()

Posted by Sam Protsenko 3 weeks, 5 days ago

On Tue, Oct 29, 2024 at 2:21 PM Peter Griffin <peter.griffin@linaro.org> wrote:
>
> Now exynos-pmu can register its custom regmap for gs101 via
> of_syscon_register_regmap() we can switch back to the standard
> syscon_regmap_lookup_by_phandle() api for obtaining the regmap.
>
> Additionally add a Kconfig dependency for MFD_SYSCON.
>
> Signed-off-by: Peter Griffin <peter.griffin@linaro.org>
> ---

Reviewed-by: Sam Protsenko <semen.protsenko@linaro.org>

>  drivers/phy/samsung/Kconfig           | 1 +
>  drivers/phy/samsung/phy-samsung-ufs.c | 6 +++---
>  2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/phy/samsung/Kconfig b/drivers/phy/samsung/Kconfig
> index f10afa3d7ff5..e2330b0894d6 100644
> --- a/drivers/phy/samsung/Kconfig
> +++ b/drivers/phy/samsung/Kconfig
> @@ -33,6 +33,7 @@ config PHY_SAMSUNG_UFS
>         tristate "Exynos SoC series UFS PHY driver"
>         depends on OF && (ARCH_EXYNOS || COMPILE_TEST)
>         select GENERIC_PHY
> +       select MFD_SYSCON
>         help
>           Enable this to support the Samsung Exynos SoC UFS PHY driver for
>           Samsung Exynos SoCs. This driver provides the interface for UFS host
> diff --git a/drivers/phy/samsung/phy-samsung-ufs.c b/drivers/phy/samsung/phy-samsung-ufs.c
> index 6c5d41552649..8e9ccd39f97e 100644
> --- a/drivers/phy/samsung/phy-samsung-ufs.c
> +++ b/drivers/phy/samsung/phy-samsung-ufs.c
> @@ -13,11 +13,11 @@
>  #include <linux/of.h>
>  #include <linux/io.h>
>  #include <linux/iopoll.h>
> +#include <linux/mfd/syscon.h>
>  #include <linux/module.h>
>  #include <linux/phy/phy.h>
>  #include <linux/platform_device.h>
>  #include <linux/regmap.h>
> -#include <linux/soc/samsung/exynos-pmu.h>
>
>  #include "phy-samsung-ufs.h"
>
> @@ -268,8 +268,8 @@ static int samsung_ufs_phy_probe(struct platform_device *pdev)
>                 goto out;
>         }
>
> -       phy->reg_pmu = exynos_get_pmu_regmap_by_phandle(dev->of_node,
> -                                                       "samsung,pmu-syscon");
> +       phy->reg_pmu = syscon_regmap_lookup_by_phandle(dev->of_node,
> +                                                      "samsung,pmu-syscon");
>         if (IS_ERR(phy->reg_pmu)) {
>                 err = PTR_ERR(phy->reg_pmu);
>                 dev_err(dev, "failed syscon remap for pmu\n");
> --
> 2.47.0.163.g1226f6d8fa-goog
>
>