From 89ae3df5fc1ec66b573f724c0e462bde0eabe783 Mon Sep 17 00:00:00 2001 From: Mark Farrugia Date: Fri, 29 Dec 2017 16:29:35 +1100 Subject: [COMMUNITY] Enable ADSP on M3ULCB Implements the patches required to interface with the HiFi2 Xtensa ADSP core. We need to remove the patch introduced by the ADAS layer since it reserves ADSP-critical memory. Bug-AGL: SPEC-1227 Change-Id: I5ec41ae5b232e3fd3e9bf63036601c0d09db3c13 Signed-off-by: Mark Farrugia --- .../linux/linux-renesas_4.9.bbappend | 1 - .../linux-renesas/0004-m3ulcb-ADSP-enable.patch | 30 ++++++++++++++++++++++ .../recipes-kernel/linux/linux-renesas_4.9.bb | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-m3ulcb-ADSP-enable.patch diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend index 3cadae6..6876b5c 100644 --- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend +++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend @@ -52,7 +52,6 @@ SRC_URI_append = " \ file://0034-media-soc_camera-Fix-VIDIOC_S_SELECTION-ioctl-miscal.patch \ file://0035-regulator-fixed-probe-after-i2c.patch \ file://0040-arm64-dts-renesas-add-ADAS-boards.patch \ - file://0041-arm64-dts-renesas-ulcb-enlarge-cma-region.patch \ file://0042-arm64-dts-renesas-r8a7795-es1-h3ulcb-disable-eMMC.patch \ file://0043-arm64-dts-renesas-ulcb-use-versaclock-for-du-rgb-and-lvds.patch \ file://0044-pinctrl-r8a779x-add-mlb-pinmux.patch \ 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 new file mode 100644 index 0000000..5e54109 --- /dev/null +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas/0004-m3ulcb-ADSP-enable.patch @@ -0,0 +1,30 @@ +diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts +index a1f3c244b83e..b08e94430bea 100644 +--- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts ++++ b/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts +@@ -49,6 +49,13 @@ + reg = <0x00000000 0x54000000 0x0 0x03000000>; + }; + ++ /* For Audio DSP */ ++ adsp_reserved: linux,adsp { ++ compatible = "shared-dma-pool"; ++ reusable; ++ reg = <0x00000000 0x57000000 0x0 0x01000000>; ++ }; ++ + /* global autoconfigured region for contiguous allocations */ + linux,cma { + compatible = "shared-dma-pool"; +@@ -388,6 +395,11 @@ + status = "okay"; + }; + ++&adsp { ++ status = "okay"; ++ memory-region = <&adsp_reserved>; ++}; ++ + &scif2 { + pinctrl-0 = <&scif2_pins>; + pinctrl-names = "default"; diff --git a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.9.bb b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.9.bb index 04e45e1..05578db 100644 --- a/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.9.bb +++ b/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_4.9.bb @@ -20,6 +20,7 @@ SRC_URI_append = " \ file://0001-dmaengine-rcar-dmac-ensure-CHCR-DE-bit-is-actually-0.patch \ file://0002-dmaengine-rcar-dmac-use-TCRB-instead-of-TCR-for-resi.patch \ file://0003-ASoC-rcar-revert-IOMMU-support-so-far.patch \ + file://0004-m3ulcb-ADSP-enable.patch \ file://defconfig \ file://touch.cfg \ ${@base_conditional("USE_AVB", "1", " file://usb-video-class.cfg", "", d)} \ -- cgit 1.2.3-korg