diff mbox series

[v3,1/2] phy: samsung-ufs: move phy-exynos7-ufs header

Message ID 20210706021804.12890-2-chanho61.park@samsung.com
State Superseded
Headers show
Series Support exynosautov9 ufs phy driver | expand

Commit Message

Chanho Park July 6, 2021, 2:18 a.m. UTC 
Instead of using exynos7 ufs definition in phy-exynos7-ufs.h, we should
put it into phy-exynos7-ufs.c to be included different objects or units.

Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: Chanho Park <chanho61.park@samsung.com>
---
 drivers/phy/samsung/Makefile                          |  3 ++-
 .../samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c}  | 11 +++++------
 drivers/phy/samsung/phy-samsung-ufs.h                 |  4 +++-
 3 files changed, 10 insertions(+), 8 deletions(-)
 rename drivers/phy/samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c} (93%)

Comments

Krzysztof Kozlowski July 6, 2021, 7:18 a.m. UTC | #1 
On 06/07/2021 04:18, Chanho Park wrote:
> Instead of using exynos7 ufs definition in phy-exynos7-ufs.h, we should
> put it into phy-exynos7-ufs.c to be included different objects or units.
> 
> Suggested-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> Signed-off-by: Chanho Park <chanho61.park@samsung.com>
> ---
>  drivers/phy/samsung/Makefile                          |  3 ++-
>  .../samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c}  | 11 +++++------
>  drivers/phy/samsung/phy-samsung-ufs.h                 |  4 +++-
>  3 files changed, 10 insertions(+), 8 deletions(-)
>  rename drivers/phy/samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c} (93%)
> 
> diff --git a/drivers/phy/samsung/Makefile b/drivers/phy/samsung/Makefile
> index 3959100fe8a2..d55d9aa5b932 100644
> --- a/drivers/phy/samsung/Makefile
> +++ b/drivers/phy/samsung/Makefile
> @@ -2,7 +2,8 @@
>  obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO)	+= phy-exynos-dp-video.o
>  obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO)	+= phy-exynos-mipi-video.o
>  obj-$(CONFIG_PHY_EXYNOS_PCIE)		+= phy-exynos-pcie.o
> -obj-$(CONFIG_PHY_SAMSUNG_UFS)		+= phy-samsung-ufs.o
> +obj-$(CONFIG_PHY_SAMSUNG_UFS)		+= phy-samsung-ufs.o \
> +					phy-exynos7-ufs.o
>  obj-$(CONFIG_PHY_SAMSUNG_USB2)		+= phy-exynos-usb2.o
>  phy-exynos-usb2-y			+= phy-samsung-usb2.o
>  phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2)	+= phy-exynos4210-usb2.o
> diff --git a/drivers/phy/samsung/phy-exynos7-ufs.h b/drivers/phy/samsung/phy-exynos7-ufs.c
> similarity index 93%
> rename from drivers/phy/samsung/phy-exynos7-ufs.h
> rename to drivers/phy/samsung/phy-exynos7-ufs.c
> index 518923141958..657b58319c14 100644
> --- a/drivers/phy/samsung/phy-exynos7-ufs.h
> +++ b/drivers/phy/samsung/phy-exynos7-ufs.c
> @@ -1,11 +1,12 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> +// SPDX-License-Identifier: GPL-2.0-only
>  /*
>   * UFS PHY driver data for Samsung EXYNOS7 SoC
>   *
>   * Copyright (C) 2020 Samsung Electronics Co., Ltd.
>   */
> -#ifndef _PHY_EXYNOS7_UFS_H_
> -#define _PHY_EXYNOS7_UFS_H_
> +
> +#include <linux/io.h>

Why do you need io.h here? Which part uses it?


Best regards,
Krzysztof

