* [PATCH 2/5] ARM: imx6q: add clock for apbh-dma
2012-05-24 10:50 [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma Huang Shijie
@ 2012-05-24 10:50 ` Huang Shijie
2012-05-24 17:30 ` Sascha Hauer
2012-05-24 10:50 ` [PATCH 3/5] dma: mxs-dma: enable apbh-dma for imx6q Huang Shijie
` (3 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Huang Shijie @ 2012-05-24 10:50 UTC (permalink / raw)
To: linux-arm-kernel
add the clock for apbh-dma.
Signed-off-by: Huang Shijie <b32955@freescale.com>
---
arch/arm/mach-imx/clk-imx6q.c | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index cab02d0..12d9040 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -318,7 +318,7 @@ int __init mx6q_clocks_init(void)
clk[ahb] = imx_clk_busy_divider("ahb", "periph", base + 0x14, 10, 3, base + 0x48, 1);
/* name parent_name reg shift */
- clk[apbh_dma] = imx_clk_gate2("apbh_dma", "ahb", base + 0x68, 4);
+ clk[apbh_dma] = imx_clk_gate2("apbh_dma", "usdhc3", base + 0x68, 4);
clk[asrc] = imx_clk_gate2("asrc", "asrc_podf", base + 0x68, 6);
clk[can1_ipg] = imx_clk_gate2("can1_ipg", "ipg", base + 0x68, 14);
clk[can1_serial] = imx_clk_gate2("can1_serial", "can_root", base + 0x68, 16);
@@ -393,6 +393,7 @@ int __init mx6q_clocks_init(void)
clk_register_clkdev(clk[gpt_ipg_per], "per", "imx-gpt.0");
clk_register_clkdev(clk[twd], NULL, "smp_twd");
clk_register_clkdev(clk[usboh3], NULL, "usboh3");
+ clk_register_clkdev(clk[apbh_dma], NULL, "110000.dma-apbh");
clk_register_clkdev(clk[uart_serial], "per", "2020000.serial");
clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.serial");
clk_register_clkdev(clk[uart_serial], "per", "21e8000.serial");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/5] ARM: imx6q: add clock for apbh-dma
2012-05-24 10:50 ` [PATCH 2/5] ARM: imx6q: add clock " Huang Shijie
@ 2012-05-24 17:30 ` Sascha Hauer
2012-05-25 2:07 ` Huang Shijie
0 siblings, 1 reply; 13+ messages in thread
From: Sascha Hauer @ 2012-05-24 17:30 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 24, 2012 at 06:50:56PM +0800, Huang Shijie wrote:
> add the clock for apbh-dma.
>
> Signed-off-by: Huang Shijie <b32955@freescale.com>
> ---
> arch/arm/mach-imx/clk-imx6q.c | 3 ++-
> 1 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
> index cab02d0..12d9040 100644
> --- a/arch/arm/mach-imx/clk-imx6q.c
> +++ b/arch/arm/mach-imx/clk-imx6q.c
> @@ -318,7 +318,7 @@ int __init mx6q_clocks_init(void)
> clk[ahb] = imx_clk_busy_divider("ahb", "periph", base + 0x14, 10, 3, base + 0x48, 1);
>
> /* name parent_name reg shift */
> - clk[apbh_dma] = imx_clk_gate2("apbh_dma", "ahb", base + 0x68, 4);
> + clk[apbh_dma] = imx_clk_gate2("apbh_dma", "usdhc3", base + 0x68, 4);
This change looks strange. Is this correct?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 2/5] ARM: imx6q: add clock for apbh-dma
2012-05-24 17:30 ` Sascha Hauer
@ 2012-05-25 2:07 ` Huang Shijie
2012-05-25 2:41 ` Shawn Guo
2012-05-25 6:47 ` Sascha Hauer
0 siblings, 2 replies; 13+ messages in thread
From: Huang Shijie @ 2012-05-25 2:07 UTC (permalink / raw)
To: linux-arm-kernel
? 2012?05?25? 01:30, Sascha Hauer ??:
> On Thu, May 24, 2012 at 06:50:56PM +0800, Huang Shijie wrote:
>> add the clock for apbh-dma.
>>
>> Signed-off-by: Huang Shijie<b32955@freescale.com>
>> ---
>> arch/arm/mach-imx/clk-imx6q.c | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
>> index cab02d0..12d9040 100644
>> --- a/arch/arm/mach-imx/clk-imx6q.c
>> +++ b/arch/arm/mach-imx/clk-imx6q.c
>> @@ -318,7 +318,7 @@ int __init mx6q_clocks_init(void)
>> clk[ahb] = imx_clk_busy_divider("ahb", "periph", base + 0x14, 10, 3, base + 0x48, 1);
>>
>> /* name parent_name reg shift */
>> - clk[apbh_dma] = imx_clk_gate2("apbh_dma", "ahb", base + 0x68, 4);
>> + clk[apbh_dma] = imx_clk_gate2("apbh_dma", "usdhc3", base + 0x68, 4);
> This change looks strange. Is this correct?
yes. it's correct.
The datasheet about the clock tells us the parent of the apbh-dma is usdhc3.
Best Regards
Huang Shijie
> Sascha
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 2/5] ARM: imx6q: add clock for apbh-dma
2012-05-25 2:07 ` Huang Shijie
@ 2012-05-25 2:41 ` Shawn Guo
2012-05-25 6:47 ` Sascha Hauer
1 sibling, 0 replies; 13+ messages in thread
From: Shawn Guo @ 2012-05-25 2:41 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, May 25, 2012 at 10:07:41AM +0800, Huang Shijie wrote:
> ? 2012?05?25? 01:30, Sascha Hauer ??:
> >On Thu, May 24, 2012 at 06:50:56PM +0800, Huang Shijie wrote:
> >>add the clock for apbh-dma.
> >>
> >>Signed-off-by: Huang Shijie<b32955@freescale.com>
> >>---
> >> arch/arm/mach-imx/clk-imx6q.c | 3 ++-
> >> 1 files changed, 2 insertions(+), 1 deletions(-)
> >>
> >>diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
> >>index cab02d0..12d9040 100644
> >>--- a/arch/arm/mach-imx/clk-imx6q.c
> >>+++ b/arch/arm/mach-imx/clk-imx6q.c
> >>@@ -318,7 +318,7 @@ int __init mx6q_clocks_init(void)
> >> clk[ahb] = imx_clk_busy_divider("ahb", "periph", base + 0x14, 10, 3, base + 0x48, 1);
> >>
> >> /* name parent_name reg shift */
> >>- clk[apbh_dma] = imx_clk_gate2("apbh_dma", "ahb", base + 0x68, 4);
> >>+ clk[apbh_dma] = imx_clk_gate2("apbh_dma", "usdhc3", base + 0x68, 4);
> >This change looks strange. Is this correct?
> yes. it's correct.
>
> The datasheet about the clock tells us the parent of the apbh-dma is usdhc3.
>
I guess it's a hardware bug.
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 2/5] ARM: imx6q: add clock for apbh-dma
2012-05-25 2:07 ` Huang Shijie
2012-05-25 2:41 ` Shawn Guo
@ 2012-05-25 6:47 ` Sascha Hauer
1 sibling, 0 replies; 13+ messages in thread
From: Sascha Hauer @ 2012-05-25 6:47 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, May 25, 2012 at 10:07:41AM +0800, Huang Shijie wrote:
> ? 2012?05?25? 01:30, Sascha Hauer ??:
> >On Thu, May 24, 2012 at 06:50:56PM +0800, Huang Shijie wrote:
> >>add the clock for apbh-dma.
> >>
> >>Signed-off-by: Huang Shijie<b32955@freescale.com>
> >>---
> >> arch/arm/mach-imx/clk-imx6q.c | 3 ++-
> >> 1 files changed, 2 insertions(+), 1 deletions(-)
> >>
> >>diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
> >>index cab02d0..12d9040 100644
> >>--- a/arch/arm/mach-imx/clk-imx6q.c
> >>+++ b/arch/arm/mach-imx/clk-imx6q.c
> >>@@ -318,7 +318,7 @@ int __init mx6q_clocks_init(void)
> >> clk[ahb] = imx_clk_busy_divider("ahb", "periph", base + 0x14, 10, 3, base + 0x48, 1);
> >>
> >> /* name parent_name reg shift */
> >>- clk[apbh_dma] = imx_clk_gate2("apbh_dma", "ahb", base + 0x68, 4);
> >>+ clk[apbh_dma] = imx_clk_gate2("apbh_dma", "usdhc3", base + 0x68, 4);
> >This change looks strange. Is this correct?
> yes. it's correct.
>
> The datasheet about the clock tells us the parent of the apbh-dma is usdhc3.
Ok then, just wanted to make sure this is no patching accident.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 3/5] dma: mxs-dma: enable apbh-dma for imx6q
2012-05-24 10:50 [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma Huang Shijie
2012-05-24 10:50 ` [PATCH 2/5] ARM: imx6q: add clock " Huang Shijie
@ 2012-05-24 10:50 ` Huang Shijie
2012-05-25 2:36 ` Shawn Guo
2012-05-24 10:50 ` [PATCH 4/5] ARM: imx6q: add DT node for gpmi-nand Huang Shijie
` (2 subsequent siblings)
4 siblings, 1 reply; 13+ messages in thread
From: Huang Shijie @ 2012-05-24 10:50 UTC (permalink / raw)
To: linux-arm-kernel
enable the apbh-dma for imx6q.
Signed-off-by: Huang Shijie <b32955@freescale.com>
Cc: Vinod Koul <vinod.koul@intel.com>
---
drivers/dma/Kconfig | 2 +-
drivers/dma/mxs-dma.c | 9 ++++++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
index aadeb5b..c8416d5 100644
--- a/drivers/dma/Kconfig
+++ b/drivers/dma/Kconfig
@@ -237,7 +237,7 @@ config IMX_DMA
config MXS_DMA
bool "MXS DMA support"
- depends on SOC_IMX23 || SOC_IMX28
+ depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q
select STMP_DEVICE
select DMA_ENGINE
help
diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
index c96ab15..f41eb9e 100644
--- a/drivers/dma/mxs-dma.c
+++ b/drivers/dma/mxs-dma.c
@@ -29,7 +29,6 @@
#include <linux/of_device.h>
#include <asm/irq.h>
-#include <mach/mxs.h>
#include "dmaengine.h"
@@ -129,6 +128,7 @@ enum mxs_dma_devtype {
enum mxs_dma_id {
IMX23_DMA,
IMX28_DMA,
+ IMX6Q_DMA,
};
struct mxs_dma_engine {
@@ -159,6 +159,9 @@ static struct mxs_dma_type mxs_dma_types[] = {
}, {
.id = IMX28_DMA,
.type = MXS_DMA_APBX,
+ }, {
+ .id = IMX6Q_DMA,
+ .type = MXS_DMA_APBH,
}
};
@@ -176,6 +179,9 @@ static struct platform_device_id mxs_dma_ids[] = {
.name = "imx28-dma-apbx",
.driver_data = (kernel_ulong_t) &mxs_dma_types[3],
}, {
+ .name = "imx6q-dma-apbh",
+ .driver_data = (kernel_ulong_t) &mxs_dma_types[4],
+ }, {
/* end of list */
}
};
@@ -185,6 +191,7 @@ static const struct of_device_id mxs_dma_dt_ids[] = {
{ .compatible = "fsl,imx23-dma-apbx", .data = &mxs_dma_ids[1], },
{ .compatible = "fsl,imx28-dma-apbh", .data = &mxs_dma_ids[2], },
{ .compatible = "fsl,imx28-dma-apbx", .data = &mxs_dma_ids[3], },
+ { .compatible = "fsl,imx6q-dma-apbh", .data = &mxs_dma_ids[4], },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/5] dma: mxs-dma: enable apbh-dma for imx6q
2012-05-24 10:50 ` [PATCH 3/5] dma: mxs-dma: enable apbh-dma for imx6q Huang Shijie
@ 2012-05-25 2:36 ` Shawn Guo
0 siblings, 0 replies; 13+ messages in thread
From: Shawn Guo @ 2012-05-25 2:36 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 24, 2012 at 06:50:57PM +0800, Huang Shijie wrote:
> enable the apbh-dma for imx6q.
>
> Signed-off-by: Huang Shijie <b32955@freescale.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> ---
> drivers/dma/Kconfig | 2 +-
> drivers/dma/mxs-dma.c | 9 ++++++++-
As I commented on dts change, you do not need to patch
drivers/dma/mxs-dma.c at all, since the IP block on imx6q is compatible
with imx28 with no need of any tweaking. All you need to do is put
imx28 compatible string at the end of imx6q one, and the driver will
simply work for imx6q. That's the whole point of DT compatible
property.
Regards,
Shawn
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig
> index aadeb5b..c8416d5 100644
> --- a/drivers/dma/Kconfig
> +++ b/drivers/dma/Kconfig
> @@ -237,7 +237,7 @@ config IMX_DMA
>
> config MXS_DMA
> bool "MXS DMA support"
> - depends on SOC_IMX23 || SOC_IMX28
> + depends on SOC_IMX23 || SOC_IMX28 || SOC_IMX6Q
> select STMP_DEVICE
> select DMA_ENGINE
> help
> diff --git a/drivers/dma/mxs-dma.c b/drivers/dma/mxs-dma.c
> index c96ab15..f41eb9e 100644
> --- a/drivers/dma/mxs-dma.c
> +++ b/drivers/dma/mxs-dma.c
> @@ -29,7 +29,6 @@
> #include <linux/of_device.h>
>
> #include <asm/irq.h>
> -#include <mach/mxs.h>
>
> #include "dmaengine.h"
>
> @@ -129,6 +128,7 @@ enum mxs_dma_devtype {
> enum mxs_dma_id {
> IMX23_DMA,
> IMX28_DMA,
> + IMX6Q_DMA,
> };
>
> struct mxs_dma_engine {
> @@ -159,6 +159,9 @@ static struct mxs_dma_type mxs_dma_types[] = {
> }, {
> .id = IMX28_DMA,
> .type = MXS_DMA_APBX,
> + }, {
> + .id = IMX6Q_DMA,
> + .type = MXS_DMA_APBH,
> }
> };
>
> @@ -176,6 +179,9 @@ static struct platform_device_id mxs_dma_ids[] = {
> .name = "imx28-dma-apbx",
> .driver_data = (kernel_ulong_t) &mxs_dma_types[3],
> }, {
> + .name = "imx6q-dma-apbh",
> + .driver_data = (kernel_ulong_t) &mxs_dma_types[4],
> + }, {
> /* end of list */
> }
> };
> @@ -185,6 +191,7 @@ static const struct of_device_id mxs_dma_dt_ids[] = {
> { .compatible = "fsl,imx23-dma-apbx", .data = &mxs_dma_ids[1], },
> { .compatible = "fsl,imx28-dma-apbh", .data = &mxs_dma_ids[2], },
> { .compatible = "fsl,imx28-dma-apbx", .data = &mxs_dma_ids[3], },
> + { .compatible = "fsl,imx6q-dma-apbh", .data = &mxs_dma_ids[4], },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, mxs_dma_dt_ids);
> --
> 1.7.0.4
>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/5] ARM: imx6q: add DT node for gpmi-nand
2012-05-24 10:50 [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma Huang Shijie
2012-05-24 10:50 ` [PATCH 2/5] ARM: imx6q: add clock " Huang Shijie
2012-05-24 10:50 ` [PATCH 3/5] dma: mxs-dma: enable apbh-dma for imx6q Huang Shijie
@ 2012-05-24 10:50 ` Huang Shijie
2012-05-25 2:50 ` Shawn Guo
2012-05-24 10:50 ` [PATCH 5/5] ARM: imx6q: add clocks " Huang Shijie
2012-05-25 2:31 ` [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma Shawn Guo
4 siblings, 1 reply; 13+ messages in thread
From: Huang Shijie @ 2012-05-24 10:50 UTC (permalink / raw)
To: linux-arm-kernel
Add DT node for gpmi-nand.
Also enable the gpmi-nand for mx6q-arm2 board.
Signed-off-by: Huang Shijie <b32955@freescale.com>
---
arch/arm/boot/dts/imx6q-arm2.dts | 4 ++++
arch/arm/boot/dts/imx6q.dtsi | 12 ++++++++++++
2 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index db4c609..15f9e0b 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -22,6 +22,10 @@
};
soc {
+ gpmi-nand at 00112000 {
+ status = "okay";
+ };
+
aips-bus at 02100000 { /* AIPS2 */
ethernet at 02188000 {
phy-mode = "rgmii";
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index cccac33..979d9f9 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -92,6 +92,18 @@
reg = <0x00110000 0x2000>;
};
+ gpmi-nand at 00112000 {
+ compatible = "fsl,imx6q-gpmi-nand";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ reg = <0x00112000 0x2000>, <0x00114000 0x2000>;
+ reg-names = "gpmi-nand", "bch";
+ interrupts = <0 13 0x04>, <0 15 0x04>;
+ interrupt-names = "gpmi-dma", "bch";
+ fsl,gpmi-dma-channel = <0>;
+ status = "disabled";
+ };
+
timer at 00a00600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0x00a00600 0x20>;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/5] ARM: imx6q: add DT node for gpmi-nand
2012-05-24 10:50 ` [PATCH 4/5] ARM: imx6q: add DT node for gpmi-nand Huang Shijie
@ 2012-05-25 2:50 ` Shawn Guo
0 siblings, 0 replies; 13+ messages in thread
From: Shawn Guo @ 2012-05-25 2:50 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 24, 2012 at 06:50:58PM +0800, Huang Shijie wrote:
> Add DT node for gpmi-nand.
> Also enable the gpmi-nand for mx6q-arm2 board.
>
> Signed-off-by: Huang Shijie <b32955@freescale.com>
> ---
> arch/arm/boot/dts/imx6q-arm2.dts | 4 ++++
> arch/arm/boot/dts/imx6q.dtsi | 12 ++++++++++++
> 2 files changed, 16 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
> index db4c609..15f9e0b 100644
> --- a/arch/arm/boot/dts/imx6q-arm2.dts
> +++ b/arch/arm/boot/dts/imx6q-arm2.dts
> @@ -22,6 +22,10 @@
> };
>
> soc {
> + gpmi-nand at 00112000 {
Missing pinctrl setup?
> + status = "okay";
> + };
> +
--
Regards,
Shawn
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 5/5] ARM: imx6q: add clocks for gpmi-nand
2012-05-24 10:50 [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma Huang Shijie
` (2 preceding siblings ...)
2012-05-24 10:50 ` [PATCH 4/5] ARM: imx6q: add DT node for gpmi-nand Huang Shijie
@ 2012-05-24 10:50 ` Huang Shijie
2012-05-25 2:31 ` [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma Shawn Guo
4 siblings, 0 replies; 13+ messages in thread
From: Huang Shijie @ 2012-05-24 10:50 UTC (permalink / raw)
To: linux-arm-kernel
add the clocks for gpmi-nand.
Signed-off-by: Huang Shijie <b32955@freescale.com>
---
arch/arm/mach-imx/clk-imx6q.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 12d9040..2b5ab5f 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -151,7 +151,7 @@ enum mx6q_clks {
esai, gpt_ipg, gpt_ipg_per, gpu2d_core, gpu3d_core, hdmi_iahb,
hdmi_isfr, i2c1, i2c2, i2c3, iim, enfc, ipu1, ipu1_di0, ipu1_di1, ipu2,
ipu2_di0, ldb_di0, ldb_di1, ipu2_di1, hsi_tx, mlb, mmdc_ch0_axi,
- mmdc_ch1_axi, ocram, openvg_axi, pcie_axi, pwm1, pwm2, pwm3, pwm4,
+ mmdc_ch1_axi, ocram, openvg_axi, pcie_axi, pwm1, pwm2, pwm3, pwm4, per1_bch,
gpmi_bch_apb, gpmi_bch, gpmi_io, gpmi_apb, sata, sdma, spba, ssi1,
ssi2, ssi3, uart_ipg, uart_serial, usboh3, usdhc1, usdhc2, usdhc3,
usdhc4, vdo_axi, vpu_axi, cko1, pll1_sys, pll2_bus, pll3_usb_otg,
@@ -357,6 +357,7 @@ int __init mx6q_clocks_init(void)
clk[ocram] = imx_clk_gate2("ocram", "ahb", base + 0x74, 28);
clk[openvg_axi] = imx_clk_gate2("openvg_axi", "axi", base + 0x74, 30);
clk[pcie_axi] = imx_clk_gate2("pcie_axi", "pcie_axi_sel", base + 0x78, 0);
+ clk[per1_bch] = imx_clk_gate2("per1_bch", "usdhc3", base + 0x78, 12);
clk[pwm1] = imx_clk_gate2("pwm1", "ipg_per", base + 0x78, 16);
clk[pwm2] = imx_clk_gate2("pwm2", "ipg_per", base + 0x78, 18);
clk[pwm3] = imx_clk_gate2("pwm3", "ipg_per", base + 0x78, 20);
@@ -394,6 +395,7 @@ int __init mx6q_clocks_init(void)
clk_register_clkdev(clk[twd], NULL, "smp_twd");
clk_register_clkdev(clk[usboh3], NULL, "usboh3");
clk_register_clkdev(clk[apbh_dma], NULL, "110000.dma-apbh");
+ clk_register_clkdev(clk[gpmi_io], NULL, "112000.gpmi-nand");
clk_register_clkdev(clk[uart_serial], "per", "2020000.serial");
clk_register_clkdev(clk[uart_ipg], "ipg", "2020000.serial");
clk_register_clkdev(clk[uart_serial], "per", "21e8000.serial");
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma
2012-05-24 10:50 [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma Huang Shijie
` (3 preceding siblings ...)
2012-05-24 10:50 ` [PATCH 5/5] ARM: imx6q: add clocks " Huang Shijie
@ 2012-05-25 2:31 ` Shawn Guo
2012-05-25 15:09 ` Huang Shijie
4 siblings, 1 reply; 13+ messages in thread
From: Shawn Guo @ 2012-05-25 2:31 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 24, 2012 at 06:50:55PM +0800, Huang Shijie wrote:
> add DT node for apbh-dma.
>
> Signed-off-by: Huang Shijie <b32955@freescale.com>
> ---
> arch/arm/boot/dts/imx6q.dtsi | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
> index 8c90cba..cccac33 100644
> --- a/arch/arm/boot/dts/imx6q.dtsi
> +++ b/arch/arm/boot/dts/imx6q.dtsi
> @@ -87,6 +87,11 @@
> interrupt-parent = <&intc>;
> ranges;
>
> + dma-apbh at 00110000 {
> + compatible = "fsl,imx6q-dma-apbh";
I guess imx6q-dma-apbh is compatible with imx28-dma-apbh. In that
case, you need something like below.
compatible = "fsl,imx6q-dma-apbh", "imx28-dma-apbh";
Then you do not need to patch mxs-dma.c at all.
Regards,
Shawn
> + reg = <0x00110000 0x2000>;
> + };
> +
> timer at 00a00600 {
> compatible = "arm,cortex-a9-twd-timer";
> reg = <0x00a00600 0x20>;
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma
2012-05-25 2:31 ` [PATCH 1/5] ARM: imx6q: add DT node for apbh-dma Shawn Guo
@ 2012-05-25 15:09 ` Huang Shijie
0 siblings, 0 replies; 13+ messages in thread
From: Huang Shijie @ 2012-05-25 15:09 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 24, 2012 at 10:31 PM, Shawn Guo <shawn.guo@linaro.org> wrote:
> On Thu, May 24, 2012 at 06:50:55PM +0800, Huang Shijie wrote:
>> add DT node for apbh-dma.
>>
>> Signed-off-by: Huang Shijie <b32955@freescale.com>
>> ---
>> ?arch/arm/boot/dts/imx6q.dtsi | ? ?5 +++++
>> ?1 files changed, 5 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
>> index 8c90cba..cccac33 100644
>> --- a/arch/arm/boot/dts/imx6q.dtsi
>> +++ b/arch/arm/boot/dts/imx6q.dtsi
>> @@ -87,6 +87,11 @@
>> ? ? ? ? ? ? ? interrupt-parent = <&intc>;
>> ? ? ? ? ? ? ? ranges;
>>
>> + ? ? ? ? ? ? dma-apbh at 00110000 {
>> + ? ? ? ? ? ? ? ? ? ? compatible = "fsl,imx6q-dma-apbh";
>
> I guess imx6q-dma-apbh is compatible with imx28-dma-apbh. ?In that
> case, you need something like below.
>
> ? ? ? ? ? ? ? ? ? ? ? ?compatible = "fsl,imx6q-dma-apbh", "imx28-dma-apbh";
>
> Then you do not need to patch mxs-dma.c at all.
thanks a lot.
Huang Shijie
>
> Regards,
> Shawn
>
>> + ? ? ? ? ? ? ? ? ? ? reg = <0x00110000 0x2000>;
>> + ? ? ? ? ? ? };
>> +
>> ? ? ? ? ? ? ? timer at 00a00600 {
>> ? ? ? ? ? ? ? ? ? ? ? compatible = "arm,cortex-a9-twd-timer";
>> ? ? ? ? ? ? ? ? ? ? ? reg = <0x00a00600 0x20>;
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread