From patchwork Wed Oct 11 14:23:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 824456 X-Patchwork-Delegate: sbabic@denx.de 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=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yBx7D1ZZMz9s7c for ; Thu, 12 Oct 2017 01:24:08 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id E5FE0C21D92; Wed, 11 Oct 2017 14:23:56 +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=BAD_ENC_HEADER, RCVD_IN_MSPIKE_H2, 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 7FE6EC21D92; Wed, 11 Oct 2017 14:23:54 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 8ED31C21D92; Wed, 11 Oct 2017 14:23:52 +0000 (UTC) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0046.outbound.protection.outlook.com [104.47.32.46]) by lists.denx.de (Postfix) with ESMTPS id A1B57C21D6A for ; Wed, 11 Oct 2017 14:23:51 +0000 (UTC) Received: from MWHPR03CA0021.namprd03.prod.outlook.com (10.175.133.159) by BN3PR03MB2355.namprd03.prod.outlook.com (10.166.74.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7; Wed, 11 Oct 2017 14:23:49 +0000 Received: from BY2FFO11FD044.protection.gbl (2a01:111:f400:7c0c::150) by MWHPR03CA0021.outlook.office365.com (2603:10b6:300:117::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.7 via Frontend Transport; Wed, 11 Oct 2017 14:23:48 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD044.mail.protection.outlook.com (10.1.14.229) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.77.10 via Frontend Transport; Wed, 11 Oct 2017 14:23:48 +0000 Received: from r49496.am.freescale.net (r49496.am.freescale.net [10.29.244.89]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v9BENkfE030824; Wed, 11 Oct 2017 07:23:46 -0700 From: Fabio Estevam To: Date: Wed, 11 Oct 2017 11:23:40 -0300 Message-ID: <1507731820-27535-1-git-send-email-fabio.estevam@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131522054284894291; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39860400002)(376002)(346002)(39380400002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(305945005)(5660300001)(77096006)(48376002)(50466002)(16586007)(81166006)(81156014)(47776003)(5003940100001)(8676002)(316002)(54906003)(86362001)(105606002)(4326008)(8656003)(53936002)(36756003)(356003)(6916009)(498600001)(50226002)(33646002)(189998001)(2351001)(6666003)(106466001)(8936002)(97736004)(50986999)(68736007)(104016004)(85426001)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:BN3PR03MB2355; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD044; 1:pIUyG9r2szYTzNLuaCjNXcROfrnI5nhz47hKXTyca94DMS2WkxmdjuARv068vEp01OiEEClpRGT4DOJuMkYPwAKUtZr4f2RE7Tl6347S2zAAfDZQSZJ9lO/1IceXtPxm MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48b97a10-4c30-4719-7ef2-08d510b3b03c X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017052603199)(201703131430075)(201703131517081); SRVR:BN3PR03MB2355; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2355; 3:hJidLm25aYdHsXEDKcv27aB37pIRvc1O8HyPYe5ZlnpclPVUGjF2oG2VusvdXMMuybUmC3HHCE43SZxg0PcLoUiSqQI5O3nVf6rcXGj12PnbvuUaIvkjti/nXHRjtmPXJTRdtN0AvBUfiLoXvhcGwXmtxKGXFWm/ViedgIXIKJUOHXNPMQBtj1RhOyVDjU6rjQyEF5wv7779Qe8/q4xD8IrhTD1vmctP0mnwWUao0w7SCv+jFiCOyjMPRdDX05H1dNTvAMoaCipfoe6zHjaDdPK3D7nVdnGRtRtr6yrKuWB3Go+ZpKsF5FfpY2lsBiR6gQEjzxdJZHlvMzLgBINgjiv8V5fbBGmaLvnXAgoSlN4=; 25:R2BJmeYmIHcrcQULo2ZygnGLqEJQkdOzLRmp2m6YHp89fy3IWQKluidhCCXWyx29dPFcq80XS93OQa+8aidIKUzbXWg/30iuXkz6eD1h0wLdOIjW+TUgB6kKINem5INDMO9z64sKmCKEXP5vOBxqnigerjS/ugUjWBAHoe/to1VftdaxyRLIj3aigvWZF4XYFd08q/G6JtVBwoPICT+06F6RjqVrbdklQyAasXsBL6rhcTCEkWJqSusul+XP5YVTaZ+X+HYmQkVOdTFIAzSFXSYD/89O/HJDug59Vp/33hZd6JYxRymgUz9gYvFBp9sJUEqtFtucuQJ4KYrE+blgwA== X-MS-TrafficTypeDiagnostic: BN3PR03MB2355: X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2355; 31:uPf6TIxtU3FxjERCq1V32jQs27qRe75FWwpas8IwdgLQm+JxQaA1V+0RuJId8AD2/PgLp3RPkt4FVOblOEvcQGx8EBaJ4P1YWF+qJUv/M1FN8+obgJLnVONtFp+Jf+Pq0tPkRlFrqfen4utqHIzEaovJ5O/mcuyhykpHNkB2HgylafmUmlLOSN03Y59afbqiX5LJWgB2pDPrTG8KYZ6atJdh7E2yrJT1Rtc8iPuEPus=; 4:ZasKyKc+MFmrhWW57XD2ILIkCFdGtMCE3tnsvnzSbGLm8pkER6R/xRdmBjgP1BUhA4iWYewT6z9lmKB4jc705i6dNoojjbl7WxHnLAOAflJf6KVMNyxtceGB4dL+5y+BELP8fKUqxtFI4f5FrVJdsh3zmKVR92MmfH/Ii/I8EXGkKT/zzFz0ol+OIQoY3zomujXzwRm1Nb4uB0zpsYZoia2nbbCoYrZ4Cjmu6SHtrJQsfelr5ahaFYGuwBl6P6deUn4t1D2bcJIu4ieb7slfBc2AOvsoGNNQpiTinQZmCIQ= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(100000703101)(100105400095)(6055026)(6096035)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123559100)(20161123563025)(20161123556025)(20161123561025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:BN3PR03MB2355; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:BN3PR03MB2355; X-Forefront-PRVS: 0457F11EAF X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2355; 23:COrHoyCv+ciqPw3v56AAGwocA3EHSWVD/ypnpNzkx?= dd3A53UeNGi3fY1XPi1xbuOHdV5SpQ72nvfJIFWyW762iBrBvjdEJIGpLC3LvWgVJN69Y2jvf6di8+fv43+0aZV1C0vzI3krYGXcvrnIoQ2cvl3lUG2zkp6GwVyY/htJxejBBwnUxxyebNzyAZGj0SZ8ybb9p5nukOaM5fiVd+VIOpXyKYXvtD9FYk6hU4624xTZUYQM2nweRIEgb4mNczR+XCFcIDj7jQyR936h86d72v6LZqDOpapWPg6Tj5ayvzhFjp4eQwW5RUYIxsPPaxj9NhRJdcmHDt1+u9BrwGpRXPiiBAMRU2Ycafc2vXAmE1uMArAym+Ix9kpRqiX4YIeXGLukxRhIsjNua6vcnVgJfvkelvjSUaKRMc8UfTl7zB91Httu/njg9pbglvggJwT1x5E8E/Fwccw0riqtgA6JnVxKArnsK7h4CmR7a3ZYmvs8cht5JQqNi389n0I+QLVVUs521dqPEEVZkBkxMvEmTAC3bYAXJ7zceoSMmn9Plu9lt+aYWoL9ENT8reQpJSVlan+gLWw6qt7nRKBgG3vjy075CU+Ds0frbAYMh+1wdLM26JzhYOksO37mywQmX4nEciZ5DwtmmBISGhZ327EHO6/cDNIczVMI2Bp/gsK7uzSO0eLlKVs6znUKgHk07BWd/I2HVgff8FsOkkGxChp1WI/ThfAwbC8CiW/k1vUeTPcRE7mQJro5TyX1+dw0awIvcpedbihwk+N7SDWH8l9YWmYxvh4h81dlH5lCk0uPkg1eDUdfZU0SK2DegxShL6fiDv2c2V9O1W0PFpcftJNmHCXtVfBawkrOSISg1H/oGig4amdeFbT7t7KJWO3cJvcNa49i4ofZcGZy/v3cOwmGx0IyA5F221iKur8S+kVtUROHMvpUynA9Zv6Iu9UsvpJaMPzvv+ieLaPKuUj8VoQrp5ZglWtMHJqykpwmWCRwWR3tPEtV3RFKyj1GvWBbVm/ES3D4VvstD2mSEZJOpBui1JU2mwsqrndbhNzMEd2cmIx/1XkyfcGzF+s+MMFLAwqF/a4ZsNQL6UZpt0EbJxAgKiUmcu53xwCP+IIly46/Sk= X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2355; 6:dm437a9xjbWUl0DimeJSh6jfWujJdviQguH3YjgXmGa01SVtLLDG6s9ppp8t+2tnwboayP8Y17ROgsMwgLW3g0/2I8oFJSfjSL5bvC8pg7SFeTndJzfFRUPgl1oFDEulZxnlnNPXUWCNc94F8S73XcAangx6ZkbOPEy0Z8keLA78pWTMxU2DmIVr/jOLAdkihA3DH50YmgQQswCj5pX7Q4BS2g4wt6cUXIAQbbWLm3izwtu4iiOJA/ss0og8UVurq/RX+uMhCxrPf9khHEgKNjgxZEHneQRjocEWlzMJD3r+V5dtMova3YrrLH2X3zLOMXeNyVUnptr33zMM5mBvVQ==; 5:nRsZ3PeN7zRkZOx+V4kcYqWhZm402Bbao7rRN8EzuFrQeM42m/SvwqwLElSxn2p4aUxSdXrGSPz2eYbc8+vkbr2v5+Vv9ghxPfWY/HgS4WjgxhUCcT1oclrLXPKYqKEiRwmw9if7w2lg03VWZzB//g==; 24:qs4x+SajArOjQYpIVLfAt9jBrfks4jwHjJbuZT/PBbKsv6HXVi4iMVlyTAWBuzRlnCvvVQ1SPZKFG85xzX4zv049gEbWnuScFsstISlIJjE=; 7:LBxrRTVz2HaPa+yUQP/4xZjJiy24sWIquHNJeHid17OQKkfryo9hndCaJNm2ERQlZtCRVxk/wUwrD2olO70QNP8Q+iH0BLjLEeR8jMv74JpVWdtpKsKh1qnYKlxdmb6504nWgpNE3Ru1qCrZsfJ/ZEfYPbb4veKZmfxOWiYDmUoCMyiUabj5NRO4uC0rq4I5ufQ2jJtq85cIdPcU2uukTqRtObVZb+FGN1NT8TQsfbE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Oct 2017 14:23:48.2866 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2355 Cc: Fabio Estevam , u-boot@lists.denx.de Subject: [U-Boot] [PATCH] mx7dsabresd: Remove CONFIG_DM_MMC to avoid regression 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" Since U-Boot 2017.09 it is no longer possible to boot a kernel from SD card: U-Boot 2017.11-rc1-00149-g38c8107-dirty (Oct 11 2017 - 09:55:22 -0300) CPU: Freescale i.MX7D rev1.2 1000 MHz (running at 792 MHz) CPU: Commercial temperature grade (0C to 95C) at 35C Reset cause: POR Model: Freescale i.MX7 SabreSD Board Board: i.MX7D SABRESD in non-secure mode DRAM: 1 GiB MMC: MMC/SD: Reset never completed. MMC Device 0 not found *** Warning - No MMC card found, using default environment While a proper fix is not available, remove CONFIG_DM_MMC and register the USDHC1 port in the old way, so that this board can boot a kernel again. Signed-off-by: Fabio Estevam --- board/freescale/mx7dsabresd/mx7dsabresd.c | 42 +++++++++++++++++++++++++++++++ configs/mx7dsabresd_defconfig | 1 - 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/board/freescale/mx7dsabresd/mx7dsabresd.c b/board/freescale/mx7dsabresd/mx7dsabresd.c index 5819b18..12f7c58 100644 --- a/board/freescale/mx7dsabresd/mx7dsabresd.c +++ b/board/freescale/mx7dsabresd/mx7dsabresd.c @@ -29,6 +29,9 @@ DECLARE_GLOBAL_DATA_PTR; #define UART_PAD_CTRL (PAD_CTL_DSE_3P3V_49OHM | \ PAD_CTL_PUS_PU100KOHM | PAD_CTL_HYS) +#define USDHC_PAD_CTRL (PAD_CTL_DSE_3P3V_32OHM | PAD_CTL_SRE_SLOW | \ + PAD_CTL_HYS | PAD_CTL_PUE | PAD_CTL_PUS_PU47KOHM) + #define ENET_PAD_CTRL (PAD_CTL_PUS_PU100KOHM | PAD_CTL_DSE_3P3V_49OHM) #define ENET_PAD_CTRL_MII (PAD_CTL_DSE_3P3V_32OHM) @@ -191,6 +194,18 @@ static iomux_v3_cfg_t const fec1_pads[] = { MX7D_PAD_GPIO1_IO11__ENET1_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL_MII), }; +static iomux_v3_cfg_t const usdhc1_pads[] = { + MX7D_PAD_SD1_CLK__SD1_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_CMD__SD1_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_DATA0__SD1_DATA0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_DATA1__SD1_DATA1 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_DATA2__SD1_DATA2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_DATA3__SD1_DATA3 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + + MX7D_PAD_SD1_CD_B__GPIO5_IO0 | MUX_PAD_CTRL(USDHC_PAD_CTRL), + MX7D_PAD_SD1_RESET_B__GPIO5_IO2 | MUX_PAD_CTRL(USDHC_PAD_CTRL), +}; + static void setup_iomux_fec(void) { imx_iomux_v3_setup_multiple_pads(fec1_pads, ARRAY_SIZE(fec1_pads)); @@ -218,6 +233,33 @@ int mmc_map_to_kernel_blk(int dev_no) return dev_no; } +#define USDHC1_CD_GPIO IMX_GPIO_NR(5, 0) +#define USDHC1_PWR_GPIO IMX_GPIO_NR(5, 2) + +static struct fsl_esdhc_cfg usdhc_cfg[3] = { + {USDHC1_BASE_ADDR, 0, 4}, +}; + +int board_mmc_getcd(struct mmc *mmc) +{ + return !gpio_get_value(USDHC1_CD_GPIO); +} + +int board_mmc_init(bd_t *bis) +{ + imx_iomux_v3_setup_multiple_pads(usdhc1_pads, ARRAY_SIZE(usdhc1_pads)); + gpio_request(USDHC1_CD_GPIO, "usdhc1_cd"); + gpio_direction_input(USDHC1_CD_GPIO); + gpio_request(USDHC1_PWR_GPIO, "usdhc1_pwr"); + gpio_direction_output(USDHC1_PWR_GPIO, 0); + udelay(500); + gpio_direction_output(USDHC1_PWR_GPIO, 1); + usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); + return fsl_esdhc_initialize(bis, &usdhc_cfg[0]); + + return 0; +} + #ifdef CONFIG_FEC_MXC int board_eth_init(bd_t *bis) { diff --git a/configs/mx7dsabresd_defconfig b/configs/mx7dsabresd_defconfig index 26250fd..9e07a94 100644 --- a/configs/mx7dsabresd_defconfig +++ b/configs/mx7dsabresd_defconfig @@ -44,7 +44,6 @@ CONFIG_DFU_RAM=y CONFIG_DM_GPIO=y CONFIG_DM_74X164=y CONFIG_DM_I2C=y -CONFIG_DM_MMC=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_EON=y CONFIG_PHYLIB=y