| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 15 Oct 2014 16:07:55 +0200
From: Heiko Stübner <heiko@...ech.de>
To: Julien CHAUVEAU <julien.chauveau@...-technologies.fr>
Cc: Rob Herring <robh+dt@...nel.org>, Pawel Moll <pawel.moll@....com>,
Mark Rutland <mark.rutland@....com>,
Ian Campbell <ijc+devicetree@...lion.org.uk>,
Kumar Gala <galak@...eaurora.org>,
Russell King <linux@....linux.org.uk>,
"moderated list:ARM/Rockchip SoC..."
<linux-arm-kernel@...ts.infradead.org>,
"open list:ARM/Rockchip SoC..." <linux-rockchip@...ts.infradead.org>,
"open list:OPEN FIRMWARE AND..." <devicetree@...r.kernel.org>,
open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH v2] ARM: dts: rockchip: add I2S controllers for rk3066 and rk3188
Hi Julien,
Am Dienstag, 14. Oktober 2014, 10:16:37 schrieb Julien CHAUVEAU:
> Add the I2S/PCM controller nodes and pin controls for rk3066 and rk3188.
>
> Signed-off-by: Julien CHAUVEAU <julien.chauveau@...-technologies.fr>
I've added the patch to my wip dts branch on github - which will move to
kernel.org after -rc1
> ---
In the future for v2 and onwards patches, please provide a changelog in the
comment section (after the "---"), so people can see what changed, like:
changes since v1:
- declare i2s nodes separately on rk3066 and rk3188 as the controllers differ
This doesn't get into the kernel itself, but is helpful for people reviewing
the patch.
> arch/arm/boot/dts/rk3066a.dtsi | 81
> ++++++++++++++++++++++++++++++++++++++++++ arch/arm/boot/dts/rk3188.dtsi |
> 26 ++++++++++++++
> 2 files changed, 107 insertions(+)
>
> diff --git a/arch/arm/boot/dts/rk3066a.dtsi b/arch/arm/boot/dts/rk3066a.dtsi
> index ad9c2db..d75b01a 100644
> --- a/arch/arm/boot/dts/rk3066a.dtsi
> +++ b/arch/arm/boot/dts/rk3066a.dtsi
> @@ -53,6 +53,51 @@
> };
> };
>
> + i2s0: i2s@...18000 {
> + compatible = "rockchip,rk3066-i2s";
> + reg = <0x10118000 0x2000>;
> + interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2s0_bus>;
> + dmas = <&dmac1_s 4>, <&dmac1_s 5>;
> + dma-names = "tx", "rx";
> + clock-names = "i2s_hclk", "i2s_clk";
> + clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
> + status = "disabled";
> + };
> +
> + i2s1: i2s@...1a000 {
> + compatible = "rockchip,rk3066-i2s";
> + reg = <0x1011a000 0x2000>;
> + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2s1_bus>;
> + dmas = <&dmac1_s 6>, <&dmac1_s 7>;
> + dma-names = "tx", "rx";
> + clock-names = "i2s_hclk", "i2s_clk";
> + clocks = <&cru HCLK_I2S1>, <&cru SCLK_I2S1>;
> + status = "disabled";
> + };
> +
> + i2s2: i2s@...1c000 {
> + compatible = "rockchip,rk3066-i2s";
> + reg = <0x1011c000 0x2000>;
> + interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2s2_bus>;
> + dmas = <&dmac1_s 9>, <&dmac1_s 10>;
> + dma-names = "tx", "rx";
> + clock-names = "i2s_hclk", "i2s_clk";
> + clocks = <&cru HCLK_I2S2>, <&cru SCLK_I2S2>;
> + status = "disabled";
> + };
> +
> cru: clock-controller@...00000 {
> compatible = "rockchip,rk3066a-cru";
> reg = <0x20000000 0x1000>;
> @@ -405,6 +450,42 @@
> <RK_GPIO3 20 RK_FUNC_1 &pcfg_pull_default>;
> };
> };
> +
> + i2s0 {
> + i2s0_bus: i2s0-bus {
> + rockchip,pins = <RK_GPIO0 7 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 8 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 9 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 10 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 11 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 12 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 13 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 14 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 15 RK_FUNC_1 &pcfg_pull_default>;
> + };
> + };
> +
> + i2s1 {
> + i2s1_bus: i2s1-bus {
> + rockchip,pins = <RK_GPIO0 16 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 17 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 18 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 19 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 20 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 21 RK_FUNC_1 &pcfg_pull_default>;
> + };
> + };
> +
> + i2s2 {
> + i2s2_bus: i2s2-bus {
> + rockchip,pins = <RK_GPIO0 24 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 25 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 26 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 27 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 28 RK_FUNC_1 &pcfg_pull_default>,
> + <RK_GPIO0 29 RK_FUNC_1 &pcfg_pull_default>;
> + };
> + };
> };
> };
>
> diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
> index ddaada7..fa3665a 100644
> --- a/arch/arm/boot/dts/rk3188.dtsi
> +++ b/arch/arm/boot/dts/rk3188.dtsi
> @@ -65,6 +65,21 @@
> };
> };
>
> + i2s0: i2s@...1a000 {
> + compatible = "rockchip,rk3188-i2s", "rockchip,rk3066-i2s";
> + reg = <0x1011a000 0x2000>;
> + interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
> + #address-cells = <1>;
> + #size-cells = <0>;
> + pinctrl-names = "default";
> + pinctrl-0 = <&i2s0_bus>;
> + dmas = <&dmac1_s 6>, <&dmac1_s 7>;
> + dma-names = "tx", "rx";
> + clock-names = "i2s_hclk", "i2s_clk";
> + clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>;
> + status = "disabled";
> + };
> +
> cru: clock-controller@...00000 {
> compatible = "rockchip,rk3188-cru";
> reg = <0x20000000 0x1000>;
> @@ -395,6 +410,17 @@
> <RK_GPIO3 20 RK_FUNC_1 &pcfg_pull_none>;
> };
> };
> +
> + i2s0 {
> + i2s0_bus: i2s0-bus {
> + rockchip,pins = <RK_GPIO1 16 RK_FUNC_1 &pcfg_pull_none>,
> + <RK_GPIO1 17 RK_FUNC_1 &pcfg_pull_none>,
> + <RK_GPIO1 18 RK_FUNC_1 &pcfg_pull_none>,
> + <RK_GPIO1 19 RK_FUNC_1 &pcfg_pull_none>,
> + <RK_GPIO1 20 RK_FUNC_1 &pcfg_pull_none>,
> + <RK_GPIO1 21 RK_FUNC_1 &pcfg_pull_none>;
> + };
> + };
> };
> };
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists