Rebase to v4.19.0

1 files changed, 0 insertions, 115 deletions

diff --git a/arm-sdhci-esdhc-imx-fixes.patch b/arm-sdhci-esdhc-imx-fixes.patch
index c42f9e195..5f041cedc 100644
--- a/arm-sdhci-esdhc-imx-fixes.patch
+++ b/arm-sdhci-esdhc-imx-fixes.patch
@@ -1,118 +1,3 @@
-From patchwork Thu Jun 28 07:31:36 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: mmc: sdhci-esdhc-imx: support eMMC DDR mode when running at 3.3V
-From: Stefan Agner <stefan@agner.ch>
-X-Patchwork-Id: 10493185
-Message-Id: <20180628073136.21748-1-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, linux-mmc@vger.kernel.org,
- linux-kernel@vger.kernel.org, Stefan Agner <stefan@agner.ch>
-Date: Thu, 28 Jun 2018 09:31:36 +0200
-
-The uSDHC supports DDR modes for eMMC devices running at 3.3V. This
-allows to run eMMC with 3.3V signaling voltage at DDR52 mode:
-
-  # cat /sys/kernel/debug/mmc1/ios
-  clock:          52000000 Hz
-  vdd:            21 (3.3 ~ 3.4 V)
-  bus mode:       2 (push-pull)
-  chip select:    0 (don't care)
-  power mode:     2 (on)
-  bus width:      3 (8 bits)
-  timing spec:    8 (mmc DDR52)
-  signal voltage: 0 (3.30 V)
-  driver type:    0 (driver type B)
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- drivers/mmc/host/sdhci-esdhc-imx.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index b716b933f00a..6f444731754d 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -1324,7 +1324,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
- 
- 	if (esdhc_is_usdhc(imx_data)) {
- 		host->quirks2 |= SDHCI_QUIRK2_PRESET_VALUE_BROKEN;
--		host->mmc->caps |= MMC_CAP_1_8V_DDR;
-+		host->mmc->caps |= MMC_CAP_1_8V_DDR | MMC_CAP_3_3V_DDR;
- 		if (!(imx_data->socdata->flags & ESDHC_FLAG_HS200))
- 			host->quirks2 |= SDHCI_QUIRK2_BROKEN_HS200;
- 
-From patchwork Thu Jun 28 08:13:29 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [1/3] mmc: sdhci-esdhc-imx: get rid of support_vsel
-From: Stefan Agner <stefan@agner.ch>
-X-Patchwork-Id: 10493269
-Message-Id: <20180628081331.13051-2-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:29 +0200
-
-The field support_vsel is currently only used in the device tree
-case. Get rid of it. No change in behavior.
-
-Signed-off-by: Stefan Agner <stefan@agner.ch>
----
- drivers/mmc/host/sdhci-esdhc-imx.c          | 8 ++------
- include/linux/platform_data/mmc-esdhc-imx.h | 2 --
- 2 files changed, 2 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
-index 6f444731754d..20a420b765b3 100644
---- a/drivers/mmc/host/sdhci-esdhc-imx.c
-+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
-@@ -1145,18 +1145,14 @@ sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
- 			     &boarddata->tuning_start_tap);
- 
- 	if (of_find_property(np, "no-1-8-v", NULL))
--		boarddata->support_vsel = false;
--	else
--		boarddata->support_vsel = true;
-+		host->quirks2 |= SDHCI_QUIRK2_NO_1_8_V;
- 
- 	if (of_property_read_u32(np, "fsl,delay-line", &boarddata->delay_line))
- 		boarddata->delay_line = 0;
- 
- 	mmc_of_parse_voltage(np, &host->ocr_mask);
- 
--	/* sdr50 and sdr104 need work on 1.8v signal voltage */
--	if ((boarddata->support_vsel) && esdhc_is_usdhc(imx_data) &&
--	    !IS_ERR(imx_data->pins_default)) {
-+	if (esdhc_is_usdhc(imx_data) && !IS_ERR(imx_data->pins_default)) {
- 		imx_data->pins_100mhz = pinctrl_lookup_state(imx_data->pinctrl,
- 						ESDHC_PINCTRL_STATE_100MHZ);
- 		imx_data->pins_200mhz = pinctrl_lookup_state(imx_data->pinctrl,
-diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
-index 7daa78a2f342..640dec8b5b0c 100644
---- a/include/linux/platform_data/mmc-esdhc-imx.h
-+++ b/include/linux/platform_data/mmc-esdhc-imx.h
-@@ -34,7 +34,6 @@ enum cd_types {
-  * @cd_gpio:	gpio for card_detect interrupt
-  * @wp_type:	type of write_protect method (see wp_types enum above)
-  * @cd_type:	type of card_detect method (see cd_types enum above)
-- * @support_vsel:  indicate it supports 1.8v switching
-  */
- 
- struct esdhc_platform_data {
-@@ -43,7 +42,6 @@ struct esdhc_platform_data {
- 	enum wp_types wp_type;
- 	enum cd_types cd_type;
- 	int max_bus_width;
--	bool support_vsel;
- 	unsigned int delay_line;
- 	unsigned int tuning_step;       /* The delay cell steps in tuning procedure */
- 	unsigned int tuning_start_tap;	/* The start delay cell point in tuning procedure */
 From patchwork Thu Jun 28 08:13:30 2018
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0