| Message ID | 20210709094524.110193-2-chanho61.park@samsung.com |
|---|---|
| State | Accepted |
| Commit | b95637e2da155cb3111d008e3c5d641b4dcf5000 |
| Headers | show |
| Series | Support exynosautov9 ufs phy driver | expand |
On 09/07/2021 11:45, 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 | 4 +++- > .../phy/samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c} | 8 ++------ > drivers/phy/samsung/phy-samsung-ufs.h | 5 ++++- > 3 files changed, 9 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..68518ae30c1b 100644 > --- a/drivers/phy/samsung/Makefile > +++ b/drivers/phy/samsung/Makefile > @@ -2,7 +2,9 @@ > 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-exynos-ufs.o > +phy-exynos-ufs-y += phy-samsung-ufs.o > +phy-exynos-ufs-y += phy-exynos7-ufs.o How does it support module builds? The previous code was working fine when built as module. Maybe I miss something, but I don't see the need for this change. > 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 Best regards, Krzysztof
On 09/07/2021 19:31, Krzysztof Kozlowski wrote: > On 09/07/2021 11:45, 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 | 4 +++- >> .../phy/samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c} | 8 ++------ >> drivers/phy/samsung/phy-samsung-ufs.h | 5 ++++- >> 3 files changed, 9 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..68518ae30c1b 100644 >> --- a/drivers/phy/samsung/Makefile >> +++ b/drivers/phy/samsung/Makefile >> @@ -2,7 +2,9 @@ >> 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-exynos-ufs.o >> +phy-exynos-ufs-y += phy-samsung-ufs.o >> +phy-exynos-ufs-y += phy-exynos7-ufs.o > > How does it support module builds? The previous code was working fine > when built as module. Maybe I miss something, but I don't see the need > for this change. Ah, I see now, your previous patch was creating separate modules. Makes sens, thanks! Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
diff --git a/drivers/phy/samsung/Makefile b/drivers/phy/samsung/Makefile index 3959100fe8a2..68518ae30c1b 100644 --- a/drivers/phy/samsung/Makefile +++ b/drivers/phy/samsung/Makefile @@ -2,7 +2,9 @@ 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-exynos-ufs.o +phy-exynos-ufs-y += phy-samsung-ufs.o +phy-exynos-ufs-y += 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..7c9008e163db 100644 --- a/drivers/phy/samsung/phy-exynos7-ufs.h +++ b/drivers/phy/samsung/phy-exynos7-ufs.c @@ -1,11 +1,9 @@ -/* 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 "phy-samsung-ufs.h" @@ -68,7 +66,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 +75,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..5ab6ca6fa187 100644 --- a/drivers/phy/samsung/phy-samsung-ufs.h +++ b/drivers/phy/samsung/phy-samsung-ufs.h @@ -10,6 +10,9 @@ #ifndef _PHY_SAMSUNG_UFS_ #define _PHY_SAMSUNG_UFS_ +#include <linux/phy/phy.h> +#include <linux/regmap.h> + #define PHY_COMN_BLK 1 #define PHY_TRSV_BLK 2 #define END_UFS_PHY_CFG { 0 } @@ -134,6 +137,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_ */
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 | 4 +++- .../phy/samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c} | 8 ++------ drivers/phy/samsung/phy-samsung-ufs.h | 5 ++++- 3 files changed, 9 insertions(+), 8 deletions(-) rename drivers/phy/samsung/{phy-exynos7-ufs.h => phy-exynos7-ufs.c} (93%)