diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-07-23 03:25:13 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-08-22 11:29:44 -0400 |
commit | 951ebf58bf2a668c385df4ce8f2f3285afa0763c (patch) | |
tree | d5819487a2f7d8e6ae3cba13a8341956bb22f58e | |
parent | e9c1786681b53d6675688c7721cbda1da321a1da (diff) |
ARM: dts: imx: ocram size is different between imx6q and imx6dl
The ocram on imx6q is 256 KiB while on imx6dl it's 128 KiB. Let's
have separate node for imx6q and imx6dl. It also changes imx6q size
0x3f000 to 0x40000 to match the hardware.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Liu Ying <Ying.Liu@freescale.com>
-rw-r--r-- | arch/arm/boot/dts/imx6dl.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6q.dtsi | 6 | ||||
-rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index e9cb589eb5a9..9e8ae118fdd4 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi | |||
@@ -32,6 +32,12 @@ | |||
32 | }; | 32 | }; |
33 | 33 | ||
34 | soc { | 34 | soc { |
35 | ocram: sram@00900000 { | ||
36 | compatible = "mmio-sram"; | ||
37 | reg = <0x00900000 0x20000>; | ||
38 | clocks = <&clks 142>; | ||
39 | }; | ||
40 | |||
35 | aips1: aips-bus@02000000 { | 41 | aips1: aips-bus@02000000 { |
36 | iomuxc: iomuxc@020e0000 { | 42 | iomuxc: iomuxc@020e0000 { |
37 | compatible = "fsl,imx6dl-iomuxc"; | 43 | compatible = "fsl,imx6dl-iomuxc"; |
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 76a84e80a1ab..f024ef28b34b 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi | |||
@@ -61,6 +61,12 @@ | |||
61 | }; | 61 | }; |
62 | 62 | ||
63 | soc { | 63 | soc { |
64 | ocram: sram@00900000 { | ||
65 | compatible = "mmio-sram"; | ||
66 | reg = <0x00900000 0x40000>; | ||
67 | clocks = <&clks 142>; | ||
68 | }; | ||
69 | |||
64 | aips-bus@02000000 { /* AIPS1 */ | 70 | aips-bus@02000000 { /* AIPS1 */ |
65 | spba-bus@02000000 { | 71 | spba-bus@02000000 { |
66 | ecspi5: ecspi@02018000 { | 72 | ecspi5: ecspi@02018000 { |
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index bc4ca033758c..ccd55c2fdb67 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi | |||
@@ -99,12 +99,6 @@ | |||
99 | status = "disabled"; | 99 | status = "disabled"; |
100 | }; | 100 | }; |
101 | 101 | ||
102 | ocram: sram@00900000 { | ||
103 | compatible = "mmio-sram"; | ||
104 | reg = <0x00900000 0x3f000>; | ||
105 | clocks = <&clks 142>; | ||
106 | }; | ||
107 | |||
108 | timer@00a00600 { | 102 | timer@00a00600 { |
109 | compatible = "arm,cortex-a9-twd-timer"; | 103 | compatible = "arm,cortex-a9-twd-timer"; |
110 | reg = <0x00a00600 0x20>; | 104 | reg = <0x00a00600 0x20>; |