[09/17] ARM: dts: dra7: Use "syscon-phy-power" instead of "ctrl-module" in SATA PHY node
diff mbox

Message ID 1435060743-5511-10-git-send-email-kishon@ti.com
State New
Headers show

Commit Message

Kishon Vijay Abraham I June 23, 2015, 11:58 a.m. UTC
Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
property from SATA PHY node. Since "omap_control_sata" note is no longer
used, remove it.

Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
 arch/arm/boot/dts/dra7.dtsi |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

Comments

Roger Quadros June 24, 2015, 12:06 p.m. UTC | #1
On Tue, 23 Jun 2015 17:28:54 +0530
Kishon Vijay Abraham I <kishon@ti.com> wrote:

> Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
> property from SATA PHY node. Since "omap_control_sata" note is no longer
> used, remove it.
> 
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>

Acked-by: Roger Quadros <rogerq@ti.com>

cheers,
-roger

> ---
>  arch/arm/boot/dts/dra7.dtsi |   10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index 3f434f7..92e0741 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -1115,14 +1115,6 @@
>  			status = "disabled";
>  		};
>  
> -		omap_control_sata: control-phy@4a002374 {
> -			compatible = "ti,control-phy-pipe3";
> -			reg = <0x4a002374 0x4>;
> -			reg-names = "power";
> -			clocks = <&sys_clkin1>;
> -			clock-names = "sysclk";
> -		};
> -
>  		/* OCP2SCP3 */
>  		ocp2scp@4a090000 {
>  			compatible = "ti,omap-ocp2scp";
> @@ -1137,7 +1129,7 @@
>  				      <0x4A096400 0x64>, /* phy_tx */
>  				      <0x4A096800 0x40>; /* pll_ctrl */
>  				reg-names = "phy_rx", "phy_tx", "pll_ctrl";
> -				ctrl-module = <&omap_control_sata>;
> +				syscon-phy-power = <&dra7_ctrl_core 0x374>;
>  				clocks = <&sys_clkin1>, <&sata_ref_clk>;
>  				clock-names = "sysclk", "refclk";
>  				syscon-pllreset = <&dra7_ctrl_core 0x3fc>;
> -- 
> 1.7.9.5
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Roger Quadros June 24, 2015, 12:12 p.m. UTC | #2
On Wed, 24 Jun 2015 15:06:02 +0300
Roger Quadros <rogerq@ti.com> wrote:

> On Tue, 23 Jun 2015 17:28:54 +0530
> Kishon Vijay Abraham I <kishon@ti.com> wrote:
> 
> > Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
> > property from SATA PHY node. Since "omap_control_sata" note is no longer
> > used, remove it.
> > 
> > Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> 
> Acked-by: Roger Quadros <rogerq@ti.com>

One comment though.

> 
> > ---
> >  arch/arm/boot/dts/dra7.dtsi |   10 +---------
> >  1 file changed, 1 insertion(+), 9 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> > index 3f434f7..92e0741 100644
> > --- a/arch/arm/boot/dts/dra7.dtsi
> > +++ b/arch/arm/boot/dts/dra7.dtsi
> > @@ -1115,14 +1115,6 @@
> >  			status = "disabled";
> >  		};
> >  
> > -		omap_control_sata: control-phy@4a002374 {
> > -			compatible = "ti,control-phy-pipe3";
> > -			reg = <0x4a002374 0x4>;
> > -			reg-names = "power";
> > -			clocks = <&sys_clkin1>;
> > -			clock-names = "sysclk";
> > -		};
> > -
> >  		/* OCP2SCP3 */
> >  		ocp2scp@4a090000 {
> >  			compatible = "ti,omap-ocp2scp";
> > @@ -1137,7 +1129,7 @@
> >  				      <0x4A096400 0x64>, /* phy_tx */
> >  				      <0x4A096800 0x40>; /* pll_ctrl */
> >  				reg-names = "phy_rx", "phy_tx", "pll_ctrl";
> > -				ctrl-module = <&omap_control_sata>;
> > +				syscon-phy-power = <&dra7_ctrl_core 0x374>;

why can't we use scm_conf instead of dra7_ctrl_core?
dra7_ctrl_core seems to be redundant and wrongly placed.

> >  				clocks = <&sys_clkin1>, <&sata_ref_clk>;
> >  				clock-names = "sysclk", "refclk";
> >  				syscon-pllreset = <&dra7_ctrl_core 0x3fc>;
> > -- 
> > 1.7.9.5
> > 

cheers,
-roger
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kishon Vijay Abraham I June 24, 2015, 1:31 p.m. UTC | #3
On Wednesday 24 June 2015 05:42 PM, Roger Quadros wrote:
> On Wed, 24 Jun 2015 15:06:02 +0300
> Roger Quadros <rogerq@ti.com> wrote:
> 
>> On Tue, 23 Jun 2015 17:28:54 +0530
>> Kishon Vijay Abraham I <kishon@ti.com> wrote:
>>
>>> Add "syscon-phy-power" property and remove the deprecated "ctrl-module"
>>> property from SATA PHY node. Since "omap_control_sata" note is no longer
>>> used, remove it.
>>>
>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>
>> Acked-by: Roger Quadros <rogerq@ti.com>
> 
> One comment though.
> 
>>
>>> ---
>>>  arch/arm/boot/dts/dra7.dtsi |   10 +---------
>>>  1 file changed, 1 insertion(+), 9 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
>>> index 3f434f7..92e0741 100644
>>> --- a/arch/arm/boot/dts/dra7.dtsi
>>> +++ b/arch/arm/boot/dts/dra7.dtsi
>>> @@ -1115,14 +1115,6 @@
>>>  			status = "disabled";
>>>  		};
>>>  
>>> -		omap_control_sata: control-phy@4a002374 {
>>> -			compatible = "ti,control-phy-pipe3";
>>> -			reg = <0x4a002374 0x4>;
>>> -			reg-names = "power";
>>> -			clocks = <&sys_clkin1>;
>>> -			clock-names = "sysclk";
>>> -		};
>>> -
>>>  		/* OCP2SCP3 */
>>>  		ocp2scp@4a090000 {
>>>  			compatible = "ti,omap-ocp2scp";
>>> @@ -1137,7 +1129,7 @@
>>>  				      <0x4A096400 0x64>, /* phy_tx */
>>>  				      <0x4A096800 0x40>; /* pll_ctrl */
>>>  				reg-names = "phy_rx", "phy_tx", "pll_ctrl";
>>> -				ctrl-module = <&omap_control_sata>;
>>> +				syscon-phy-power = <&dra7_ctrl_core 0x374>;
> 
> why can't we use scm_conf instead of dra7_ctrl_core?
> dra7_ctrl_core seems to be redundant and wrongly placed.

Agreed!

Thanks
Kishon
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 3f434f7..92e0741 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -1115,14 +1115,6 @@ 
 			status = "disabled";
 		};
 
-		omap_control_sata: control-phy@4a002374 {
-			compatible = "ti,control-phy-pipe3";
-			reg = <0x4a002374 0x4>;
-			reg-names = "power";
-			clocks = <&sys_clkin1>;
-			clock-names = "sysclk";
-		};
-
 		/* OCP2SCP3 */
 		ocp2scp@4a090000 {
 			compatible = "ti,omap-ocp2scp";
@@ -1137,7 +1129,7 @@ 
 				      <0x4A096400 0x64>, /* phy_tx */
 				      <0x4A096800 0x40>; /* pll_ctrl */
 				reg-names = "phy_rx", "phy_tx", "pll_ctrl";
-				ctrl-module = <&omap_control_sata>;
+				syscon-phy-power = <&dra7_ctrl_core 0x374>;
 				clocks = <&sys_clkin1>, <&sata_ref_clk>;
 				clock-names = "sysclk", "refclk";
 				syscon-pllreset = <&dra7_ctrl_core 0x3fc>;