From: Ying.Liu@freescale.com (Liu Ying)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: dts: imx: ocram size is different between imx6q and imx6dl
Date: Tue, 23 Jul 2013 16:04:03 +0800 [thread overview]
Message-ID: <51EE38F3.7020503@freescale.com> (raw)
In-Reply-To: <1374565107-9658-1-git-send-email-shawn.guo@linaro.org>
On 07/23/2013 03:38 PM, Shawn Guo wrote:
> 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>
> ---
> arch/arm/boot/dts/imx6dl.dtsi | 6 ++++++
> arch/arm/boot/dts/imx6q.dtsi | 6 ++++++
> 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 e9cb589..9e8ae11 100644
> --- a/arch/arm/boot/dts/imx6dl.dtsi
> +++ b/arch/arm/boot/dts/imx6dl.dtsi
> @@ -32,6 +32,12 @@
> };
>
> soc {
> + ocram: sram at 00900000 {
> + compatible = "mmio-sram";
> + reg = <0x00900000 0x20000>;
> + clocks = <&clks 142>;
> + };
> +
> aips1: aips-bus at 02000000 {
> iomuxc: iomuxc at 020e0000 {
> compatible = "fsl,imx6dl-iomuxc";
> diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
> index 76a84e8..f024ef2 100644
> --- a/arch/arm/boot/dts/imx6q.dtsi
> +++ b/arch/arm/boot/dts/imx6q.dtsi
> @@ -61,6 +61,12 @@
> };
>
> soc {
> + ocram: sram at 00900000 {
> + compatible = "mmio-sram";
> + reg = <0x00900000 0x40000>;
> + clocks = <&clks 142>;
> + };
> +
> aips-bus at 02000000 { /* AIPS1 */
> spba-bus at 02000000 {
> ecspi5: ecspi at 02018000 {
> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
> index bc4ca03..ccd55c2 100644
> --- a/arch/arm/boot/dts/imx6qdl.dtsi
> +++ b/arch/arm/boot/dts/imx6qdl.dtsi
> @@ -99,12 +99,6 @@
> status = "disabled";
> };
>
> - ocram: sram at 00900000 {
> - compatible = "mmio-sram";
> - reg = <0x00900000 0x3f000>;
> - clocks = <&clks 142>;
> - };
> -
> timer at 00a00600 {
> compatible = "arm,cortex-a9-twd-timer";
> reg = <0x00a00600 0x20>;
>
prev parent reply other threads:[~2013-07-23 8:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-23 7:38 [PATCH] ARM: dts: imx: ocram size is different between imx6q and imx6dl Shawn Guo
2013-07-23 8:04 ` Liu Ying [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51EE38F3.7020503@freescale.com \
--to=ying.liu@freescale.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.