Patchwork powerpc/p5040: fix dtb build warning of p5040ds.dtb

login
register
mail settings
Submitter shaohui xie
Date Sept. 12, 2012, 10:36 a.m.
Message ID <1347446163-15470-1-git-send-email-Shaohui.Xie@freescale.com>
Download mbox | patch
Permalink /patch/183318/
State Accepted, archived
Commit c8c4e2c3d911cb004db1ae8483df3795d8d20459
Delegated to: Kumar Gala
Headers show

Comments

shaohui xie - Sept. 12, 2012, 10:36 a.m.
Device node adt7461 was wrongly added in p5040ds.dts, it should be added
into i2c instead of localbus, when build p5040ds.dtb, a warning will dump:

Warning (reg_format): "reg" property in
/localbus@ffe124000/nand@2,0/adt7461@4c has invalid length (4 bytes)
(#address-cells == 1, #size-cells == 1)

This was introduced by:

commit ea6b1ba692bcb5f6e39f409a78cf8b04fdf23baa
Author: Jia Hongtao <B38951@freescale.com>
Date:   Tue Aug 28 10:00:55 2012 +0800

    powerpc: add adt7461 thermal monitor support to applicable boards

    Add thermal monitor support to following boards:
    P1022DS, MPC8536DS, P2041RDB, P3041DS, P4080DS, P5020DS, P5040DS

Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
---
based on next branch of http://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git

 arch/powerpc/boot/dts/p5040ds.dts |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Kumar Gala - Sept. 12, 2012, 8:20 p.m.
On Sep 12, 2012, at 5:36 AM, Shaohui Xie wrote:

> Device node adt7461 was wrongly added in p5040ds.dts, it should be added
> into i2c instead of localbus, when build p5040ds.dtb, a warning will dump:
> 
> Warning (reg_format): "reg" property in
> /localbus@ffe124000/nand@2,0/adt7461@4c has invalid length (4 bytes)
> (#address-cells == 1, #size-cells == 1)
> 
> This was introduced by:
> 
> commit ea6b1ba692bcb5f6e39f409a78cf8b04fdf23baa
> Author: Jia Hongtao <B38951@freescale.com>
> Date:   Tue Aug 28 10:00:55 2012 +0800
> 
>    powerpc: add adt7461 thermal monitor support to applicable boards
> 
>    Add thermal monitor support to following boards:
>    P1022DS, MPC8536DS, P2041RDB, P3041DS, P4080DS, P5020DS, P5040DS
> 
> Signed-off-by: Shaohui Xie <Shaohui.Xie@freescale.com>
> ---
> based on next branch of http://git.kernel.org/pub/scm/linux/kernel/git/galak/powerpc.git
> 
> arch/powerpc/boot/dts/p5040ds.dts |    8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-)

applied to next

- k

Patch

diff --git a/arch/powerpc/boot/dts/p5040ds.dts b/arch/powerpc/boot/dts/p5040ds.dts
index 8165c93..860b5cc 100644
--- a/arch/powerpc/boot/dts/p5040ds.dts
+++ b/arch/powerpc/boot/dts/p5040ds.dts
@@ -95,6 +95,10 @@ 
 				reg = <0x68>;
 				interrupts = <0x1 0x1 0 0>;
 			};
+			adt7461@4c {
+				compatible = "adi,adt7461";
+				reg = <0x4c>;
+			};
 		};
 	};
 
@@ -146,10 +150,6 @@ 
 				label = "NAND Writable User area";
 				reg = <0x1f000000 0x01000000>;
 			};
-			adt7461@4c {
-				compatible = "adi,adt7461";
-				reg = <0x4c>;
-			};
 		};
 
 		board-control@3,0 {