[PATCH v2 0/3] ARM: dts: dra7: scm_conf node cleanup

[PATCH v2 0/3] ARM: dts: dra7: scm_conf node cleanup

[Roger Quadros]

Hi,

This series cleans up the scm_conf node.

v2:
- split patch. use only core_sma_sw registers for the new scm_conf child.

cheers,
-roger

Roger Quadros (3):
  ARM: dts: dra7: Remove ctrl_core and ctrl_general nodes
  ARM: dts: dra7: fix pinmux@1400 resource length
  ARM: dts: dra7: Add scm_conf@1c04 node

 arch/arm/boot/dts/dra7.dtsi | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

-- 
2.1.4

[PATCH v2 1/3] ARM: dts: dra7: Remove ctrl_core and ctrl_general nodes

[Roger Quadros]

These nodes are wrongly placed. They must come under the
scm node. Nobody uses them either so get rid of them.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dra7.dtsi | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 4a0718c..cf2931e 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -286,16 +286,6 @@
 				#thermal-sensor-cells = <1>;
 		};
 
-		dra7_ctrl_core: ctrl_core@4a002000 {
-			compatible = "syscon";
-			reg = <0x4a002000 0x6d0>;
-		};
-
-		dra7_ctrl_general: tisyscon@4a002e00 {
-			compatible = "syscon";
-			reg = <0x4a002e00 0x7c>;
-		};
-
 		sdma: dma-controller@4a056000 {
 			compatible = "ti,omap4430-sdma";
 			reg = <0x4a056000 0x1000>;
-- 
2.1.4

[PATCH v2 2/3] ARM: dts: dra7: fix pinmux@1400 resource length

[Roger Quadros]

We need to add 4 bytes to include the last 32-bit register space.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dra7.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index cf2931e..913032b 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -141,7 +141,7 @@
 				dra7_pmx_core: pinmux@1400 {
 					compatible = "ti,dra7-padconf",
 						     "pinctrl-single";
-					reg = <0x1400 0x0464>;
+					reg = <0x1400 0x0468>;
 					#address-cells = <1>;
 					#size-cells = <0>;
 					#interrupt-cells = <1>;
-- 
2.1.4

[PATCH v2 3/3] ARM: dts: dra7: Add scm_conf@1c04 node

[Roger Quadros]

This region contains CTRL_CORE_SMA_SW2..9 registers which
are not specific to any domain and can be reasonably
accessed via syscon driver.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/dra7.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 913032b..43b5074 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -149,6 +149,13 @@
 					pinctrl-single,register-width = <32>;
 					pinctrl-single,function-mask = <0x3fffffff>;
 				};
+
+				scm_conf1: scm_conf@1c04 {
+					compatible = "syscon";
+					reg = <0x1c04 0x0020>;
+					#address-cells = <1>;
+					#size-cells = <1>;
+				};
 			};
 
 			cm_core_aon: cm_core_aon@5000 {
-- 
2.1.4

Re: [PATCH v2 0/3] ARM: dts: dra7: scm_conf node cleanup

[Tero Kristo]

On 07/27/2015 01:27 PM, Roger Quadros wrote:
> Hi,
>
> This series cleans up the scm_conf node.
>
> v2:
> - split patch. use only core_sma_sw registers for the new scm_conf child.

Series looks ok to me, so:

Acked-by: Tero Kristo <t-kristo@ti.com>

>
> cheers,
> -roger
>
> Roger Quadros (3):
>    ARM: dts: dra7: Remove ctrl_core and ctrl_general nodes
>    ARM: dts: dra7: fix pinmux@1400 resource length
>    ARM: dts: dra7: Add scm_conf@1c04 node
>
>   arch/arm/boot/dts/dra7.dtsi | 19 ++++++++-----------
>   1 file changed, 8 insertions(+), 11 deletions(-)
>

Re: [PATCH v2 3/3] ARM: dts: dra7: Add scm_conf@1c04 node

[Kishon Vijay Abraham I]

Hi Roger,

On Monday 27 July 2015 03:57 PM, Roger Quadros wrote:
> This region contains CTRL_CORE_SMA_SW2..9 registers which
> are not specific to any domain and can be reasonably
> accessed via syscon driver.
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
>  arch/arm/boot/dts/dra7.dtsi | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index 913032b..43b5074 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -149,6 +149,13 @@
>  					pinctrl-single,register-width = <32>;
>  					pinctrl-single,function-mask = <0x3fffffff>;
>  				};
> +
> +				scm_conf1: scm_conf@1c04 {
> +					compatible = "syscon";
> +					reg = <0x1c04 0x0020>;
> +					#address-cells = <1>;
> +					#size-cells = <1>;

Why do you need address-cells and size-cells property here? AFAIK it is usually
used to decode childs reg property.

Thanks
Kishon

Re: [PATCH v2 3/3] ARM: dts: dra7: Add scm_conf@1c04 node

[Roger Quadros]

On 03/08/15 18:51, Kishon Vijay Abraham I wrote:
> Hi Roger,
> 
> On Monday 27 July 2015 03:57 PM, Roger Quadros wrote:
>> This region contains CTRL_CORE_SMA_SW2..9 registers which
>> are not specific to any domain and can be reasonably
>> accessed via syscon driver.
>>
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> ---
>>  arch/arm/boot/dts/dra7.dtsi | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
>> index 913032b..43b5074 100644
>> --- a/arch/arm/boot/dts/dra7.dtsi
>> +++ b/arch/arm/boot/dts/dra7.dtsi
>> @@ -149,6 +149,13 @@
>>  					pinctrl-single,register-width = <32>;
>>  					pinctrl-single,function-mask = <0x3fffffff>;
>>  				};
>> +
>> +				scm_conf1: scm_conf@1c04 {
>> +					compatible = "syscon";
>> +					reg = <0x1c04 0x0020>;
>> +					#address-cells = <1>;
>> +					#size-cells = <1>;
> 
> Why do you need address-cells and size-cells property here? AFAIK it is usually
> used to decode childs reg property.

Right. I'll remove them.

cheers,
-roger

[PATCH v3 3/3] ARM: dts: dra7: Add scm_conf@1c04 node

[Roger Quadros]

This region contains CTRL_CORE_SMA_SW2..9 registers which
are not specific to any domain and can be reasonably
accessed via syscon driver.

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

v3: removed #address/size-cells.

 arch/arm/boot/dts/dra7.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 913032b..2cab476 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -149,6 +149,11 @@
 					pinctrl-single,register-width = <32>;
 					pinctrl-single,function-mask = <0x3fffffff>;
 				};
