diff options
| author |   Stephen Lawrence <stephen.lawrence@renesas.com> | 2015-04-08 22:43:42 +0100 |
|---|---|---|
| committer | Stephen Lawrence <stephen.lawrence@renesas.com> | 2015-04-08 22:43:42 +0100 |
| commit | 6e829fe6e422793bbb05ec563c8544154c0e9bd8 (patch) | |
| tree | 4c095f95070c20ddee6fea8cb0f02133551b916f /meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-ARM-shmobile-porter-Sound-PIO-support-on-DTS.patch | |
| parent | 17b2653eefb8659a9c594f56e20cd8249295464f (diff) | |
porter: kernel: migrate porter board audio from platform data to DTS
Kernel BSP v1.9.0 contained a backported ASoC and dma descriptor mode driver for AUDIO-DMAC from the upstream kernel.
This patch series migrates the R-Car M2 Porter board audio from platform data to DTS to make use of this driver and
restore audio on the board.
Diffstat (limited to 'meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-ARM-shmobile-porter-Sound-PIO-support-on-DTS.patch')
| -rw-r--r-- | meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-ARM-shmobile-porter-Sound-PIO-support-on-DTS.patch | 104 |
1 files changed, 104 insertions, 0 deletions
diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-ARM-shmobile-porter-Sound-PIO-support-on-DTS.patch b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-ARM-shmobile-porter-Sound-PIO-support-on-DTS.patch new file mode 100644 index 0000000..2d46e32 --- /dev/null +++ b/meta-rcar-gen2/recipes-kernel/linux/linux-renesas/0002-ARM-shmobile-porter-Sound-PIO-support-on-DTS.patch @@ -0,0 +1,104 @@ +From cf4fa13cdad142f1d1bdf1485cc941140062e1ce Mon Sep 17 00:00:00 2001 +From: Biju Das <biju.das@bp.renesas.com> +Date: Thu, 2 Apr 2015 13:46:13 +0100 +Subject: [PATCH 2/7] ARM: shmobile: porter: Sound PIO support on DTS + +This change is identical to the koelsch patch "ARM: shmobile: koelsch: Sound PIO support on DTS" +from Kuninori Morimoto and backported to 3.10 +Signed-off-by: Biju Das <biju.das@bp.renesas.com> +--- + arch/arm/boot/dts/r8a7791-porter.dts | 52 ++++++++++++++++++++++++++++++---- + 1 file changed, 46 insertions(+), 6 deletions(-) + +diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts +index 4fb5cd5..b39dc6a 100644 +--- a/arch/arm/boot/dts/r8a7791-porter.dts ++++ b/arch/arm/boot/dts/r8a7791-porter.dts +@@ -12,11 +12,9 @@ + /* + * SSI-AK4643 + * +- * these commands are required when playback. ++ * This command is required when Playback/Capture + * +- * # amixer set "LINEOUT Mixer DACL" on +- * # amixer set "Digital" 200 +- * # amixer set "DVC Out" 50 ++ * amixer set "LINEOUT Mixer DACL" on + */ + + /dts-v1/; +@@ -102,6 +100,23 @@ + 1800000 0>; + }; + ++ sound { ++ compatible = "simple-audio-card"; ++ ++ simple-audio-card,format = "left_j"; ++ simple-audio-card,bitclock-master = <&sndcodec>; ++ simple-audio-card,frame-master = <&sndcodec>; ++ ++ sndcpu: simple-audio-card,cpu { ++ sound-dai = <&rcar_sound>; ++ }; ++ ++ sndcodec: simple-audio-card,codec { ++ sound-dai = <&ak4643>; ++ system-clock-frequency = <11289600>; ++ }; ++ }; ++ + hdmi_transmitter: adv7511 { + compatible = "adi,adv7511"; + gpios = <&gpio3 29 GPIO_ACTIVE_LOW>; +@@ -128,7 +143,7 @@ + }; + + &pfc { +- pinctrl-0 = <&du_pins &usb0_pins &usb1_pins &sound_pins &sound_clk_pins &vin0_pins>; ++ pinctrl-0 = <&du_pins &usb0_pins &usb1_pins &vin0_pins>; + pinctrl-names = "default"; + + du_pins: du { +@@ -337,7 +352,7 @@ + pagesize = <16>; + }; + +- snd_codec: ak4643 { ++ ak4643: sound-codec@12 { + #sound-dai-cells = <0>; + compatible = "asahi-kasei,ak4643"; + reg = <0x12>; +@@ -395,3 +410,28 @@ + &cpu0 { + cpu0-supply = <&vdd_dvfs>; + }; ++ ++&rcar_sound { ++ pinctrl-0 = <&sound_pins &sound_clk_pins>; ++ pinctrl-names = "default"; ++ ++ #sound-dai-cells = <0>; ++ ++ status = "okay"; ++ ++ rcar_sound,dai { ++ dai0 { ++ playback = <&ssi0>; ++ capture = <&ssi1>; ++ }; ++ }; ++}; ++ ++&ssi0 { ++ pio-transfer; ++}; ++ ++&ssi1 { ++ pio-transfer; ++ shared-pin; ++}; +-- +1.7.9.5 + |