From: b32955@freescale.com (Huang Shijie)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] ARM: mx6q-arm2: add gpmi-nand dt support
Date: Fri, 20 Apr 2012 17:24:17 +0800 [thread overview]
Message-ID: <1334913859-5314-2-git-send-email-b32955@freescale.com> (raw)
In-Reply-To: <1334913859-5314-1-git-send-email-b32955@freescale.com>
add gpmi-nand dt support, and add the proper clock for gpmi-nand.
Signed-off-by: Huang Shijie <b32955@freescale.com>
---
arch/arm/boot/dts/imx6q.dtsi | 12 ++++++++++++
arch/arm/mach-imx/clock-imx6q.c | 5 +++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 4905f51..f23a0c4 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -87,6 +87,18 @@
interrupt-parent = <&intc>;
ranges;
+ gpmi-nand at 00112000 {
+ compatible = "fsl,imx6q-gpmi-nand";
+ reg = <0x00112000 0x2000>;
+ interrupts = <0 13 0x04>;
+ dma_channel = <0>;
+ };
+ bch at 00114000 {
+ compatible = "fsl,imx6q-bch";
+ reg = <0x00114000 0x2000>;
+ interrupts = <0 15 0x04>;
+ };
+
timer at 00a00600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0x00a00600 0x20>;
diff --git a/arch/arm/mach-imx/clock-imx6q.c b/arch/arm/mach-imx/clock-imx6q.c
index 111c328..e3dc1b3 100644
--- a/arch/arm/mach-imx/clock-imx6q.c
+++ b/arch/arm/mach-imx/clock-imx6q.c
@@ -1859,7 +1859,8 @@ DEF_CLK(pwm1_clk, CCGR4, CG8, &ipg_perclk, NULL);
DEF_CLK(pwm2_clk, CCGR4, CG9, &ipg_perclk, NULL);
DEF_CLK(pwm3_clk, CCGR4, CG10, &ipg_perclk, NULL);
DEF_CLK(pwm4_clk, CCGR4, CG11, &ipg_perclk, NULL);
-DEF_CLK(gpmi_bch_apb_clk, CCGR4, CG12, &usdhc3_clk, NULL);
+DEF_CLK(per1_bch_clk, CCGR4, CG6, &usdhc3_clk, NULL);
+DEF_CLK(gpmi_bch_apb_clk, CCGR4, CG12, &usdhc3_clk, &per1_bch_clk);
DEF_CLK(gpmi_bch_clk, CCGR4, CG13, &usdhc4_clk, &gpmi_bch_apb_clk);
DEF_CLK(gpmi_apb_clk, CCGR4, CG15, &usdhc3_clk, &gpmi_bch_clk);
DEF_CLK(gpmi_io_clk, CCGR4, CG14, &enfc_clk, &gpmi_apb_clk);
@@ -1988,7 +1989,7 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK(NULL, "pwm2_clk", pwm2_clk),
_REGISTER_CLOCK(NULL, "pwm3_clk", pwm3_clk),
_REGISTER_CLOCK(NULL, "pwm4_clk", pwm4_clk),
- _REGISTER_CLOCK(NULL, "gpmi_io_clk", gpmi_io_clk),
+ _REGISTER_CLOCK("112000.gpmi-nand", NULL, gpmi_io_clk),
_REGISTER_CLOCK(NULL, "usboh3_clk", usboh3_clk),
_REGISTER_CLOCK(NULL, "sata_clk", sata_clk),
_REGISTER_CLOCK(NULL, "cko1_clk", cko1_clk),
--
1.7.0.4
next prev parent reply other threads:[~2012-04-20 9:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-20 9:24 [PATCH 0/3] add gpmi-nand dt support for mx6q-arm2 and imx28evk Huang Shijie
2012-04-20 9:24 ` Huang Shijie [this message]
2012-04-23 5:35 ` [PATCH 1/3] ARM: mx6q-arm2: add gpmi-nand dt support Shawn Guo
2012-04-20 9:24 ` [PATCH 2/3] ARM: mx28evk: " Huang Shijie
2012-04-23 5:38 ` Shawn Guo
2012-04-20 9:24 ` [PATCH 3/3] mtd: gpmi: add device tree support for mx6q-arm2 and mx28evk Huang Shijie
2012-04-23 6:43 ` Shawn Guo
2012-04-23 8:10 ` Huang Shijie
2012-04-23 13:05 ` Shawn Guo
2012-04-23 5:26 ` [PATCH 0/3] add gpmi-nand dt support for mx6q-arm2 and imx28evk Shawn Guo
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=1334913859-5314-2-git-send-email-b32955@freescale.com \
--to=b32955@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).