diff options
Diffstat (limited to 'arm-bcm2711-mmc-sdhci-iproc-Add-custom-set_power-callback.patch')
-rw-r--r-- | arm-bcm2711-mmc-sdhci-iproc-Add-custom-set_power-callback.patch | 374 |
1 files changed, 0 insertions, 374 deletions
diff --git a/arm-bcm2711-mmc-sdhci-iproc-Add-custom-set_power-callback.patch b/arm-bcm2711-mmc-sdhci-iproc-Add-custom-set_power-callback.patch deleted file mode 100644 index 8c7a43185..000000000 --- a/arm-bcm2711-mmc-sdhci-iproc-Add-custom-set_power-callback.patch +++ /dev/null @@ -1,374 +0,0 @@ -From 6c92ae1e452ff3f4648b1450c9a3233a2ca53feb Mon Sep 17 00:00:00 2001 -From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -Date: Fri, 6 Mar 2020 18:44:03 +0100 -Subject: mmc: sdhci: Introduce sdhci_set_power_and_bus_voltage() - -Some controllers diverge from the standard way of setting power and need -their bus voltage register to be configured regardless of the whether -they use regulators. As this is a common pattern across sdhci hosts, -create a helper function. - -Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -Acked-by: Adrian Hunter <adrian.hunter@intel.com> -Link: https://lore.kernel.org/r/20200306174413.20634-2-nsaenzjulienne@suse.de -Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> ---- - drivers/mmc/host/sdhci.c | 19 +++++++++++++++++++ - drivers/mmc/host/sdhci.h | 3 +++ - 2 files changed, 22 insertions(+) - -diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c -index c59566363a42..525e0c971c6a 100644 ---- a/drivers/mmc/host/sdhci.c -+++ b/drivers/mmc/host/sdhci.c -@@ -2010,6 +2010,25 @@ void sdhci_set_power(struct sdhci_host *host, unsigned char mode, - } - EXPORT_SYMBOL_GPL(sdhci_set_power); - -+/* -+ * Some controllers need to configure a valid bus voltage on their power -+ * register regardless of whether an external regulator is taking care of power -+ * supply. This helper function takes care of it if set as the controller's -+ * sdhci_ops.set_power callback. -+ */ -+void sdhci_set_power_and_bus_voltage(struct sdhci_host *host, -+ unsigned char mode, -+ unsigned short vdd) -+{ -+ if (!IS_ERR(host->mmc->supply.vmmc)) { -+ struct mmc_host *mmc = host->mmc; -+ -+ mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); -+ } -+ sdhci_set_power_noreg(host, mode, vdd); -+} -+EXPORT_SYMBOL_GPL(sdhci_set_power_and_bus_voltage); -+ - /*****************************************************************************\ - * * - * MMC callbacks * -diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h -index 249635692112..851b81565f46 100644 ---- a/drivers/mmc/host/sdhci.h -+++ b/drivers/mmc/host/sdhci.h -@@ -772,6 +772,9 @@ void sdhci_set_clock(struct sdhci_host *host, unsigned int clock); - void sdhci_enable_clk(struct sdhci_host *host, u16 clk); - void sdhci_set_power(struct sdhci_host *host, unsigned char mode, - unsigned short vdd); -+void sdhci_set_power_and_bus_voltage(struct sdhci_host *host, -+ unsigned char mode, -+ unsigned short vdd); - void sdhci_set_power_noreg(struct sdhci_host *host, unsigned char mode, - unsigned short vdd); - void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq); --- -cgit 1.2-0.3.lf.el7 -From f87391eec2c5f54269e64d655da19f2c32515e4c Mon Sep 17 00:00:00 2001 -From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -Date: Fri, 6 Mar 2020 18:44:11 +0100 -Subject: mmc: sdhci: iproc: Add custom set_power() callback for bcm2711 - -The controller needs a valid bus voltage in its power register -regardless of whether an external regulator is taking care of the power -supply. - -The sdhci core already provides a helper function for this, -sdhci_set_power_and_bus_voltage(), so create a bcm2711 specific 'struct -sdhci_ops' which makes use of it. - -Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -Acked-by: Adrian Hunter <adrian.hunter@intel.com> -Link: https://lore.kernel.org/r/20200306174413.20634-10-nsaenzjulienne@suse.de -Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> ---- - drivers/mmc/host/sdhci-iproc.c | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c -index f4f5f0a70cda..225603148d7d 100644 ---- a/drivers/mmc/host/sdhci-iproc.c -+++ b/drivers/mmc/host/sdhci-iproc.c -@@ -261,9 +261,24 @@ static const struct sdhci_iproc_data bcm2835_data = { - .mmc_caps = 0x00000000, - }; - -+static const struct sdhci_ops sdhci_iproc_bcm2711_ops = { -+ .read_l = sdhci_iproc_readl, -+ .read_w = sdhci_iproc_readw, -+ .read_b = sdhci_iproc_readb, -+ .write_l = sdhci_iproc_writel, -+ .write_w = sdhci_iproc_writew, -+ .write_b = sdhci_iproc_writeb, -+ .set_clock = sdhci_set_clock, -+ .set_power = sdhci_set_power_and_bus_voltage, -+ .get_max_clock = sdhci_iproc_get_max_clock, -+ .set_bus_width = sdhci_set_bus_width, -+ .reset = sdhci_reset, -+ .set_uhs_signaling = sdhci_set_uhs_signaling, -+}; -+ - static const struct sdhci_pltfm_data sdhci_bcm2711_pltfm_data = { - .quirks = SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12, -- .ops = &sdhci_iproc_32only_ops, -+ .ops = &sdhci_iproc_bcm2711_ops, - }; - - static const struct sdhci_iproc_data bcm2711_data = { --- -cgit 1.2-0.3.lf.el7 -From patchwork Fri Mar 6 17:44:12 2020 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -X-Patchwork-Id: 11424593 -Return-Path: - <SRS0=iJpk=4X=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org> -Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org - [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D86014E3 - for <patchwork-linux-arm@patchwork.kernel.org>; - Fri, 6 Mar 2020 17:46:55 +0000 (UTC) -Received: from bombadil.infradead.org (bombadil.infradead.org - [198.137.202.133]) - (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id 7BFCB2072A - for <patchwork-linux-arm@patchwork.kernel.org>; - Fri, 6 Mar 2020 17:46:55 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="YjdlKV21" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7BFCB2072A -Authentication-Results: mail.kernel.org; - dmarc=none (p=none dis=none) header.from=suse.de -Authentication-Results: mail.kernel.org; - spf=none - smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; - d=lists.infradead.org; s=bombadil.20170209; h=Sender: - Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: - List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: - Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: - Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: - List-Owner; bh=uwmoUBe7WYtSPXJudhI4GM1SShwysP2rkzh9oA/iygA=; b=YjdlKV21P2YnYd - uFZk/zUDicQRMv6kHWHSeOubxKYNNZjuVUmkI6PWtCuEt37bz+3qPjaDWjY6QO0qR9wHKzxaPikjZ - upSKvBHf9jcYSON0gQhjCxZEGnfO3zrdObtnjdQFTTE9rJPiUXe+bIsvhqlNCO/5Xq4pXjSVR81Fw - IVfXtxtw0tmDjrN7VDqH+dhvUPrvLDRnXOHnolvQfQyuvyvSZ9I7Wn/c4fFJsZemBA7mjvORI7cTd - lVRuIqACikY2bT4Zh+ZtglOCFxtlNjCe60Dj94AnA/j51dvC8MHQOOD+HGKjGzKBwk5FONXjvKeUZ - kR8WGaZiQsG3hj3hzxyw==; -Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) - by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) - id 1jAH3k-0003wN-91; Fri, 06 Mar 2020 17:46:52 +0000 -Received: from mx2.suse.de ([195.135.220.15]) - by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) - id 1jAH1V-00085X-Ut; Fri, 06 Mar 2020 17:44:35 +0000 -X-Virus-Scanned: by amavisd-new at test-mx.suse.de -Received: from relay2.suse.de (unknown [195.135.220.254]) - by mx2.suse.de (Postfix) with ESMTP id 8906AACC2; - Fri, 6 Mar 2020 17:44:32 +0000 (UTC) -From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -To: adrian.hunter@intel.com, linux-kernel@vger.kernel.org, - Rob Herring <robh+dt@kernel.org>, - Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -Subject: [PATCH v2 10/11] ARM: dts: bcm2711: Update expgpio's GPIO labels -Date: Fri, 6 Mar 2020 18:44:12 +0100 -Message-Id: <20200306174413.20634-11-nsaenzjulienne@suse.de> -X-Mailer: git-send-email 2.25.1 -In-Reply-To: <20200306174413.20634-1-nsaenzjulienne@suse.de> -References: <20200306174413.20634-1-nsaenzjulienne@suse.de> -MIME-Version: 1.0 -X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20200306_094434_171925_0978A2DC -X-CRM114-Status: GOOD ( 11.64 ) -X-Spam-Score: -2.3 (--) -X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: - Content analysis details: (-2.3 points) - pts rule name description - ---- ---------------------- - -------------------------------------------------- - 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) - [195.135.220.15 listed in wl.mailspike.net] - -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, - medium trust [195.135.220.15 listed in list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record - -0.0 SPF_PASS SPF: sender matches SPF record - 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -X-BeenThere: linux-arm-kernel@lists.infradead.org -X-Mailman-Version: 2.1.29 -Precedence: list -List-Id: <linux-arm-kernel.lists.infradead.org> -List-Unsubscribe: - <http://lists.infradead.org/mailman/options/linux-arm-kernel>, - <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> -List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> -List-Post: <mailto:linux-arm-kernel@lists.infradead.org> -List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> -List-Subscribe: - <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, - <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> -Cc: stefan.wahren@i2se.com, devicetree@vger.kernel.org, f.fainelli@gmail.com, - linux-mmc@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, - linux-rpi-kernel@lists.infradead.org, phil@raspberrypi.com, - linux-arm-kernel@lists.infradead.org -Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> -Errors-To: - linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org - -The 6th line of the GPIO expander is used to power the board's SD card. - -Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> ---- - arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index 1d4b589fe233..b0ea8233b636 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -@@ -68,7 +68,7 @@ expgpio: gpio { - "GLOBAL_RESET", - "VDD_SD_IO_SEL", - "CAM_GPIO", -- "", -+ "SD_PWR_ON", - ""; - status = "okay"; - }; -From patchwork Fri Mar 6 17:44:13 2020 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -X-Patchwork-Id: 11424599 -Return-Path: - <SRS0=iJpk=4X=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org> -Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org - [172.30.200.123]) - by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A9E8E14BC - for <patchwork-linux-arm@patchwork.kernel.org>; - Fri, 6 Mar 2020 17:47:49 +0000 (UTC) -Received: from bombadil.infradead.org (bombadil.infradead.org - [198.137.202.133]) - (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) - (No client certificate requested) - by mail.kernel.org (Postfix) with ESMTPS id 86F7120656 - for <patchwork-linux-arm@patchwork.kernel.org>; - Fri, 6 Mar 2020 17:47:49 +0000 (UTC) -Authentication-Results: mail.kernel.org; - dkim=pass (2048-bit key) header.d=lists.infradead.org - header.i=@lists.infradead.org header.b="nK9IFX75" -DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 86F7120656 -Authentication-Results: mail.kernel.org; - dmarc=none (p=none dis=none) header.from=suse.de -Authentication-Results: mail.kernel.org; - spf=none - smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org -DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; - d=lists.infradead.org; s=bombadil.20170209; h=Sender: - Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: - List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: - Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: - Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: - List-Owner; bh=yrr+wQNcWoBzz3a/8/AcMlS2enrwpsgYIWUpL8bLv8o=; b=nK9IFX75hVaG6g - t8PhPIHJnIGtQxqZ65valF8dAq8JXeUle2mgnW5xdfa/YWcgzajD9/LaS1qMXKW7wDU/rQ0GbSW9t - +8F8v8NQzCf34sfHmFBEl30S1pJN/dQVJKJk0kmx6/P9N+ig3vAyMVsPsXq1Xij+OU0aU8SU1V+mE - nZnwLti9oSRWY6sNhg1MoHB2DNBt/FBNtROGqiXh13ngQTg8C/HgYapnJnXb+GjrutVM2DzH+i/tG - OtgGRm0XoLRz5QjavZZHPmlHUm8pMxfgllYbUvrESNgDT06vBiPj4idCN7X1XXxxoqPsP3/k8kido - Py713+dNVA1gqQEWqG1g==; -Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) - by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) - id 1jAH4a-0004vA-Os; Fri, 06 Mar 2020 17:47:44 +0000 -Received: from mx2.suse.de ([195.135.220.15]) - by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) - id 1jAH1W-00086J-W9; Fri, 06 Mar 2020 17:44:36 +0000 -X-Virus-Scanned: by amavisd-new at test-mx.suse.de -Received: from relay2.suse.de (unknown [195.135.220.254]) - by mx2.suse.de (Postfix) with ESMTP id 8D8E5AEC5; - Fri, 6 Mar 2020 17:44:33 +0000 (UTC) -From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -To: adrian.hunter@intel.com, linux-kernel@vger.kernel.org, - Rob Herring <robh+dt@kernel.org>, - Nicolas Saenz Julienne <nsaenzjulienne@suse.de> -Subject: [PATCH v2 11/11] ARM: dts: bcm2711: Add vmmc regulator in emmc2 -Date: Fri, 6 Mar 2020 18:44:13 +0100 -Message-Id: <20200306174413.20634-12-nsaenzjulienne@suse.de> -X-Mailer: git-send-email 2.25.1 -In-Reply-To: <20200306174413.20634-1-nsaenzjulienne@suse.de> -References: <20200306174413.20634-1-nsaenzjulienne@suse.de> -MIME-Version: 1.0 -X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 -X-CRM114-CacheID: sfid-20200306_094435_205829_20FE02CB -X-CRM114-Status: GOOD ( 10.34 ) -X-Spam-Score: -2.3 (--) -X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary: - Content analysis details: (-2.3 points) - pts rule name description - ---- ---------------------- - -------------------------------------------------- - 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) - [195.135.220.15 listed in wl.mailspike.net] - -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, - medium trust [195.135.220.15 listed in list.dnswl.org] - 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record - -0.0 SPF_PASS SPF: sender matches SPF record - 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -X-BeenThere: linux-arm-kernel@lists.infradead.org -X-Mailman-Version: 2.1.29 -Precedence: list -List-Id: <linux-arm-kernel.lists.infradead.org> -List-Unsubscribe: - <http://lists.infradead.org/mailman/options/linux-arm-kernel>, - <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> -List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> -List-Post: <mailto:linux-arm-kernel@lists.infradead.org> -List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> -List-Subscribe: - <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, - <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> -Cc: stefan.wahren@i2se.com, devicetree@vger.kernel.org, f.fainelli@gmail.com, - linux-mmc@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com, - linux-rpi-kernel@lists.infradead.org, phil@raspberrypi.com, - linux-arm-kernel@lists.infradead.org -Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> -Errors-To: - linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org - -The SD card power can be controlled trough a pin routed into the board's -external GPIO expander. Turn that into a regulator and provide it to -emmc2. - -Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de> ---- - arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -index b0ea8233b636..a2da058396fe 100644 ---- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -+++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts -@@ -55,6 +55,16 @@ sd_io_1v8_reg: sd_io_1v8_reg { - 3300000 0x0>; - status = "okay"; - }; -+ -+ sd_vcc_reg: sd_vcc_reg { -+ compatible = "regulator-fixed"; -+ regulator-name = "vcc-sd"; -+ regulator-min-microvolt = <3300000>; -+ regulator-max-microvolt = <3300000>; -+ regulator-boot-on; -+ enable-active-high; -+ gpio = <&expgpio 6 GPIO_ACTIVE_HIGH>; -+ }; - }; - - &firmware { -@@ -173,6 +183,7 @@ brcmf: wifi@1 { - /* EMMC2 is used to drive the SD card */ - &emmc2 { - vqmmc-supply = <&sd_io_1v8_reg>; -+ vmmc-supply = <&sd_vcc_reg>; - broken-cd; - status = "okay"; - }; |