summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch2
-rw-r--r--meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0090-spidev-Do-not-automatically-bind-to-MSIOF-spi-may-be.patch26
-rw-r--r--meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_4.9.bbappend1
3 files changed, 1 insertions, 28 deletions
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch
index 4d914f1..346d5dc 100644
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch
+++ b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0040-arm64-dts-renesas-add-ADAS-boards.patch
@@ -11994,7 +11994,7 @@ index 0000000..8612f64
+
+ status = "okay";
+ spidev@0 {
-+ compatible = "spidev";
++ compatible = "renesas,sh-msiof";
+ reg = <0>;
+ spi-max-frequency = <66666666>;
+ };
diff --git a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0090-spidev-Do-not-automatically-bind-to-MSIOF-spi-may-be.patch b/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0090-spidev-Do-not-automatically-bind-to-MSIOF-spi-may-be.patch
deleted file mode 100644
index de7cc2b..0000000
--- a/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas/0090-spidev-Do-not-automatically-bind-to-MSIOF-spi-may-be.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From e2fe50b628f660ef35c82b778c5d0c56b5c4487b Mon Sep 17 00:00:00 2001
-From: Andrey Dolnikov <andrey.dolnikov@cogentembedded.com>
-Date: Fri, 12 Jan 2018 18:25:33 +0300
-Subject: [PATCH] spidev: Do not automatically bind to MSIOF spi (may be used
- as slave).
-
-Signed-off-by: Andrey Dolnikov <andrey.dolnikov@cogentembedded.com>
----
- drivers/spi/spidev.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c
-index 203d68c..cbd0b93 100644
---- a/drivers/spi/spidev.c
-+++ b/drivers/spi/spidev.c
-@@ -697,7 +697,6 @@ static struct class *spidev_class;
- static const struct of_device_id spidev_dt_ids[] = {
- { .compatible = "rohm,dh2228fv" },
- { .compatible = "lineartechnology,ltc2488" },
-- { .compatible = "renesas,sh-msiof" },
- { .compatible = "spi-gpio" },
- {},
- };
---
-2.7.4
-
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 f855641..1ab0ac5 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,7 +80,6 @@ SRC_URI_append = " \
file://0087-spi-slave-Add-SPI-slave-handler-reporting-uptime-at-.patch \
file://0088-spi-slave-Add-SPI-slave-handler-controlling-system-s.patch \
file://0089-spi-Generalize-SPI-master-to-controller.patch \
- file://0090-spidev-Do-not-automatically-bind-to-MSIOF-spi-may-be.patch \
file://0103-gpu-drm-rcar-du-Extend-VSP1-DRM-interface.patch \
file://0104-media-vsp1-extend-DRM-VSP1-interface.patch \
file://0105-media-rcar-imr-IMR-driver-updates-for-raw-DL.patch \