* [PATCH 1/9] ARM: shmobile: emev2: add IIC cores to dtsi
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
2015-07-24 8:41 ` [PATCH 2/9] ARM: shmobile: emev2: kzm9d: enable IIC busses Simon Horman
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/emev2.dtsi | 48 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi
index bb45694d91bc..edad0c4eea35 100644
--- a/arch/arm/boot/dts/emev2.dtsi
+++ b/arch/arm/boot/dts/emev2.dtsi
@@ -21,6 +21,8 @@
gpio2 = &gpio2;
gpio3 = &gpio3;
gpio4 = &gpio4;
+ i2c0 = &iic0;
+ i2c1 = &iic1;
};
cpus {
@@ -66,6 +68,30 @@
clock-frequency = <32768>;
#clock-cells = <0>;
};
+ iic0_sclkdiv: iic0_sclkdiv {
+ compatible = "renesas,emev2-smu-clkdiv";
+ reg = <0x624 0>;
+ clocks = <&pll3_fo>;
+ #clock-cells = <0>;
+ };
+ iic0_sclk: iic0_sclk {
+ compatible = "renesas,emev2-smu-gclk";
+ reg = <0x48c 1>;
+ clocks = <&iic0_sclkdiv>;
+ #clock-cells = <0>;
+ };
+ iic1_sclkdiv: iic1_sclkdiv {
+ compatible = "renesas,emev2-smu-clkdiv";
+ reg = <0x624 16>;
+ clocks = <&pll3_fo>;
+ #clock-cells = <0>;
+ };
+ iic1_sclk: iic1_sclk {
+ compatible = "renesas,emev2-smu-gclk";
+ reg = <0x490 1>;
+ clocks = <&iic1_sclkdiv>;
+ #clock-cells = <0>;
+ };
pll3_fo: pll3_fo {
compatible = "fixed-factor-clock";
clocks = <&c32ki>;
@@ -234,4 +260,26 @@
interrupt-controller;
#interrupt-cells = <2>;
};
+
+ iic0: i2c at e0070000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,iic-emev2";
+ reg = <0xe0070000 0x28>;
+ interrupts = <0 32 IRQ_TYPE_EDGE_RISING>;
+ clocks = <&iic0_sclk>;
+ clock-names = "sclk";
+ status = "disabled";
+ };
+
+ iic1: i2c at e10a0000 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ compatible = "renesas,iic-emev2";
+ reg = <0xe10a0000 0x28>;
+ interrupts = <0 33 IRQ_TYPE_EDGE_RISING>;
+ clocks = <&iic1_sclk>;
+ clock-names = "sclk";
+ status = "disabled";
+ };
};
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/9] ARM: shmobile: emev2: kzm9d: enable IIC busses
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
2015-07-24 8:41 ` [PATCH 1/9] ARM: shmobile: emev2: add IIC cores to dtsi Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
2015-07-24 8:41 ` [PATCH 3/9] ARM: shmobile: lager: add sound label on DTS Simon Horman
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/emev2-kzm9d.dts | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index 1dee0aa4f40c..955c24ee4a8c 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -95,6 +95,14 @@
};
};
+&iic0 {
+ status = "okay";
+};
+
+&iic1 {
+ status = "okay";
+};
+
&pfc {
uart1_pins: serial at e1030000 {
renesas,groups = "uart1_ctrl", "uart1_data";
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/9] ARM: shmobile: lager: add sound label on DTS
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
2015-07-24 8:41 ` [PATCH 1/9] ARM: shmobile: emev2: add IIC cores to dtsi Simon Horman
2015-07-24 8:41 ` [PATCH 2/9] ARM: shmobile: emev2: kzm9d: enable IIC busses Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
2015-07-24 8:41 ` [PATCH 4/9] ARM: shmobile: koelsch: " Simon Horman
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
It is easy to modify settings for Test or other purpose if sound has label
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 2eb8a995ae9f..5ae07a8385c5 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -174,7 +174,7 @@
1800000 0>;
};
- sound {
+ rsnd_ak4643: sound {
compatible = "simple-audio-card";
simple-audio-card,format = "left_j";
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/9] ARM: shmobile: koelsch: add sound label on DTS
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
` (2 preceding siblings ...)
2015-07-24 8:41 ` [PATCH 3/9] ARM: shmobile: lager: add sound label on DTS Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
2015-07-24 8:41 ` [PATCH 5/9] ARM: shmobile: lager: Fix adv7511 IRQ sensing Simon Horman
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
It is easy to modify settings for Test or other purpose if sound has label
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index cffe33ff4d16..dc158845afdc 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -242,7 +242,7 @@
1800000 0>;
};
- sound {
+ rsnd_ak4643: sound {
compatible = "simple-audio-card";
simple-audio-card,format = "left_j";
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/9] ARM: shmobile: lager: Fix adv7511 IRQ sensing
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
` (3 preceding siblings ...)
2015-07-24 8:41 ` [PATCH 4/9] ARM: shmobile: koelsch: " Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
2015-07-24 8:41 ` [PATCH 6/9] ARM: shmobile: r8a7790: Add Audio CTU support on DTSI Simon Horman
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The adv7511 IRQ is low level triggered, not falling edge triggered. The
wrong sense configuration results in no interrupt being triggered at
all, breaking hotplug detection. Fix it.
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790-lager.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 5ae07a8385c5..37dec5269491 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -548,7 +548,7 @@
compatible = "adi,adv7511w";
reg = <0x39>;
interrupt-parent = <&gpio1>;
- interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
+ interrupts = <15 IRQ_TYPE_LEVEL_LOW>;
adi,input-depth = <8>;
adi,input-colorspace = "rgb";
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/9] ARM: shmobile: r8a7790: Add Audio CTU support on DTSI
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
` (4 preceding siblings ...)
2015-07-24 8:41 ` [PATCH 5/9] ARM: shmobile: lager: Fix adv7511 IRQ sensing Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
2015-07-24 8:41 ` [PATCH 7/9] ARM: shmobile: r8a7790: Add Audio MIX " Simon Horman
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 16 ++++++++++++++++
include/dt-bindings/clock/r8a7790-clock.h | 2 ++
2 files changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 3ae0c3bfb9b9..6aa1d759690b 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1303,6 +1303,7 @@
<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
+ <&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>,
<&mstp10_clks R8A7790_CLK_SCU_ALL>, <&mstp10_clks R8A7790_CLK_SCU_ALL>;
#clock-cells = <1>;
@@ -1312,6 +1313,7 @@
R8A7790_CLK_SSI4 R8A7790_CLK_SSI3 R8A7790_CLK_SSI2 R8A7790_CLK_SSI1 R8A7790_CLK_SSI0
R8A7790_CLK_SCU_ALL
R8A7790_CLK_SCU_DVC1 R8A7790_CLK_SCU_DVC0
+ R8A7790_CLK_SCU_CTU1_MIX1 R8A7790_CLK_SCU_CTU0_MIX0
R8A7790_CLK_SCU_SRC9 R8A7790_CLK_SCU_SRC8 R8A7790_CLK_SCU_SRC7 R8A7790_CLK_SCU_SRC6 R8A7790_CLK_SCU_SRC5
R8A7790_CLK_SCU_SRC4 R8A7790_CLK_SCU_SRC3 R8A7790_CLK_SCU_SRC2 R8A7790_CLK_SCU_SRC1 R8A7790_CLK_SCU_SRC0
>;
@@ -1321,6 +1323,7 @@
"ssi4", "ssi3", "ssi2", "ssi1", "ssi0",
"scu-all",
"scu-dvc1", "scu-dvc0",
+ "scu-ctu1-mix1", "scu-ctu0-mix0",
"scu-src9", "scu-src8", "scu-src7", "scu-src6", "scu-src5",
"scu-src4", "scu-src3", "scu-src2", "scu-src1", "scu-src0";
};
@@ -1536,6 +1539,7 @@
<&mstp10_clks R8A7790_CLK_SCU_SRC5>, <&mstp10_clks R8A7790_CLK_SCU_SRC4>,
<&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,
<&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,
+ <&mstp10_clks R8A7790_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7790_CLK_SCU_CTU1_MIX1>,
<&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,
<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
clock-names = "ssi-all",
@@ -1543,6 +1547,7 @@
"ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
"src.9", "src.8", "src.7", "src.6", "src.5",
"src.4", "src.3", "src.2", "src.1", "src.0",
+ "ctu.0", "ctu.1",
"dvc.0", "dvc.1",
"clk_a", "clk_b", "clk_c", "clk_i";
@@ -1559,6 +1564,17 @@
};
};
+ rcar_sound,ctu {
+ ctu00: ctu at 0 { };
+ ctu01: ctu at 1 { };
+ ctu02: ctu at 2 { };
+ ctu03: ctu at 3 { };
+ ctu10: ctu at 4 { };
+ ctu11: ctu at 5 { };
+ ctu12: ctu at 6 { };
+ ctu13: ctu at 7 { };
+ };
+
rcar_sound,src {
src0: src at 0 {
interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/include/dt-bindings/clock/r8a7790-clock.h b/include/dt-bindings/clock/r8a7790-clock.h
index e119ef372ba3..7b1ad8922eec 100644
--- a/include/dt-bindings/clock/r8a7790-clock.h
+++ b/include/dt-bindings/clock/r8a7790-clock.h
@@ -144,6 +144,8 @@
#define R8A7790_CLK_SCU_ALL 17
#define R8A7790_CLK_SCU_DVC1 18
#define R8A7790_CLK_SCU_DVC0 19
+#define R8A7790_CLK_SCU_CTU1_MIX1 20
+#define R8A7790_CLK_SCU_CTU0_MIX0 21
#define R8A7790_CLK_SCU_SRC9 22
#define R8A7790_CLK_SCU_SRC8 23
#define R8A7790_CLK_SCU_SRC7 24
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 7/9] ARM: shmobile: r8a7790: Add Audio MIX support on DTSI
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
` (5 preceding siblings ...)
2015-07-24 8:41 ` [PATCH 6/9] ARM: shmobile: r8a7790: Add Audio CTU support on DTSI Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
2015-07-24 8:41 ` [PATCH 8/9] ARM: shmobile: r8a7791: Add Audio CTU " Simon Horman
2015-07-24 8:41 ` [PATCH 9/9] ARM: shmobile: r8a7791: Add Audio MIX " Simon Horman
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tested-by: Keita Kobayashi <keita.kobayashi.ym@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 6aa1d759690b..f1cdccc0a8c8 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1540,6 +1540,7 @@
<&mstp10_clks R8A7790_CLK_SCU_SRC3>, <&mstp10_clks R8A7790_CLK_SCU_SRC2>,
<&mstp10_clks R8A7790_CLK_SCU_SRC1>, <&mstp10_clks R8A7790_CLK_SCU_SRC0>,
<&mstp10_clks R8A7790_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7790_CLK_SCU_CTU1_MIX1>,
+ <&mstp10_clks R8A7790_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7790_CLK_SCU_CTU1_MIX1>,
<&mstp10_clks R8A7790_CLK_SCU_DVC0>, <&mstp10_clks R8A7790_CLK_SCU_DVC1>,
<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
clock-names = "ssi-all",
@@ -1548,6 +1549,7 @@
"src.9", "src.8", "src.7", "src.6", "src.5",
"src.4", "src.3", "src.2", "src.1", "src.0",
"ctu.0", "ctu.1",
+ "mix.0", "mix.1",
"dvc.0", "dvc.1",
"clk_a", "clk_b", "clk_c", "clk_i";
@@ -1564,6 +1566,11 @@
};
};
+ rcar_sound,mix {
+ mix0: mix at 0 { };
+ mix1: mix at 1 { };
+ };
+
rcar_sound,ctu {
ctu00: ctu at 0 { };
ctu01: ctu at 1 { };
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3
@ 2015-07-24 8:41 Simon Horman
2015-07-24 8:41 ` [PATCH 1/9] ARM: shmobile: emev2: add IIC cores to dtsi Simon Horman
` (8 more replies)
0 siblings, 9 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Kevin, Hi Arnd,
Please consider these second round of Renesas ARM based SoC DT updates for v4.3.
This pull request is based on the previous round of
such requests, tagged as renesas-dt-for-v4.3,
which I have already sent a pull-request for.
The following changes since commit 7bf46d0be278a3586c78322c65ceff5fd03bb95d:
ARM: shmobile: r8a7779: Configure IRLM mode via DT (2015-07-06 09:33:41 +0900)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v4.3
for you to fetch changes up to 7fd6e11dca09b21efbe2b9db4eff08c8f4a16125:
ARM: shmobile: r8a7791: Add Audio MIX support on DTSI (2015-07-22 09:36:49 +0900)
----------------------------------------------------------------
Second Round of Renesas ARM Based SoC DT Updates for v4.3
* Add Audio MIX and CTU support to r8a779[01] SoCs
* Correct IRQ sense for adv7511 on lager board
* Add sound label to koelsch and lager boards
* Add IIC support to emev2 SoC
----------------------------------------------------------------
Kuninori Morimoto (6):
ARM: shmobile: lager: add sound label on DTS
ARM: shmobile: koelsch: add sound label on DTS
ARM: shmobile: r8a7790: Add Audio CTU support on DTSI
ARM: shmobile: r8a7790: Add Audio MIX support on DTSI
ARM: shmobile: r8a7791: Add Audio CTU support on DTSI
ARM: shmobile: r8a7791: Add Audio MIX support on DTSI
Laurent Pinchart (1):
ARM: shmobile: lager: Fix adv7511 IRQ sensing
Wolfram Sang (2):
ARM: shmobile: emev2: add IIC cores to dtsi
ARM: shmobile: emev2: kzm9d: enable IIC busses
arch/arm/boot/dts/emev2-kzm9d.dts | 8 ++++++
arch/arm/boot/dts/emev2.dtsi | 48 +++++++++++++++++++++++++++++++
arch/arm/boot/dts/r8a7790-lager.dts | 4 +--
arch/arm/boot/dts/r8a7790.dtsi | 23 +++++++++++++++
arch/arm/boot/dts/r8a7791-koelsch.dts | 2 +-
arch/arm/boot/dts/r8a7791.dtsi | 23 +++++++++++++++
include/dt-bindings/clock/r8a7790-clock.h | 2 ++
include/dt-bindings/clock/r8a7791-clock.h | 2 ++
8 files changed, 109 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 8/9] ARM: shmobile: r8a7791: Add Audio CTU support on DTSI
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
` (6 preceding siblings ...)
2015-07-24 8:41 ` [PATCH 7/9] ARM: shmobile: r8a7790: Add Audio MIX " Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
2015-07-24 8:41 ` [PATCH 9/9] ARM: shmobile: r8a7791: Add Audio MIX " Simon Horman
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 16 ++++++++++++++++
include/dt-bindings/clock/r8a7791-clock.h | 2 ++
2 files changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 07ea2bebe496..cdd55b82ba4e 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1311,6 +1311,7 @@
<&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
<&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
<&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
+ <&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>,
<&mstp10_clks R8A7791_CLK_SCU_ALL>, <&mstp10_clks R8A7791_CLK_SCU_ALL>;
#clock-cells = <1>;
@@ -1320,6 +1321,7 @@
R8A7791_CLK_SSI4 R8A7791_CLK_SSI3 R8A7791_CLK_SSI2 R8A7791_CLK_SSI1 R8A7791_CLK_SSI0
R8A7791_CLK_SCU_ALL
R8A7791_CLK_SCU_DVC1 R8A7791_CLK_SCU_DVC0
+ R8A7791_CLK_SCU_CTU1_MIX1 R8A7791_CLK_SCU_CTU0_MIX0
R8A7791_CLK_SCU_SRC9 R8A7791_CLK_SCU_SRC8 R8A7791_CLK_SCU_SRC7 R8A7791_CLK_SCU_SRC6 R8A7791_CLK_SCU_SRC5
R8A7791_CLK_SCU_SRC4 R8A7791_CLK_SCU_SRC3 R8A7791_CLK_SCU_SRC2 R8A7791_CLK_SCU_SRC1 R8A7791_CLK_SCU_SRC0
>;
@@ -1329,6 +1331,7 @@
"ssi4", "ssi3", "ssi2", "ssi1", "ssi0",
"scu-all",
"scu-dvc1", "scu-dvc0",
+ "scu-ctu1-mix1", "scu-ctu0-mix0",
"scu-src9", "scu-src8", "scu-src7", "scu-src6", "scu-src5",
"scu-src4", "scu-src3", "scu-src2", "scu-src1", "scu-src0";
};
@@ -1582,6 +1585,7 @@
<&mstp10_clks R8A7791_CLK_SCU_SRC5>, <&mstp10_clks R8A7791_CLK_SCU_SRC4>,
<&mstp10_clks R8A7791_CLK_SCU_SRC3>, <&mstp10_clks R8A7791_CLK_SCU_SRC2>,
<&mstp10_clks R8A7791_CLK_SCU_SRC1>, <&mstp10_clks R8A7791_CLK_SCU_SRC0>,
+ <&mstp10_clks R8A7791_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7791_CLK_SCU_CTU1_MIX1>,
<&mstp10_clks R8A7791_CLK_SCU_DVC0>, <&mstp10_clks R8A7791_CLK_SCU_DVC1>,
<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
clock-names = "ssi-all",
@@ -1589,6 +1593,7 @@
"ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
"src.9", "src.8", "src.7", "src.6", "src.5",
"src.4", "src.3", "src.2", "src.1", "src.0",
+ "ctu.0", "ctu.1",
"dvc.0", "dvc.1",
"clk_a", "clk_b", "clk_c", "clk_i";
@@ -1605,6 +1610,17 @@
};
};
+ rcar_sound,ctu {
+ ctu00: ctu at 0 { };
+ ctu01: ctu at 1 { };
+ ctu02: ctu at 2 { };
+ ctu03: ctu at 3 { };
+ ctu10: ctu at 4 { };
+ ctu11: ctu at 5 { };
+ ctu12: ctu at 6 { };
+ ctu13: ctu at 7 { };
+ };
+
rcar_sound,src {
src0: src at 0 {
interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/include/dt-bindings/clock/r8a7791-clock.h b/include/dt-bindings/clock/r8a7791-clock.h
index 402268384b99..dd09b73c4aaf 100644
--- a/include/dt-bindings/clock/r8a7791-clock.h
+++ b/include/dt-bindings/clock/r8a7791-clock.h
@@ -141,6 +141,8 @@
#define R8A7791_CLK_SCU_ALL 17
#define R8A7791_CLK_SCU_DVC1 18
#define R8A7791_CLK_SCU_DVC0 19
+#define R8A7791_CLK_SCU_CTU1_MIX1 20
+#define R8A7791_CLK_SCU_CTU0_MIX0 21
#define R8A7791_CLK_SCU_SRC9 22
#define R8A7791_CLK_SCU_SRC8 23
#define R8A7791_CLK_SCU_SRC7 24
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 9/9] ARM: shmobile: r8a7791: Add Audio MIX support on DTSI
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
` (7 preceding siblings ...)
2015-07-24 8:41 ` [PATCH 8/9] ARM: shmobile: r8a7791: Add Audio CTU " Simon Horman
@ 2015-07-24 8:41 ` Simon Horman
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2015-07-24 8:41 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791.dtsi | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index cdd55b82ba4e..d37339bd7cdb 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1586,6 +1586,7 @@
<&mstp10_clks R8A7791_CLK_SCU_SRC3>, <&mstp10_clks R8A7791_CLK_SCU_SRC2>,
<&mstp10_clks R8A7791_CLK_SCU_SRC1>, <&mstp10_clks R8A7791_CLK_SCU_SRC0>,
<&mstp10_clks R8A7791_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7791_CLK_SCU_CTU1_MIX1>,
+ <&mstp10_clks R8A7791_CLK_SCU_CTU0_MIX0>, <&mstp10_clks R8A7791_CLK_SCU_CTU1_MIX1>,
<&mstp10_clks R8A7791_CLK_SCU_DVC0>, <&mstp10_clks R8A7791_CLK_SCU_DVC1>,
<&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
clock-names = "ssi-all",
@@ -1594,6 +1595,7 @@
"src.9", "src.8", "src.7", "src.6", "src.5",
"src.4", "src.3", "src.2", "src.1", "src.0",
"ctu.0", "ctu.1",
+ "mix.0", "mix.1",
"dvc.0", "dvc.1",
"clk_a", "clk_b", "clk_c", "clk_i";
@@ -1610,6 +1612,11 @@
};
};
+ rcar_sound,mix {
+ mix0: mix at 0 { };
+ mix1: mix at 1 { };
+ };
+
rcar_sound,ctu {
ctu00: ctu at 0 { };
ctu01: ctu at 1 { };
--
2.1.4
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-07-24 8:41 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-24 8:41 [GIT PULL] Second Round of Renesas ARM Based SoC DT Updates for v4.3 Simon Horman
2015-07-24 8:41 ` [PATCH 1/9] ARM: shmobile: emev2: add IIC cores to dtsi Simon Horman
2015-07-24 8:41 ` [PATCH 2/9] ARM: shmobile: emev2: kzm9d: enable IIC busses Simon Horman
2015-07-24 8:41 ` [PATCH 3/9] ARM: shmobile: lager: add sound label on DTS Simon Horman
2015-07-24 8:41 ` [PATCH 4/9] ARM: shmobile: koelsch: " Simon Horman
2015-07-24 8:41 ` [PATCH 5/9] ARM: shmobile: lager: Fix adv7511 IRQ sensing Simon Horman
2015-07-24 8:41 ` [PATCH 6/9] ARM: shmobile: r8a7790: Add Audio CTU support on DTSI Simon Horman
2015-07-24 8:41 ` [PATCH 7/9] ARM: shmobile: r8a7790: Add Audio MIX " Simon Horman
2015-07-24 8:41 ` [PATCH 8/9] ARM: shmobile: r8a7791: Add Audio CTU " Simon Horman
2015-07-24 8:41 ` [PATCH 9/9] ARM: shmobile: r8a7791: Add Audio MIX " Simon Horman
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).