* [PATCH] ARM: dts: add rk3288 i2s controller
@ 2014-09-12 8:11 Jianqun
2014-09-12 10:54 ` [PATCH v2] " Jianqun
0 siblings, 1 reply; 3+ messages in thread
From: Jianqun @ 2014-09-12 8:11 UTC (permalink / raw)
To: robh+dt, pawel.moll, heiko, mark.rutland, ijc+devicetree, galak,
linux, linux-kernel, linux-arm-kernel, linux-rockchip,
devicetree
Cc: huangtao, cf, Jianqun
Add dt for rk3288 i2s controller, since i2s clock pins and data pins
default to be GPIO, this patch also add pinctrl to mux them.
Tested on RK3288 board.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
arch/arm/boot/dts/rk3288.dtsi | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 5950b0a..0e2a815 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -130,6 +130,21 @@
status = "disabled";
};
+ i2s: i2s@ff890000 {
+ compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
+ reg = <0xff890000 0x10000>;
+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ dmas = <&dmac_bus_s 0>, <&dmac_bus_s 1>;
+ dma-names = "tx", "rx";
+ clock-names = "i2s_hclk", "i2s_clk";
+ clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2s0_clk>;
+ status = "disabled";
+ };
+
uart0: serial@ff180000 {
compatible = "rockchip,rk3288-uart", "snps,dw-apb-uart";
reg = <0xff180000 0x100>;
@@ -463,6 +478,17 @@
};
};
+ i2s0 {
+ i2s0_clk: i2s0_clk {
+ rockchip,pins = <6 0 RK_FUNC_1 &pcfg_pull_none>,
+ <6 1 RK_FUNC_1 &pcfg_pull_none>,
+ <6 2 RK_FUNC_1 &pcfg_pull_none>,
+ <6 3 RK_FUNC_1 &pcfg_pull_none>,
+ <6 4 RK_FUNC_1 &pcfg_pull_none>,
+ <6 8 RK_FUNC_1 &pcfg_pull_none>;
+ };
+ };
+
sdmmc {
sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] ARM: dts: add rk3288 i2s controller
2014-09-12 8:11 [PATCH] ARM: dts: add rk3288 i2s controller Jianqun
@ 2014-09-12 10:54 ` Jianqun
2014-09-22 14:35 ` Heiko Stübner
0 siblings, 1 reply; 3+ messages in thread
From: Jianqun @ 2014-09-12 10:54 UTC (permalink / raw)
To: robh+dt, pawel.moll, heiko, mark.rutland, ijc+devicetree, galak,
linux, linux-kernel, linux-arm-kernel, linux-rockchip,
devicetree
Cc: huangtao, cf, Jianqun
Add dt for rk3288 i2s controller, since i2s clock pins and data pins
default to be GPIO, this patch also add pinctrl to mux them.
Tested on RK3288 board.
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
---
change since v1:
- move i2s relate codes later in order by CPU address map
arch/arm/boot/dts/rk3288.dtsi | 26 ++++++++++++++++++++++++++
1 file changed, 26 insertions(+)
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 5950b0a..5b17718 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -271,6 +271,21 @@
status = "disabled";
};
+ i2s: i2s@ff890000 {
+ compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
+ reg = <0xff890000 0x10000>;
+ interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+ dmas = <&dmac_bus_s 0>, <&dmac_bus_s 1>;
+ dma-names = "tx", "rx";
+ clock-names = "i2s_hclk", "i2s_clk";
+ clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2s0_clk>;
+ status = "disabled";
+ };
+
gic: interrupt-controller@ffc01000 {
compatible = "arm,gic-400";
interrupt-controller;
@@ -463,6 +478,17 @@
};
};
+ i2s0 {
+ i2s0_clk: i2s0_clk {
+ rockchip,pins = <6 0 RK_FUNC_1 &pcfg_pull_none>,
+ <6 1 RK_FUNC_1 &pcfg_pull_none>,
+ <6 2 RK_FUNC_1 &pcfg_pull_none>,
+ <6 3 RK_FUNC_1 &pcfg_pull_none>,
+ <6 4 RK_FUNC_1 &pcfg_pull_none>,
+ <6 8 RK_FUNC_1 &pcfg_pull_none>;
+ };
+ };
+
sdmmc {
sdmmc_clk: sdmmc-clk {
rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] ARM: dts: add rk3288 i2s controller
2014-09-12 10:54 ` [PATCH v2] " Jianqun
@ 2014-09-22 14:35 ` Heiko Stübner
0 siblings, 0 replies; 3+ messages in thread
From: Heiko Stübner @ 2014-09-22 14:35 UTC (permalink / raw)
To: Jianqun
Cc: robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, linux,
linux-kernel, linux-arm-kernel, linux-rockchip, devicetree,
huangtao, cf
Am Freitag, 12. September 2014, 18:54:55 schrieb Jianqun:
> Add dt for rk3288 i2s controller, since i2s clock pins and data pins
> default to be GPIO, this patch also add pinctrl to mux them.
>
> Tested on RK3288 board.
>
> Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
I've added this to my tree.
> ---
> change since v1:
> - move i2s relate codes later in order by CPU address map
>
> arch/arm/boot/dts/rk3288.dtsi | 26 ++++++++++++++++++++++++++
> 1 file changed, 26 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
> index 5950b0a..5b17718 100644
> --- a/arch/arm/boot/dts/rk3288.dtsi
> +++ b/arch/arm/boot/dts/rk3288.dtsi
> @@ -271,6 +271,21 @@
> status = "disabled";
> };
>
> + i2s: i2s@ff890000 {
> + compatible = "rockchip,rk3288-i2s", "rockchip,rk3066-i2s";
> + reg = <0xff890000 0x10000>;
> + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + dmas = <&dmac_bus_s 0>, <&dmac_bus_s 1>;
> + dma-names = "tx", "rx";
> + clock-names = "i2s_hclk", "i2s_clk";
> + clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2s0_clk>;
> + status = "disabled";
> + };
> +
> gic: interrupt-controller@ffc01000 {
> compatible = "arm,gic-400";
> interrupt-controller;
> @@ -463,6 +478,17 @@
> };
> };
>
> + i2s0 {
> + i2s0_clk: i2s0_clk {
> + rockchip,pins = <6 0 RK_FUNC_1 &pcfg_pull_none>,
> + <6 1 RK_FUNC_1 &pcfg_pull_none>,
> + <6 2 RK_FUNC_1 &pcfg_pull_none>,
> + <6 3 RK_FUNC_1 &pcfg_pull_none>,
> + <6 4 RK_FUNC_1 &pcfg_pull_none>,
> + <6 8 RK_FUNC_1 &pcfg_pull_none>;
> + };
> + };
> +
> sdmmc {
> sdmmc_clk: sdmmc-clk {
> rockchip,pins = <6 20 RK_FUNC_1 &pcfg_pull_none>;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-22 14:36 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-12 8:11 [PATCH] ARM: dts: add rk3288 i2s controller Jianqun
2014-09-12 10:54 ` [PATCH v2] " Jianqun
2014-09-22 14:35 ` Heiko Stübner
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).