aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch
diff options
context:
space:
mode:
authorStijn Segers <foss@volatilesystems.org>2018-06-29 22:29:06 +0200
committerJohn Crispin <john@phrozen.org>2018-07-02 07:06:23 +0200
commitab7cabd09df542cf3558725573c2ef2cf1c7cdff (patch)
tree791b3f74b7c5e60f1409836871287337f4cf0e38 /target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch
parentc96b344466fc80cb5815eeab87c6ca9a29fb9207 (diff)
downloadupstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.gz
upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.tar.bz2
upstream-ab7cabd09df542cf3558725573c2ef2cf1c7cdff.zip
kernel: bump 4.14 to 4.14.52 for 18.06
Compile-tested on: ramips/mt7621, x86/64. Run-tested on: ramips/mt7621. Signed-off-by: Stijn Segers <foss@volatilesystems.org>
Diffstat (limited to 'target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch')
-rw-r--r--target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch9
1 files changed, 2 insertions, 7 deletions
diff --git a/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch b/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch
index c2c00e8712..cad45f6cf8 100644
--- a/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch
+++ b/target/linux/mediatek/patches-4.14/0158-mmc-mediatek-add-latch-ck-support.patch
@@ -14,8 +14,6 @@ Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
drivers/mmc/host/mtk-sd.c | 6 ++++++
1 file changed, 6 insertions(+)
-diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
-index a2f26c9b17b4..d75a93d6803f 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -378,6 +378,7 @@ struct msdc_host {
@@ -26,7 +24,7 @@ index a2f26c9b17b4..d75a93d6803f 100644
u32 hs400_ds_delay;
u32 hs200_cmd_int_delay; /* cmd internal delay for HS200/SDR104 */
u32 hs400_cmd_int_delay; /* cmd internal delay for HS400 */
-@@ -1661,6 +1662,8 @@ static int msdc_tune_data(struct mmc_host *mmc, u32 opcode)
+@@ -1661,6 +1662,8 @@ static int msdc_tune_data(struct mmc_hos
u32 tune_reg = host->dev_comp->pad_tune_reg;
int i, ret;
@@ -35,7 +33,7 @@ index a2f26c9b17b4..d75a93d6803f 100644
sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_DSPL);
sdr_clr_bits(host->base + MSDC_IOCON, MSDC_IOCON_W_DSPL);
for (i = 0 ; i < PAD_DELAY_MAX; i++) {
-@@ -1773,6 +1776,9 @@ static const struct mmc_host_ops mt_msdc_ops = {
+@@ -1773,6 +1776,9 @@ static const struct mmc_host_ops mt_msdc
static void msdc_of_property_parse(struct platform_device *pdev,
struct msdc_host *host)
{
@@ -45,6 +43,3 @@ index a2f26c9b17b4..d75a93d6803f 100644
of_property_read_u32(pdev->dev.of_node, "hs400-ds-delay",
&host->hs400_ds_delay);
---
-2.11.0
-