diff mbox

[U-Boot,1/2] dts:exynos:update pinctrl size-cells and fix child regs

Message ID 1452609644-25249-2-git-send-email-p.marczak@samsung.com
State Accepted
Commit 3349682c777e0835a0b628ae1ec2859632d479a2
Delegated to: Simon Glass
Headers show

Commit Message

Przemyslaw Marczak Jan. 12, 2016, 2:40 p.m. UTC
This change is required to avoid warnings about invalid
size-cells defined in device-tree pinctrl nodes for Exynos.

Tested on:
- Odroid U3
- Odroid XU3

Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
Cc: Stefan Roese <sr@denx.de>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@nvidia.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>
---
 arch/arm/dts/exynos4210-pinctrl-uboot.dtsi |  8 ++++----
 arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi | 18 +++++++++---------
 arch/arm/dts/exynos5250-pinctrl-uboot.dtsi | 16 ++++++++--------
 arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi | 12 ++++++------
 arch/arm/dts/s5pc110-pinctrl.dtsi          |  4 ++--
 5 files changed, 29 insertions(+), 29 deletions(-)

Comments

Simon Glass Jan. 14, 2016, 5:17 p.m. UTC | #1
On 12 January 2016 at 07:40, Przemyslaw Marczak <p.marczak@samsung.com> wrote:
> This change is required to avoid warnings about invalid
> size-cells defined in device-tree pinctrl nodes for Exynos.
>
> Tested on:
> - Odroid U3
> - Odroid XU3
>
> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
> Cc: Stefan Roese <sr@denx.de>
> Cc: Tom Rini <trini@konsulko.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Stephen Warren <swarren@nvidia.com>
> Cc: Stephen Warren <swarren@wwwdotorg.org>
> ---
>  arch/arm/dts/exynos4210-pinctrl-uboot.dtsi |  8 ++++----
>  arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi | 18 +++++++++---------
>  arch/arm/dts/exynos5250-pinctrl-uboot.dtsi | 16 ++++++++--------
>  arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi | 12 ++++++------
>  arch/arm/dts/s5pc110-pinctrl.dtsi          |  4 ++--
>  5 files changed, 29 insertions(+), 29 deletions(-)

Tested on snow:
Tested-by: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>

Stephen, I plan to pick this up so please sing out if there is a problem.
Minkyu Kang Jan. 15, 2016, 9:31 a.m. UTC | #2
On 15/01/16 02:17, Simon Glass wrote:
> On 12 January 2016 at 07:40, Przemyslaw Marczak <p.marczak@samsung.com> wrote:
>> This change is required to avoid warnings about invalid
>> size-cells defined in device-tree pinctrl nodes for Exynos.
>>
>> Tested on:
>> - Odroid U3
>> - Odroid XU3
>>
>> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
>> Cc: Stefan Roese <sr@denx.de>
>> Cc: Tom Rini <trini@konsulko.com>
>> Cc: Simon Glass <sjg@chromium.org>
>> Cc: Stephen Warren <swarren@nvidia.com>
>> Cc: Stephen Warren <swarren@wwwdotorg.org>
>> ---
>>  arch/arm/dts/exynos4210-pinctrl-uboot.dtsi |  8 ++++----
>>  arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi | 18 +++++++++---------
>>  arch/arm/dts/exynos5250-pinctrl-uboot.dtsi | 16 ++++++++--------
>>  arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi | 12 ++++++------
>>  arch/arm/dts/s5pc110-pinctrl.dtsi          |  4 ++--
>>  5 files changed, 29 insertions(+), 29 deletions(-)
> 
> Tested on snow:
> Tested-by: Simon Glass <sjg@chromium.org>
> Acked-by: Simon Glass <sjg@chromium.org>
> 
> Stephen, I plan to pick this up so please sing out if there is a problem.
> 
> 

Acked-by: Minkyu Kang <mk7.kang@samsung.com>

Thanks,
Minkyu Kang.
Simon Glass March 13, 2016, 1:54 a.m. UTC | #3
On 15 January 2016 at 02:31, Minkyu Kang <mk7.kang@samsung.com> wrote:
> On 15/01/16 02:17, Simon Glass wrote:
>> On 12 January 2016 at 07:40, Przemyslaw Marczak <p.marczak@samsung.com> wrote:
>>> This change is required to avoid warnings about invalid
>>> size-cells defined in device-tree pinctrl nodes for Exynos.
>>>
>>> Tested on:
>>> - Odroid U3
>>> - Odroid XU3
>>>
>>> Signed-off-by: Przemyslaw Marczak <p.marczak@samsung.com>
>>> Cc: Stefan Roese <sr@denx.de>
>>> Cc: Tom Rini <trini@konsulko.com>
>>> Cc: Simon Glass <sjg@chromium.org>
>>> Cc: Stephen Warren <swarren@nvidia.com>
>>> Cc: Stephen Warren <swarren@wwwdotorg.org>
>>> ---
>>>  arch/arm/dts/exynos4210-pinctrl-uboot.dtsi |  8 ++++----
>>>  arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi | 18 +++++++++---------
>>>  arch/arm/dts/exynos5250-pinctrl-uboot.dtsi | 16 ++++++++--------
>>>  arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi | 12 ++++++------
>>>  arch/arm/dts/s5pc110-pinctrl.dtsi          |  4 ++--
>>>  5 files changed, 29 insertions(+), 29 deletions(-)
>>
>> Tested on snow:
>> Tested-by: Simon Glass <sjg@chromium.org>
>> Acked-by: Simon Glass <sjg@chromium.org>
>>
>> Stephen, I plan to pick this up so please sing out if there is a problem.
>>
>>
>
> Acked-by: Minkyu Kang <mk7.kang@samsung.com>

