From: Greg Kroah-Hartman Date: Wed, 4 Dec 2019 11:28:52 +0000 (+0100) Subject: drop arm64-dts-marvell-armada-37xx-enable-emmc-on-espress.patch from 4.19 X-Git-Tag: v5.4.2~1 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=cbf50bdf37f61ad6eb7b8a9c0f546a79d076ea62;p=thirdparty%2Fkernel%2Fstable-queue.git drop arm64-dts-marvell-armada-37xx-enable-emmc-on-espress.patch from 4.19 --- diff --git a/queue-4.19/arm64-dts-marvell-armada-37xx-enable-emmc-on-espress.patch b/queue-4.19/arm64-dts-marvell-armada-37xx-enable-emmc-on-espress.patch deleted file mode 100644 index c50b874cd17..00000000000 --- a/queue-4.19/arm64-dts-marvell-armada-37xx-enable-emmc-on-espress.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 8c77bafa4bd80898f2892d83037dbe382528df36 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 26 Oct 2018 11:50:28 +0000 -Subject: arm64: dts: marvell: armada-37xx: Enable emmc on espressobin - -From: Ding Tao - -[ Upstream commit 43ebc7c1b3ed8198b9acf3019eca16e722f7331c ] - -The ESPRESSObin board has a emmc interface available on U11: declare it -and let the bootloader enable it if the emmc is present. - -[gregory.clement@bootlin.com: disable the emmc by default] -Signed-off-by: Ding Tao -Signed-off-by: Gregory CLEMENT -Signed-off-by: Sasha Levin ---- - .../dts/marvell/armada-3720-espressobin.dts | 22 +++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts -index 3ab25ad402b90..846003bb480cd 100644 ---- a/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts -+++ b/arch/arm64/boot/dts/marvell/armada-3720-espressobin.dts -@@ -60,9 +60,31 @@ - cd-gpios = <&gpionb 3 GPIO_ACTIVE_LOW>; - marvell,pad-type = "sd"; - vqmmc-supply = <&vcc_sd_reg1>; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&sdio_pins>; - status = "okay"; - }; - -+/* U11 */ -+&sdhci0 { -+ non-removable; -+ bus-width = <8>; -+ mmc-ddr-1_8v; -+ mmc-hs400-1_8v; -+ marvell,xenon-emmc; -+ marvell,xenon-tun-count = <9>; -+ marvell,pad-type = "fixed-1-8v"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&mmc_pins>; -+/* -+ * This eMMC is not populated on all boards, so disable it by -+ * default and let the bootloader enable it, if it is present -+ */ -+ status = "disabled"; -+}; -+ - &spi0 { - status = "okay"; - --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 208d513c88a..f2e6f759993 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -47,7 +47,6 @@ pwm-bcm-iproc-prevent-unloading-the-driver-module-wh.patch scsi-target-tcmu-fix-queue_cmd_ring-declaration.patch scsi-lpfc-fix-kernel-oops-due-to-null-pring-pointers.patch scsi-lpfc-fix-dif-and-first-burst-use-in-write-comma.patch -arm64-dts-marvell-armada-37xx-enable-emmc-on-espress.patch arm-dts-fix-up-sq201-flash-access.patch tracing-lock-event_mutex-before-synth_event_mutex.patch arm-debug-imx-only-define-debug_imx_uart_port-if-nee.patch