> +#include <linux/phy/phy.h>
>  
>  #include "phy-samsung-ufs.h"
>  
> @@ -68,7 +69,7 @@ static const struct samsung_ufs_phy_cfg *exynos7_ufs_phy_cfgs[CFG_TAG_MAX] = {
>  	[CFG_POST_PWR_HS]	= exynos7_post_pwr_hs_cfg,
>  };
>  
> -static struct samsung_ufs_phy_drvdata exynos7_ufs_phy = {
> +const struct samsung_ufs_phy_drvdata exynos7_ufs_phy = {
>  	.cfg = exynos7_ufs_phy_cfgs,
>  	.isol = {
>  		.offset = EXYNOS7_EMBEDDED_COMBO_PHY_CTRL,
> @@ -77,5 +78,3 @@ static struct samsung_ufs_phy_drvdata exynos7_ufs_phy = {
>  	},
>  	.has_symbol_clk = 1,
>  };
> -
> -#endif /* _PHY_EXYNOS7_UFS_H_ */
> diff --git a/drivers/phy/samsung/phy-samsung-ufs.h b/drivers/phy/samsung/phy-samsung-ufs.h
> index 5de78710524c..1532d239ff0e 100644
> --- a/drivers/phy/samsung/phy-samsung-ufs.h
> +++ b/drivers/phy/samsung/phy-samsung-ufs.h
> @@ -10,6 +10,8 @@
>  #ifndef _PHY_SAMSUNG_UFS_
>  #define _PHY_SAMSUNG_UFS_
>  
> +#include <linux/regmap.h>
> +
>  #define PHY_COMN_BLK	1
>  #define PHY_TRSV_BLK	2
>  #define END_UFS_PHY_CFG { 0 }
> @@ -134,6 +136,6 @@ static inline void samsung_ufs_phy_ctrl_isol(
>  			   phy->isol->mask, isol ? 0 : phy->isol->en);
>  }
>  
> -#include "phy-exynos7-ufs.h"
> +extern const struct samsung_ufs_phy_drvdata exynos7_ufs_phy;
>  
>  #endif /* _PHY_SAMSUNG_UFS_ */
>
diff mbox series

Patch

diff --git a/drivers/phy/samsung/Makefile b/drivers/phy/samsung/Makefile
index 3959100fe8a2..d55d9aa5b932 100644
--- a/drivers/phy/samsung/Makefile
+++ b/drivers/phy/samsung/Makefile
@@ -2,7 +2,8 @@ 
 obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO)	+= phy-exynos-dp-video.o
 obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO)	+= phy-exynos-mipi-video.o
 obj-$(CONFIG_PHY_EXYNOS_PCIE)		+= phy-exynos-pcie.o
-obj-$(CONFIG_PHY_SAMSUNG_UFS)		+= phy-samsung-ufs.o
+obj-$(CONFIG_PHY_SAMSUNG_UFS)		+= phy-samsung-ufs.o \
+					phy-exynos7-ufs.o
 obj-$(CONFIG_PHY_SAMSUNG_USB2)		+= phy-exynos-usb2.o
 phy-exynos-usb2-y			+= phy-samsung-usb2.o
 phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2)	+= phy-exynos4210-usb2.o
diff --git a/drivers/phy/samsung/phy-exynos7-ufs.h b/drivers/phy/samsung/phy-exynos7-ufs.c
similarity index 93%
rename from drivers/phy/samsung/phy-exynos7-ufs.h
rename to drivers/phy/samsung/phy-exynos7-ufs.c
index 518923141958..657b58319c14 100644
--- a/drivers/phy/samsung/phy-exynos7-ufs.h
+++ b/drivers/phy/samsung/phy-exynos7-ufs.c
@@ -1,11 +1,12 @@ 
-/* SPDX-License-Identifier: GPL-2.0-only */
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * UFS PHY driver data for Samsung EXYNOS7 SoC
  *
  * Copyright (C) 2020 Samsung Electronics Co., Ltd.
  */
-#ifndef _PHY_EXYNOS7_UFS_H_
-#define _PHY_EXYNOS7_UFS_H_
+
+#include <linux/io.h>
+#include <linux/phy/phy.h>
 
 #include "phy-samsung-ufs.h"
 
@@ -68,7 +69,7 @@  static const struct samsung_ufs_phy_cfg *exynos7_ufs_phy_cfgs[CFG_TAG_MAX] = {
 	[CFG_POST_PWR_HS]	= exynos7_post_pwr_hs_cfg,
 };
 
-static struct samsung_ufs_phy_drvdata exynos7_ufs_phy = {
+const struct samsung_ufs_phy_drvdata exynos7_ufs_phy = {
 	.cfg = exynos7_ufs_phy_cfgs,
 	.isol = {
 		.offset = EXYNOS7_EMBEDDED_COMBO_PHY_CTRL,
@@ -77,5 +78,3 @@  static struct samsung_ufs_phy_drvdata exynos7_ufs_phy = {
 	},
 	.has_symbol_clk = 1,
 };
-
-#endif /* _PHY_EXYNOS7_UFS_H_ */
diff --git a/drivers/phy/samsung/phy-samsung-ufs.h b/drivers/phy/samsung/phy-samsung-ufs.h
index 5de78710524c..1532d239ff0e 100644
--- a/drivers/phy/samsung/phy-samsung-ufs.h
+++ b/drivers/phy/samsung/phy-samsung-ufs.h
@@ -10,6 +10,8 @@ 
 #ifndef _PHY_SAMSUNG_UFS_
 #define _PHY_SAMSUNG_UFS_
 
+#include <linux/regmap.h>
+
 #define PHY_COMN_BLK	1
 #define PHY_TRSV_BLK	2
 #define END_UFS_PHY_CFG { 0 }
@@ -134,6 +136,6 @@  static inline void samsung_ufs_phy_ctrl_isol(
 			   phy->isol->mask, isol ? 0 : phy->isol->en);
 }
 
-#include "phy-exynos7-ufs.h"
+extern const struct samsung_ufs_phy_drvdata exynos7_ufs_phy;
 
 #endif /* _PHY_SAMSUNG_UFS_ */