phy: exynos5: Remove duplicated defines of PHY register defines

Phy drivers access PMU region through regmap provided by exynos-pmu
driver.   However there is no need to duplicate defines for PMU
registers.  Instead just use whatever is defined in exynos-regs-pmu.h.

This reduces number of defines.

Suggested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

diff --git a/drivers/phy/phy-exynos-dp-video.c b/drivers/phy/phy-exynos-dp-video.c
index 34b06154e5d959b8b2b0f429e62dd9ae0355151f..d72193188980efc697ee01f1fc8c3f3edfc27097 100644 (file)
--- a/drivers/phy/phy-exynos-dp-video.c
+++ b/drivers/phy/phy-exynos-dp-video.c
@@ -20,6 +20,7 @@
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/regmap.h>
+#include <linux/soc/samsung/exynos-regs-pmu.h>
 
 struct exynos_dp_video_phy_drvdata {
        u32 phy_ctrl_offset;

diff --git a/drivers/phy/phy-exynos5-usbdrd.c b/drivers/phy/phy-exynos5-usbdrd.c
index 07ed608905ac975440f028b5ac9117f7da5b1ce1..7c896d0cda187d59ddfeaba41b73ff4c25002227 100644 (file)
--- a/drivers/phy/phy-exynos5-usbdrd.c
+++ b/drivers/phy/phy-exynos5-usbdrd.c
@@ -25,6 +25,7 @@
 #include <linux/mfd/syscon/exynos5-pmu.h>
 #include <linux/regmap.h>
 #include <linux/regulator/consumer.h>
+#include <linux/soc/samsung/exynos-regs-pmu.h>
 
 /* Exynos USB PHY registers */
 #define EXYNOS5_FSEL_9MHZ6             0x0

diff --git a/include/linux/mfd/syscon/exynos5-pmu.h b/include/linux/mfd/syscon/exynos5-pmu.h
index 77c93551ee58bdc7d4667b2e79965c59cb6a02d3..0a4ddabc395e00bb35ae86da90757884c50421e1 100644 (file)
--- a/include/linux/mfd/syscon/exynos5-pmu.h
+++ b/include/linux/mfd/syscon/exynos5-pmu.h
@@ -12,33 +12,6 @@
 #ifndef _LINUX_MFD_SYSCON_PMU_EXYNOS5_H_
 #define _LINUX_MFD_SYSCON_PMU_EXYNOS5_H_
 
-/* Exynos5 PMU register definitions */
-#define EXYNOS5_HDMI_PHY_CONTROL               (0x700)
-#define EXYNOS5_USBDRD_PHY_CONTROL             (0x704)
-
-/* Exynos5250 specific register definitions */
-#define EXYNOS5_USBHOST_PHY_CONTROL            (0x708)
-#define EXYNOS5_EFNAND_PHY_CONTROL             (0x70c)
-#define EXYNOS5_MIPI_PHY0_CONTROL              (0x710)
-#define EXYNOS5_MIPI_PHY1_CONTROL              (0x714)
-#define EXYNOS5_ADC_PHY_CONTROL                        (0x718)
-#define EXYNOS5_MTCADC_PHY_CONTROL             (0x71c)
-#define EXYNOS5_DPTX_PHY_CONTROL               (0x720)
-#define EXYNOS5_SATA_PHY_CONTROL               (0x724)
-
-/* Exynos5420 specific register definitions */
-#define EXYNOS5420_USBDRD1_PHY_CONTROL         (0x708)
-#define EXYNOS5420_USBHOST_PHY_CONTROL         (0x70c)
-#define EXYNOS5420_MIPI_PHY0_CONTROL           (0x714)
-#define EXYNOS5420_MIPI_PHY1_CONTROL           (0x718)
-#define EXYNOS5420_MIPI_PHY2_CONTROL           (0x71c)
-#define EXYNOS5420_ADC_PHY_CONTROL             (0x720)
-#define EXYNOS5420_MTCADC_PHY_CONTROL          (0x724)
-#define EXYNOS5420_DPTX_PHY_CONTROL            (0x728)
-
-/* Exynos5433 specific register definitions */
-#define EXYNOS5433_USBHOST30_PHY_CONTROL       (0x728)
-
 #define EXYNOS5_PHY_ENABLE                     BIT(0)
 #define EXYNOS5_MIPI_PHY_S_RESETN              BIT(1)
 #define EXYNOS5_MIPI_PHY_M_RESETN              BIT(2)

diff --git a/include/linux/soc/samsung/exynos-regs-pmu.h b/include/linux/soc/samsung/exynos-regs-pmu.h
index e57d75889a0928091270d282bac934fb27a97947..4ee54b3fcd57ac5849d6984ba1f87d37ae53d263 100644 (file)
--- a/include/linux/soc/samsung/exynos-regs-pmu.h
+++ b/include/linux/soc/samsung/exynos-regs-pmu.h
@@ -349,6 +349,8 @@
 
 #define EXYNOS5_AUTO_WDTRESET_DISABLE                          0x0408
 #define EXYNOS5_MASK_WDTRESET_REQUEST                          0x040C
+#define EXYNOS5_USBDRD_PHY_CONTROL                             0x0704
+#define EXYNOS5_DPTX_PHY_CONTROL                               0x0720
 
 #define EXYNOS5_USE_RETENTION                  BIT(4)
 #define EXYNOS5_SYS_WDTRESET                                   (1 << 20)
@@ -502,6 +504,11 @@
 #define EXYNOS5420_KFC_CORE_RESET(_nr)                         \
        ((EXYNOS5420_KFC_CORE_RESET0 | EXYNOS5420_KFC_ETM_RESET0) << (_nr))
 
+#define EXYNOS5420_USBDRD1_PHY_CONTROL                         0x0708
+#define EXYNOS5420_MIPI_PHY0_CONTROL                           0x0714
+#define EXYNOS5420_MIPI_PHY1_CONTROL                           0x0718
+#define EXYNOS5420_MIPI_PHY2_CONTROL                           0x071C
+#define EXYNOS5420_DPTX_PHY_CONTROL                            0x0728
 #define EXYNOS5420_ARM_CORE2_SYS_PWR_REG                       0x1020
 #define EXYNOS5420_DIS_IRQ_ARM_CORE2_LOCAL_SYS_PWR_REG         0x1024
 #define EXYNOS5420_DIS_IRQ_ARM_CORE2_CENTRAL_SYS_PWR_REG       0x1028
@@ -639,6 +646,7 @@
                                         | EXYNOS5420_KFC_USE_STANDBY_WFI3)
 
 /* For EXYNOS5433 */
+#define EXYNOS5433_USBHOST30_PHY_CONTROL                       (0x0728)
 #define EXYNOS5433_PAD_RETENTION_AUD_OPTION                    (0x3028)
 #define EXYNOS5433_PAD_RETENTION_MMC2_OPTION                   (0x30C8)
 #define EXYNOS5433_PAD_RETENTION_TOP_OPTION                    (0x3108)