Re: [PATCH v3 5/5] phy: exynos: Use one define for enable bit

[Lee Jones]

On Sat, 11 Mar 2017, Krzysztof Kozlowski wrote:

> There is no need for separate defines for Exynos4 and Exynos5 phy enable
> bit and MIPI phy reset bits.  In both cases there are the same so
> simplify it.
> 
> This reduces number of defines and allows removal of one header file.
> 
> Signed-off-by: Krzysztof Kozlowski 
> Acked-by: Lee Jones 
> ---
>  drivers/phy/phy-exynos-dp-video.c   |  5 ++--
>  drivers/phy/phy-exynos-mipi-video.c | 39 
> ++---
>  drivers/phy/phy-exynos5-usbdrd.c|  5 ++--

>  include/linux/mfd/syscon/exynos5-pmu.h  | 22 

My kind of diffstat:

Acked-by: Lee Jones 

>  include/linux/soc/samsung/exynos-regs-pmu.h |  3 ++-
>  5 files changed, 25 insertions(+), 49 deletions(-)
>  delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h
> 
> diff --git a/drivers/phy/phy-exynos-dp-video.c 
> b/drivers/phy/phy-exynos-dp-video.c
> index d72193188980..bb3279dbf88c 100644
> --- a/drivers/phy/phy-exynos-dp-video.c
> +++ b/drivers/phy/phy-exynos-dp-video.c
> @@ -14,7 +14,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -37,7 +36,7 @@ static int exynos_dp_video_phy_power_on(struct phy *phy)
>  
>   /* Disable power isolation on DP-PHY */
>   return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
> -   EXYNOS5_PHY_ENABLE, EXYNOS5_PHY_ENABLE);
> +   EXYNOS4_PHY_ENABLE, EXYNOS4_PHY_ENABLE);
>  }
>  
>  static int exynos_dp_video_phy_power_off(struct phy *phy)
> @@ -46,7 +45,7 @@ static int exynos_dp_video_phy_power_off(struct phy *phy)
>  
>   /* Enable power isolation on DP-PHY */
>   return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
> -   EXYNOS5_PHY_ENABLE, 0);
> +   EXYNOS4_PHY_ENABLE, 0);
>  }
>  
>  static const struct phy_ops exynos_dp_video_phy_ops = {
> diff --git a/drivers/phy/phy-exynos-mipi-video.c 
> b/drivers/phy/phy-exynos-mipi-video.c
> index acef1d92691e..c198886f80a3 100644
> --- a/drivers/phy/phy-exynos-mipi-video.c
> +++ b/drivers/phy/phy-exynos-mipi-video.c
> @@ -12,7 +12,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -64,7 +63,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = 
> {
>   {
>   /* EXYNOS_MIPI_PHY_ID_CSIS0 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM0,
> - .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS4_MIPI_PHY_CONTROL(0),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
>   .resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
> @@ -73,7 +72,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = 
> {
>   }, {
>   /* EXYNOS_MIPI_PHY_ID_DSIM0 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_CSIS0,
> - .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS4_MIPI_PHY_CONTROL(0),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
>   .resetn_val = EXYNOS4_MIPI_PHY_MRESETN,
> @@ -82,7 +81,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = 
> {
>   }, {
>   /* EXYNOS_MIPI_PHY_ID_CSIS1 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM1,
> - .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS4_MIPI_PHY_CONTROL(1),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
>   .resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
> @@ -91,7 +90,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = 
> {
>   }, {
>   /* EXYNOS_MIPI_PHY_ID_DSIM1 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_CSIS1,
> - .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS4_MIPI_PHY_CONTROL(1),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
>   .resetn_val = EXYNOS4_MIPI_PHY_MRESETN,
> @@ -109,46 +108,46 @@ static const struct mipi_phy_device_desc 
> exynos5420_mipi_phy = {
>   {
>   /* EXYNOS_MIPI_PHY_ID_CSIS0 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM0,
> - .enable_val = EXYNOS5_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS5420_MIPI_PHY_CONTROL(0),
>   

Re: [PATCH v3 5/5] phy: exynos: Use one define for enable bit

[Lee Jones]

On Sat, 11 Mar 2017, Krzysztof Kozlowski wrote:

> There is no need for separate defines for Exynos4 and Exynos5 phy enable
> bit and MIPI phy reset bits.  In both cases there are the same so
> simplify it.
> 
> This reduces number of defines and allows removal of one header file.
> 
> Signed-off-by: Krzysztof Kozlowski 
> Acked-by: Lee Jones 
> ---
>  drivers/phy/phy-exynos-dp-video.c   |  5 ++--
>  drivers/phy/phy-exynos-mipi-video.c | 39 
> ++---
>  drivers/phy/phy-exynos5-usbdrd.c|  5 ++--

>  include/linux/mfd/syscon/exynos5-pmu.h  | 22 

My kind of diffstat:

Acked-by: Lee Jones 

>  include/linux/soc/samsung/exynos-regs-pmu.h |  3 ++-
>  5 files changed, 25 insertions(+), 49 deletions(-)
>  delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h
> 
> diff --git a/drivers/phy/phy-exynos-dp-video.c 
> b/drivers/phy/phy-exynos-dp-video.c
> index d72193188980..bb3279dbf88c 100644
> --- a/drivers/phy/phy-exynos-dp-video.c
> +++ b/drivers/phy/phy-exynos-dp-video.c
> @@ -14,7 +14,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -37,7 +36,7 @@ static int exynos_dp_video_phy_power_on(struct phy *phy)
>  
>   /* Disable power isolation on DP-PHY */
>   return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
> -   EXYNOS5_PHY_ENABLE, EXYNOS5_PHY_ENABLE);
> +   EXYNOS4_PHY_ENABLE, EXYNOS4_PHY_ENABLE);
>  }
>  
>  static int exynos_dp_video_phy_power_off(struct phy *phy)
> @@ -46,7 +45,7 @@ static int exynos_dp_video_phy_power_off(struct phy *phy)
>  
>   /* Enable power isolation on DP-PHY */
>   return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
> -   EXYNOS5_PHY_ENABLE, 0);
> +   EXYNOS4_PHY_ENABLE, 0);
>  }
>  
>  static const struct phy_ops exynos_dp_video_phy_ops = {
> diff --git a/drivers/phy/phy-exynos-mipi-video.c 
> b/drivers/phy/phy-exynos-mipi-video.c
> index acef1d92691e..c198886f80a3 100644
> --- a/drivers/phy/phy-exynos-mipi-video.c
> +++ b/drivers/phy/phy-exynos-mipi-video.c
> @@ -12,7 +12,6 @@
>  #include 
>  #include 
>  #include 
> -#include 
>  #include 
>  #include 
>  #include 
> @@ -64,7 +63,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = 
> {
>   {
>   /* EXYNOS_MIPI_PHY_ID_CSIS0 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM0,
> - .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS4_MIPI_PHY_CONTROL(0),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
>   .resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
> @@ -73,7 +72,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = 
> {
>   }, {
>   /* EXYNOS_MIPI_PHY_ID_DSIM0 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_CSIS0,
> - .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS4_MIPI_PHY_CONTROL(0),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
>   .resetn_val = EXYNOS4_MIPI_PHY_MRESETN,
> @@ -82,7 +81,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = 
> {
>   }, {
>   /* EXYNOS_MIPI_PHY_ID_CSIS1 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM1,
> - .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS4_MIPI_PHY_CONTROL(1),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
>   .resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
> @@ -91,7 +90,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = 
> {
>   }, {
>   /* EXYNOS_MIPI_PHY_ID_DSIM1 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_CSIS1,
> - .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS4_MIPI_PHY_CONTROL(1),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
>   .resetn_val = EXYNOS4_MIPI_PHY_MRESETN,
> @@ -109,46 +108,46 @@ static const struct mipi_phy_device_desc 
> exynos5420_mipi_phy = {
>   {
>   /* EXYNOS_MIPI_PHY_ID_CSIS0 */
>   .coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM0,
> - .enable_val = EXYNOS5_PHY_ENABLE,
> + .enable_val = EXYNOS4_PHY_ENABLE,
>   .enable_reg = EXYNOS5420_MIPI_PHY_CONTROL(0),
>   .enable_map = EXYNOS_MIPI_REGMAP_PMU,
> - 

[PATCH v3 5/5] phy: exynos: Use one define for enable bit

[Krzysztof Kozlowski]

There is no need for separate defines for Exynos4 and Exynos5 phy enable
bit and MIPI phy reset bits.  In both cases there are the same so
simplify it.

This reduces number of defines and allows removal of one header file.

Signed-off-by: Krzysztof Kozlowski 
Acked-by: Lee Jones 
---
 drivers/phy/phy-exynos-dp-video.c   |  5 ++--
 drivers/phy/phy-exynos-mipi-video.c | 39 ++---
 drivers/phy/phy-exynos5-usbdrd.c|  5 ++--
 include/linux/mfd/syscon/exynos5-pmu.h  | 22 
 include/linux/soc/samsung/exynos-regs-pmu.h |  3 ++-
 5 files changed, 25 insertions(+), 49 deletions(-)
 delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h

diff --git a/drivers/phy/phy-exynos-dp-video.c 
b/drivers/phy/phy-exynos-dp-video.c
index d72193188980..bb3279dbf88c 100644
--- a/drivers/phy/phy-exynos-dp-video.c
+++ b/drivers/phy/phy-exynos-dp-video.c
@@ -14,7 +14,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -37,7 +36,7 @@ static int exynos_dp_video_phy_power_on(struct phy *phy)
 
/* Disable power isolation on DP-PHY */
return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
- EXYNOS5_PHY_ENABLE, EXYNOS5_PHY_ENABLE);
+ EXYNOS4_PHY_ENABLE, EXYNOS4_PHY_ENABLE);
 }
 
 static int exynos_dp_video_phy_power_off(struct phy *phy)
