* [PATCH 1/5] ARM: shmobile: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags
2014-04-17 0:32 [GIT PULL] Renesas ARM Based SoC Fixes Updates for v3.15 Simon Horman
@ 2014-04-17 0:32 ` Simon Horman
2014-04-17 0:32 ` [PATCH 2/5] ARM: shmobile: armadillo800eva: " Simon Horman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-04-17 0:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
e1508289404ab6ca28e0dc931612600f0441c417
(ASoC: rcar: fixup SND_SOC_DAIFMT_CBx_CFx flags)
corrected SND_SOC_DAIFMT_CBx_CFx definition.
But then, Lager board was maintenanced other branch.
This patch correct SND_SOC_DAIFMT_CBx_CFx flag for lager
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-lager.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index f0104bf..18c7e03 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -588,14 +588,12 @@ static struct asoc_simple_card_info rsnd_card_info = {
.card = "SSI01-AK4643",
.codec = "ak4642-codec.2-0012",
.platform = "rcar_sound",
- .daifmt = SND_SOC_DAIFMT_LEFT_J,
+ .daifmt = SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM,
.cpu_dai = {
.name = "rcar_sound",
- .fmt = SND_SOC_DAIFMT_CBS_CFS,
},
.codec_dai = {
.name = "ak4642-hifi",
- .fmt = SND_SOC_DAIFMT_CBM_CFM,
.sysclk = 11289600,
},
};
--
1.8.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/5] ARM: shmobile: armadillo800eva: fixup SND_SOC_DAIFMT_CBx_CFx flags
2014-04-17 0:32 [GIT PULL] Renesas ARM Based SoC Fixes Updates for v3.15 Simon Horman
2014-04-17 0:32 ` [PATCH 1/5] ARM: shmobile: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags Simon Horman
@ 2014-04-17 0:32 ` Simon Horman
2014-04-17 0:32 ` [PATCH 3/5] ARM: shmobile: sh73a0: drop address cells from GIC node Simon Horman
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-04-17 0:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
c7a507eea1db1430476289f525f9c853d5d485e8
(ASoC: fsi: fixup SND_SOC_DAIFMT_CBx_CFx flags)
exchanged sound flags, but armadillo800eva flags needs IB_NF.
The recorded sound will be noise without this patch.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/mach-shmobile/board-armadillo800eva.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index 2858f38..486063d 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -992,6 +992,7 @@ static struct asoc_simple_card_info fsi_wm8978_info = {
.platform = "sh_fsi2",
.daifmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM,
.cpu_dai = {
+ .fmt = SND_SOC_DAIFMT_IB_NF,
.name = "fsia-dai",
},
.codec_dai = {
--
1.8.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] ARM: shmobile: sh73a0: drop address cells from GIC node
2014-04-17 0:32 [GIT PULL] Renesas ARM Based SoC Fixes Updates for v3.15 Simon Horman
2014-04-17 0:32 ` [PATCH 1/5] ARM: shmobile: lager: fixup SND_SOC_DAIFMT_CBx_CFx flags Simon Horman
2014-04-17 0:32 ` [PATCH 2/5] ARM: shmobile: armadillo800eva: " Simon Horman
@ 2014-04-17 0:32 ` Simon Horman
2014-04-17 0:32 ` [PATCH 4/5] ARM: shmobile: r8a7740: " Simon Horman
2014-04-17 0:32 ` [PATCH 5/5] ARM: shmobile: koelsch: correct renesas, gpios to renesas, groups in sd[012] pfc Simon Horman
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-04-17 0:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Lucas Stach <l.stach@pengutronix.de>
This is likely a copy-and-paste error from the
ARM GIC documentation, that has already been fixed.
address-cells should have been set to 0, as with the size
cells. As having those properties set to 0 is the
same thing as not specifying them, drop them completely.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index b7bd3b9..5ecf552 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -34,7 +34,6 @@
gic: interrupt-controller at f0001000 {
compatible = "arm,cortex-a9-gic";
#interrupt-cells = <3>;
- #address-cells = <1>;
interrupt-controller;
reg = <0xf0001000 0x1000>,
<0xf0000100 0x100>;
--
1.8.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] ARM: shmobile: r8a7740: drop address cells from GIC node
2014-04-17 0:32 [GIT PULL] Renesas ARM Based SoC Fixes Updates for v3.15 Simon Horman
` (2 preceding siblings ...)
2014-04-17 0:32 ` [PATCH 3/5] ARM: shmobile: sh73a0: drop address cells from GIC node Simon Horman
@ 2014-04-17 0:32 ` Simon Horman
2014-04-17 0:32 ` [PATCH 5/5] ARM: shmobile: koelsch: correct renesas, gpios to renesas, groups in sd[012] pfc Simon Horman
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-04-17 0:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Lucas Stach <l.stach@pengutronix.de>
This is likely a copy-and-paste error from the
ARM GIC documentation, that has already been fixed.
address-cells should have been set to 0, as with the size
cells. As having those properties set to 0 is the
same thing as not specifying them, drop them completely.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7740.dtsi | 1 -
1 file changed, 1 deletion(-)
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 8280884..2551e94 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -28,7 +28,6 @@
gic: interrupt-controller at c2800000 {
compatible = "arm,cortex-a9-gic";
#interrupt-cells = <3>;
- #address-cells = <1>;
interrupt-controller;
reg = <0xc2800000 0x1000>,
<0xc2000000 0x1000>;
--
1.8.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 5/5] ARM: shmobile: koelsch: correct renesas, gpios to renesas, groups in sd[012] pfc
2014-04-17 0:32 [GIT PULL] Renesas ARM Based SoC Fixes Updates for v3.15 Simon Horman
` (3 preceding siblings ...)
2014-04-17 0:32 ` [PATCH 4/5] ARM: shmobile: r8a7740: " Simon Horman
@ 2014-04-17 0:32 ` Simon Horman
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-04-17 0:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Magnus Damm <damm@opensource.se>
Fix typo of renesas,groups in the koeslch dt. The kernel has no
renesas,gpios but this should match renesas,groups.
Noticed thanks to similar fix for Lager by Rob Taylor and Ben Dooks.
Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7791-koelsch.dts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index bdd73e6..de1b697 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -230,17 +230,17 @@
};
sdhi0_pins: sd0 {
- renesas,gpios = "sdhi0_data4", "sdhi0_ctrl";
+ renesas,groups = "sdhi0_data4", "sdhi0_ctrl";
renesas,function = "sdhi0";
};
sdhi1_pins: sd1 {
- renesas,gpios = "sdhi1_data4", "sdhi1_ctrl";
+ renesas,groups = "sdhi1_data4", "sdhi1_ctrl";
renesas,function = "sdhi1";
};
sdhi2_pins: sd2 {
- renesas,gpios = "sdhi2_data4", "sdhi2_ctrl";
+ renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
renesas,function = "sdhi2";
};
--
1.8.4
^ permalink raw reply related [flat|nested] 6+ messages in thread