diff options
| author |   Khang Nguyen <khang.nguyen.xw@renesas.com> | 2018-10-19 02:05:26 -0400 |
|---|---|---|
| committer |   Khang Nguyen <khang.nguyen.xv@renesas.com> | 2018-10-29 13:41:32 +0700 |
| commit | 4787fee594d0215a32e4a84c799e315a3c8e004a (patch) | |
| tree | 2701ffeda2df5665a6c26116dd27714446ac8cae /meta-rcar-gen3 | |
| parent | 612234ba9a53ee39600b5128c50065866c63955a (diff) | |
rcar-gen3: linux-renesas: Update device tree to support ADSP ALSA driver
This commit applies device tree rollback patches to support ADSP ALSA
driver.
Signed-off-by: Khang Nguyen <khang.nguyen.xw@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Diffstat (limited to 'meta-rcar-gen3')
14 files changed, 500 insertions, 0 deletions
diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-dts-salvator-common-Rcar-Sound.patch b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-dts-salvator-common-Rcar-Sound.patch new file mode 100644 index 0000000..a7e0587 --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0001-arm64-dts-salvator-common-Rcar-Sound.patch @@ -0,0 +1,83 @@ +From cda5747801eadd0f29a591bee4b36c6f1ae30a54 Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:48:30 +0900 +Subject: [PATCH 1/6] arm64: dts: salvator-common: Rcar-Sound + +This Patch Adds Rcar_Sound + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + .../boot/dts/renesas/salvator-common.dtsi | 40 ++++++++----------- + 1 file changed, 16 insertions(+), 24 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi +index 3257143e43c1..6cda02800731 100644 +--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi ++++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi +@@ -125,15 +125,21 @@ + regulator-boot-on; + regulator-always-on; + }; ++ rsnd_ak4613: sound { ++ compatible = "simple-audio-card"; ++ simple-audio-card,format = "left_j"; ++ simple-audio-card,bitclock-master = <&sndcpu>; ++ simple-audio-card,frame-master = <&sndcpu>; ++ sndcpu: simple-audio-card,cpu { ++ sound-dai = <&rcar_sound>; ++ }; + +- sound_card: sound { +- compatible = "audio-graph-card"; +- +- label = "rcar-sound"; +- +- dais = <&rsnd_port0>; ++ sndcodec: simple-audio-card,codec { ++ sound-dai = <&ak4613>; ++ }; + }; + ++ + vbus0_usb2: regulator-vbus0-usb2 { + compatible = "regulator-fixed"; + +@@ -454,12 +460,6 @@ + asahi-kasei,out4-single-end; + asahi-kasei,out5-single-end; + asahi-kasei,out6-single-end; +- +- port { +- ak4613_endpoint: endpoint { +- remote-endpoint = <&rsnd_endpoint0>; +- }; +- }; + }; + + cs2000: clk_multiplier@4f { +@@ -795,18 +795,10 @@ + <&audio_clk_c>, + <&cpg CPG_CORE CPG_AUDIO_CLK_I>; + +- ports { +- rsnd_port0: port@0 { +- rsnd_endpoint0: endpoint { +- remote-endpoint = <&ak4613_endpoint>; +- +- dai-format = "left_j"; +- bitclock-master = <&rsnd_endpoint0>; +- frame-master = <&rsnd_endpoint0>; +- +- playback = <&ssi0 &src0 &dvc0>; +- capture = <&ssi1 &src1 &dvc1>; +- }; ++ rcar_sound,dai { ++ dai0 { ++ playback = <&ssi0 &src0 &dvc0>; ++ capture = <&ssi1 &src1 &dvc1>; + }; + }; + }; +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-arm64-dts-r8a7796-salvator-xs-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-arm64-dts-r8a7796-salvator-xs-Remove-Sound-Card.patch new file mode 100644 index 0000000..e7c17d6 --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0002-arm64-dts-r8a7796-salvator-xs-Remove-Sound-Card.patch @@ -0,0 +1,31 @@ +From d25996a812524c338423b9da86233564d18f0042 Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:48:41 +0900 +Subject: [PATCH 2/6] arm64: dts: r8a7796-salvator-xs: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts +index 2f4bd3ae3678..ba040341aa26 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts +@@ -101,11 +101,6 @@ + "dclkin.0", "dclkin.1", "dclkin.2"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1>; /* HDMI0 */ +-}; +- + &hdmi0 { + status = "okay"; + +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-arm64-dts-r8a7795-salvator-x-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-arm64-dts-r8a7795-salvator-x-Remove-Sound-Card.patch new file mode 100644 index 0000000..d068e6d --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0003-arm64-dts-r8a7795-salvator-x-Remove-Sound-Card.patch @@ -0,0 +1,32 @@ +From bcf876462ac57204cf9054ba6cc5d0703b9beb5e Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:48:48 +0900 +Subject: [PATCH 3/6] arm64: dts: r8a7795-salvator-x: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +index 6156bcc521b2..1f1920270aa4 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +@@ -117,12 +117,6 @@ + status = "okay"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1 /* HDMI0 */ +- &rsnd_port2>; /* HDMI1 */ +-}; +- + &hdmi0 { + status = "okay"; + +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0004-arm64-dts-r8a7795-salvator-xs-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0004-arm64-dts-r8a7795-salvator-xs-Remove-Sound-Card.patch new file mode 100644 index 0000000..b740cfe --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0004-arm64-dts-r8a7795-salvator-xs-Remove-Sound-Card.patch @@ -0,0 +1,32 @@ +From 47fe276f805a83ef155bd9c16aea9fb16a3a931d Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:48:54 +0900 +Subject: [PATCH 4/6] arm64: dts: r8a7795-salvator-xs: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts +index b37b1de9d51a..286a8ffbdce5 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts +@@ -127,12 +127,6 @@ + status = "okay"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1 /* HDMI0 */ +- &rsnd_port2>; /* HDMI1 */ +-}; +- + &hdmi0 { + status = "okay"; + +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0005-arm64-dts-r8a7795-es1-salvator-x-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0005-arm64-dts-r8a7795-es1-salvator-x-Remove-Sound-Card.patch new file mode 100644 index 0000000..825e48f --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0005-arm64-dts-r8a7795-es1-salvator-x-Remove-Sound-Card.patch @@ -0,0 +1,31 @@ +From 7f000c3d136f9c2fb2087a1a1715a29e51140fc9 Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:49:00 +0900 +Subject: [PATCH 5/6] arm64: dts: r8a7795-es1-salvator-x: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts +index 212e1f6ac5af..8e56c7b9d4bf 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts +@@ -117,11 +117,6 @@ + status = "okay"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1 /* HDMI0 */ +- &rsnd_port2>; /* HDMI1 */ +-}; + + &hdmi0 { + status = "okay"; +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0006-arm64-dts-r8a7796-salvator-x-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0006-arm64-dts-r8a7796-salvator-x-Remove-Sound-Card.patch new file mode 100644 index 0000000..c312fea --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers/0006-arm64-dts-r8a7796-salvator-x-Remove-Sound-Card.patch @@ -0,0 +1,31 @@ +From 867b08a686424cb771dbf83814b44e64e72cebe2 Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:49:09 +0900 +Subject: [PATCH 6/6] arm64: dts: r8a7796-salvator-x: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts +index 8e4f264ff8a3..9343244e8032 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts +@@ -91,11 +91,6 @@ + "dclkin.0", "dclkin.1", "dclkin.2"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1>; /* HDMI0 */ +-}; +- + &lvds0 { + ports { + port@1 { +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb index 47c58c2..5b0995b 100644 --- a/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb +++ b/meta-rcar-gen3/recipes-kernel/linux-libc-headers/linux-libc-headers_4.14.bb @@ -13,4 +13,14 @@ SRC_URI_append = " \ ${@base_conditional("USE_ICCOM", "1", " file://0001-rpmsg-Add-message-to-be-able-to-configure-RPMSG_VIRT.patch", "", d)} \ " +# Device tree patches +SRC_URI_append = " \ + file://0001-arm64-dts-salvator-common-Rcar-Sound.patch \ + file://0002-arm64-dts-r8a7796-salvator-xs-Remove-Sound-Card.patch \ + file://0003-arm64-dts-r8a7795-salvator-x-Remove-Sound-Card.patch \ + file://0004-arm64-dts-r8a7795-salvator-xs-Remove-Sound-Card.patch \ + file://0005-arm64-dts-r8a7795-es1-salvator-x-Remove-Sound-Card.patch \ + file://0006-arm64-dts-r8a7796-salvator-x-Remove-Sound-Card.patch \ +" + S = "${WORKDIR}/git" diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-arm64-dts-salvator-common-Rcar-Sound.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-arm64-dts-salvator-common-Rcar-Sound.patch new file mode 100644 index 0000000..a7e0587 --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0001-arm64-dts-salvator-common-Rcar-Sound.patch @@ -0,0 +1,83 @@ +From cda5747801eadd0f29a591bee4b36c6f1ae30a54 Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:48:30 +0900 +Subject: [PATCH 1/6] arm64: dts: salvator-common: Rcar-Sound + +This Patch Adds Rcar_Sound + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + .../boot/dts/renesas/salvator-common.dtsi | 40 ++++++++----------- + 1 file changed, 16 insertions(+), 24 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi +index 3257143e43c1..6cda02800731 100644 +--- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi ++++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi +@@ -125,15 +125,21 @@ + regulator-boot-on; + regulator-always-on; + }; ++ rsnd_ak4613: sound { ++ compatible = "simple-audio-card"; ++ simple-audio-card,format = "left_j"; ++ simple-audio-card,bitclock-master = <&sndcpu>; ++ simple-audio-card,frame-master = <&sndcpu>; ++ sndcpu: simple-audio-card,cpu { ++ sound-dai = <&rcar_sound>; ++ }; + +- sound_card: sound { +- compatible = "audio-graph-card"; +- +- label = "rcar-sound"; +- +- dais = <&rsnd_port0>; ++ sndcodec: simple-audio-card,codec { ++ sound-dai = <&ak4613>; ++ }; + }; + ++ + vbus0_usb2: regulator-vbus0-usb2 { + compatible = "regulator-fixed"; + +@@ -454,12 +460,6 @@ + asahi-kasei,out4-single-end; + asahi-kasei,out5-single-end; + asahi-kasei,out6-single-end; +- +- port { +- ak4613_endpoint: endpoint { +- remote-endpoint = <&rsnd_endpoint0>; +- }; +- }; + }; + + cs2000: clk_multiplier@4f { +@@ -795,18 +795,10 @@ + <&audio_clk_c>, + <&cpg CPG_CORE CPG_AUDIO_CLK_I>; + +- ports { +- rsnd_port0: port@0 { +- rsnd_endpoint0: endpoint { +- remote-endpoint = <&ak4613_endpoint>; +- +- dai-format = "left_j"; +- bitclock-master = <&rsnd_endpoint0>; +- frame-master = <&rsnd_endpoint0>; +- +- playback = <&ssi0 &src0 &dvc0>; +- capture = <&ssi1 &src1 &dvc1>; +- }; ++ rcar_sound,dai { ++ dai0 { ++ playback = <&ssi0 &src0 &dvc0>; ++ capture = <&ssi1 &src1 &dvc1>; + }; + }; + }; +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0002-arm64-dts-r8a7796-salvator-xs-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0002-arm64-dts-r8a7796-salvator-xs-Remove-Sound-Card.patch new file mode 100644 index 0000000..e7c17d6 --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0002-arm64-dts-r8a7796-salvator-xs-Remove-Sound-Card.patch @@ -0,0 +1,31 @@ +From d25996a812524c338423b9da86233564d18f0042 Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:48:41 +0900 +Subject: [PATCH 2/6] arm64: dts: r8a7796-salvator-xs: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts +index 2f4bd3ae3678..ba040341aa26 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts +@@ -101,11 +101,6 @@ + "dclkin.0", "dclkin.1", "dclkin.2"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1>; /* HDMI0 */ +-}; +- + &hdmi0 { + status = "okay"; + +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0003-arm64-dts-r8a7795-salvator-x-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0003-arm64-dts-r8a7795-salvator-x-Remove-Sound-Card.patch new file mode 100644 index 0000000..d068e6d --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0003-arm64-dts-r8a7795-salvator-x-Remove-Sound-Card.patch @@ -0,0 +1,32 @@ +From bcf876462ac57204cf9054ba6cc5d0703b9beb5e Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:48:48 +0900 +Subject: [PATCH 3/6] arm64: dts: r8a7795-salvator-x: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +index 6156bcc521b2..1f1920270aa4 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts +@@ -117,12 +117,6 @@ + status = "okay"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1 /* HDMI0 */ +- &rsnd_port2>; /* HDMI1 */ +-}; +- + &hdmi0 { + status = "okay"; + +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-arm64-dts-r8a7795-salvator-xs-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-arm64-dts-r8a7795-salvator-xs-Remove-Sound-Card.patch new file mode 100644 index 0000000..b740cfe --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-arm64-dts-r8a7795-salvator-xs-Remove-Sound-Card.patch @@ -0,0 +1,32 @@ +From 47fe276f805a83ef155bd9c16aea9fb16a3a931d Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:48:54 +0900 +Subject: [PATCH 4/6] arm64: dts: r8a7795-salvator-xs: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts +index b37b1de9d51a..286a8ffbdce5 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts +@@ -127,12 +127,6 @@ + status = "okay"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1 /* HDMI0 */ +- &rsnd_port2>; /* HDMI1 */ +-}; +- + &hdmi0 { + status = "okay"; + +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0005-arm64-dts-r8a7795-es1-salvator-x-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0005-arm64-dts-r8a7795-es1-salvator-x-Remove-Sound-Card.patch new file mode 100644 index 0000000..825e48f --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0005-arm64-dts-r8a7795-es1-salvator-x-Remove-Sound-Card.patch @@ -0,0 +1,31 @@ +From 7f000c3d136f9c2fb2087a1a1715a29e51140fc9 Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:49:00 +0900 +Subject: [PATCH 5/6] arm64: dts: r8a7795-es1-salvator-x: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts +index 212e1f6ac5af..8e56c7b9d4bf 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts +@@ -117,11 +117,6 @@ + status = "okay"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1 /* HDMI0 */ +- &rsnd_port2>; /* HDMI1 */ +-}; + + &hdmi0 { + status = "okay"; +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0006-arm64-dts-r8a7796-salvator-x-Remove-Sound-Card.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0006-arm64-dts-r8a7796-salvator-x-Remove-Sound-Card.patch new file mode 100644 index 0000000..c312fea --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0006-arm64-dts-r8a7796-salvator-x-Remove-Sound-Card.patch @@ -0,0 +1,31 @@ +From 867b08a686424cb771dbf83814b44e64e72cebe2 Mon Sep 17 00:00:00 2001 +From: Takeshi Kihara <takeshi.kihara.df@renesas.com> +Date: Fri, 19 Oct 2018 11:49:09 +0900 +Subject: [PATCH 6/6] arm64: dts: r8a7796-salvator-x: Remove-Sound-Card + +This Patch Removes Sound-Card + +Signed-off-by: Takeshi Kihara <takeshi.kihara.df@renesas.com> +--- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts +index 8e4f264ff8a3..9343244e8032 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts +@@ -91,11 +91,6 @@ + "dclkin.0", "dclkin.1", "dclkin.2"; + }; + +-&sound_card { +- dais = <&rsnd_port0 /* ak4613 */ +- &rsnd_port1>; /* HDMI0 */ +-}; +- + &lvds0 { + ports { + port@1 { +-- +2.19.0 + diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb index 6fda44e..208607a 100644 --- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb @@ -39,6 +39,16 @@ SRC_URI_append = " \ ${@base_conditional("USE_CAS", "1", " file://capacity_aware_migration_strategy.cfg", "",d)} \ " +# Device tree patches +SRC_URI_append = " \ + file://0001-arm64-dts-salvator-common-Rcar-Sound.patch \ + file://0002-arm64-dts-r8a7796-salvator-xs-Remove-Sound-Card.patch \ + file://0003-arm64-dts-r8a7795-salvator-x-Remove-Sound-Card.patch \ + file://0004-arm64-dts-r8a7795-salvator-xs-Remove-Sound-Card.patch \ + file://0005-arm64-dts-r8a7795-es1-salvator-x-Remove-Sound-Card.patch \ + file://0006-arm64-dts-r8a7796-salvator-x-Remove-Sound-Card.patch \ +" + # Install USB3.0 firmware to rootfs USB3_FIRMWARE_V2 = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/r8a779x_usb3_v2.dlmem;md5sum=645db7e9056029efa15f158e51cc8a11" USB3_FIRMWARE_V3 = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/plain/r8a779x_usb3_v3.dlmem;md5sum=687d5d42f38f9850f8d5a6071dca3109" |