@@ -46,7 +45,7 @@ static int exynos_dp_video_phy_power_off(struct phy *phy)
 
/* Enable power isolation on DP-PHY */
return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
- EXYNOS5_PHY_ENABLE, 0);
+ EXYNOS4_PHY_ENABLE, 0);
 }
 
 static const struct phy_ops exynos_dp_video_phy_ops = {
diff --git a/drivers/phy/phy-exynos-mipi-video.c 
b/drivers/phy/phy-exynos-mipi-video.c
index acef1d92691e..c198886f80a3 100644
--- a/drivers/phy/phy-exynos-mipi-video.c
+++ b/drivers/phy/phy-exynos-mipi-video.c
@@ -12,7 +12,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -64,7 +63,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = {
{
/* EXYNOS_MIPI_PHY_ID_CSIS0 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM0,
-   .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS4_MIPI_PHY_CONTROL(0),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
.resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
@@ -73,7 +72,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = {
}, {
/* EXYNOS_MIPI_PHY_ID_DSIM0 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_CSIS0,
-   .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS4_MIPI_PHY_CONTROL(0),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
.resetn_val = EXYNOS4_MIPI_PHY_MRESETN,
@@ -82,7 +81,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = {
}, {
/* EXYNOS_MIPI_PHY_ID_CSIS1 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM1,
-   .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS4_MIPI_PHY_CONTROL(1),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
.resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
@@ -91,7 +90,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = {
}, {
/* EXYNOS_MIPI_PHY_ID_DSIM1 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_CSIS1,
-   .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS4_MIPI_PHY_CONTROL(1),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
.resetn_val = EXYNOS4_MIPI_PHY_MRESETN,
@@ -109,46 +108,46 @@ static const struct mipi_phy_device_desc 
exynos5420_mipi_phy = {
{
/* EXYNOS_MIPI_PHY_ID_CSIS0 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM0,
-   .enable_val = EXYNOS5_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS5420_MIPI_PHY_CONTROL(0),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
-   .resetn_val = EXYNOS5_MIPI_PHY_S_RESETN,
+   .resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
.resetn_reg = EXYNOS5420_MIPI_PHY_CONTROL(0),
   

[PATCH v3 5/5] phy: exynos: Use one define for enable bit

[Krzysztof Kozlowski]

There is no need for separate defines for Exynos4 and Exynos5 phy enable
bit and MIPI phy reset bits.  In both cases there are the same so
simplify it.

This reduces number of defines and allows removal of one header file.

Signed-off-by: Krzysztof Kozlowski 
Acked-by: Lee Jones 
---
 drivers/phy/phy-exynos-dp-video.c   |  5 ++--
 drivers/phy/phy-exynos-mipi-video.c | 39 ++---
 drivers/phy/phy-exynos5-usbdrd.c|  5 ++--
 include/linux/mfd/syscon/exynos5-pmu.h  | 22 
 include/linux/soc/samsung/exynos-regs-pmu.h |  3 ++-
 5 files changed, 25 insertions(+), 49 deletions(-)
 delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h

diff --git a/drivers/phy/phy-exynos-dp-video.c 
b/drivers/phy/phy-exynos-dp-video.c
index d72193188980..bb3279dbf88c 100644
--- a/drivers/phy/phy-exynos-dp-video.c
+++ b/drivers/phy/phy-exynos-dp-video.c
@@ -14,7 +14,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -37,7 +36,7 @@ static int exynos_dp_video_phy_power_on(struct phy *phy)
 
/* Disable power isolation on DP-PHY */
return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
- EXYNOS5_PHY_ENABLE, EXYNOS5_PHY_ENABLE);
+ EXYNOS4_PHY_ENABLE, EXYNOS4_PHY_ENABLE);
 }
 
 static int exynos_dp_video_phy_power_off(struct phy *phy)
