diff options
| author |   Tom Rini <trini@konsulko.com> | 2017-12-19 16:23:42 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-12-19 16:28:09 -0500 |
| commit | 20f06cccf59ec5588e15917caa94227b93dc597e (patch) | |
| tree | 546f5dff215a3f46fbd54c849e56a737c08906db /meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend | |
| parent | 9ae3b81724f87dcc1f5cbd618c472e0cf79b2791 (diff) | |
| parent | 27fc60c85a12c07109fdd2a7e8fca3c36a837c96 (diff) | |
Merge remote-tracking branch 'origin/pyro' into eel
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend')
| -rw-r--r-- | meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend | 4 |
1 files changed, 4 insertions, 0 deletions
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 924e309..3cadae6 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 @@ -6,6 +6,9 @@ COMPATIBLE_MACHINE_v3msk = "v3msk" BRANCH = "v4.9/rcar-3.5.9" SRCREV = "2c20c9881d53f1b5c7a3ebf55bb83ec15902d0d0" +KERNEL_MODULE_PROBECONF += "btwilink" +module_conf_btwilink = "blacklist btwilink" + SRC_URI_remove = " \ 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 \ @@ -81,6 +84,7 @@ SRC_URI_append = " \ file://0080-dmaengine-rcar-dmac-ensure-CHCR-DE-bit-is-actually-0.patch \ file://0081-dmaengine-rcar-dmac-use-TCRB-instead-of-TCR-for-resi.patch \ file://0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch \ + file://0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch \ " SRC_URI_append_r8a7797 = " \ |