Applied to u-boot-dm/next, thanks!
diff mbox

Patch

diff --git a/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi b/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi
index 0ff41d0..b76c77d 100644
--- a/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi
+++ b/arch/arm/dts/exynos4210-pinctrl-uboot.dtsi
@@ -9,21 +9,21 @@ 
 /{
 	pinctrl_0: pinctrl@11400000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 		compatible = "samsung,exynos4210-pinctrl";
 	};
 
 	pinctrl_1: pinctrl@11000000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 		gpx0: gpx0 {
-			reg = <0xc00>;
+			reg = <0xc00 0x20>;
 		};
 	};
 
 	pinctrl_2: pinctrl@03860000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 
 };
diff --git a/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi b/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi
index 8e5a6c6..33ecc14 100644
--- a/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi
+++ b/arch/arm/dts/exynos4x12-pinctrl-uboot.dtsi
@@ -9,37 +9,37 @@ 
 /{
 	pinctrl_0: pinctrl@11400000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 		gpf0: gpf0 {
-			reg = <0x180>;
+			reg = <0x180 0x20>;
 		};
 		gpj0: gpj0 {
-			reg = <0x240>;
+			reg = <0x240 0x20>;
 		};
 	};
 
 	pinctrl_1: pinctrl@11000000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 		gpk0: gpk0 {
-			reg = <0x40>;
+			reg = <0x40 0x20>;
 		};
 		gpm0: gpm0 {
-			reg = <0x260>;
+			reg = <0x260 0x20>;
 		};
 		gpx0: gpx0 {
-			reg = <0xc00>;
+			reg = <0xc00 0x20>;
 		};
 	};
 
 	pinctrl_2: pinctrl@03860000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 
 	pinctrl_3: pinctrl@106E0000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 
 };
diff --git a/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi b/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi
index 068c5f6..b8c0526 100644
--- a/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi
+++ b/arch/arm/dts/exynos5250-pinctrl-uboot.dtsi
@@ -9,34 +9,34 @@ 
 /{
 	pinctrl_0: pinctrl@11400000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 		gpc4: gpc4 {
-			reg = <0x2e0>;
+			reg = <0x2e0 0x20>;
 		};
 		gpx0: gpx0 {
-			reg = <0xc00>;
+			reg = <0xc00 0x20>;
 		};
 	};
 
 	pinctrl_1: pinctrl@13400000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 
 	pinctrl_2: pinctrl@10d10000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 		gpv2: gpv2 {
-			reg = <0x060>;
+			reg = <0x060 0x20>;
 		};
 		gpv4: gpv4 {
-			reg = <0xc0>;
+			reg = <0xc0 0x20>;
 		};
 	};
 
 	pinctrl_3: pinctrl@03860000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 
 };
diff --git a/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi b/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi
index 635a1b0..341194f 100644
--- a/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi
+++ b/arch/arm/dts/exynos54xx-pinctrl-uboot.dtsi
@@ -14,29 +14,29 @@ 
 	 */
 	pinctrl@14010000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 	pinctrl@13400000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 		gpy7 {
 		};
 
 		gpx0 {
-			reg = <0xc00>;
+			reg = <0xc00 0x0>;
 		};
 	};
 	pinctrl@13410000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 	pinctrl@14000000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 	pinctrl@03860000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 	};
 
 };
diff --git a/arch/arm/dts/s5pc110-pinctrl.dtsi b/arch/arm/dts/s5pc110-pinctrl.dtsi
index 2e9d552..07e76c0 100644
--- a/arch/arm/dts/s5pc110-pinctrl.dtsi
+++ b/arch/arm/dts/s5pc110-pinctrl.dtsi
@@ -9,7 +9,7 @@ 
 / {
 	pinctrl@e0200000 {
 		#address-cells = <1>;
-		#size-cells = <0>;
+		#size-cells = <1>;
 		gpa0: gpa0 {
 			gpio-controller;
 			#gpio-cells = <2>;
@@ -251,7 +251,7 @@ 
 		};
 
 		gph0: gph0 {
-			reg = <0xc00>;
+			reg = <0xc00 0x20>;
 			gpio-controller;
 			#gpio-cells = <2>;
 		};