Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phy: samsung-ufs: move phy-exynos7-ufs header

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>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Link: https://lore.kernel.org/r/20210709094524.110193-2-chanho61.park@samsung.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Chanho Park and committed by
Vinod Koul
b95637e2 057d445b

+9 -8
+3 -1
drivers/phy/samsung/Makefile
··· 2 2 obj-$(CONFIG_PHY_EXYNOS_DP_VIDEO) += phy-exynos-dp-video.o 3 3 obj-$(CONFIG_PHY_EXYNOS_MIPI_VIDEO) += phy-exynos-mipi-video.o 4 4 obj-$(CONFIG_PHY_EXYNOS_PCIE) += phy-exynos-pcie.o 5 - obj-$(CONFIG_PHY_SAMSUNG_UFS) += phy-samsung-ufs.o 5 + obj-$(CONFIG_PHY_SAMSUNG_UFS) += phy-exynos-ufs.o 6 + phy-exynos-ufs-y += phy-samsung-ufs.o 7 + phy-exynos-ufs-y += phy-exynos7-ufs.o 6 8 obj-$(CONFIG_PHY_SAMSUNG_USB2) += phy-exynos-usb2.o 7 9 phy-exynos-usb2-y += phy-samsung-usb2.o 8 10 phy-exynos-usb2-$(CONFIG_PHY_EXYNOS4210_USB2) += phy-exynos4210-usb2.o
+2 -6
drivers/phy/samsung/phy-exynos7-ufs.h drivers/phy/samsung/phy-exynos7-ufs.c
··· 1 - /* SPDX-License-Identifier: GPL-2.0-only */ 1 + // SPDX-License-Identifier: GPL-2.0-only 2 2 /* 3 3 * UFS PHY driver data for Samsung EXYNOS7 SoC 4 4 * 5 5 * Copyright (C) 2020 Samsung Electronics Co., Ltd. 6 6 */ 7 - #ifndef _PHY_EXYNOS7_UFS_H_ 8 - #define _PHY_EXYNOS7_UFS_H_ 9 7 10 8 #include "phy-samsung-ufs.h" 11 9 ··· 66 68 [CFG_POST_PWR_HS] = exynos7_post_pwr_hs_cfg, 67 69 }; 68 70 69 - static struct samsung_ufs_phy_drvdata exynos7_ufs_phy = { 71 + const struct samsung_ufs_phy_drvdata exynos7_ufs_phy = { 70 72 .cfg = exynos7_ufs_phy_cfgs, 71 73 .isol = { 72 74 .offset = EXYNOS7_EMBEDDED_COMBO_PHY_CTRL, ··· 75 77 }, 76 78 .has_symbol_clk = 1, 77 79 }; 78 - 79 - #endif /* _PHY_EXYNOS7_UFS_H_ */
+4 -1
drivers/phy/samsung/phy-samsung-ufs.h
··· 10 10 #ifndef _PHY_SAMSUNG_UFS_ 11 11 #define _PHY_SAMSUNG_UFS_ 12 12 13 + #include <linux/phy/phy.h> 14 + #include <linux/regmap.h> 15 + 13 16 #define PHY_COMN_BLK 1 14 17 #define PHY_TRSV_BLK 2 15 18 #define END_UFS_PHY_CFG { 0 } ··· 137 134 phy->isol->mask, isol ? 0 : phy->isol->en); 138 135 } 139 136 140 - #include "phy-exynos7-ufs.h" 137 + extern const struct samsung_ufs_phy_drvdata exynos7_ufs_phy; 141 138 142 139 #endif /* _PHY_SAMSUNG_UFS_ */