@@ -46,7 +45,7 @@ static int exynos_dp_video_phy_power_off(struct phy *phy)
 
/* Enable power isolation on DP-PHY */
return regmap_update_bits(state->regs, state->drvdata->phy_ctrl_offset,
- EXYNOS5_PHY_ENABLE, 0);
+ EXYNOS4_PHY_ENABLE, 0);
 }
 
 static const struct phy_ops exynos_dp_video_phy_ops = {
diff --git a/drivers/phy/phy-exynos-mipi-video.c 
b/drivers/phy/phy-exynos-mipi-video.c
index acef1d92691e..c198886f80a3 100644
--- a/drivers/phy/phy-exynos-mipi-video.c
+++ b/drivers/phy/phy-exynos-mipi-video.c
@@ -12,7 +12,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -64,7 +63,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = {
{
/* EXYNOS_MIPI_PHY_ID_CSIS0 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM0,
-   .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS4_MIPI_PHY_CONTROL(0),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
.resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
@@ -73,7 +72,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = {
}, {
/* EXYNOS_MIPI_PHY_ID_DSIM0 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_CSIS0,
-   .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS4_MIPI_PHY_CONTROL(0),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
.resetn_val = EXYNOS4_MIPI_PHY_MRESETN,
@@ -82,7 +81,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = {
}, {
/* EXYNOS_MIPI_PHY_ID_CSIS1 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM1,
-   .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS4_MIPI_PHY_CONTROL(1),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
.resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
@@ -91,7 +90,7 @@ static const struct mipi_phy_device_desc s5pv210_mipi_phy = {
}, {
/* EXYNOS_MIPI_PHY_ID_DSIM1 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_CSIS1,
-   .enable_val = EXYNOS4_MIPI_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS4_MIPI_PHY_CONTROL(1),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
.resetn_val = EXYNOS4_MIPI_PHY_MRESETN,
@@ -109,46 +108,46 @@ static const struct mipi_phy_device_desc 
exynos5420_mipi_phy = {
{
/* EXYNOS_MIPI_PHY_ID_CSIS0 */
.coupled_phy_id = EXYNOS_MIPI_PHY_ID_DSIM0,
-   .enable_val = EXYNOS5_PHY_ENABLE,
+   .enable_val = EXYNOS4_PHY_ENABLE,
.enable_reg = EXYNOS5420_MIPI_PHY_CONTROL(0),
.enable_map = EXYNOS_MIPI_REGMAP_PMU,
-   .resetn_val = EXYNOS5_MIPI_PHY_S_RESETN,
+   .resetn_val = EXYNOS4_MIPI_PHY_SRESETN,
.resetn_reg = EXYNOS5420_MIPI_PHY_CONTROL(0),
.resetn_map =