From patchwork Tue Jun 5 09:48:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Durga Prasad Paladugu X-Patchwork-Id: 925372 X-Patchwork-Delegate: monstr@monstr.eu 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=xilinx.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=xilinx.onmicrosoft.com header.i=@xilinx.onmicrosoft.com header.b="4ls72379"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 410Rp15VBZz9s1B for ; Tue, 5 Jun 2018 19:48:41 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 4BA6FC21FB5; Tue, 5 Jun 2018 09:48:38 +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_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,T_DKIM_INVALID 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 095FDC21EF2; Tue, 5 Jun 2018 09:48:35 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 4478DC21EF2; Tue, 5 Jun 2018 09:48:34 +0000 (UTC) Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0068.outbound.protection.outlook.com [104.47.34.68]) by lists.denx.de (Postfix) with ESMTPS id 85619C21E89 for ; Tue, 5 Jun 2018 09:48:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=83qULpXnUxFTTKEV47I+SFLBdE0rzz5AC86PVSINA0Q=; b=4ls723794y9KafwuFEcHvAlDHCbmZaYyLkrBzV/o7sYcgtpRLJw3M/arSOw+gGcJdLMLC4rz5OQFKVwi56vLPP1V8XHFkr1E5JRHSdYSWAptt/TKPpRzJPkgeNt1XtdS7y8on66nV8Zc/bk6R/VX+Mr0vhHreGzyCilS+iZudKQ= Received: from SN4PR0201CA0065.namprd02.prod.outlook.com (2603:10b6:803:20::27) by CY1PR0201MB1451.namprd02.prod.outlook.com (2a01:111:e400:5318::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.820.13; Tue, 5 Jun 2018 09:48:29 +0000 Received: from SN1NAM02FT035.eop-nam02.prod.protection.outlook.com (216.32.180.23) by SN4PR0201CA0065.outlook.office365.com (10.171.31.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.820.11 via Frontend Transport; Tue, 5 Jun 2018 09:48:29 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT035.mail.protection.outlook.com (10.152.72.145) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.820.8 via Frontend Transport; Tue, 5 Jun 2018 09:48:28 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1fQ8Zn-0001Xx-DJ for u-boot@lists.denx.de; Tue, 05 Jun 2018 02:48:27 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1fQ8Zi-0005MC-8U for u-boot@lists.denx.de; Tue, 05 Jun 2018 02:48:22 -0700 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id w559mHmH003306; Tue, 5 Jun 2018 02:48:18 -0700 Received: from [172.23.37.99] (helo=xhdsivadur40.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1fQ8Zd-0005Lg-Cv; Tue, 05 Jun 2018 02:48:17 -0700 From: Siva Durga Prasad Paladugu To: Date: Tue, 5 Jun 2018 15:18:32 +0530 Message-ID: <1528192112-7086-1-git-send-email-siva.durga.paladugu@xilinx.com> X-Mailer: git-send-email 2.7.4 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.2.0.1013-23620.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(2980300002)(438002)(189003)(199004)(305945005)(8936002)(9786002)(316002)(2351001)(54906003)(81156014)(81166006)(50466002)(8676002)(478600001)(59450400001)(48376002)(4326008)(106466001)(5890100001)(50226002)(36756003)(47776003)(63266004)(51416003)(7696005)(356003)(336012)(36386004)(77096007)(426003)(486006)(26005)(6666003)(126002)(476003)(2906002)(1857600001)(6916009)(2616005)(186003)(5660300001)(107886003)(8746002)(106002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0201MB1451; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; LANG:en; PTR:unknown-60-83.xilinx.com; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT035; 1:F3F+5Ks8iGNc336OWzKNfkI1WNA1QKEn/sFAION9sj2mRq80PcIa/gdBqyvFzcwHMP/6b+1QkxwjMY/b1WuTECWA7uirhKlMWhJ8qjGBQmVzcGy77jWhhUDNi5NDYgUY MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4608076)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060); SRVR:CY1PR0201MB1451; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1451; 3:a2b3qYyAFJu4kpXVLtQXmueyIjGYlYXLoc5vNGQPeGq6ExX1jdr1TXli7YfyizDcjMRE4eQ/OsXsaCCOeJ7J4uckl9AgWtM/DqdyXBtmq/pu0eyOjx1Wdb8VQEJaXQiBAY+4VaAsRUt7VjibK0vlDOpaIcjmHyIJGFHATtYDRKYbXAhUCusMfi/GIJXeAsarXjEv60mXJAdG++uCtvuzNRRTZGParybmTkyLTwz8vZwHsJcFIPI842drxIgN/cprNex7lZTB9KiKWN0fhlDjHZZ7pu5hSAlMyqZZ2AipUsBtzYjZH/gLbZCjE8UM2NTbH5xOjigTf+XMvXFGZKwd6Lfnd18ZlnFtqMGkB66Ct3Q=; 25:nUKE14nP9yGmcYbPfoDbv4TopfMAXnWPl/3qS/xax4N1bbU8Mqf6VRUs/wqjVkwY1RaXE7cH83R4ZEMpF2lVBFTdPSnGgLT6cxbfW/MImR2UEgwMVLQYd3flfMI6xJJxzt2bsQHUUBF8eHle7bqwD3H1BbGXJEh72V9e+QKrD6hqrw9TrZCCXqC5aiU0qUxGSm1gkb1dj6I+4iPj6lui20Wj/uuOsnORl8Lr0UHaPasmmQLBlTGn2MBEwf8nWLBaJf3iftLCAuo32EZLP/kst0RuIiPwMKkGRHvY7ilPD/Gbn5csX6nLl4HJYJZJ8diWCoI/yaBgKcocoDB8bUaDdQ== X-MS-TrafficTypeDiagnostic: CY1PR0201MB1451: X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1451; 31:/dW1PPvROOEugWQ3iXviOCV1rTNEztRJSHXl/jVgoxdFVgt3Rdhlr9V3fyaRRxN0MCzG/bAEMVc0y0m3CiGHmKxaVDQsU+sC13lAVhztkELQSyg2wQFqBID020IDxq/6oz3S5u9jthglRnigtRRg2K2rA+AuTAcn8pc/lBvIy3hQEkOyEWCg8Scubwxdny8+921jFKbzr9NDC+tZo9+qidVptoJBOH74d85moj+YHlo=; 20:riN1UQ44jH46n9U9mz+avCdQJNMhlmL29nvPL++RCJfJST4dSVPcaR5Kt85qz7zp2jXbTKUlpBTSWEZXLRQrlvzYUQklFbrLMhKEstAiDU/n6SOrkoK5K/kZbwjR6ZIJCg5evCG+0M1Zzd9AUw93uRZaEtBhN8I1uXEQUMeYvNno7Odfi7cbbPfkAzAxo8KEXzxIVDiSJdYeVEGCnDKkWDQecvuUwT4HZG54KXoKnfAOz2RCkdkxVg3gPMq/YcrWkZzotO3KXG1DXt3cOuuPMckAIkO0WYqC/0A8gM00qxIBE3OWaJZHvDy1t6o6vk9UdAC/gaClGBuX+alIMiR7VLAadM4rHa3efYHeJLfI2eEk7pkhIEzyWQ29qkGAEpL0VDcGJYo0mIvwwDNBMc01LLu4/opF2kaqtSbvEIpp+Irlj2GgR2+9ya1dOaviAhmrO6/BHmk6u9iWKfKdS4Iu4Xu9kN6HM6qFpmgQ9DOYICkpdYQDWiZORdvNBupV3/DW X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192813158149592); X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(5005006)(8121501046)(93006095)(93004095)(3231254)(944501410)(52105095)(10201501046)(3002001)(6055026)(149027)(150027)(6041310)(20161123564045)(20161123560045)(20161123562045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(6072148)(201708071742011)(7699016); SRVR:CY1PR0201MB1451; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0201MB1451; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1451; 4:EmU5djcGZgBCKpl0YvaZS92+8Che2cMEcZ+7DMqXUHGoq+5sBxlqvFfBCEgkB3kZvhP+AIA10DYG8p3J4rKCuc8tMA34HKXvjaJL3ZnHEl7VsNWmf0UFLBlF355yhP3ncxwtct/kQebc547+ZXMqYg6ReHb42Y2JZGp6jLc4EtrTIHI7jWrNLnHR55nz0235wCKCquQJdpwVXxPObKZHyHp+blIupPP2dhO+GepWD/P97m6molVO+XBhA6b4oPfCvwHvLb/G8Noth2XwYEcuwMvWexYG9+/ZUY+f7+g54HlEoEU6atkCCzwcB+FZbKLC X-Forefront-PRVS: 0694C54398 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0201MB1451; 23:rnVjdfJERI0QC0cC162tRX5tsiWVbksqwonXx8Y?= mS171KobtVo6S6YavPeKvbWsJNFXDXj7gCABFm1q4X45J0DodUB7+Nor2uP5ruUpoB+vAUabZlsqsUoo+KvzvGIxXsT5ekRDg1CR8LzLOgfdhYK0wp/X2KyLHd1Ija1/VIBocvymEdE7BtZ5SHBlHhDpgtPgH3Gr5kAlntsBqiXHulx75FCSDx0YpUy8kZL17EQt05NYUJsYZX6diPCLX8Sf+3ifPnxHjn5UoahLDT7cvJ8Ff4cRrPRxToB5vkDwNknXMElnJpGXxEdS9cWgtPwFdqiPN8uN3XRSuOZ5HbNaPe8yfzmzY4ot59hkBxuk329oHVVliYHy41TsGecCVrHiI/v0AgFwcVQRoW7it4zMGPCgccqSDTYL1f+YvKgcyYBGJTE0WemJQKAxa7Sp4Wa3M8Q+dwc4A4/LCaH0+NqocTES+/kKhqrwqfMFPvF0rY5ILG4L+/64zeZUsQYoSIJMDzIJIgocXtNuRhO69SkgzMvHvJoa5QPs0QhT8S3xTaN06jbhzagc5w5GqWN6PQJnyNcqSe1aOBrUYg4kUgAZEDTFzwDGAS35tDzksKwlyg/uVkVc3DtpVYAeGLgaoSAq5qT16Arge9grw8Lb+Szb9C1CJflhnQjniUuM5iGubibii8BqHFXZFW/MJNXbWeh8V6iK37N9jLaFJzbTNRSbhvTKc6SPpdIs2I6hLKfw1jflOarL0KwT6UMzNkqaAPpxDXJw7qi8Q9b9z7olOpK8XsO5C49b/0tY3TSjUCfy4GykjlqlmgcWT65hWeETwonjWH3BHmuObTAywouW9mSGQJVTfblJp23Tdwh+zFLWx9Xw/W0ybHXfzdClQVH3xkd6qFKlABLxPM2NsBGgP+UgIuod8AKAaYkb6VIxJCLhCJ7BDmeQVNkKq8b+R1cnNBM29B9MZAzcw4/DocBDmEYFLdug8lopw9A2TRL8Bk5u5hU0HMoktmj1wneZch+NHamvo/hWrlR8WIhTvybriILeEz7rEyPtcqgduxhYI8mut+XzmevPLrol00f85WjJVgWUGtwuHDuFoF6EzN8bBiXHwoRXijsi+zKj3Q1nGoU9ifEFXaQIsaAFibG+Kp8Kc+3vYe1BzTuyvwEm/JDALcAkZ/Q== X-Microsoft-Antispam-Message-Info: 8RAtVoVSkupZvPoE+OSdJLwqfPKB/gy/5ZmWF+91xqHzZ50mc5KQ3QPxjLUh41wGNVFn0oincrZAyXASc5u5Ysfjw4NxpCsd5qEScxCRoQdEoeqSkPGXHix9HSlz3WPLYQmaUe3lE68GFmr8Ty0/0YgRdQCJuE57Yi8BrxFwHWLOerO2tgCCnhEIfb+zHXiw X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1451; 6:prnwdrVa0YGyiBWD6o8rvWdZhwGewqPwJxt/hVUTYrw3qn8fFqGhFp+0KAU6OorJ1+LZp+uMtG4iIR4r3GyCpNKJ9mojD/JGPOqg2arBuc3Ib8NRUZCz5S4fNyw/vZRseVgkGvkWbVPNC9HwkT4uh3eZ5STkZLxST7dwTJ9+Q58/rSQ4l8tmG+6YhkSx600kRKyeiQv9ab88w5Jt1K5HoUpp4R1ROvrh6teyX3IzL0/cQT1TNJK+Q7RlrEr+sLaQTlHcu4NuPwOTjU6BxEbesKrikLSKj2AeygdNzQLtEkQChe4sz0lRA4Uu0aE9Pe8oCyswO3u5RUdt1VLHKZCGH210vQLYZgcU//PTCs2DQXAFg/OAmXaXByrmi3iuK6/LYMlj3pxVFpmgjgJGIiRVUdCRMfixkXibLVxBPIcyNjjNPA8LNJ9VpgaEG+xf1RIUYoLRj3HW06UledsJ7+2V0w==; 5:eKg1y50AcAI+HTmzkqJ35A0+F/t4Zh1OWb8IrkvjRr78piR3oLV5YMS2C+8HkV02eRw7wgbiB/F7Xjx0+HkuEWQYbv/cDRCQvuvWceEGXkznmsn9SLCsvwbehvk5NW5HgCw8pftv6RkSg0o6uI33eaxRxDQZsyePluVrMLM2S1c=; 24:VFH5s7FnXCbU2ulzJWAM8+d87rMS38JeVtcCd6HBr1EgKFnUt2iuKe618vnzcrj8f96wjpML4YA5nGnQfuAYO31vn6mUybnOu2yz+KOUqSQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0201MB1451; 7:htprRc4bcyhlhLBbTK22EC4XVeR7qAJK8Ge09u6+FH8KqolQvCSQt3z2dNcdEwZhU1DRMQ48xBW6zkPRX4S1QdQ1pBoTqmVY88UB27wOZBmM1JsNbb5SHEG2cNSdf9YVRv2M4sGTDUAeAdeF+EBVw0HUB5bMAd7JLlmbPyt3sbSIWv2WdjqTaEb3pxNRVjCawNZJmfvju190tpt0T/73FspTnawrdoTGniCoUXyqur7AYvvVCKk2Rv0N49920fKk X-MS-Office365-Filtering-Correlation-Id: 92647b22-59f6-4149-fe71-08d5cac97dc4 X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jun 2018 09:48:28.5405 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92647b22-59f6-4149-fe71-08d5cac97dc4 X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR0201MB1451 Cc: michal.simek@xilinx.com Subject: [U-Boot] [PATCH] arm64: zynqmp: Split emmc configuration into emmc0 and emmc1 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" This patch splits the current mini emmc configuration into emmc0 and emmc1 configurations because emmc is probed at boot time and on systems which have only one interface mini configuration is failing on unused interface. This patch also adds required clock node in dts and enables CONFIG_MMC_SDHCI_ZYNQ through defconfig. Signed-off-by: Siva Durga Prasad Paladugu --- arch/arm/dts/Makefile | 4 +- ...{zynqmp-mini-emmc.dts => zynqmp-mini-emmc0.dts} | 20 ++----- arch/arm/dts/zynqmp-mini-emmc1.dts | 67 ++++++++++++++++++++++ ...efconfig => xilinx_zynqmp_mini_emmc0_defconfig} | 3 +- configs/xilinx_zynqmp_mini_emmc1_defconfig | 49 ++++++++++++++++ 5 files changed, 127 insertions(+), 16 deletions(-) rename arch/arm/dts/{zynqmp-mini-emmc.dts => zynqmp-mini-emmc0.dts} (77%) create mode 100644 arch/arm/dts/zynqmp-mini-emmc1.dts rename configs/{xilinx_zynqmp_mini_emmc_defconfig => xilinx_zynqmp_mini_emmc0_defconfig} (94%) create mode 100644 configs/xilinx_zynqmp_mini_emmc1_defconfig -- 2.7.4 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately. diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 9e29fe6..6367b2d 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -147,7 +147,9 @@ dtb-$(CONFIG_ARCH_ZYNQ) += \ zynq-zturn.dtb \ zynq-zybo.dtb dtb-$(CONFIG_ARCH_ZYNQMP) += \ - zynqmp-mini-emmc.dtb \ + zynqmp-mini-emmc0.dtb \ + zynqmp-mini-emmc1.dtb \ + zynqmp-mini-nand.dtb \ zynqmp-mini-nand.dtb \ zynqmp-zcu100-revC.dtb \ zynqmp-zcu102-revA.dtb \ diff --git a/arch/arm/dts/zynqmp-mini-emmc.dts b/arch/arm/dts/zynqmp-mini-emmc0.dts similarity index 77% rename from arch/arm/dts/zynqmp-mini-emmc.dts rename to arch/arm/dts/zynqmp-mini-emmc0.dts index e5b3c5f..24dd1ab 100644 --- a/arch/arm/dts/zynqmp-mini-emmc.dts +++ b/arch/arm/dts/zynqmp-mini-emmc0.dts @@ -18,7 +18,6 @@ aliases { serial0 = &dcc; mmc0 = &sdhci0; - mmc1 = &sdhci1; }; chosen { @@ -36,6 +35,12 @@ u-boot,dm-pre-reloc; }; + clk_xin: clk_xin { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <200000000>; + }; + amba: amba { compatible = "simple-bus"; #address-cells = <2>; @@ -50,15 +55,6 @@ clock-names = "clk_xin", "clk_ahb"; xlnx,device_id = <0>; }; - - sdhci1: sdhci@ff170000 { - u-boot,dm-pre-reloc; - compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a"; - status = "disabled"; - reg = <0x0 0xff170000 0x0 0x1000>; - clock-names = "clk_xin", "clk_ahb"; - xlnx,device_id = <1>; - }; }; }; @@ -69,7 +65,3 @@ &sdhci0 { status = "okay"; }; - -&sdhci1 { - status = "okay"; -}; diff --git a/arch/arm/dts/zynqmp-mini-emmc1.dts b/arch/arm/dts/zynqmp-mini-emmc1.dts new file mode 100644 index 0000000..d1549b6 --- /dev/null +++ b/arch/arm/dts/zynqmp-mini-emmc1.dts @@ -0,0 +1,67 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * dts file for Xilinx ZynqMP Mini Configuration + * + * (C) Copyright 2018, Xilinx, Inc. + * + * Siva Durga Prasad + */ + +/dts-v1/; + +/ { + model = "ZynqMP MINI EMMC"; + compatible = "xlnx,zynqmp"; + #address-cells = <2>; + #size-cells = <2>; + + aliases { + serial0 = &dcc; + mmc0 = &sdhci1; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x20000000>; + }; + + dcc: dcc { + compatible = "arm,dcc"; + status = "disabled"; + u-boot,dm-pre-reloc; + }; + + clk_xin: clk_xin { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <200000000>; + }; + + amba: amba { + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges; + + sdhci1: sdhci@ff170000 { + u-boot,dm-pre-reloc; + compatible = "xlnx,zynqmp-8.9a", "arasan,sdhci-8.9a"; + status = "disabled"; + reg = <0x0 0xff170000 0x0 0x1000>; + clock-names = "clk_xin", "clk_xin"; + xlnx,device_id = <1>; + }; + }; +}; + +&dcc { + status = "okay"; +}; + +&sdhci1 { + status = "okay"; +}; diff --git a/configs/xilinx_zynqmp_mini_emmc_defconfig b/configs/xilinx_zynqmp_mini_emmc0_defconfig similarity index 94% rename from configs/xilinx_zynqmp_mini_emmc_defconfig rename to configs/xilinx_zynqmp_mini_emmc0_defconfig index a1ab39e..ffb9693 100644 --- a/configs/xilinx_zynqmp_mini_emmc_defconfig +++ b/configs/xilinx_zynqmp_mini_emmc0_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc" CONFIG_ARCH_ZYNQMP=y CONFIG_SYS_TEXT_BASE=0x10000 # CONFIG_CMD_ZYNQMP is not set -CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc" +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc0" CONFIG_ENV_VARS_UBOOT_CONFIG=y CONFIG_FIT=y CONFIG_BOOTDELAY=-1 @@ -45,4 +45,5 @@ CONFIG_OF_EMBED=y # CONFIG_DM_DEVICE_REMOVE is not set CONFIG_DM_MMC=y CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ZYNQ=y # CONFIG_EFI_LOADER is not set diff --git a/configs/xilinx_zynqmp_mini_emmc1_defconfig b/configs/xilinx_zynqmp_mini_emmc1_defconfig new file mode 100644 index 0000000..edca32d --- /dev/null +++ b/configs/xilinx_zynqmp_mini_emmc1_defconfig @@ -0,0 +1,49 @@ +CONFIG_ARM=y +CONFIG_SYS_CONFIG_NAME="xilinx_zynqmp_mini_emmc" +CONFIG_ARCH_ZYNQMP=y +CONFIG_SYS_TEXT_BASE=0x10000 +# CONFIG_CMD_ZYNQMP is not set +CONFIG_DEFAULT_DEVICE_TREE="zynqmp-mini-emmc1" +CONFIG_ENV_VARS_UBOOT_CONFIG=y +CONFIG_FIT=y +CONFIG_BOOTDELAY=-1 +CONFIG_SUPPORT_RAW_INITRD=y +# CONFIG_DISPLAY_CPUINFO is not set +CONFIG_BOARD_EARLY_INIT_R=y +# CONFIG_CMDLINE_EDITING is not set +# CONFIG_AUTO_COMPLETE is not set +CONFIG_SYS_PROMPT="ZynqMP> " +# CONFIG_CMD_BDI is not set +# CONFIG_CMD_CONSOLE is not set +# CONFIG_CMD_BOOTD is not set +# CONFIG_CMD_BOOTM is not set +# CONFIG_CMD_BOOTI is not set +# CONFIG_CMD_GO is not set +# CONFIG_CMD_RUN is not set +# CONFIG_CMD_IMI is not set +# CONFIG_CMD_XIMG is not set +# CONFIG_CMD_EXPORTENV is not set +# CONFIG_CMD_IMPORTENV is not set +# CONFIG_CMD_EDITENV is not set +# CONFIG_CMD_SAVEENV is not set +# CONFIG_CMD_ENV_EXISTS is not set +# CONFIG_CMD_CRC32 is not set +# CONFIG_CMD_DM is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set +CONFIG_CMD_MMC=y +# CONFIG_CMD_ECHO is not set +# CONFIG_CMD_ITEST is not set +# CONFIG_CMD_SOURCE is not set +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_OF_EMBED=y +# CONFIG_NET is not set +# CONFIG_DM_WARN is not set +# CONFIG_DM_DEVICE_REMOVE is not set +CONFIG_DM_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_ZYNQ=y +# CONFIG_EFI_LOADER is not set