From: Greg Kroah-Hartman Date: Mon, 9 Dec 2019 17:36:03 +0000 (+0100) Subject: drop broken 4.9 patches X-Git-Tag: v5.4.3~48 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=306e571ddfd8f0e83f7d32a9689fb6350e967f1a;p=thirdparty%2Fkernel%2Fstable-queue.git drop broken 4.9 patches --- diff --git a/queue-4.9/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch b/queue-4.9/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch deleted file mode 100644 index eddeb07eb5c..00000000000 --- a/queue-4.9/dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch +++ /dev/null @@ -1,42 +0,0 @@ -From becb6b622da23aeca6a97ad747c0ecc0ed06a917 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sat, 29 Sep 2018 11:18:00 -0600 -Subject: dmaengine: xilinx_dma: Fix 64-bit simple CDMA transfer - -From: Radhey Shyam Pandey - -[ Upstream commit 0e03aca2659ef7a85eaff1a1ca9b0b498002ede8 ] - -In AXI CDMA simple mode also pass MSB bits of source and destination -address to xilinx_write function. This fixes simple CDMA operation -mode using 64-bit addressing. - -Signed-off-by: Radhey Shyam Pandey -Signed-off-by: Michal Simek -Reviewed-by: Appana Durga Kedareswara Rao -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/dma/xilinx/xilinx_dma.c | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c -index cd271f7826051..381df46246dac 100644 ---- a/drivers/dma/xilinx/xilinx_dma.c -+++ b/drivers/dma/xilinx/xilinx_dma.c -@@ -1174,8 +1174,10 @@ static void xilinx_cdma_start_transfer(struct xilinx_dma_chan *chan) - - hw = &segment->hw; - -- xilinx_write(chan, XILINX_CDMA_REG_SRCADDR, hw->src_addr); -- xilinx_write(chan, XILINX_CDMA_REG_DSTADDR, hw->dest_addr); -+ xilinx_write(chan, XILINX_CDMA_REG_SRCADDR, -+ xilinx_prep_dma_addr_t(hw->src_addr)); -+ xilinx_write(chan, XILINX_CDMA_REG_DSTADDR, -+ xilinx_prep_dma_addr_t(hw->dest_addr)); - - /* Start the transfer */ - dma_ctrl_write(chan, XILINX_DMA_REG_BTT, --- -2.20.1 - diff --git a/queue-4.9/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch b/queue-4.9/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch deleted file mode 100644 index e7ba7c074ff..00000000000 --- a/queue-4.9/pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 721f8cf36087786b4a03e28bda7e1266442a52cf Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 8 Nov 2018 17:07:25 +0100 -Subject: pinctrl: sh-pfc: r8a7792: Fix VIN versioned groups - -From: Jacopo Mondi - -[ Upstream commit 11c8f8df85e77329d5a3cacc08682722cb80b95b ] - -Versioned VIN groups can appear on different sets of pins. Using the -VIN_DATA_PIN_GROUP macro now supports proper naming of said groups -through an optional 'version' argument. - -Use the 'version' argument for said macro to fix naming of versioned -groups for the R-Car V2H R8A7792 SoC. - -Fixes: 7dd74bb1f058 ("pinctrl: sh-pfc: r8a7792: Add VIN pin groups") -Signed-off-by: Jacopo Mondi -Reviewed-by: Simon Horman -Signed-off-by: Geert Uytterhoeven -Signed-off-by: Sasha Levin ---- - drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7792.c b/drivers/pinctrl/sh-pfc/pfc-r8a7792.c -index 21badb6166b92..97547f8871211 100644 ---- a/drivers/pinctrl/sh-pfc/pfc-r8a7792.c -+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7792.c -@@ -1705,10 +1705,10 @@ static const struct sh_pfc_pin_group pinmux_groups[] = { - VIN_DATA_PIN_GROUP(vin1_data, 12), - VIN_DATA_PIN_GROUP(vin1_data, 10), - VIN_DATA_PIN_GROUP(vin1_data, 8), -- VIN_DATA_PIN_GROUP(vin1_data_b, 24), -- VIN_DATA_PIN_GROUP(vin1_data_b, 20), -+ VIN_DATA_PIN_GROUP(vin1_data, 24, _b), -+ VIN_DATA_PIN_GROUP(vin1_data, 20, _b), - SH_PFC_PIN_GROUP(vin1_data18_b), -- VIN_DATA_PIN_GROUP(vin1_data_b, 16), -+ VIN_DATA_PIN_GROUP(vin1_data, 16, _b), - SH_PFC_PIN_GROUP(vin1_sync), - SH_PFC_PIN_GROUP(vin1_field), - SH_PFC_PIN_GROUP(vin1_clkenb), --- -2.20.1 - diff --git a/queue-4.9/series b/queue-4.9/series index 8d4226a12e1..b32ccb38d66 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -17,10 +17,8 @@ net-ep93xx_eth-fix-mismatch-of-request_mem_region-in.patch serial-core-allow-processing-sysrq-at-port-unlock-ti.patch cxgb4vf-fix-memleak-in-mac_hlist-initialization.patch iwlwifi-mvm-send-non-offchannel-traffic-via-ap-sta.patch -dmaengine-xilinx_dma-fix-64-bit-simple-cdma-transfer.patch arm-8813-1-make-aligned-2-byte-getuser-putuser-atomi.patch net-mlx5-release-resource-on-error-flow.patch -pinctrl-sh-pfc-r8a7792-fix-vin-versioned-groups.patch extcon-max8997-fix-lack-of-path-setting-in-usb-devic.patch clk-rockchip-fix-rk3188-sclk_smc-gate-data.patch clk-rockchip-fix-rk3188-sclk_mac_lbtest-parameter-or.patch