From patchwork Wed Dec 11 06:17:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 1207464 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=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="MFfKahjf"; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Xmtj3Qbtz9sR7 for ; Wed, 11 Dec 2019 17:17:30 +1100 (AEDT) Received: from phobos.denx.de (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0B51C803C2; Wed, 11 Dec 2019 07:17:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=nxp.com header.i=@nxp.com header.b="MFfKahjf"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 42355801BA; Wed, 11 Dec 2019 07:17:19 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU, FORGED_SPF_HELO, SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from EUR03-VE1-obe.outbound.protection.outlook.com (mail-ve1eur03on0602.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe09::602]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4D490801BA for ; Wed, 11 Dec 2019 07:17:13 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=peng.fan@nxp.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y9ttAyAGe1uWO3ZiOC37EL3G30sDNlsRSI28+D8yAvnuwg83Vj8m/TMw6tq+Hyh6Qt9oZNX4DylXvyioR6nqzmvGBKlnif/9IehOBegOREoTSEOYGrAhovW6ekIZsVTwF2Xf54BEfEfFCSx46x8+8SGIAyvgCURiZR/wgXs8OvsH4C7+jhNJaFZyic4dSXA/Syn8SrCmRTzGZgGjnNB0M4zp7+zYfLQf8NNghFM7znYJ+/FnHDHubk19keGO1/1RFzzpy0jI9nZsZOXe0yYPCYF9BmFuBLo/OyumO30qKPRPcDapjt4IwiYRsaF3la5wbLQ/GOpsSJjtvsRbrL+qbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MBcd9+tHWVOClxKn2Xfee6cHfA5Cwjd6bpqfGstKpFo=; b=HDuq/3flI6vGjBj5V5dLZ1gAh6u5aSDP22X2CZjcG2HN+uPg63ORTaxSbmlF5GkpVLKBVqXA62h/B5tt6m207MslAH4DVoCDRhr3KBDm4toS0psVr5qRExkxzkyrYGYckyP50V0BUh+XPX/63N82W8EYfnA/Oo4ORRJI3lSmu0gFA+VwDkV0Xdwrw6yhCv+kNPJrZYjAnUMeeqiQIOVK8lJAx+ma025IDjSBlQo/rllzoHYbmkje1+HLv98hx4jxeJpQ/PTHecJzudAmyADXuOamONdShiFHMy/ApUaSeucC55TgJmwqD0vIf4YI7MZcC4WbS0XhkL2GT0InIRf7Kg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=MBcd9+tHWVOClxKn2Xfee6cHfA5Cwjd6bpqfGstKpFo=; b=MFfKahjfvUTHrUtsFKXTi+Uu7AkWtY8CAFpEnDLAXp+ogX5UJnIf7VaY2MEkQSXeuHof1/00CHxQgI8Mqrgkrv9BylO17tythOzL4HvbFGf/Lhd5JIoEdhybG07xVWizFWT7FzR8johhka3KhzEQnJgQg/c1YiLK5JiUA6RNcSM= Received: from AM0PR04MB4481.eurprd04.prod.outlook.com (52.135.147.15) by AM0PR04MB5796.eurprd04.prod.outlook.com (20.178.202.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2516.16; Wed, 11 Dec 2019 06:17:12 +0000 Received: from AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::505:87e7:6b49:3d29]) by AM0PR04MB4481.eurprd04.prod.outlook.com ([fe80::505:87e7:6b49:3d29%7]) with mapi id 15.20.2516.018; Wed, 11 Dec 2019 06:17:12 +0000 From: Peng Fan To: "sbabic@denx.de" , "festevam@gmail.com" Subject: [PATCH] imx: imx8mq: handle ESDHC in mxc_get_clock Thread-Topic: [PATCH] imx: imx8mq: handle ESDHC in mxc_get_clock Thread-Index: AQHVr+qgjAtsuRQqT0unNS15jrKyIA== Date: Wed, 11 Dec 2019 06:17:12 +0000 Message-ID: <20191211063554.24132-1-peng.fan@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.16.4 x-clientproxiedby: HK2PR02CA0164.apcprd02.prod.outlook.com (2603:1096:201:1f::24) To AM0PR04MB4481.eurprd04.prod.outlook.com (2603:10a6:208:70::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=peng.fan@nxp.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [119.31.174.71] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: be54ef73-a950-41e0-ebc5-08d77e01c296 x-ms-traffictypediagnostic: AM0PR04MB5796:|AM0PR04MB5796: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1227; x-forefront-prvs: 024847EE92 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(136003)(376002)(396003)(346002)(39860400002)(199004)(189003)(2906002)(66556008)(64756008)(6486002)(478600001)(6512007)(81166006)(8936002)(81156014)(5660300002)(36756003)(1076003)(44832011)(54906003)(4326008)(186003)(6506007)(2616005)(66946007)(66446008)(52116002)(86362001)(110136005)(8676002)(316002)(26005)(71200400001)(66476007)(32563001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM0PR04MB5796; H:AM0PR04MB4481.eurprd04.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: nxp.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ZHQYs7tEP4dq5tHhTaOa98GJEu4woQhA1kKtyGPy+O7LF0S+CVBAaXUnQyoM/XKFloLqinf8SS8uzCcSneYfEeA2HOpJcpr/dtXsD0eJ8q+RUbGmrsaqqv95D7EFGEzzrEsYgm92dO0sKoHxw0hos4onVsgJX9+jGRcDyhfbeaQZdEYASK7rUgv8Qo0cfIDkTX8VlSDVsFHrma0OuXg0HYKJxe38QrT31DfOfff7h8F5XZ0jo5cmucoxVShUd2LQ8nuwCizZm+BIgM7weiXmVadRgkmEdRIRY+Rgz7Hlx7Vr88uBITtTFBDJRP/rW8c/GCqyhkmzXz4FVlQOLIMF6NM4Jen2TSrjINAXtvFqy7M3L7Bp10AOGlrOohSmGaNsdttNafPN98rCz+En4x/D3KJe4PeIXDF8XABg8CA6t4zoIywWil9K4PI0aSB12mSXB5GyKPteTeXvLvoLVCOML331yU9NMnVf+fXdvXDdc9M= MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: be54ef73-a950-41e0-ebc5-08d77e01c296 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Dec 2019 06:17:12.4700 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ivROXg8fAKCj/b15r0/rP3gdd0GvmIt2qTtRXA0jw211gFkBVbbmuzHFuaT614ygjrRXz7cCdadjJmAxKBfRBw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5796 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.26 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "u-boot@lists.denx.de" , dl-uboot-imx Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.101.4 at phobos.denx.de X-Virus-Status: Clean fsl_esdhc_imx driver will call "mxc_get_clock(MXC_ESDHC_CLK + dev->seq)", however mxc_get_clock wrongly handle MXC_ESDHC_CLK as root clk and cause sd card could not be detected in U-Boot proper, as below: "Loading Environment from MMC... unable to select a mode" Handle MXC_ESDHC_CLK in mxc_get_clock to fix the issue. Signed-off-by: Peng Fan Tested-by: Baruch Siach Tested-by: Fabio Estevam --- arch/arm/mach-imx/imx8m/clock_imx8mq.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-imx/imx8m/clock_imx8mq.c b/arch/arm/mach-imx/imx8m/clock_imx8mq.c index 2db5bde211..878f2be166 100644 --- a/arch/arm/mach-imx/imx8m/clock_imx8mq.c +++ b/arch/arm/mach-imx/imx8m/clock_imx8mq.c @@ -326,16 +326,20 @@ unsigned int mxc_get_clock(enum mxc_clock clk) { u32 val; - if (clk == MXC_ARM_CLK) + switch(clk) { + case MXC_ARM_CLK: return get_root_clk(ARM_A53_CLK_ROOT); - - if (clk == MXC_IPG_CLK) { + case MXC_IPG_CLK: clock_get_target_val(IPG_CLK_ROOT, &val); val = val & 0x3; return get_root_clk(AHB_CLK_ROOT) / (val + 1); + case MXC_ESDHC_CLK: + return get_root_clk(USDHC1_CLK_ROOT); + case MXC_ESDHC2_CLK: + return get_root_clk(USDHC2_CLK_ROOT); + default: + return get_root_clk(clk); } - - return get_root_clk(clk); } u32 imx_get_uartclk(void)