diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-20 01:34:00 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-20 01:34:00 +0100 |
| commit | b5c3d7d3af9444130038ba29892e9bcf3c59ec10 (patch) | |
| tree | e22735be90902244fc7dd28b2e8ae76dff130626 /arch/arm/boot/dts/r8a7791-koelsch.dts | |
| parent | ARM: dts: move alphascale in makefile (diff) | |
| parent | ARM: shmobile: r8a7791: tidyup #sound-dai-cells settings (diff) | |
| download | linux-b5c3d7d3af9444130038ba29892e9bcf3c59ec10.tar.xz linux-b5c3d7d3af9444130038ba29892e9bcf3c59ec10.zip | |
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-koelsch.dts')
| -rw-r--r-- | arch/arm/boot/dts/r8a7791-koelsch.dts | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts index 64fd044e1147..96f5b5877f22 100644 --- a/arch/arm/boot/dts/r8a7791-koelsch.dts +++ b/arch/arm/boot/dts/r8a7791-koelsch.dts @@ -584,6 +584,7 @@ pinctrl-0 = <&sound_pins &sound_clk_pins>; pinctrl-names = "default"; + /* Single DAI */ #sound-dai-cells = <0>; status = "okay"; |