+
+				scm_conf1: scm_conf@1c04 {
+					compatible = "syscon";
+					reg = <0x1c04 0x0020>;
+				};
 			};
 
 			cm_core_aon: cm_core_aon@5000 {
-- 
2.1.4

Re: [PATCH v3 3/3] ARM: dts: dra7: Add scm_conf@1c04 node

[Tony Lindgren]

* Roger Quadros <rogerq@ti.com> [150804 02:13]:
> This region contains CTRL_CORE_SMA_SW2..9 registers which
> are not specific to any domain and can be reasonably
> accessed via syscon driver.
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>

Applying all three into omap-for-v4.3/dt thanks.

Tony

> ---
> 
> v3: removed #address/size-cells.
> 
>  arch/arm/boot/dts/dra7.dtsi | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
> index 913032b..2cab476 100644
> --- a/arch/arm/boot/dts/dra7.dtsi
> +++ b/arch/arm/boot/dts/dra7.dtsi
> @@ -149,6 +149,11 @@
>  					pinctrl-single,register-width = <32>;
>  					pinctrl-single,function-mask = <0x3fffffff>;
>  				};
> +
> +				scm_conf1: scm_conf@1c04 {
> +					compatible = "syscon";
> +					reg = <0x1c04 0x0020>;
> +				};
>  			};
>  
>  			cm_core_aon: cm_core_aon@5000 {
> -- 
> 2.1.4
> 
>