Linux v4.18-rc4-69-gc25c74b7476e

4 files changed, 6 insertions, 69 deletions

diff --git a/arm-sdhci-esdhc-imx-fixes.patch b/arm-sdhci-esdhc-imx-fixes.patch
index ecb8d096c..c42f9e195 100644
--- a/arm-sdhci-esdhc-imx-fixes.patch
+++ b/arm-sdhci-esdhc-imx-fixes.patch
@@ -170,69 +170,3 @@ index 23966f887da6..cb2433d6d61f 100644
  
  	int irq;		/* Device IRQ */
  	void __iomem *ioaddr;	/* Mapped address */
-From patchwork Thu Jun 28 08:13:31 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [3/3] mmc: sdhci-esdhc-imx: prevent stack from using higher speed
- modes
-From: Stefan Agner <stefan@agner.ch>
-X-Patchwork-Id: 10493271
-Message-Id: <20180628081331.13051-4-stefan@agner.ch>
-To: adrian.hunter@intel.com, ulf.hansson@linaro.org
-Cc: fabio.estevam@nxp.com, haibo.chen@nxp.com, aisheng.dong@nxp.com,
- michael@amarulasolutions.com, rmk+kernel@armlinux.org.uk,
- linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
- Stefan Agner <stefan@agner.ch>
-Date: Thu, 28 Jun 2018 10:13:31 +0200
-
-If pinctrl configurations for higher speed modes are missing, the
-stack currently uses the no 1.8V quirk. This comes close to what
-we need but not exactly: E.g. if a eMMC chip uses 1.8V signaling
-(by specifying a 1.8V only vqmmc-supply) while not providing any
-100MHz/200MHz pinctrl configurations then the SDHCI_QUIRK2_NO_1_8_V
-leads the stack to print signaling voltage switch failed errors
-continuously:
-  mmc1: Switching to 3.3V signalling voltage failed
-
-Presumably because the stack tries to use 3.3V signaling:
-
-  # cat /sys/kernel/debug/mmc1/ios
-  ...
-  timing spec:    8 (mmc DDR52)
-  signal voltage: 0 (3.30 V)
-  ...
-
-With using SDHCI_QUIRK2_NO_UHS_HS200_HS400 we prevent the stack
-from choosing any modes require speeds higher than 52MHz while
-still allowing to select modes using 1.8V at lower speeds (e.g.
-DDR52):
-
-  # cat /sys/kernel/debug/mmc1/ios
-  ...
-  timing spec:    8 (mmc DDR52)
-  signal voltage: 1 (1.80 V)
-  ...
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- drivers/mmc/host/sdhci-esdhc-imx.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index 20a420b765b3..4a1c33018072 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -1165,10 +1165,10 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
- 			 * fall back to not supporting uhs by specifying no
- 			 * 1.8v quirk
- 			 */
--			host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
-+			host->quirks2 |= SDHCI_QUIRK2_NO_UHS_HS200_HS400;
- 		}
- 	} else {
--		host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
-+		host->quirks2 |= SDHCI_QUIRK2_NO_UHS_HS200_HS400;
- 	}
- 
- 	/* call to generic mmc_of_parse to support additional capabilities */
diff --git a/gitrev b/gitrev
index 3700e320f..5e1617f7d 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-1e09177acae32a61586af26d83ca5ef591cdcaf5
+c25c74b7476e27180e9b76840e963e542023f118
diff --git a/kernel.spec b/kernel.spec
index be9af2a11..ad683f872 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -69,7 +69,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %global rcrev 4
 # The git snapshot level
-%define gitrev 2
+%define gitrev 3
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -1845,6 +1845,9 @@ fi
 #
 #
 %changelog
+* Thu Jul 12 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git3.1
+- Linux v4.18-rc4-69-gc25c74b7476e
+
 * Wed Jul 11 2018 Laura Abbott <labbott@redhat.com> - 4.18.0-0.rc4.git2.1
 - Linux v4.18-rc4-17-g1e09177acae3
 
diff --git a/sources b/sources
index bae2daa6a..956d5ec62 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (linux-4.17.tar.xz) = 4d9de340a26155a89ea8773131c76220cc2057f2b5d031b467b60e8b14c1842518e2d60a863d8c695f0f7640f3f18d43826201984a238dade857b6cef79837db
 SHA512 (patch-4.18-rc4.xz) = 6d2b502a0a183b3612d3fe64d7836d12087db18cb7446842b777b4e936c60da58faa22830668b1af2acb903ccbf5577bb7b337127c6d6b7778f51c4aa3296c08
-SHA512 (patch-4.18-rc4-git2.xz) = 9ec19398912e349526d1782c37f6ec8450ff9dd35c0e353c88701c9ce011d9cede67d238ceece529c75b6b96e2c893477c3f146f15780f55dd2262cd8d4a8282
+SHA512 (patch-4.18-rc4-git3.xz) = aad5c2664ce39cd408f63f50329f6737b3c21445db97ac2db1545637bb2c787cd899c9229e3a85b590ba807099e24eff1ee36bf065350146660b38e353415697