diff options
author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-04-29 12:11:16 +0200 |
---|---|---|
committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-05-02 13:00:26 +0200 |
commit | 2faceb1a395fcd61107b2154638b35d15172ef06 (patch) | |
tree | 8038a7a6bd97cbb27048383b04a056f66b76d4c9 /target/linux/layerscape/patches-4.9/812-mmc-layerscape-support.patch | |
parent | e0505cc0182acf569cdd7b849189c134684160f8 (diff) | |
download | upstream-2faceb1a395fcd61107b2154638b35d15172ef06.tar.gz upstream-2faceb1a395fcd61107b2154638b35d15172ef06.tar.bz2 upstream-2faceb1a395fcd61107b2154638b35d15172ef06.zip |
kernel: bump 4.9 to 4.9.171
Refreshed all patches.
Altered patches:
- 150-bridge_allow_receiption_on_disabled_port.patch
- 201-extra_optimization.patch
Compile-tested on: ar71xx
Runtime-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.patch | 12 |
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 4b32417379..5971fdcbe7 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 -@@ -1631,26 +1631,24 @@ static void sdhci_set_ios(struct mmc_hos +@@ -1629,26 +1629,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); /* -@@ -1963,7 +1961,7 @@ static int sdhci_prepare_hs400_tuning(st +@@ -1961,7 +1959,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; -@@ -2022,6 +2020,9 @@ static int sdhci_execute_tuning(struct m +@@ -2020,6 +2018,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) -@@ -2134,9 +2135,10 @@ static int sdhci_execute_tuning(struct m +@@ -2132,9 +2133,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); /* -@@ -2172,6 +2174,7 @@ out_unlock: +@@ -2170,6 +2172,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, -@@ -3004,6 +3007,8 @@ struct sdhci_host *sdhci_alloc_host(stru +@@ -2994,6 +2997,8 @@ struct sdhci_host *sdhci_alloc_host(stru host->flags = SDHCI_SIGNALING_330; |