diff options
author | Duy Dang <duy.dang.yw@rvc.renesas.com> | 2018-10-20 14:55:18 +0700 |
---|---|---|
committer | Duy Dang <duy.dang.yw@rvc.renesas.com> | 2018-12-19 15:23:55 +0700 |
commit | 0814c5cebd418b10a24b11e22ae08a84324d0f27 (patch) | |
tree | ebbd74ba4f5601ce202f057abf19d0d99d4a48db /meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-Update-device-tree-for-ADSP-sound-driver.patch | |
parent | 98f4f5ec2c9bc4ab03d430e9cdcb4b7591a64dcd (diff) |
rcar-gen3: linux-renesas: Upgrade Linux BSP to v3.9.2
This commit upgrades Linux BSP to v3.9.2 for the following changes:
[Kernel]
- Add support for RCKSEL clock selection.
- Fix pin functions of R-Car E3 according to H/W UM Rev1.00 errata.
- Fix warning of the make W=1 C=2.
- Identify R-Car M3 Ver.1.3.
- Add the big.LITTLE CAS scheduler fix patches.
- Fix MOD_SEL bit numbering for R-Car E3.
[Power Management]
- Fixup power-domains of 3DGE for R-Car E3 Ver.1.0 and add device
tree file for R-Car E3 Ver.1.0.
[Audio Driver]
- Fixup clock start checker.
- Resolve the problem that the noise is generated during long playback
with R-Car E3 Ebisu-4D board by kernel rebasing.
[Display Driver]
- Add function of suspend and resume to adv7511_drv.c and add hot plug
event function at resume in rcar_du_drv.c.
- Add depends on DRM_RCAR_DU to config DRM_RCAR_LVDS.
- Revert "drm: rcar-du: Fix legacy DT to create LVDS encoder nodes".
- Add clock function for LVDS PLL.
[Ethernet Driver]
- Decrease TxFIFO depth of Q3 and Q2 to one.
- Fix not to call phy_resume() if PHY is not attached and add toggling
phy reset if PHY is not attached.
- Revert "ravb: RX checksum offload" for communicating of Q-Tag VLAN
frame correctly.
- Resolved the problem that the S2RAM resume failed on R-Car E3
Ebisu-4D by kernel rebasing.
- Avoid unsupported internal delay mode for R-Car E3 and limit to
100Mbps.
[I2C Driver]
- Check bus state before reinitializing.
[IPMMU Driver]
- Fix crash on early domain free.
- Revert "arm64: defconfig: Enable QCOM_IOMMU" for suspending with
LTSI kernel.
- Correct whitelist devices assignment.
[PCIe Driver]
- Avoid PCI device removing/rescanning through sysfs triggers
a deadlock.
[PWM Driver]
- Avoid deadlock warning when removing PWM device.
[SD/MMC Driver]
- Fix card initialization failure in high speed mode.
- Add adjust HS400 offset by manual calibration mode and adjust HS400
offset by manual calibration mode for R-Car M3 Ver.1.3.
[USB2.0 Function]
- Add reset_control.
- Backport upstream patches to support OTG mode for R-Car E3.
- Make DMAC system sleep callbacks explicit.
- Add Super-Speed (b-device) support.
[Video Capture driver]
- Review adv748x driver for R-Car E3 Ebisu board and add option for
changing SD output route to TXA.
- Revert "rcar-vin: rcar-csi2: Add blank margin when caluculating bit
rate" and fix pixel rate values.
- Add CPG reset and release when using digital pin.
[RWDT Driver]
- Don't keep timer value during suspend/resume.
- Don't set divider while watchdog is running.
This also updates ADSP driver patches to adapt to the new
Linux version.
Signed-off-by: Duy Dang <duy.dang.yw@rvc.renesas.com>
Signed-off-by: Khang Nguyen <khang.nguyen.xv@renesas.com>
Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com>
Diffstat (limited to 'meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-Update-device-tree-for-ADSP-sound-driver.patch')
-rw-r--r-- | meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-Update-device-tree-for-ADSP-sound-driver.patch | 249 |
1 files changed, 0 insertions, 249 deletions
diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-Update-device-tree-for-ADSP-sound-driver.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-Update-device-tree-for-ADSP-sound-driver.patch deleted file mode 100644 index 2586dac..0000000 --- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-Update-device-tree-for-ADSP-sound-driver.patch +++ /dev/null @@ -1,249 +0,0 @@ -From 81528aacc64df60f2471873deca3f1092d47b6ae Mon Sep 17 00:00:00 2001 -From: tienphitran <tien.tran.uw@renesas.com> -Date: Mon, 15 Oct 2018 17:56:29 +0700 -Subject: [PATCH 4/4] Update device tree for ADSP sound driver - -Signed-off-by: tienphitran <tien.tran.uw@renesas.com> - -diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi -index 1c8e713..1331a09 100644 ---- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi -+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi -@@ -2161,6 +2161,11 @@ - status = "disabled"; - }; - -+ rcar_adsp_sound: adsp_sound@0 { -+ compatible = "renesas,rcar_adsp_sound_gen3"; -+ status = "disabled"; -+ }; -+ - rcar_sound: sound@ec500000 { - /* - * #sound-dai-cells is required -diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -index f25b476..ed332e7 100644 ---- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi -+++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi -@@ -2067,6 +2067,11 @@ - status = "disabled"; - }; - -+ rcar_adsp_sound: adsp_sound@0 { -+ compatible = "renesas,rcar_adsp_sound_gen3"; -+ status = "disabled"; -+ }; -+ - rcar_sound: sound@ec500000 { - /* - * #sound-dai-cells is required -diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi -index d86bf9e..05861b4 100644 ---- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi -+++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi -@@ -1478,6 +1478,11 @@ - }; - }; - -+ rcar_adsp_sound: adsp_sound@0 { -+ compatible = "renesas,rcar_adsp_sound_gen3"; -+ status = "disabled"; -+ }; -+ - rcar_sound: sound@ec500000 { - /* - * #sound-dai-cells is required -diff --git a/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts b/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts -index 10a3403..b96ae07 100644 ---- a/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts -+++ b/arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts -@@ -356,11 +356,26 @@ - }; - - sound_card: sound { -- compatible = "audio-graph-card"; -+ compatible = "audio-graph-scu-card"; - - label = "rcar-sound"; -- -- dais = <&rsnd_port0>; -+ prefix = "ak4613"; -+ routing = "ak4613 Playback", "DAI0 Playback", -+ "DAI0 Capture", "ak4613 Capture", -+ "ak4613 Playback", "Playback0", -+ "ak4613 Playback", "Playback1", -+ "ak4613 Playback", "Playback2", -+ "ak4613 Playback", "Playback3", -+ "Capture0", "ak4613 Capture", -+ "Capture1", "ak4613 Capture", -+ "Capture2", "ak4613 Capture", -+ "Capture3", "ak4613 Capture"; -+ -+ dais = <&adsp_port0 -+ &adsp_port1 -+ &adsp_port2 -+ &adsp_port3 -+ &rsnd_port0>; - }; - }; - -@@ -567,7 +582,19 @@ - asahi-kasei,out6-single-end; - - port { -- ak4613_endpoint: endpoint { -+ ak4613_endpoint0: endpoint@0 { -+ remote-endpoint = <&adsp_endpoint0>; -+ }; -+ ak4613_endpoint1: endpoint@1 { -+ remote-endpoint = <&adsp_endpoint1>; -+ }; -+ ak4613_endpoint2: endpoint@2 { -+ remote-endpoint = <&adsp_endpoint2>; -+ }; -+ ak4613_endpoint3: endpoint@3 { -+ remote-endpoint = <&adsp_endpoint3>; -+ }; -+ ak4613_endpoint4: endpoint@4 { - remote-endpoint = <&rsnd_endpoint0>; - }; - }; -@@ -766,6 +793,39 @@ - shared-pin; - }; - -+&rcar_adsp_sound { -+ status = "okay"; -+ /* Multiple DAI */ -+ #sound-dai-cells = <1>; -+ -+ ports { -+ adsp_port0: port@0 { -+ adsp_endpoint0: endpoint@0 { -+ remote-endpoint = <&ak4613_endpoint0>; -+ dai-format = "left_j"; -+ }; -+ }; -+ adsp_port1: port@1 { -+ adsp_endpoint1: endpoint@1 { -+ remote-endpoint = <&ak4613_endpoint1>; -+ dai-format = "left_j"; -+ }; -+ }; -+ adsp_port2: port@2 { -+ adsp_endpoint2: endpoint@2 { -+ remote-endpoint = <&ak4613_endpoint2>; -+ dai-format = "left_j"; -+ }; -+ }; -+ adsp_port3: port@3 { -+ adsp_endpoint3: endpoint@3 { -+ remote-endpoint = <&ak4613_endpoint3>; -+ dai-format = "left_j"; -+ }; -+ }; -+ }; -+}; -+ - &rcar_sound { - pinctrl-0 = <&sound_pins &sound_clk_pins>; - pinctrl-names = "default"; -@@ -801,7 +861,7 @@ - ports { - rsnd_port0: port@0 { - rsnd_endpoint0: endpoint { -- remote-endpoint = <&ak4613_endpoint>; -+ remote-endpoint = <&ak4613_endpoint4>; - - dai-format = "left_j"; - bitclock-master = <&rsnd_endpoint0>; -diff --git a/arch/arm64/boot/dts/renesas/r8a77990.dtsi b/arch/arm64/boot/dts/renesas/r8a77990.dtsi -index 242de2c..870bd4e 100644 ---- a/arch/arm64/boot/dts/renesas/r8a77990.dtsi -+++ b/arch/arm64/boot/dts/renesas/r8a77990.dtsi -@@ -1276,6 +1276,11 @@ - }; - }; - -+ rcar_adsp_sound: adsp_sound@0 { -+ compatible = "renesas,rcar_adsp_sound_gen3"; -+ status = "disabled"; -+ }; -+ - rcar_sound: sound@ec500000 { - /* - * #sound-dai-cells is required -diff --git a/arch/arm64/boot/dts/renesas/salvator-common.dtsi b/arch/arm64/boot/dts/renesas/salvator-common.dtsi -index 6cda028..89fbcf6 100644 ---- a/arch/arm64/boot/dts/renesas/salvator-common.dtsi -+++ b/arch/arm64/boot/dts/renesas/salvator-common.dtsi -@@ -125,12 +125,43 @@ - regulator-boot-on; - regulator-always-on; - }; -+ - rsnd_ak4613: sound { -- compatible = "simple-audio-card"; -+ compatible = "simple-scu-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 { -+ -+ simple-audio-card,name = "audio-card"; -+ simple-audio-card,prefix = "ak4613"; -+ simple-audio-card,routing = "ak4613 Playback", "Playback0", -+ "ak4613 Playback", "Playback1", -+ "ak4613 Playback", "Playback2", -+ "ak4613 Playback", "Playback3", -+ "Capture0", "ak4613 Capture", -+ "Capture1", "ak4613 Capture", -+ "Capture2", "ak4613 Capture", -+ "Capture3", "ak4613 Capture", -+ "ak4613 Playback", "DAI0 Playback", -+ "DAI0 Capture", "ak4613 Capture"; -+ -+ sndcpu: simple-audio-card,cpu@0 { -+ sound-dai = <&rcar_adsp_sound 0>; -+ }; -+ -+ simple-audio-card,cpu@1 { -+ sound-dai = <&rcar_adsp_sound 1>; -+ }; -+ -+ simple-audio-card,cpu@2 { -+ sound-dai = <&rcar_adsp_sound 2>; -+ }; -+ -+ simple-audio-card,cpu@3 { -+ sound-dai = <&rcar_adsp_sound 3>; -+ }; -+ -+ simple-audio-card,cpu@4 { - sound-dai = <&rcar_sound>; - }; - -@@ -139,7 +170,6 @@ - }; - }; - -- - vbus0_usb2: regulator-vbus0-usb2 { - compatible = "regulator-fixed"; - -@@ -763,6 +793,12 @@ - status = "okay"; - }; - -+&rcar_adsp_sound { -+ status = "okay"; -+ /* Multiple DAI */ -+ #sound-dai-cells = <1>; -+}; -+ - &rcar_sound { - pinctrl-0 = <&sound_pins &sound_clk_pins>; - pinctrl-names = "default"; --- -2.7.4 - |