summaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend
diff options
context:
space:
mode:
authorHarunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>2018-01-19 20:43:09 +0900
committerHarunobu Kurokawa <harunobu.kurokawa.dn@renesas.com>2018-01-19 20:43:09 +0900
commit2e1a7e39e012ea4436c819f46cfcac05fb161184 (patch)
tree094a98fe4f8a2970fdd7a86e1562125f096db049 /meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend
parent89ae3df5fc1ec66b573f724c0e462bde0eabe783 (diff)
parent87b938882b4c672c775c7a0908f4a8b711a16c95 (diff)
Merge remote-tracking branch 'cogent/v2.23.1' into test
Change-Id: I2615a0e01b209fb359245a56996185e046cdb94a Signed-off-by: Harunobu Kurokawa <harunobu.kurokawa.dn@renesas.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.bbappend6
1 files changed, 4 insertions, 2 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 6876b5c..c4cad0f 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
@@ -80,8 +80,7 @@ SRC_URI_append = " \
file://0077-MOST-dim2-add-timeouts.patch \
file://0078-MOST-aim-fix-null-pointer-crash.patch \
file://0079-Revert-dmaengine-rcar-dmac-use-TCRB-instead-of-TCR-f.patch \
- 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://0082-gpio-pca953x-fix-interrupt-trigger.patch \
file://0001-arm64-dts-renesas-preserve-drm-HDMI-connector-naming.patch \
file://0001-arm64-dts-renesas-disable-r8a7796-hscif0-dma.patch \
"
@@ -104,12 +103,14 @@ KERNEL_DEVICETREE_append_h3ulcb = " \
renesas/r8a7795-es1-h3ulcb-had-beta.dtb \
renesas/r8a7795-es1-h3ulcb-kf.dtb \
renesas/r8a7795-es1-h3ulcb-vb.dtb \
+ renesas/r8a7795-es1-h3ulcb-vb2.dtb \
renesas/r8a7795-es1-h3ulcb-vbm.dtb \
renesas/r8a7795-h3ulcb-view.dtb \
renesas/r8a7795-h3ulcb-had-alfa.dtb \
renesas/r8a7795-h3ulcb-had-beta.dtb \
renesas/r8a7795-h3ulcb-kf.dtb \
renesas/r8a7795-h3ulcb-vb.dtb \
+ renesas/r8a7795-h3ulcb-vb2.dtb \
renesas/r8a7795-h3ulcb-vbm.dtb \
"
@@ -126,6 +127,7 @@ KERNEL_DEVICETREE_append_salvator-x = " \
KERNEL_DEVICETREE_append_eagle = " \
renesas/r8a7797-eagle.dtb \
+ renesas/r8a7797-eagle-function.dtb \
"
KERNEL_DEVICETREE_append_v3msk = " \