diff --git a/arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch b/arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch deleted file mode 100644 index b55dec0cb..000000000 --- a/arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch +++ /dev/null @@ -1,100 +0,0 @@ -From bb3e08008c0e48fd4f51a0f0957eecae61a24d69 Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Tue, 1 Nov 2016 09:35:30 +0000 -Subject: [PATCH] Revert "mmc: omap_hsmmc: Use dma_request_chan() for - requesting DMA channel" - -This reverts commit 81eef6ca92014845d40e3f1310e42b7010303acc. ---- - drivers/mmc/host/omap_hsmmc.c | 50 ++++++++++++++++++++++++++++++++++--------- - 1 file changed, 40 insertions(+), 10 deletions(-) - -diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c -index 24ebc9a..3563321 100644 ---- a/drivers/mmc/host/omap_hsmmc.c -+++ b/drivers/mmc/host/omap_hsmmc.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -1992,6 +1993,8 @@ static int omap_hsmmc_probe(struct platform_device *pdev) - struct resource *res; - int ret, irq; - const struct of_device_id *match; -+ dma_cap_mask_t mask; -+ unsigned tx_req, rx_req; - const struct omap_mmc_of_data *data; - void __iomem *base; - -@@ -2121,17 +2124,44 @@ static int omap_hsmmc_probe(struct platform_device *pdev) - - omap_hsmmc_conf_bus_power(host); - -- host->rx_chan = dma_request_chan(&pdev->dev, "rx"); -- if (IS_ERR(host->rx_chan)) { -- dev_err(mmc_dev(host->mmc), "RX DMA channel request failed\n"); -- ret = PTR_ERR(host->rx_chan); -+ if (!pdev->dev.of_node) { -+ res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx"); -+ if (!res) { -+ dev_err(mmc_dev(host->mmc), "cannot get DMA TX channel\n"); -+ ret = -ENXIO; -+ goto err_irq; -+ } -+ tx_req = res->start; -+ -+ res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx"); -+ if (!res) { -+ dev_err(mmc_dev(host->mmc), "cannot get DMA RX channel\n"); -+ ret = -ENXIO; -+ goto err_irq; -+ } -+ rx_req = res->start; -+ } -+ -+ dma_cap_zero(mask); -+ dma_cap_set(DMA_SLAVE, mask); -+ -+ host->rx_chan = -+ dma_request_slave_channel_compat(mask, omap_dma_filter_fn, -+ &rx_req, &pdev->dev, "rx"); -+ -+ if (!host->rx_chan) { -+ dev_err(mmc_dev(host->mmc), "unable to obtain RX DMA engine channel\n"); -+ ret = -ENXIO; - goto err_irq; - } - -- host->tx_chan = dma_request_chan(&pdev->dev, "tx"); -- if (IS_ERR(host->tx_chan)) { -- dev_err(mmc_dev(host->mmc), "TX DMA channel request failed\n"); -- ret = PTR_ERR(host->tx_chan); -+ host->tx_chan = -+ dma_request_slave_channel_compat(mask, omap_dma_filter_fn, -+ &tx_req, &pdev->dev, "tx"); -+ -+ if (!host->tx_chan) { -+ dev_err(mmc_dev(host->mmc), "unable to obtain TX DMA engine channel\n"); -+ ret = -ENXIO; - goto err_irq; - } - -@@ -2189,9 +2219,9 @@ err_slot_name: - mmc_remove_host(mmc); - err_irq: - device_init_wakeup(&pdev->dev, false); -- if (!IS_ERR_OR_NULL(host->tx_chan)) -+ if (host->tx_chan) - dma_release_channel(host->tx_chan); -- if (!IS_ERR_OR_NULL(host->rx_chan)) -+ if (host->rx_chan) - dma_release_channel(host->rx_chan); - pm_runtime_dont_use_autosuspend(host->dev); - pm_runtime_put_sync(host->dev); --- -2.9.3 - diff --git a/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch b/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch deleted file mode 100644 index 33f9271b7..000000000 --- a/arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 90e388ca5d8bbee022f9ed5fc24137b31579fa6e Mon Sep 17 00:00:00 2001 -From: Peter Robinson -Date: Wed, 22 Nov 2017 15:52:36 +0000 -Subject: [PATCH] Revert "arm64: allwinner: a64: pine64: Use dcdc1 regulator - for mmc0" - -This reverts commit 3f241bfa60bdc9c4fde63fa6664a8ce00fd668c6. ---- - arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts -index d06e34b5d192..caf8b6fbe5e3 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts -@@ -61,6 +61,13 @@ - chosen { - stdout-path = "serial0:115200n8"; - }; -+ -+ reg_vcc3v3: vcc3v3 { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc3v3"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ }; - }; - - &ehci0 { -@@ -84,7 +91,7 @@ - &mmc0 { - pinctrl-names = "default"; - pinctrl-0 = <&mmc0_pins>; -- vmmc-supply = <®_dcdc1>; -+ vmmc-supply = <®_vcc3v3>; - cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; - cd-inverted; - disable-wp; --- -2.14.3 - diff --git a/kernel.spec b/kernel.spec index 90b308d79..169ff8c85 100644 --- a/kernel.spec +++ b/kernel.spec @@ -573,48 +573,43 @@ Patch300: arm64-Add-option-of-13-for-FORCE_MAX_ZONEORDER.patch # http://www.spinics.net/lists/linux-tegra/msg26029.html Patch301: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch -# Fix OMAP4 (pandaboard) -Patch302: arm-revert-mmc-omap_hsmmc-Use-dma_request_chan-for-reque.patch - # http://patchwork.ozlabs.org/patch/587554/ -Patch303: ARM-tegra-usb-no-reset.patch - -Patch304: arm64-Revert-allwinner-a64-pine64-Use-dcdc1-regulato.patch +Patch302: ARM-tegra-usb-no-reset.patch # https://patchwork.kernel.org/patch/9820417/ -Patch305: qcom-msm89xx-fixes.patch +Patch303: qcom-msm89xx-fixes.patch # https://patchwork.kernel.org/patch/10173115/ -Patch306: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch +Patch304: arm-dts-imx6qdl-udoo-Disable-usbh1-to-avoid-kernel-hang.patch # http://patches.linaro.org/patch/131764/ -Patch307: wcn36xx-Fix-firmware-crash-due-to-corrupted-buffer-address.patch +Patch305: wcn36xx-Fix-firmware-crash-due-to-corrupted-buffer-address.patch # https://patchwork.kernel.org/patch/10245303/ -Patch308: wcn36xx-reduce-verbosity-of-drivers-messages.patch +Patch306: wcn36xx-reduce-verbosity-of-drivers-messages.patch # https://www.spinics.net/lists/arm-kernel/msg632925.html -Patch309: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch +Patch307: arm-crypto-sunxi-ss-Add-MODULE_ALIAS-to-sun4i-ss.patch # Fix USB on the RPi https://patchwork.kernel.org/patch/9879371/ -Patch310: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch +Patch308: bcm283x-dma-mapping-skip-USB-devices-when-configuring-DMA-during-probe.patch # https://www.spinics.net/lists/arm-kernel/msg621982.html -Patch311: bcm283x-Fix-probing-of-bcm2835-i2s.patch +Patch309: bcm283x-Fix-probing-of-bcm2835-i2s.patch # https://www.spinics.net/lists/arm-kernel/msg633942.html -Patch312: mmc-sdhci-iproc-Disable-preset-values-for-BCM2835.patch +Patch310: mmc-sdhci-iproc-Disable-preset-values-for-BCM2835.patch # https://www.spinics.net/lists/arm-kernel/msg633945.html -Patch313: bcm2835-hwrng-Handle-deferred-clock-properly.patch +Patch311: bcm2835-hwrng-Handle-deferred-clock-properly.patch -Patch314: bcm283x-clk-audio-fixes.patch +Patch312: bcm283x-clk-audio-fixes.patch # Enabling Patches for the RPi3+ -Patch330: bcm2837-rpi-initial-support-for-the-3.patch -Patch331: bcm2837-gpio-expander.patch -Patch332: bcm2837-enable-pmu.patch -Patch333: bcm2837-lan78xx-fixes.patch +Patch320: bcm2837-rpi-initial-support-for-the-3.patch +Patch321: bcm2837-gpio-expander.patch +Patch322: bcm2837-enable-pmu.patch +Patch323: bcm2837-lan78xx-fixes.patch # 400 - IBM (ppc/s390x) patches