All of lore.kernel.org
 help / color / mirror / Atom feed
From: heiko@sntech.de (Heiko Stübner)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] ARM: dts: add rk3288 i2s controller
Date: Mon, 22 Sep 2014 16:35:27 +0200	[thread overview]
Message-ID: <2576845.mbFzWJ2q3T@phil> (raw)
In-Reply-To: <1410519295-18980-1-git-send-email-jay.xu@rock-chips.com>

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 at 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 at 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>;

WARNING: multiple messages have this Message-ID (diff)
From: "Heiko Stübner" <heiko@sntech.de>
To: Jianqun <jay.xu@rock-chips.com>
Cc: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com,
	ijc+devicetree@hellion.org.uk, galak@codeaurora.org,
	linux@arm.linux.org.uk, linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-rockchip@lists.infradead.org, devicetree@vger.kernel.org,
	huangtao@rock-chips.com, cf@rock-chips.com
Subject: Re: [PATCH v2] ARM: dts: add rk3288 i2s controller
Date: Mon, 22 Sep 2014 16:35:27 +0200	[thread overview]
Message-ID: <2576845.mbFzWJ2q3T@phil> (raw)
In-Reply-To: <1410519295-18980-1-git-send-email-jay.xu@rock-chips.com>

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>;

  reply	other threads:[~2014-09-22 14:35 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-12  8:11 [PATCH] ARM: dts: add rk3288 i2s controller Jianqun
2014-09-12  8:11 ` Jianqun
2014-09-12  8:11 ` Jianqun
2014-09-12 10:54 ` [PATCH v2] " Jianqun
2014-09-12 10:54   ` Jianqun
2014-09-22 14:35   ` Heiko Stübner [this message]
2014-09-22 14:35     ` Heiko Stübner

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=2576845.mbFzWJ2q3T@phil \
    --to=heiko@sntech.de \
    --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.