aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-10-07 13:06:05 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-10-08 12:46:02 +0200
commitd513f28351872c6b5ff5b902e96526ec970828b5 (patch)
tree68d86a845ade49b4e374fc3f8d56fdacb8b69487 /target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch
parent6f1a71c2d08ac072541c7da9eb029b418970c09b (diff)
downloadupstream-d513f28351872c6b5ff5b902e96526ec970828b5.tar.gz
upstream-d513f28351872c6b5ff5b902e96526ec970828b5.tar.bz2
upstream-d513f28351872c6b5ff5b902e96526ec970828b5.zip
kernel: bump 4.9 to 4.9.195
Refreshed all patches. Altered patches: - 403-mtd_fix_cfi_cmdset_0002_status_check.patch Compile-tested on: ar71xx Compile-tested on: ar71xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch')
-rw-r--r--target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch12
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch b/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch
index 5971fdcbe7..71e4e2a8d1 100644
--- a/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch
+++ b/target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch
@@ -482,7 +482,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
sdhci_get_of_property(pdev);
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
-@@ -1629,26 +1629,24 @@ static void sdhci_set_ios(struct mmc_hos
+@@ -1631,26 +1631,24 @@ static void sdhci_set_ios(struct mmc_hos
ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
@@ -523,7 +523,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
if (!host->preset_enabled) {
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
/*
-@@ -1961,7 +1959,7 @@ static int sdhci_prepare_hs400_tuning(st
+@@ -1963,7 +1961,7 @@ static int sdhci_prepare_hs400_tuning(st
return 0;
}
@@ -532,7 +532,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
{
struct sdhci_host *host = mmc_priv(mmc);
u16 ctrl;
-@@ -2020,6 +2018,9 @@ static int sdhci_execute_tuning(struct m
+@@ -2022,6 +2020,9 @@ static int sdhci_execute_tuning(struct m
return err;
}
@@ -542,7 +542,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
ctrl |= SDHCI_CTRL_EXEC_TUNING;
if (host->quirks2 & SDHCI_QUIRK2_TUNING_WORK_AROUND)
-@@ -2132,9 +2133,10 @@ static int sdhci_execute_tuning(struct m
+@@ -2134,9 +2135,10 @@ static int sdhci_execute_tuning(struct m
ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
@@ -556,7 +556,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
} while (ctrl & SDHCI_CTRL_EXEC_TUNING);
/*
-@@ -2170,6 +2172,7 @@ out_unlock:
+@@ -2172,6 +2174,7 @@ out_unlock:
spin_unlock_irqrestore(&host->lock, flags);
return err;
}
@@ -564,7 +564,7 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
static int sdhci_select_drive_strength(struct mmc_card *card,
unsigned int max_dtr, int host_drv,
-@@ -2994,6 +2997,8 @@ struct sdhci_host *sdhci_alloc_host(stru
+@@ -2996,6 +2999,8 @@ struct sdhci_host *sdhci_alloc_host(stru
host->flags = SDHCI_SIGNALING_330;