diff mbox

[4/7] arm: dts: imx: update snvs to use syscon access register

Message ID 1431696990-23078-5-git-send-email-Frank.Li@freescale.com
State Superseded
Headers show

Commit Message

Frank Li May 15, 2015, 1:36 p.m. UTC
From: Frank Li <Frank.Li@freescale.com>

snvs is MFP device. Change dts to use syscon to allocate register resource.

Signed-off-by: Frank Li <Frank.Li@freescale.com>
---
 arch/arm/boot/dts/imx6qdl.dtsi | 12 ++++--------
 arch/arm/boot/dts/imx6sl.dtsi  | 12 ++++--------
 arch/arm/boot/dts/imx6sx.dtsi  | 12 ++++--------
 arch/arm/boot/dts/vfxxx.dtsi   |  9 +++------
 4 files changed, 15 insertions(+), 30 deletions(-)

Comments

Philipp Zabel May 18, 2015, 8:45 a.m. UTC | #1
Hi Frank,

Am Freitag, den 15.05.2015, 21:36 +0800 schrieb Frank.Li@freescale.com:
> From: Frank Li <Frank.Li@freescale.com>
> 
> snvs is MFP device. Change dts to use syscon to allocate register resource.
> 
> Signed-off-by: Frank Li <Frank.Li@freescale.com>
> ---
>  arch/arm/boot/dts/imx6qdl.dtsi | 12 ++++--------
>  arch/arm/boot/dts/imx6sl.dtsi  | 12 ++++--------
>  arch/arm/boot/dts/imx6sx.dtsi  | 12 ++++--------
>  arch/arm/boot/dts/vfxxx.dtsi   |  9 +++------
>  4 files changed, 15 insertions(+), 30 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index 0482a66..6d8161d 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -687,21 +687,17 @@
>  			};
>  
>  			snvs@020cc000 {
> -				compatible = "fsl,sec-v4.0-mon", "simple-bus";
> -				#address-cells = <1>;
> -				#size-cells = <1>;
> -				ranges = <0 0x020cc000 0x4000>;
> +				compatible = "fsl,sec-v4.0-mon", "syscon",  "simple-bus";

The compatible should change from "simple-bus" to "simple-mfd", then.

regards
Philipp
Zhi Li May 18, 2015, 7:30 p.m. UTC | #2
On Mon, May 18, 2015 at 3:45 AM, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> Hi Frank,
>
> Am Freitag, den 15.05.2015, 21:36 +0800 schrieb Frank.Li@freescale.com:
>> From: Frank Li <Frank.Li@freescale.com>
>>
>> snvs is MFP device. Change dts to use syscon to allocate register resource.
>>
>> Signed-off-by: Frank Li <Frank.Li@freescale.com>
>> ---
>>  arch/arm/boot/dts/imx6qdl.dtsi | 12 ++++--------
>>  arch/arm/boot/dts/imx6sl.dtsi  | 12 ++++--------
>>  arch/arm/boot/dts/imx6sx.dtsi  | 12 ++++--------
>>  arch/arm/boot/dts/vfxxx.dtsi   |  9 +++------
>>  4 files changed, 15 insertions(+), 30 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
>> index 0482a66..6d8161d 100644
>> --- a/arch/arm/boot/dts/imx6qdl.dtsi
>> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
>> @@ -687,21 +687,17 @@
>>                       };
>>
>>                       snvs@020cc000 {
>> -                             compatible = "fsl,sec-v4.0-mon", "simple-bus";
>> -                             #address-cells = <1>;
>> -                             #size-cells = <1>;
>> -                             ranges = <0 0x020cc000 0x4000>;
>> +                             compatible = "fsl,sec-v4.0-mon", "syscon",  "simple-bus";
>
> The compatible should change from "simple-bus" to "simple-mfd", then.

After change to simple-mfd,  driver can't been probed. Anything missed?

>
> regards
> Philipp
>
Alexandre Belloni May 18, 2015, 10:17 p.m. UTC | #3
On 18/05/2015 at 14:30:50 -0500, Zhi Li wrote :
> On Mon, May 18, 2015 at 3:45 AM, Philipp Zabel <p.zabel@pengutronix.de> wrote:
> > Hi Frank,
> >
> > Am Freitag, den 15.05.2015, 21:36 +0800 schrieb Frank.Li@freescale.com:
> >> From: Frank Li <Frank.Li@freescale.com>
> >>
> >> snvs is MFP device. Change dts to use syscon to allocate register resource.
> >>
> >> Signed-off-by: Frank Li <Frank.Li@freescale.com>
> >> ---
> >>  arch/arm/boot/dts/imx6qdl.dtsi | 12 ++++--------
> >>  arch/arm/boot/dts/imx6sl.dtsi  | 12 ++++--------
> >>  arch/arm/boot/dts/imx6sx.dtsi  | 12 ++++--------
> >>  arch/arm/boot/dts/vfxxx.dtsi   |  9 +++------
> >>  4 files changed, 15 insertions(+), 30 deletions(-)
> >>
> >> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> >> index 0482a66..6d8161d 100644
> >> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> >> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> >> @@ -687,21 +687,17 @@
> >>                       };
> >>
> >>                       snvs@020cc000 {
> >> -                             compatible = "fsl,sec-v4.0-mon", "simple-bus";
> >> -                             #address-cells = <1>;
> >> -                             #size-cells = <1>;
> >> -                             ranges = <0 0x020cc000 0x4000>;
> >> +                             compatible = "fsl,sec-v4.0-mon", "syscon",  "simple-bus";
> >
> > The compatible should change from "simple-bus" to "simple-mfd", then.
> 
> After change to simple-mfd,  driver can't been probed. Anything missed?

The pull request is there:
http://lists.infradead.org/pipermail/linux-arm-kernel/2015-May/342131.html

It has landed in linux-next
diff mbox

Patch

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 0482a66..6d8161d 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -687,21 +687,17 @@ 
 			};
 
 			snvs@020cc000 {
-				compatible = "fsl,sec-v4.0-mon", "simple-bus";
-				#address-cells = <1>;
-				#size-cells = <1>;
-				ranges = <0 0x020cc000 0x4000>;
+				compatible = "fsl,sec-v4.0-mon", "syscon",  "simple-bus";
+				reg = <0x020cc000 0x4000>;
 
-				snvs_rtc: snvs-rtc-lp@34 {
+				snvs_rtc: snvs-rtc-lp {
 					compatible = "fsl,sec-v4.0-mon-rtc-lp";
-					reg = <0x34 0x58>;
 					interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>,
 						     <0 20 IRQ_TYPE_LEVEL_HIGH>;
 				};
 
-				snvs_poweroff: snvs-poweroff@38 {
+				snvs_poweroff: snvs-poweroff {
 					compatible = "fsl,sec-v4.0-poweroff";
-					reg = <0x38 0x4>;
 					status = "disabled";
 				};
 			};
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index a78e715..2ec9021 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -564,21 +564,17 @@ 
 			};
 
 			snvs@020cc000 {
-				compatible = "fsl,sec-v4.0-mon", "simple-bus";
-				#address-cells = <1>;
-				#size-cells = <1>;
-				ranges = <0 0x020cc000 0x4000>;
+				compatible = "fsl,sec-v4.0-mon", "syscon", "simple-bus";
+				reg = <0x020cc000 0x4000>;
 
-				snvs_rtc: snvs-rtc-lp@34 {
+				snvs_rtc: snvs-rtc-lp {
 					compatible = "fsl,sec-v4.0-mon-rtc-lp";
-					reg = <0x34 0x58>;
 					interrupts = <0 19 IRQ_TYPE_LEVEL_HIGH>,
 						     <0 20 IRQ_TYPE_LEVEL_HIGH>;
 				};
 
-				snvs_poweroff: snvs-poweroff@38 {
+				snvs_poweroff: snvs-poweroff {
 					compatible = "fsl,sec-v4.0-poweroff";
-					reg = <0x38 0x4>;
 					status = "disabled";
 				};
 			};
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 708175d..7bc5b20 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -662,20 +662,16 @@ 
 			};
 
 			snvs: snvs@020cc000 {
-				compatible = "fsl,sec-v4.0-mon", "simple-bus";
-				#address-cells = <1>;
-				#size-cells = <1>;
-				ranges = <0 0x020cc000 0x4000>;
+				compatible = "fsl,sec-v4.0-mon", "syscon", "simple-bus";
+				reg = <0x020cc000 0x4000>;
 
-				snvs_rtc: snvs-rtc-lp@34 {
+				snvs_rtc: snvs-rtc-lp {
 					compatible = "fsl,sec-v4.0-mon-rtc-lp";
-					reg = <0x34 0x58>;
 					interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
 				};
 
-				snvs_poweroff: snvs-poweroff@38 {
+				snvs_poweroff: snvs-poweroff {
 					compatible = "fsl,sec-v4.0-poweroff";
-					reg = <0x38 0x4>;
 					status = "disabled";
 				};
 			};
diff --git a/arch/arm/boot/dts/vfxxx.dtsi b/arch/arm/boot/dts/vfxxx.dtsi
index 4aa3351..e038378 100644
--- a/arch/arm/boot/dts/vfxxx.dtsi
+++ b/arch/arm/boot/dts/vfxxx.dtsi
@@ -404,14 +404,11 @@ 
 			};
 
 			snvs0: snvs@400a7000 {
-			    compatible = "fsl,sec-v4.0-mon", "simple-bus";
-				#address-cells = <1>;
-				#size-cells = <1>;
-				ranges = <0 0x400a7000 0x2000>;
+			    compatible = "fsl,sec-v4.0-mon", "syscon", "simple-bus";
+				reg = <0x400a7000 0x2000>;
 
-				snvsrtc: snvs-rtc-lp@34 {
+				snvsrtc: snvs-rtc-lp {
 					compatible = "fsl,sec-v4.0-mon-rtc-lp";
-					reg = <0x34 0x58>;
 					interrupts = <100 IRQ_TYPE_LEVEL_HIGH>;
 					clocks = <&clks VF610_CLK_SNVS>;
 					clock-names = "snvs-rtc";