diff options
| author |   Mark Farrugia <mark.farrugia@fiberdyne.com.au> | 2018-04-30 18:23:29 +1000 |
|---|---|---|
| committer |   Ronan Le Martret <ronan.lemartret@iot.bzh> | 2018-05-16 09:34:38 +0200 |
| commit | af0cb94fb4802b151bc9f7393136b7975f6970b7 (patch) | |
| tree | f7d32b31476a1cdce4683a3e45bf44286f601ba6 /meta-rcar-gen3 | |
| parent | b4a26785e4b75eb1747cbc149b9ee6f7665df4c0 (diff) | |
[COMMUNITY] Enable ADSP on BSP 4.14
Implements the patches required to interface with the HiFi2 Xtensa ADSP
core on BSP 4.14, including M3ULCB, Kingfisher, and Salvator boards.
Bug-AGL: SPEC-1227
Change-Id: I9e58f89bdd93db595b8ec7a77b9261a9438e4878
Signed-off-by: Mark Farrugia <mark.farrugia@fiberdyne.com.au>
Diffstat (limited to 'meta-rcar-gen3')
| -rw-r--r-- | meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-m3ulcb-ADSP-enable.patch | 23 | ||||
| -rw-r--r-- | meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.14.bb | 5 |
2 files changed, 20 insertions, 8 deletions
diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-m3ulcb-ADSP-enable.patch b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-m3ulcb-ADSP-enable.patch index 5e54109..eb737d9 100644 --- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-m3ulcb-ADSP-enable.patch +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-m3ulcb-ADSP-enable.patch @@ -1,8 +1,8 @@ diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts -index a1f3c244b83e..b08e94430bea 100644 +index 1cd64c1b3b31..cc454a5e6a52 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts +++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts -@@ -49,6 +49,13 @@ +@@ -45,11 +45,18 @@ reg = <0x00000000 0x54000000 0x0 0x03000000>; }; @@ -12,12 +12,18 @@ index a1f3c244b83e..b08e94430bea 100644 + reusable; + reg = <0x00000000 0x57000000 0x0 0x01000000>; + }; -+ ++ /* global autoconfigured region for contiguous allocations */ linux,cma { compatible = "shared-dma-pool"; -@@ -388,6 +395,11 @@ - status = "okay"; + reusable; +- reg = <0x00000000 0x57000000 0x0 0x19000000>; ++ reg = <0x00000000 0x58000000 0x0 0x18000000>; + linux,cma-default; + }; + +@@ -110,6 +117,11 @@ + "dclkin.0", "dclkin.1", "dclkin.2"; }; +&adsp { @@ -25,6 +31,7 @@ index a1f3c244b83e..b08e94430bea 100644 + memory-region = <&adsp_reserved>; +}; + - &scif2 { - pinctrl-0 = <&scif2_pins>; - pinctrl-names = "default"; + &vspb { + status = "okay"; + }; +
\ No newline at end of file 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 8d954c7..6ce3ea3 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 @@ -50,6 +50,11 @@ SRC_URI_append = " \ ${@base_conditional("USE_CAS", "1", " file://capacity_aware_migration_strategy.cfg", "",d)} \ " +# Add ADSP enable patch +SRC_URI_append = " \ + file://0004-m3ulcb-ADSP-enable.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" |