korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-26 07:44:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Second Round of Renesas ARM Based SoC DT Cleanups for v3.20

Browse Source 
* Tidy up #sound-dai-cells settings
 * Drop "renesas,rcar_sound" compatible value
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJUuGg9AAoJENfPZGlqN0++RkcP/2Pz2DZoSlyj9VeJIF2+0A5B
 RLoUV9ilVlka4VZAFiBtHMTrF/rraYesJ56Z/jb2TIKB7p+cgC2HyO/6qNlhJkAN
 DftbsLSg7fECC5WVrTtehc/orwO8dS4C5nwwh64gfTrpXxY2+N9P0pTYBGbvTS98
 JFL4JLsROGvKGZ0TABeg7ZboJLQ8v9NwgZoV1outdk2k0NF9JY1+XG+ggK7PX3Ou
 MwiQHe3wMsWFj4kTDr6HrEwjIRJfl38o3YKr9PRxuyAMqWBynwmdlR7g7IVKCb0t
 toT/AQwXigvaNW8fhc90QoEVUlWR2QS8fUuv3jt3ZfJE0qG9SXRarT0QJp5wbIqP
 jTJs7/ZKH28B0qu/fexOb7GH4I835tSbx13/zD0PQ1Cjb8+rERyZ45oPZyWGjk8S
 2Zy22hyUUtVq3lCcjHhTchpuuN47URXpvJv+erP3hf58IrZVxhjJKoSqeBFJ3YRt
 rr5R4QlL7RKmLmodH30SqePQNMS3dqrGe+hI/tK2XQoAfPPuNaywZ6fyyUByciRq
 /WhyG8Y9yqC8RtQb+Vasc7d5mMggcKuxBnh+wB3OZZBHLe/Nbm391XFKr+tdrJvc
 HqCkiau80DFlqvoKX7EN9YwYIjw+iasVydgN8bR3SZzgHYPTEomexQl+kYwQ6QmO
 Wocaeqzeqj5qqYsVVlln
 =VWG8
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2015-01-19 16:34:00 -08:00
commit b5c3d7d3af
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/boot/dts/r8a7790-lager.dts
View File

@ -581,6 +581,7 @@
pinctrl-0 = <&sound_pins &sound_clk_pins>;
pinctrl-names = "default";
/* Single DAI */
#sound-dai-cells = <0>;
status = "okay";

9
arch/arm/boot/dts/r8a7790.dtsi
View File

@ -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 */

1
arch/arm/boot/dts/r8a7791-koelsch.dts
View File

@ -584,6 +584,7 @@
pinctrl-0 = <&sound_pins &sound_clk_pins>;
pinctrl-names = "default";
/* Single DAI */
#sound-dai-cells = <0>;
status = "okay";

9
arch/arm/boot/dts/r8a7791.dtsi
View File

@ -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 */