summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/r8a7791.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2015-01-19 16:34:00 -0800
committerOlof Johansson <olof@lixom.net>2015-01-19 16:34:00 -0800
commitb5c3d7d3af9444130038ba29892e9bcf3c59ec10 (patch)
treee22735be90902244fc7dd28b2e8ae76dff130626 /arch/arm/boot/dts/r8a7791.dtsi
parent1b012fbc11878a3c965d982f828fccc15caed996 (diff)
parentd2b541c98f5402ebb49ee1c636ef5bc31462b4ca (diff)
Merge tag 'renesas-dt-cleanups2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Second Round of Renesas ARM Based SoC DT Cleanups for v3.20" from Simon Horman: Second Round of Renesas ARM Based SoC DT Cleanups for v3.20 * Tidy up #sound-dai-cells settings * Drop "renesas,rcar_sound" compatible value * tag 'renesas-dt-cleanups2-for-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: ARM: shmobile: r8a7791: tidyup #sound-dai-cells settings ARM: shmobile: r8a7790: tidyup #sound-dai-cells settings ARM: shmobile: r8a7791 dtsi: Drop "renesas,rcar_sound" compatible value ARM: shmobile: r8a7790 dtsi: Drop "renesas,rcar_sound" compatible value Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/r8a7791.dtsi')
-rw-r--r--arch/arm/boot/dts/r8a7791.dtsi9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 28102265cc71..5769faf17f28 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1385,8 +1385,13 @@
};
rcar_sound: rcar_sound@ec500000 {
- #sound-dai-cells = <1>;
- compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
+ /*
+ * #sound-dai-cells is required
+ *
+ * Single DAI : #sound-dai-cells = <0>; <&rcar_sound>;
+ * Multi DAI : #sound-dai-cells = <1>; <&rcar_sound N>;
+ */
+ compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2";
reg = <0 0xec500000 0 0x1000>, /* SCU */
<0 0xec5a0000 0 0x100>, /* ADG */
<0 0xec540000 0 0x1000>, /* SSIU */