Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5c3d7d3 authored Jan 19, 2015 by Olof Johansson

Merge tag 'renesas-dt-cleanups2-for-v3.20' of...

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>

parents 1b012fbc d2b541c9

arch/arm/boot/dts/r8a7790-lager.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -581,6 +581,7 @@
		pinctrl-0 = <&sound_pins &sound_clk_pins>;
		pinctrl-names = "default";

		/* Single DAI */
		#sound-dai-cells = <0>;

		status = "okay";

arch/arm/boot/dts/r8a7790.dtsi

+7 −2

Original line number	Diff line number	Diff line
		@@ -1400,8 +1400,13 @@
		};

		rcar_sound: rcar_sound@ec500000 {
		#sound-dai-cells = <1>;
		compatible = "renesas,rcar_sound-r8a7790", "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-r8a7790", "renesas,rcar_sound-gen2";
		reg = <0 0xec500000 0 0x1000>, /* SCU */
		<0 0xec5a0000 0 0x100>, /* ADG */
		<0 0xec540000 0 0x1000>, /* SSIU */

arch/arm/boot/dts/r8a7791-koelsch.dts

+1 −0

Original line number	Diff line number	Diff line
		@@ -584,6 +584,7 @@
		pinctrl-0 = <&sound_pins &sound_clk_pins>;
		pinctrl-names = "default";

		/* Single DAI */
		#sound-dai-cells = <0>;

		status = "okay";

arch/arm/boot/dts/r8a7791.dtsi

+7 −2

Original line number	Diff line number	Diff line
		@@ -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 */