From patchwork Mon May 20 00:44:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101746 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gDQ6kLKz9s6w for ; Mon, 20 May 2019 10:45:40 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 89334C21E30; Mon, 20 May 2019 00:45:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id AF2FFC21D56; Mon, 20 May 2019 00:45:28 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 77397C21D74; Mon, 20 May 2019 00:45:26 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 05446C21D56 for ; Mon, 20 May 2019 00:45:24 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N9dHN-1gXtjR1psT-015dlC; Mon, 20 May 2019 02:45:20 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:44:53 +0200 Message-Id: <20190520004502.8924-2-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:ugOz3pXGASO8T5AxTv+wgPlBnknkHvOVJREMsN1h3ebNBa3jwVc 0nPt1TYQ+/ZM4EVcbG18D5P89mN3zyEOrdARQDHbqiVurqv2mr7l9HnI7bVsg+BTqyz0/Ex hbdoX5S9V09JAnkhexhT7W9FBPm1ktNeWXFQ05vbf7xQJVo5fel7DXKyh2HwoZo6QgkfApv 2n2+exabktgdb28JHFDVg== X-UI-Out-Filterresults: notjunk:1; V03:K0:ccr3Ik0Rfb4=:oxw/g2cvBuDmKn28x4eixN 8fqQWmRe44d259bYvCztNB5OB65bQr73MtbIRyKu9nXyrnqnB+7Fmxnw39tikge126uB1HisR HS9XmFt298KkZFg+bkVwLMoT7AVCyzvvwemr8ybuE4KV2ZmDfrchsFAgVtrkNCub7Xf5UQIpE 2zE7p5xANY/kvreGdV1V821keuiIa8ZkjJWxNWLRrKInJULPyVQB8EgYnrkBCytyJtH2sAwDI fMP67ge67nI1OVrIUXv2BoNl6OfxOVjkuiZvR+YpAv5rp1bOO5eC06sbyp5/KlSpKfhSAfsgN 2Liyea7t7Y01NM4dsJ3R5bLxvVwBMi5dmpyAunbCMUDffTeYb9wckSTzG6Mn/1RAq2hePscic erh+8hNakZlr/I3x6F0AzA+WPVzfidlXo9RbvN5xiu/VqP5Q1FEVRA6HJhlN+K+v1Q+4NbaOz AGKP9AIlRN5dLOn6bLegbYqdu5AmXKHA972eAh02kOonyg/eiVQRC1voij/5afP8hbbmQrWQy TbSc/SwxVOCRcuHubC1H0nnXH3Z17+TDiWPBSNClmdEsGooN+Oq45wIDd6rlAUw1gjYM+6jv7 LALo4NmNNnETZVk95fj0b3P8YlB7+mllCN4hwI64LBrNwWPWizrKDFJy04qOYpVvhIHybrl9T Qq+RqtJspwGMumZm8i/COqggEZeReiGop6bV+6+tUIFqJfX02EqQa51d49Bffx9azYHWBj2pK oHqKN+4nRklUASH9uzD/EIQZZwXBE7IkCMDPmg== Cc: Marcel Ziswiler Subject: [U-Boot] [PATCH v1 01/10] mmc: add missing space before comment delimiter X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add missing space before a comment delimiter. Signed-off-by: Marcel Ziswiler Reviewed-by: Peng Fan Reviewed-by: Igor Opaniuk --- drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 456c1b4cc9..ede528dc5a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -2672,7 +2672,7 @@ retry: if (err) return err; - /* The internal partition reset to user partition(0) at every CMD0*/ + /* The internal partition reset to user partition(0) at every CMD0 */ mmc_get_blk_desc(mmc)->hwpart = 0; /* Test for SD version 2 */ From patchwork Mon May 20 00:44:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101749 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gGx5cV2z9s6w for ; Mon, 20 May 2019 10:47:53 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 602DCC21C93; Mon, 20 May 2019 00:45:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D7C78C21E13; Mon, 20 May 2019 00:45:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 448A5C21C93; Mon, 20 May 2019 00:45:27 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 601D1C21D56 for ; Mon, 20 May 2019 00:45:27 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MVdcm-1h37oL2xy0-00RbyV; Mon, 20 May 2019 02:45:22 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:44:54 +0200 Message-Id: <20190520004502.8924-3-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:jQy7p1rboq/H2oAXOqjX2XwSpI6LGQQZa7fIic5jUkI9MPARbzi AWQYVUSqkGGnpn8Reu1Ab+9mGIbaPHgHx8jpaLdXv/S8xqgZBA9i0VPvWtY/ST6FvchsvDa u2ZHPRlKB9tlC/y4ijvE2lwun5sIBJ4FArf6MTCab3qbEjK/n3q7oFyfyCp5heDvXiQocbJ qiJXTuDaCXQODdPuARQUQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:yxIHR3Lmb2s=:e0/xUkzMERQ2xIeSiPoDwQ BIH+KEz4axOWWuZRhx4O2fcyC8wZngK9EA18A6AMkYqBhus4gDLRNUvhYEuo3iklO+fmuqfqR zOCxjty6K0LP1QckX399LyISkJxHhP30JjFUNrNfF4Eu0m/uqN4PNMjpgf8QUWJeDXLthOwdJ 9EPhgMgby8sBO9LU5WzmC2kHY5b87c7lYz/jAzPf4x9Sdelzi4eWaLfU1bhL59zlgoMBLG2JQ G0obs6lvd9I9+JtDWFN4eZhOK72X8vBpSFFVRmdDDkxMOuYHjFy/epY57OTj8BL5Ncz4YrzbS D7JSTnLOhb6p/GKiRWK0z7SfGVxRk+kOrl1HrURxiJfhGhV3rxw2o3Gv6CGFCzngqAXr/NpDu YOln/WqLqvn6S+vgO5wVtNbAI4Hxew7Rny9LExf9xGeNRGpKxYoMzNcPKIM6nJ2OzHtQRaUVf hLnOYrEGCr5eYFUYRXpC1omgeNnvzmJUC7GuXhHWrdhxg7B/nkUCSrav+eiCGRE20ci/oeI7g hMLx7cSqOFd/RKU5GcMOA3iERXHX3MVhvD4rLHOtFA/XVZvCz30r5XluDzbaoCdjqvy1kCXFr 60g8S+cQvSaYZ9KCn1jqJkZoqMEK6MrcncwG8RquSuAQwrUOzkKT7NyaVtvkS9bC3MV3A/OWY tBuk4JM2Tu7F5opJZsE1tKUgzFmVnUCIdHsED9wljkJPrMfEb9Em9DG8IvzSjlgzKpF159aTO CXvxdCRtmJxDUmLMAbqH4lqUFsQmpmOewuJScQ== Cc: Marcel Ziswiler Subject: [U-Boot] [PATCH v1 02/10] mmc: fsl_esdhc: annotate endifs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Annotate endifs to make CONFIG_IS_ENABLED(DM_MMC) or not more obvious. Signed-off-by: Marcel Ziswiler Reviewed-by: Fabio Estevam Reviewed-by: Peng Fan Reviewed-by: Igor Opaniuk --- drivers/mmc/fsl_esdhc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index 1b7de74a72..0742cd64e1 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -1372,7 +1372,7 @@ int fsl_esdhc_mmc_init(bd_t *bis) cfg->sdhc_clk = gd->arch.sdhc_clk; return fsl_esdhc_initialize(bis, cfg); } -#endif +#endif /* !CONFIG_IS_ENABLED(DM_MMC) */ #ifdef CONFIG_FSL_ESDHC_ADAPTER_IDENT void mmc_adapter_card_type_ident(void) @@ -1635,7 +1635,7 @@ static const struct dm_mmc_ops fsl_esdhc_ops = { .execute_tuning = fsl_esdhc_execute_tuning, #endif }; -#endif +#endif /* CONFIG_IS_ENABLED(DM_MMC) */ static struct esdhc_soc_data usdhc_imx7d_data = { .flags = ESDHC_FLAG_USDHC | ESDHC_FLAG_STD_TUNING From patchwork Mon May 20 00:44:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101748 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gFh61Wqz9s6w for ; Mon, 20 May 2019 10:46:48 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 3A524C21DA1; Mon, 20 May 2019 00:46:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 500BDC21E1E; Mon, 20 May 2019 00:45:32 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4ED3FC21D56; Mon, 20 May 2019 00:45:27 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 3F3C0C21C93 for ; Mon, 20 May 2019 00:45:27 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1M9WFU-1hY0c23Pqm-005WiJ; Mon, 20 May 2019 02:45:23 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:44:55 +0200 Message-Id: <20190520004502.8924-4-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:LLWzDOOtFceHMjFx8BHBeE1uIr5fzgrWwLtbcLGaK5LNcOWMGqA q/zyb3gorxJP+AJ/KVq+zk0bO+VdUIcCB4iJEoWJylOzveKZ6PEBRAZr/+LPwEim2FZLltK v85klw9/FusonBc59T5cAXKZAr575DT8t7NazF+Q1segT9eT6seBGEeu6sko3NSewWWdtmT EqfZGmu/ykU8Z8JMLfRXQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:uf8AR2FEeVE=:wDC9Qm2YXUhPn2L14u3sPl uvwy763hfVsHOdxWBMLidrSi/o/T57YRzncLj8fHSMV2k/DSs+TmGBg2YfEp03IEkuKvogPxt jPnizasDabrsPMPlfB1DlxnTyziaTOZn7cQZD0zgjTTQJTXPDzDreG3j8oVNkS/spsUIQa6eW obP1l8AmQ1OXrOBQpc17SHJ5ZG01YIRI1UAI2jhu6AwHszriA1JA+QIS0hkXLIFPuLroWed9A rECwZ9pLilxZoq5cY+m84+PJ6pqdLh8k4OsTWUJM9CHrEqs9+q71q/2hKm378Pj9JyZUzHUs4 gcq7yWkaHu36ExhaEL1ozG+ErbOTyVGBMKha3pxejBts/TCBKSDpo1b4D6clVD39LZd2Off0h zrqfgYg1HxTgwhZK4lfQA9GEHLdlQOM7/jHYQbnyVBs+qgraw/GfM6quWbzeKAt5gCUGdd77b KIxP3GAGuhuqwTvZRRuEVWbXG0ule7K3z454g34OkqX6TMvGYAu+ZIlEN2X/AVdapAQjRKucm a5MhFRPguFf9IKuIy2X0h3EZhKJ6kwJe2Rl+Cf1VTJEX+HQrLdqJUblY7yzpXqtdH0Nt0qHTx 4nCknu+k+qgjLyqsdPdErsJMzwm3DctWJkgAcN1gc9tq6VyjdCzLVKvNDvrUSElFaP+X1MzmN HTh929+ec4zOS2PGZUHapzlcygaayXNiRKFBlfE1jGUztPxklbSWhumm0cMekc/IYQHsTgDLG Zp9d5eKkPHYcdQpQCf7f6Zl8WVJTVMk2OQ7ghg== Cc: Marek Vasut , Marcel Ziswiler Subject: [U-Boot] [PATCH v1 03/10] serial: pxa: clean-up platform data include file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Clean-up platform data include file by using BIT macro and converting indentation with spaces to tabs. Signed-off-by: Marcel Ziswiler --- include/dm/platform_data/serial_pxa.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/dm/platform_data/serial_pxa.h b/include/dm/platform_data/serial_pxa.h index 408c00885d..b78bdb6409 100644 --- a/include/dm/platform_data/serial_pxa.h +++ b/include/dm/platform_data/serial_pxa.h @@ -17,7 +17,7 @@ #define FFUART_INDEX 1 #define STUART_INDEX 2 #elif CONFIG_CPU_PXA25X -#define UART_CLK_BASE (1 << 4) /* HWUART */ +#define UART_CLK_BASE BIT(4) /* HWUART */ #define UART_CLK_REG CKEN #define HWUART_INDEX 0 #define STUART_INDEX 1 @@ -42,9 +42,9 @@ /* * struct pxa_serial_platdata - information about a PXA port * - * @base: Uart port base register address - * @port: Uart port index, for cpu with pinmux for uart / gpio - * baudrtatre: Uart port baudrate + * @base: Uart port base register address + * @port: Uart port index, for cpu with pinmux for uart / gpio + * baudrtatre: Uart port baudrate */ struct pxa_serial_platdata { struct pxa_uart_regs *base; From patchwork Mon May 20 00:44:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101752 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gHz1ytgz9s6w for ; Mon, 20 May 2019 10:48:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id F1D7CC21DDC; Mon, 20 May 2019 00:47:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 3FF71C21DFD; Mon, 20 May 2019 00:45:53 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 986BFC21DEC; Mon, 20 May 2019 00:45:35 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 48C12C21DF3 for ; Mon, 20 May 2019 00:45:31 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MGycx-1hOLh91x9X-00E5ZM; Mon, 20 May 2019 02:45:24 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:44:56 +0200 Message-Id: <20190520004502.8924-5-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:MwpeZ9Pu0QQE62xsMNXLvtgeZXc/Oz3bW/97jO8fRYc96Jwzn3r UWacpaQ0fCcEntUWjFORK1UKIIM/2fG8Qc1NqY9qFM6rtqvzvhSoE9grCLUnM+3GA3E8OyH q+BxzBQT/AX5+PBsgcLt0FtDlWvoPe3FqzlAQqYOoig1LsOQPoGL2Oow3i56tuMqgZfq42L 9sjjGAfqSeBUdp9nP92/A== X-UI-Out-Filterresults: notjunk:1; V03:K0:3hEx7aNA0ug=:Aw/KwjwPFLmMSLEzqvEo4W plmOPlU20gOwT+oa/vl3Ia1qaQcU5MqafCNmv3bjTQJ3u9h8ALNWV8u1DS9FvOgBoVkmcJZwS dFuEFKrZLS0utV8GTVUlGi+aXQls3TgqH2Jjn2arVIIhiRoDoSA4vrreTnu+EJZUHDgN1rcIV SOxajforutcLRaZP1487yadEayjxwI7c1EcC3zVopYG86tROz7WIVLPHwOMbXV1key6enXcTE UNKoPl5h/qrCfPw8odalzdavQO2NxBvye3vsenBW06UVNn7tUDMHzKsRrvXz2elNx1/mYAZ8P NchqtDI61/d2dzfSqcy6c0rRHx38UjyijmpXCt6mhQTomR5+9Lo08fBAghnD+83Iz+kmUDe7V Vw+j/8o1/W7Mrn7jcocmxk944SP4We86r0kjEA0DrtKnKAQ75L/MlljJY9PCBmjymJb+IoAoF SLVJJTf7cLAorowUOxSVFttCPqabQZ8RIKRMqn7F9GRcCcyfNjC6BozxNUdCbtLxIsxffizLi emrPYiirt8ubaluMq21RTHEGZm3iKQqBzOUeJ8/fE1/DRhy8aAks7RBx+3m533awsu/lreLyp lnWwpApf6jdQgJrRAGj1W9OpFb1BFbAzn6R9UOYo8jdw/NKAAj3a1ABPSUkJoQ6kF+sr+KKPG HOcV/gs9hsIsTilrFkyX5Dhq+IoOyAK4mX35qRLClUpzQGVh6lfGlklD/9WaCk+9RLSWsb/RF ZymiNvPHmxirAW03JB2z+smBBh+OWavh2g0PdQ== Cc: Tom Rini , Baruch Siach , Marcel Ziswiler , Stefan Roese , Chris Packham Subject: [U-Boot] [PATCH v1 04/10] Makefile: allow dm_mmc without of_control X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Allow for CONFIG_DM_MMC with platform data rather than CONFIG_OF_CONTROL. Signed-off-by: Marcel Ziswiler --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6eb08a5724..eb08aaea75 100644 --- a/Makefile +++ b/Makefile @@ -926,7 +926,7 @@ ifeq ($(CONFIG_DM_I2C_COMPAT)$(CONFIG_SANDBOX),y) @echo >&2 "====================================================" endif ifeq ($(CONFIG_MMC),y) -ifneq ($(CONFIG_DM_MMC)$(CONFIG_OF_CONTROL)$(CONFIG_BLK),yyy) +ifneq ($(CONFIG_DM_MMC)$(CONFIG_BLK),yy) @echo >&2 "===================== WARNING ======================" @echo >&2 "This board does not use CONFIG_DM_MMC. Please update" @echo >&2 "the board to use CONFIG_DM_MMC before the v2019.04 release." From patchwork Mon May 20 00:44:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101747 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gDs3drRz9s6w for ; Mon, 20 May 2019 10:46:05 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id EC6F2C21E16; Mon, 20 May 2019 00:45:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 63987C21DFD; Mon, 20 May 2019 00:45:31 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 33C77C21D83; Mon, 20 May 2019 00:45:28 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id 70D26C21D74 for ; Mon, 20 May 2019 00:45:27 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MLQcx-1hB8Io1stX-00IVQC; Mon, 20 May 2019 02:45:25 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:44:57 +0200 Message-Id: <20190520004502.8924-6-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:x+4YTMJ8Fb9CyqO8NJbKHjEHW+gEwgsZTkbrRXnKhXVhoLkRo68 IS9NziApCLQPXZLpM8JKh3IezBoufs8b8IeZbd+TBp0ano8R/kPSidIg8TPD0ugJUTO7vI1 CDL/EXsAEPBYjx5+ea4hXaOJfaSpmddZvn6szA3k2wMQPCPiYq3g3NRhI/XUAjkhsfoacxH 9lpwt8i2D0vvAxL4wK7DQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:RNAjDWmBpII=:R8JXVciy6ahfaTEU703sz6 Xm3e+M02RzJpiUQ2yeXpobyVLWxp13F8gOKWP6aMTr3nfGiPg3+bUb8074s2VQuK2yBihfmNG ghfF0nkJhUo+TLjH4xMElSfPx0vuXVg66HiYxtdTMRmaqWqfAUu5oxIdCBHDSzfHkpEVF6w9F nymTC7Znl9RGtUP9DXXLCCkE824g+SAzmfz8Y+vc6JRPpKNk9pmbUpTtB3c5irfKPffV35XZR 3ZUPNyVCPlIarchc3/H0Ag9TVgnaoIleDH7UEoqh9Kkwv+WMveLfWsJOclFcNRJqDczbX8gvL INdCw/vktNvbuQMZ8oOVq1S9jfE7oAJIKQS3F2tbgkSGY1MY8Y0KXcEBaSOr/LUcp50qUyMFs gcfDQUGdfPvunhLhB2/Qc4VCS/0A/67UCfTIWQVaPkLmFlmnACX0HdFKlFDPFOM0MEF5VCain QhZCiRut0Qbcmp2pn4F/m1w6r6IroiGCW79BtV4+7faIFRaKXOFtkWGJfgqrHjfrAkojga2BW qBvcQuvyzwuc0tMTAA89yvy+tPEwQSclVgJBZ4gW7chEvdu6Fu40dZ3mbwEYeLYLFTxiujipw UKz/w+0j09cLNLYN/gFqpZgEjjPvBjTRjJHmfR1CQiHxydADgOH77dhPPJnH7RvYQ61PZ7+On FGfO2aVVXFQM2FNERNpTG0F+FN+lw8ymyxNmKk7bnms2WFA5HQRN+ONd6jD3ZQduohs4el1Ys ERgQcxfupiPS89ZpI52AAKvjHVZauXdrlxYA5A== Cc: Marcel Ziswiler Subject: [U-Boot] [PATCH v1 05/10] dm: core: gracefully handle alias seq without of X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Gracefully handle alias seq in the platform data rather than OF case. Signed-off-by: Marcel Ziswiler --- drivers/core/read.c | 4 +++- include/dm/read.h | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/core/read.c b/drivers/core/read.c index 6bda077a34..670ffe5dc5 100644 --- a/drivers/core/read.c +++ b/drivers/core/read.c @@ -212,15 +212,17 @@ int dev_read_alias_seq(struct udevice *dev, int *devnump) { ofnode node = dev_ofnode(dev); const char *uc_name = dev->uclass->uc_drv->name; - int ret; + int ret = -ENOTSUPP; if (ofnode_is_np(node)) { ret = of_alias_get_id(ofnode_to_np(node), uc_name); if (ret >= 0) *devnump = ret; } else { +#if CONFIG_IS_ENABLED(OF_CONTROL) ret = fdtdec_get_alias_seq(gd->fdt_blob, uc_name, ofnode_to_offset(node), devnump); +#endif } return ret; diff --git a/include/dm/read.h b/include/dm/read.h index 60b727cbd8..a8ffbe42ac 100644 --- a/include/dm/read.h +++ b/include/dm/read.h @@ -702,8 +702,12 @@ static inline const void *dev_read_prop(struct udevice *dev, static inline int dev_read_alias_seq(struct udevice *dev, int *devnump) { +#if CONFIG_IS_ENABLED(OF_CONTROL) return fdtdec_get_alias_seq(gd->fdt_blob, dev->uclass->uc_drv->name, dev_of_offset(dev), devnump); +#else + return -ENOTSUPP; +#endif } static inline int dev_read_u32_array(struct udevice *dev, const char *propname, From patchwork Mon May 20 00:44:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101755 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gKD61nkz9s6w for ; Mon, 20 May 2019 10:49:52 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 72230C21D8E; Mon, 20 May 2019 00:47:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 7A6E7C21DEC; Mon, 20 May 2019 00:47:19 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F39E7C21DC1; Mon, 20 May 2019 00:45:53 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.196]) by lists.denx.de (Postfix) with ESMTPS id D2513C21E38 for ; Mon, 20 May 2019 00:45:49 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1N4yRU-1gTmzb3p4u-010wnD; Mon, 20 May 2019 02:45:28 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:44:58 +0200 Message-Id: <20190520004502.8924-7-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:cESNRYXZvQn9lmT5ldDl+vg0whjZ7wqn/+HlvedKVZOLlpK1muQ FIoI56IpltGB1tercwG63whDsJi+MMnlmh7qsSE0yhFonaFQ0xLN3aysXSib7LAQcjqCw0j bQuzZNfeB0LizLBLEuq7mJwQ0ZRrkcr/Jo6WESWpHJgv0loGjji/fUqpY5mgI8O78s8ZOn/ KAJQDtpp5FNJvok/RvkAA== X-UI-Out-Filterresults: notjunk:1; V03:K0:w3I4niBjc40=:poBuy0sMj5FFjj5ipQ4gkc Mdx3Cww0Vmxla0bS/ZK6sanki6EVqXRWxX4rJ5FVUHwGTOJgoCLHyjHhmrVkShVIQZrbptZ33 0xYTh9S+/BaRztwHZ8T+J9STf8umZAkZxDKaKzaH1Qu2ZO5Apu2/ZsRoVY4pPQaI6mkT7kXoC 5fjrCD1A70QAmTdmT9O6alKymP3N30ikRKvFSFyauHVeqyUgcxA5DzmCv7RxTdi34HRpMinSp /nlr3ShB6bwTzKc4pLqm5pXSKsMLjDZN5BtxM8sqrEwTK/a44KcS/jziIy44OZazeyGg2Vupi buHJy7InPq9uEJ82yY3K8JZoNIzj+JdTbV3/FW4lkgfkdvjONSf8r0n2LejSy+Z094lUoccC1 rNpUkl7mHhimaVOHxPKLGPKdnu7AImc7GOuU3NeebQ8otuee6rZjgwuPni7I8GFSXytHuRMvo G87xU/Q33wxcS89ids9CHEujXE7MVmUS7i1ffs+6MsKLt6e6SKEDgRtzevJvcKWhCXC5xtxbC pxz8sH2x8nchsvuN+XtU1xdxOvFSKu9v4jyNGVadCc9+QlzBvcBgknQd6wB0jci2y70mFKnD1 CDLzalC2KPLWq3I7R3DPvAaBE+lPx626uU4K89IUIF8if4Qcj77S4zJf5XZzL/lcNb1yaRLim gaCM72Cy2tzAsNp2A7fFrsu3ffDNFszfgfAqZralShRzMxbZ/jf//6glm1HP4Aj/97sqHp5VX QY1sjmB5yr63H5VtQd/1urAEunTjUdGF1u+duA== Cc: Stephen Warren , Marcel Ziswiler , Chris Packham Subject: [U-Boot] [PATCH v1 06/10] kconfig: mmc: move pxa_mmc_generic to kconfig X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Move CONFIG_PXA_MMC_GENERIC to Kconfig. Signed-off-by: Marcel Ziswiler Reviewed-by: Simon Glass --- configs/colibri_pxa270_defconfig | 1 + configs/zipitz2_defconfig | 1 + drivers/mmc/Kconfig | 8 ++++++++ include/configs/pxa-common.h | 7 ------- include/configs/zipitz2.h | 8 -------- scripts/config_whitelist.txt | 1 - 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig index 492ee9eaaf..a3c07d5887 100644 --- a/configs/colibri_pxa270_defconfig +++ b/configs/colibri_pxa270_defconfig @@ -27,6 +27,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y +CONFIG_PXA_MMC_GENERIC=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y diff --git a/configs/zipitz2_defconfig b/configs/zipitz2_defconfig index 509adcffd9..9590d16593 100644 --- a/configs/zipitz2_defconfig +++ b/configs/zipitz2_defconfig @@ -11,6 +11,7 @@ CONFIG_HUSH_PARSER=y # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="$ " CONFIG_CMD_MMC=y +CONFIG_PXA_MMC_GENERIC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y # CONFIG_CMD_SETEXPR is not set diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index c23299ea96..d89140e520 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -274,6 +274,14 @@ config MMC_PCI If unsure, say N. +config PXA_MMC_GENERIC + bool "Support for MMC controllers on PXA" + help + This selects MMC controllers on PXA. + If you are on a PXA architecture, say Y here. + + If unsure, say N. + config MMC_OMAP_HS bool "TI OMAP High Speed Multimedia Card Interface support" select DM_REGULATOR_PBIAS if DM_MMC && DM_REGULATOR diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h index e25800a095..ba315b3fb8 100644 --- a/include/configs/pxa-common.h +++ b/include/configs/pxa-common.h @@ -17,13 +17,6 @@ #define CONFIG_KGDB_BAUDRATE 230400 #endif -/* - * MMC Card Configuration - */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_PXA_MMC_GENERIC -#endif - /* * OHCI USB */ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 24fea68a11..cf8f6ff671 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -47,14 +47,6 @@ * Bootloader Components Configuration */ -/* - * MMC Card Configuration - */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_PXA_MMC_GENERIC -#define CONFIG_SYS_MMC_BASE 0xF0000000 -#endif - /* * SPI and LCD */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index b16bc6ae34..511287ada0 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1533,7 +1533,6 @@ CONFIG_PSRAM_SCFG CONFIG_PWM CONFIG_PWM_IMX CONFIG_PXA_LCD -CONFIG_PXA_MMC_GENERIC CONFIG_PXA_PWR_I2C CONFIG_PXA_STD_I2C CONFIG_PXA_VGA From patchwork Mon May 20 00:44:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101751 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gHP4xbSz9s6w for ; Mon, 20 May 2019 10:48:17 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 63E0FC21DA1; Mon, 20 May 2019 00:47:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D4E9EC21DFB; Mon, 20 May 2019 00:46:00 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D0EA7C21DF3; Mon, 20 May 2019 00:45:42 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id E378CC21E36 for ; Mon, 20 May 2019 00:45:37 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MKc4m-1hE9NF1oMu-00Ky8B; Mon, 20 May 2019 02:45:29 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:44:59 +0200 Message-Id: <20190520004502.8924-8-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:3yorpWGE5259y0O8cCjr75g7ZzROrdgBQdCxra9E8PNXsSOZbJ4 Vf2LocEEJrgCzYcmhEmaKQCcY8T8GEQro3EnV0h6+wGm5b0v91S7YzjNWVK9D0rxkxjsl1G x4y7p2bAx2xIeeQZ9rz40Fl70zpn1E6uJsCHd/7qUKTYZrRdCVYmjZ3Wsm9yRpb/cue+lca H4Yi+3JY7TnYLwfigErSg== X-UI-Out-Filterresults: notjunk:1; V03:K0:mdHtK3kSU08=:ZkmA9PZ9dYO+WgMl6h2pym JvGSqTRsJkl0ACafDNR1D89zhQaXfAuCs9CjkkaV+YbRV5g+mb/i5/FuK6bN9vcY4g90aLto8 LTTi5A31PvxZQhOXe4H5iP36H424K/ydgWhdsO83AHH7pw4gEqAoL95iGTwT6d/4f8YePzfaI 77C25MwDrw47DEpmU+T90M0/v0lMNYyxSDaE08adherzBxC/R2aT2CNz6M49QMZ+FC7SrNiiF vouaZ2mzvDSSCSM0+1vOC0xoyQGcIbHkVay6Kalc+Hl353aNgYGDnunhSf83avjxp3z91/V1Z AStVkwbbG7zeg3U0W85H8IbHztG9mi5h22NqYIR2jAjBbEzygjKdtFLn/mEgbO/ECLAPVRGz1 5dXIqTTa7GC0VneJF8O+pxIGgzXUl3UPyYi7JJBwZmG0MQGvmyr3ef9nhuhkeeHRJDBaGgxZn IfluFZDppNcmshwrcLoppNOWZrZUPNsCqRfLk9pTpvS/CWLJeSbue7lKe5PBDlOGv4J/G5D1o 5yjILPi1mdFPkz6qYeeLmBYEZ7UO2361EI+5rePWT9NghX8Kcxl5173yuWPCO0D5C9jIuLn9/ tJzlCuogVmm5k3bJS24Waj7DW4sq760yHv7aQciUA5hWgUyhOVCNafSit3GZvIk7/z7bz1AZA LzN+hE4Ng5sui7IJWtodVSSArVcGpfNFExCphM/CDvXx7RmSVD2tKB85VcDhmu2EMbj8SVaXK 4ekAJTYwShjDkJjSnoyZW4fvFqpdlFrbZR+Igw== Cc: Marek Vasut , Tom Rini , Marcel Ziswiler Subject: [U-Boot] [PATCH v1 07/10] arm: pxa: mmc: add driver model support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add driver model (DM) support. Signed-off-by: Marcel Ziswiler --- drivers/mmc/pxa_mmc_gen.c | 160 ++++++++++++++++++++----- include/dm/platform_data/pxa_mmc_gen.h | 22 ++++ 2 files changed, 154 insertions(+), 28 deletions(-) create mode 100644 include/dm/platform_data/pxa_mmc_gen.h diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c index a4dcdb5cff..08a5ca36a1 100644 --- a/drivers/mmc/pxa_mmc_gen.c +++ b/drivers/mmc/pxa_mmc_gen.c @@ -2,6 +2,9 @@ /* * Copyright (C) 2010 Marek Vasut * + * Modified to add driver model (DM) support + * Copyright (C) 2019 Marcel Ziswiler + * * Loosely based on the old code and Linux's PXA MMC driver */ @@ -10,6 +13,8 @@ #include #include #include +#include +#include #include #include @@ -95,7 +100,7 @@ static int pxa_mmc_stop_clock(struct mmc *mmc) } static int pxa_mmc_start_cmd(struct mmc *mmc, struct mmc_cmd *cmd, - uint32_t cmdat) + uint32_t cmdat) { struct pxa_mmc_priv *priv = mmc->priv; struct pxa_mmc_regs *regs = priv->regs; @@ -142,7 +147,7 @@ static int pxa_mmc_cmd_done(struct mmc *mmc, struct mmc_cmd *cmd) { struct pxa_mmc_priv *priv = mmc->priv; struct pxa_mmc_regs *regs = priv->regs; - uint32_t a, b, c; + u32 a, b, c; int i; int stat; @@ -151,7 +156,7 @@ static int pxa_mmc_cmd_done(struct mmc *mmc, struct mmc_cmd *cmd) /* * Linux says: - * Did I mention this is Sick. We always need to + * Did I mention this is Sick. We always need to * discard the upper 8 bits of the first 16-bit word. */ a = readl(®s->res) & 0xffff; @@ -163,13 +168,13 @@ static int pxa_mmc_cmd_done(struct mmc *mmc, struct mmc_cmd *cmd) } /* The command response didn't arrive */ - if (stat & MMC_STAT_TIME_OUT_RESPONSE) + if (stat & MMC_STAT_TIME_OUT_RESPONSE) { return -ETIMEDOUT; - else if (stat & MMC_STAT_RES_CRC_ERROR - && cmd->resp_type & MMC_RSP_CRC) { -#ifdef PXAMMC_CRC_SKIP - if (cmd->resp_type & MMC_RSP_136 - && cmd->response[0] & (1 << 31)) + } else if (stat & MMC_STAT_RES_CRC_ERROR && + cmd->resp_type & MMC_RSP_CRC) { +#ifdef PXAMMC_CRC_SKIP + if (cmd->resp_type & MMC_RSP_136 && + cmd->response[0] & (1 << 31)) printf("Ignoring CRC, this may be dangerous!\n"); else #endif @@ -184,8 +189,8 @@ static int pxa_mmc_do_read_xfer(struct mmc *mmc, struct mmc_data *data) { struct pxa_mmc_priv *priv = mmc->priv; struct pxa_mmc_regs *regs = priv->regs; - uint32_t len; - uint32_t *buf = (uint32_t *)data->dest; + u32 len; + u32 *buf = (uint32_t *)data->dest; int size; int ret; @@ -201,7 +206,6 @@ static int pxa_mmc_do_read_xfer(struct mmc *mmc, struct mmc_data *data) /* Read data into the buffer */ while (size--) *buf++ = readl(®s->rxfifo); - } if (readl(®s->stat) & MMC_STAT_ERRORS) @@ -220,8 +224,8 @@ static int pxa_mmc_do_write_xfer(struct mmc *mmc, struct mmc_data *data) { struct pxa_mmc_priv *priv = mmc->priv; struct pxa_mmc_regs *regs = priv->regs; - uint32_t len; - uint32_t *buf = (uint32_t *)data->src; + u32 len; + u32 *buf = (uint32_t *)data->src; int size; int ret; @@ -258,12 +262,11 @@ static int pxa_mmc_do_write_xfer(struct mmc *mmc, struct mmc_data *data) return 0; } -static int pxa_mmc_request(struct mmc *mmc, struct mmc_cmd *cmd, - struct mmc_data *data) +static int pxa_mmc_send_cmd_common(struct pxa_mmc_priv *priv, struct mmc *mmc, + struct mmc_cmd *cmd, struct mmc_data *data) { - struct pxa_mmc_priv *priv = mmc->priv; struct pxa_mmc_regs *regs = priv->regs; - uint32_t cmdat = 0; + u32 cmdat = 0; int ret; /* Stop the controller */ @@ -312,12 +315,11 @@ static int pxa_mmc_request(struct mmc *mmc, struct mmc_cmd *cmd, return 0; } -static int pxa_mmc_set_ios(struct mmc *mmc) +static int pxa_mmc_set_ios_common(struct pxa_mmc_priv *priv, struct mmc *mmc) { - struct pxa_mmc_priv *priv = mmc->priv; struct pxa_mmc_regs *regs = priv->regs; - uint32_t tmp; - uint32_t pxa_mmc_clock; + u32 tmp; + u32 pxa_mmc_clock; if (!mmc->clock) { pxa_mmc_stop_clock(mmc); @@ -345,9 +347,8 @@ static int pxa_mmc_set_ios(struct mmc *mmc) return 0; } -static int pxa_mmc_init(struct mmc *mmc) +static int pxa_mmc_init_common(struct pxa_mmc_priv *priv, struct mmc *mmc) { - struct pxa_mmc_priv *priv = mmc->priv; struct pxa_mmc_regs *regs = priv->regs; /* Make sure the clock are stopped */ @@ -361,10 +362,34 @@ static int pxa_mmc_init(struct mmc *mmc) /* Mask all interrupts */ writel(~(MMC_I_MASK_TXFIFO_WR_REQ | MMC_I_MASK_RXFIFO_RD_REQ), - ®s->i_mask); + ®s->i_mask); + return 0; } +#if !CONFIG_IS_ENABLED(DM_MMC) +static int pxa_mmc_init(struct mmc *mmc) +{ + struct pxa_mmc_priv *priv = mmc->priv; + + return pxa_mmc_init_common(priv, mmc); +} + +static int pxa_mmc_request(struct mmc *mmc, struct mmc_cmd *cmd, + struct mmc_data *data) +{ + struct pxa_mmc_priv *priv = mmc->priv; + + return pxa_mmc_send_cmd_common(priv, mmc, cmd, data); +} + +static int pxa_mmc_set_ios(struct mmc *mmc) +{ + struct pxa_mmc_priv *priv = mmc->priv; + + return pxa_mmc_set_ios_common(priv, mmc); +} + static const struct mmc_ops pxa_mmc_ops = { .send_cmd = pxa_mmc_request, .set_ios = pxa_mmc_set_ios, @@ -385,7 +410,7 @@ int pxa_mmc_register(int card_index) { struct mmc *mmc; struct pxa_mmc_priv *priv; - uint32_t reg; + u32 reg; int ret = -ENOMEM; priv = malloc(sizeof(struct pxa_mmc_priv)); @@ -404,7 +429,7 @@ int pxa_mmc_register(int card_index) default: ret = -EINVAL; printf("PXA MMC: Invalid MMC controller ID (card_index = %d)\n", - card_index); + card_index); goto err1; } @@ -419,7 +444,7 @@ int pxa_mmc_register(int card_index) #endif mmc = mmc_create(&pxa_mmc_cfg, priv); - if (mmc == NULL) + if (!mmc) goto err1; return 0; @@ -429,3 +454,82 @@ err1: err0: return ret; } +#else /* !CONFIG_IS_ENABLED(DM_MMC) */ +static int pxa_mmc_probe(struct udevice *dev) +{ + struct mmc_uclass_priv *upriv = dev_get_uclass_priv(dev); + struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct mmc_config *cfg = &plat->cfg; + struct mmc *mmc = &plat->mmc; + struct pxa_mmc_priv *priv = dev_get_priv(dev); + u32 reg; + + upriv->mmc = mmc; + + cfg->b_max = CONFIG_SYS_MMC_MAX_BLK_COUNT; + cfg->f_max = PXAMMC_MAX_SPEED; + cfg->f_min = PXAMMC_MIN_SPEED; + cfg->host_caps = PXAMMC_HOST_CAPS; + cfg->name = dev->name; + cfg->voltages = MMC_VDD_32_33 | MMC_VDD_33_34; + + mmc->priv = priv; + + priv->regs = plat->base; + +#ifndef CONFIG_CPU_MONAHANS /* PXA2xx */ + reg = readl(CKEN); + reg |= CKEN12_MMC; + writel(reg, CKEN); +#else /* PXA3xx */ + reg = readl(CKENA); + reg |= CKENA_12_MMC0 | CKENA_13_MMC1; + writel(reg, CKENA); +#endif + + return pxa_mmc_init_common(priv, mmc); +} + +static int pxa_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, + struct mmc_data *data) +{ + struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_priv *priv = dev_get_priv(dev); + + return pxa_mmc_send_cmd_common(priv, &plat->mmc, cmd, data); +} + +static int pxa_mmc_set_ios(struct udevice *dev) +{ + struct pxa_mmc_plat *plat = dev_get_platdata(dev); + struct pxa_mmc_priv *priv = dev_get_priv(dev); + + return pxa_mmc_set_ios_common(priv, &plat->mmc); +} + +static const struct dm_mmc_ops pxa_mmc_ops = { + .get_cd = NULL, + .send_cmd = pxa_mmc_send_cmd, + .set_ios = pxa_mmc_set_ios, +}; + +#if CONFIG_IS_ENABLED(BLK) +static int pxa_mmc_bind(struct udevice *dev) +{ + struct pxa_mmc_plat *plat = dev_get_platdata(dev); + + return mmc_bind(dev, &plat->mmc, &plat->cfg); +} +#endif + +U_BOOT_DRIVER(pxa_mmc) = { +#if CONFIG_IS_ENABLED(BLK) + .bind = pxa_mmc_bind, +#endif + .id = UCLASS_MMC, + .name = "pxa_mmc", + .ops = &pxa_mmc_ops, + .priv_auto_alloc_size = sizeof(struct pxa_mmc_priv), + .probe = pxa_mmc_probe, +}; +#endif /* !CONFIG_IS_ENABLED(DM_MMC) */ diff --git a/include/dm/platform_data/pxa_mmc_gen.h b/include/dm/platform_data/pxa_mmc_gen.h new file mode 100644 index 0000000000..9875bab2cf --- /dev/null +++ b/include/dm/platform_data/pxa_mmc_gen.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (c) 2019 Marcel Ziswiler + */ + +#ifndef __PXA_MMC_GEN_H +#define __PXA_MMC_GEN_H + +#include + +/* + * struct pxa_mmc_platdata - information about a PXA MMC controller + * + * @base: MMC controller base register address + */ +struct pxa_mmc_plat { + struct mmc_config cfg; + struct mmc mmc; + struct pxa_mmc_regs *base; +}; + +#endif /* __PXA_MMC_GEN_H */ From patchwork Mon May 20 00:45:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101756 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gL366Zrz9s6w for ; Mon, 20 May 2019 10:50:35 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 92D4CC21E0B; Mon, 20 May 2019 00:46:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id B9708C21DB6; Mon, 20 May 2019 00:45:49 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 779EAC21D8A; Mon, 20 May 2019 00:45:36 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id 8E12FC21DEC for ; Mon, 20 May 2019 00:45:32 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1MUXAC-1h21Lm2GoK-00QW2x; Mon, 20 May 2019 02:45:30 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:45:00 +0200 Message-Id: <20190520004502.8924-9-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:T0PJu20MPLY0BbX5jW4r+tOAYY+JdbmXk+Z8UTRZTQNSfutkSH0 GDohAky0g5kL+eRQN41TDiuXf7mp8GzUOqdwyfiAGDQLSDO5YiJNy84IKyUvzpGENqtxREs FplO3kOzQVWMCHJDgVjq42/0gtMzxk036zymw6Ns73VdkUGRAhQ9gnKjpQkN0sLNe36fILP TcyPp9l+7TCdMkBMYUQyw== X-UI-Out-Filterresults: notjunk:1; V03:K0:QT3LjGDF808=:HIfohNA/NG3dU6WC02RlmE jQ/vQsZmea0+PFUgAl286wH+gjaRtDuLW8BFDAqrgt5MVvgdK/Dox4nJ1YAhUszkWKRo0fxp2 Iu04c/MstF58Rjj2lqHLGHgTr3nOJ6xPETq47CH+Zv56+t0PN1tsm9aJMl2br1GYvmQfyNjHw iclM/lcq9YkTqOcpiqk/bU1SqVTwTQg0vUR3xIl5Vw79yyku1IrQ9/BFV0sg6TiS9lj1aQJp3 Q4yxnWTExkIegZY4lTXNORJXH8YpdgWTPIU/pQXH5t54F4adkf4YCo80TnoRBMmwVO875DsaU vtcmAb/yevEkTbhRmHI2p7DX75H/DbgeWPlSbdiKE/FMrOSVcB3eIvLszvQ8TCEYbPSni+J6I fZjLk1Q8miuF/SDL6n2Uh6BySa7mjGAbPqNyNY8Hp1gOYSMIi+Il21lsVF5MJ8b77COK2/FOf 9A2pzUWhQqN2ywbCmlfkofLrhUTUeDXCdCV2hETK3ky7fi5pNqSSWwZMr+bNLlV1Ity5sSUX4 FL7mlPKAYzsjOcbXRCTzuZmDLW+Pp+usZUm/5U1L49iuGNTp+cuimnd7g34ZtnPwrnl5N1Gu8 /JzIigYsobnEn9VzyvIfkdkdMrhZOplhnN/ve1vsgtU/WPClFRPYbbSn0F/srEXPPfUoks2QX F2OT3oNPHu3JnvHKpDoPYhAWHKNrB0TRsqFF4tTrOblnt3Qo/yywhq2GIwOjXQZokjKf9zilY Y32eW1Yj6w66C5VoJcwNrcvU7ko4dGgMBM7Hdw== Cc: Marek Vasut , Marcel Ziswiler Subject: [U-Boot] [PATCH v1 08/10] colibri_pxa270_defconfig: enable cmd_dm X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_CMD_DM. Signed-off-by: Marcel Ziswiler --- configs/colibri_pxa270_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig index a3c07d5887..c9d7e4e7ce 100644 --- a/configs/colibri_pxa270_defconfig +++ b/configs/colibri_pxa270_defconfig @@ -15,6 +15,7 @@ CONFIG_SYS_PROMPT="$ " # CONFIG_CMD_ELF is not set # CONFIG_CMD_EXPORTENV is not set # CONFIG_CMD_IMPORTENV is not set +CONFIG_CMD_DM=y # CONFIG_CMD_LOADB is not set # CONFIG_CMD_LOADS is not set CONFIG_CMD_MMC=y From patchwork Mon May 20 00:45:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101750 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gH43BjNz9s6w for ; Mon, 20 May 2019 10:48:00 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 26E69C21DE8; Mon, 20 May 2019 00:46:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id BB3DAC21E30; Mon, 20 May 2019 00:45:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id C51B3C21DB6; Mon, 20 May 2019 00:45:37 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.194]) by lists.denx.de (Postfix) with ESMTPS id A8CEFC21E31 for ; Mon, 20 May 2019 00:45:33 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1Mr8n4-1gqOK52qjG-00oFCT; Mon, 20 May 2019 02:45:32 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:45:01 +0200 Message-Id: <20190520004502.8924-10-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:97fli9BB6wIuBfpdwqIZcgzGpP4lfyxHQBdTMQtjSxMqEKYUBSh 1l5ZRKTuyDAvDq6Pf18DjSggTjoaM1ZT7hzuJj5Wb06BlbCt5+dku2abgxi5znhvR6+gLUa Z/PEn1bcPc36AHOfrEnpg3lnghCKAlG/ZjcdEfOrA+X+SdQukXXsujSIHnYnTfy58ZkBUbK nuT0i2B7UDMNE5Cz/JOmQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:NkEyp4Zlkh4=:7Tae2xK24b7/6l40tR59lg a0k/63ZrpjEHsFu33kS+Y5v/t3FytXZI+Jf236hrpgqUwyOD6pSzjOflQrW1EWL+CE+5YCBzR 3Mstx0S/yQDmWGz6dzxStrnfXftM9MmCG1Ol437hzpf2OyjhjA3MxIq+2dTwTO5G2TvbS9h1r Cdwj9pNDCWEdRiGNiT3BRxbyXIbg1rxr4FtMPeU/X0Iy8WuauRXujSvcvbKJy8zk620EX7iRA UPNWLNlSDSELuNxg4hFChRI+faiz5UPjFLXJhI8MWv4uo1uzqa4aYLSxD+3SqMtcWMu2zDvdp SM9fgOO2i5kMEGhCp0MQDuFDSGjHdMO9Ts7kh1gtX+QTnH6t6jIPEcKyfpnedQQU+oGOVPGLU BgxuAw0rrFQavLBxx/3A75SX0ZlKJBiGSMK4j1qqXH/2pKwenMaNRzKp/30owsajoTwSZa32y /ZTXhOuHwAjGMSGZGBXBehcxyHvOVF2y3PiteVJug1KQwQtwCsyfbGvFijoKCm0o8IcjNdiyj AP40ihjRvH9Sl9hi163sVMDL5FPP4Wln4+oIPcQHR2fzhj9hlNaXl988dKdF2CepCLSuFaUVC B578lagBouJkUpFs/ZNaRF6csz3C1MJBDYICXVAfep51ZUOmkPSgVo4c/Pwtnrk3UDs8TVHDS 17Jkhd4BilqO08812DipYYWPLN9yI9Pl5ddz2zdXmrSvTKbMRRpCQ4ovWBGg0n7dWRQBrvRfI ebAqYHmTwXlQ3S0N41ZkFiZ5VxrOLQU2WbaHfQ== Cc: Marek Vasut , Marcel Ziswiler Subject: [U-Boot] [PATCH v1 09/10] colibri_pxa270: add mmc platform data X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Add MMC platform data. While at it also fix trivial checkpatch.pl issues. Signed-off-by: Marcel Ziswiler --- board/toradex/colibri_pxa270/colibri_pxa270.c | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/board/toradex/colibri_pxa270/colibri_pxa270.c b/board/toradex/colibri_pxa270/colibri_pxa270.c index e9e17508a5..507bf579cf 100644 --- a/board/toradex/colibri_pxa270/colibri_pxa270.c +++ b/board/toradex/colibri_pxa270/colibri_pxa270.c @@ -3,7 +3,7 @@ * Toradex Colibri PXA270 Support * * Copyright (C) 2010 Marek Vasut - * Copyright (C) 2016 Marcel Ziswiler + * Copyright (C) 2016-2019 Marcel Ziswiler */ #include @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -32,7 +33,7 @@ int board_init(void) /* arch number of Toradex Colibri PXA270 */ gd->bd->bi_arch_number = MACH_TYPE_COLIBRI; - /* adress of boot parameters */ + /* address of boot parameters */ gd->bd->bi_boot_params = 0xa0000100; return 0; @@ -82,7 +83,7 @@ int board_usb_init(int index, enum usb_init_type init) writel(readl(UHCRHDA) | 0x100, UHCRHDA); /* Set port power control mask bits, only 3 ports. */ - writel(readl(UHCRHDB) | (0x7<<17), UHCRHDB); + writel(readl(UHCRHDB) | (0x7 << 17), UHCRHDB); /* enable port 2 */ writel(readl(UP2OCR) | UP2OCR_HXOE | UP2OCR_HXS | @@ -106,8 +107,6 @@ void usb_board_stop(void) udelay(10); writel(readl(CKEN) & ~CKEN10_USBHOST, CKEN); - - return; } #endif @@ -119,11 +118,22 @@ int board_eth_init(bd_t *bis) #endif #ifdef CONFIG_CMD_MMC +#if !CONFIG_IS_ENABLED(DM_MMC) int board_mmc_init(bd_t *bis) { pxa_mmc_register(0); return 0; } +#else /* !CONFIG_IS_ENABLED(DM_MMC) */ +static const struct pxa_mmc_plat mmc_platdata = { + .base = (struct pxa_mmc_regs *)MMC0_BASE, +}; + +U_BOOT_DEVICE(pxa_mmcs) = { + .name = "pxa_mmc", + .platdata = &mmc_platdata, +}; +#endif /* !CONFIG_IS_ENABLED(DM_MMC) */ #endif static const struct pxa_serial_platdata serial_platdata = { From patchwork Mon May 20 00:45:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcel Ziswiler X-Patchwork-Id: 1101754 X-Patchwork-Delegate: van.freenix@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ziswiler.com Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 456gJp6c2Fz9s6w for ; Mon, 20 May 2019 10:49:30 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id A00E6C21DFD; Mon, 20 May 2019 00:46:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 4989BC21DC1; Mon, 20 May 2019 00:45:45 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id D60BBC21D83; Mon, 20 May 2019 00:45:38 +0000 (UTC) Received: from mout.perfora.net (mout.perfora.net [74.208.4.197]) by lists.denx.de (Postfix) with ESMTPS id D8CCFC21E35 for ; Mon, 20 May 2019 00:45:34 +0000 (UTC) Received: from localhost.localdomain ([81.221.138.131]) by mrelay.perfora.net (mreueus004 [74.208.5.2]) with ESMTPSA (Nemesis) id 1Mrgkq-1gpq5g3HdM-00nhEh; Mon, 20 May 2019 02:45:33 +0200 From: Marcel Ziswiler To: u-boot@lists.denx.de Date: Mon, 20 May 2019 02:45:02 +0200 Message-Id: <20190520004502.8924-11-marcel@ziswiler.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520004502.8924-1-marcel@ziswiler.com> References: <20190520004502.8924-1-marcel@ziswiler.com> MIME-Version: 1.0 X-Provags-ID: V03:K1:dUBVb5rypzhDSEXN7INDIlakoIQPWYoU10rHDgXT+GZhZ3WnJID mEnCsHlt4GiAxPg7IOaiAkwhjEoVakT7YfzfWtQO4/nrXAZr3Fhu+1t7jPTEmfKDbNDgLT9 3edKx5R8XXC3jFfEEXkAjMu921l+lyPLgzutuyO4vkdaQnP4ZtWZ4XDKGNwJxI8ICHg1SUD kkH3Hb7ESTBIaa+lfHytQ== X-UI-Out-Filterresults: notjunk:1; V03:K0:JH3CrG9rI0A=:oF2Ni4G4zyhMFGL+Jp0Tpc 4cls5aFOHM9o5U+SZhRQMVz5SsLW9gJ9LLJ3jU9+Sv+JRI6dM9dN4VCgwKVq+NuGmCw3uI52r UGTD963a95o6jdxjFQFjXdoe7qPfwJMjGmEmOMO6V+2xDd81bcUnIJ4MeKu+9Ev45rFVi6aim TT6iaS7vBRnWkA5ZWiXoNrjXFn3PaUFCQDXmUcue4Kf5Lz6IEDhy3P10k8YNQGcyhpjl0UVlF VNDpo0Gn+yx2srw/obXYK22I/Lth6c6VNxyeGvvdpxVrJhqUeK1tYk41tmtnkxu1I7ponEhYH 8+Mffe2YlH3WpQX2EAho6IBIC2xExgNlKBCPVuj5l8giWw/X2U6YZg/oW9fgHfDtymapAZ4z8 0R44A62mJPNAj5UlXYuiBdgpMQNyCmKipzNPzaqQA1MPH3LKSx28ADaZUwdqJTiNrIdbZhV5g UoiWDlZg9ihpQrACiEa6wxZeCTCE8fVom4mdcrBGLLiioqqpHJjdsMJzLpA4iIsyOtSWoBamd 5Yn2bH6LTZVNRw0f4tZ6WFRb7CNzqYmP8OJWQ39/3HcddqjrSNnuQLoXrNdtekJDO4JQVETJ6 MRsGP3Om9TY2x3xoFp+9tl1CEmLU+BdVCnnDUkqTsBollBTOdjHJmZX8IewiMF+e41H1GW6e9 +jkspGFpkY+RzAvQdd8mduGwUoRNDa/kRQ8NipiHfkLgbH0ycCzqYrrFPUhVS3si1BuOydMxi 0PV3RwbAkS61R3QIju6q5ctdaWgIOPvBN9H6Cw== Cc: Marek Vasut , Marcel Ziswiler Subject: [U-Boot] [PATCH v1 10/10] colibri_pxa270_defconfig: enable dm_mmc X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Enable CONFIG_DM_MMC. Signed-off-by: Marcel Ziswiler Reviewed-by: Igor Opaniuk --- configs/colibri_pxa270_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/colibri_pxa270_defconfig b/configs/colibri_pxa270_defconfig index c9d7e4e7ce..609855fe7d 100644 --- a/configs/colibri_pxa270_defconfig +++ b/configs/colibri_pxa270_defconfig @@ -28,6 +28,7 @@ CONFIG_CMD_FAT=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y +CONFIG_DM_MMC=y CONFIG_PXA_MMC_GENERIC=y CONFIG_MTD_NOR_FLASH=y CONFIG_FLASH_CFI_DRIVER=y