From patchwork Wed Jan 15 14:05:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 1223558 X-Patchwork-Delegate: promsoft@gmail.com 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=85.214.62.61; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.a=rsa-sha256 header.s=mail20170921 header.b=WJORs7mc; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47yTdg1MCRz9sRm for ; Thu, 16 Jan 2020 01:06:27 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 63970817BF; Wed, 15 Jan 2020 15:06:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="WJORs7mc"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id BDC53817F2; Wed, 15 Jan 2020 15:06:18 +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.1 required=5.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id CBF20817B6 for ; Wed, 15 Jan 2020 15:06:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=samsung.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=m.szyprowski@samsung.com Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20200115140608euoutp0159aa6d1c80985f8d56a01156388e65ff~qFIIdkwAU0308703087euoutp01T for ; Wed, 15 Jan 2020 14:06:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20200115140608euoutp0159aa6d1c80985f8d56a01156388e65ff~qFIIdkwAU0308703087euoutp01T DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1579097168; bh=/ZOmADLdtF8591G131g6qm3nAI2+ZWkFbvVatjM3qrg=; h=From:To:Cc:Subject:Date:References:From; b=WJORs7mcqJFaVwwOYgaAjAOxbjVWThSxfpDcJrOI8nKR8YnZKvn0RzdcaQp7J8DMe Ye4qGVebKMONgjF6qgLz3h8wTadx1b4vfWUcJtyg8LMz9lx7qOumD5BnjcZy3FMEAd /lsxZLPjxNds8IheG7TEPkyiAk6+jAPFgTI5mMQs= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20200115140608eucas1p2523a908039e1c3171a04db6be3b40966~qFIIMmeHF2255322553eucas1p2B; Wed, 15 Jan 2020 14:06:08 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id E5.83.60679.05C1F1E5; Wed, 15 Jan 2020 14:06:08 +0000 (GMT) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20200115140607eucas1p2abbf759b7ebbe07b14455bb135c02fa0~qFIH3qQXV2719827198eucas1p2u; Wed, 15 Jan 2020 14:06:07 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20200115140607eusmtrp2796bd3bdf1d77f85c9766563e26e69ca~qFIH3ExDj1193511935eusmtrp2L; Wed, 15 Jan 2020 14:06:07 +0000 (GMT) X-AuditID: cbfec7f4-0e5ff7000001ed07-67-5e1f1c50d071 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 29.74.07950.F4C1F1E5; Wed, 15 Jan 2020 14:06:07 +0000 (GMT) Received: from AMDC2765.digital.local (unknown [106.120.51.73]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20200115140607eusmtip1f6082508171a7ce9f77658add4933578~qFIHjHnyU0058400584eusmtip1u; Wed, 15 Jan 2020 14:06:07 +0000 (GMT) From: Marek Szyprowski To: u-boot@lists.denx.de Subject: [PATCH] arm: exynos: Read default MMC device from XOM[7:5] pins Date: Wed, 15 Jan 2020 15:05:58 +0100 Message-Id: <20200115140558.6332-1-m.szyprowski@samsung.com> X-Mailer: git-send-email 2.17.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsWy7djPc7oBMvJxBtv+sVnc+NXGanH+/AZ2 i+fvLjNZrD1yl92i40gLo8XbvZ3sDmwe82adYPHYtKqTzePsnR2MHn1bVjEGsERx2aSk5mSW pRbp2yVwZWxtXsBasIWn4vmL46wNjEu4uhg5OSQETCQWf1nL3MXIxSEksIJRYvKVyawQzhdG ifPXPkA5nxklHl/uYINpOfHnLiNEYjmjxKn5MA5QS9/dTywgVWwChhJdb7vAOkQEJCR+9V8F K2IWOM4ocfPUJiaQhLCAh8SMtp9gNouAqsTDp8tZQWxeARuJQ4eusECsk5dYveEA2IUSAifY JP6/uMQIkXCReHT9JFSRsMSr41vYIWwZif875zNBNDQzSjw8t5YdwulhlLjcNAOq21rizrlf QPdxAN2kKbF+lz5E2FHiTdsZsLCEAJ/EjbeCIGFmIHPStunMEGFeiY42IYhqNYlZx9fBrT14 4RIzhO0hcfzpTbDThARiJSZ/+8o8gVFuFsKuBYyMqxjFU0uLc9NTi43yUsv1ihNzi0vz0vWS 83M3MQLj//S/4192MO76k3SIUYCDUYmHN+OPXJwQa2JZcWXuIUYJDmYlEd6TM2TjhHhTEiur Uovy44tKc1KLDzFKc7AoifMaL3oZKySQnliSmp2aWpBaBJNl4uCUamAM2P76zsNm9skx912y vkR80OVdvCmtSaiyvP6D5UHevxNPFbcVaR54F2xiPEH4/vTqObxnvRJO1r3Z2PMvQGeRr3/0 582nXpmFLzqTOaEm5Zgl+7PXfzfaK82V5paOZn26vVN82qw7V753anq1bI59xpN25LKBQprw XCk3PwFGz3sHV+X03eJSYinOSDTUYi4qTgQAUcxY7fsCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrLLMWRmVeSWpSXmKPExsVy+t/xu7r+MvJxBl9/6Vrc+NXGanH+/AZ2 i+fvLjNZrD1yl92i40gLo8XbvZ3sDmwe82adYPHYtKqTzePsnR2MHn1bVjEGsETp2RTll5ak KmTkF5fYKkUbWhjpGVpa6BmZWOoZGpvHWhmZKunb2aSk5mSWpRbp2yXoZWxtXsBasIWn4vmL 46wNjEu4uhg5OSQETCRO/LnL2MXIxSEksJRR4mHva2aIhIzEyWkNrBC2sMSfa11sEEWfGCU2 3X4CVsQmYCjR9RYkwckhIiAh8av/KtgkZoHTjBKP5y4ESwgLeEjMaPvJBGKzCKhKPHy6HGwq r4CNxKFDV1ggNshLrN5wgHkCI88CRoZVjCKppcW56bnFRnrFibnFpXnpesn5uZsYgUG37djP LTsYu94FH2IU4GBU4uE98E8uTog1say4MvcQowQHs5II78kZsnFCvCmJlVWpRfnxRaU5qcWH GE2Blk9klhJNzgdGRF5JvKGpobmFpaG5sbmxmYWSOG+HwMEYIYH0xJLU7NTUgtQimD4mDk6p BsZpU+5t6D/4nnf9+jZjZXnVoHtf/C5G5Qat/cLIca+8iL0zPOTjnjkuxemHv5V2qk2yfSaw n11+qawX/37movJDxyUtZ11XrHrHZibSff32M/0di9mu9qoc8apyc9iSn+/y2VmxRvLm3Hzr 3pB9G+fO4V18fef3yFuTw5t+zrY8lMlWftHt43IlluKMREMt5qLiRABbpmQKUAIAAA== X-CMS-MailID: 20200115140607eucas1p2abbf759b7ebbe07b14455bb135c02fa0 X-Msg-Generator: CA X-RootMTR: 20200115140607eucas1p2abbf759b7ebbe07b14455bb135c02fa0 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20200115140607eucas1p2abbf759b7ebbe07b14455bb135c02fa0 References: 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: Krzysztof Kozlowski , Marek Szyprowski 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 XOM pins provide information for iROM bootloader about the boot device. Those pins are mapped to lower bits of OP_MODE register (0x10000008), which is common for all Exynos SoC variants. Set the default MMC device id to reflect the boot device selected by XOM[7:5] pins (2 for the SD or 0 for the eMMC). Signed-off-by: Marek Szyprowski Reviewed-by: Lukasz Majewski Reviewed-by: Anand Moon --- arch/arm/mach-exynos/include/mach/cpu.h | 1 + board/samsung/common/board.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/arch/arm/mach-exynos/include/mach/cpu.h b/arch/arm/mach-exynos/include/mach/cpu.h index 766edeeb29..fb5fdaf3ba 100644 --- a/arch/arm/mach-exynos/include/mach/cpu.h +++ b/arch/arm/mach-exynos/include/mach/cpu.h @@ -17,6 +17,7 @@ #define EXYNOS4_GPIO_PART3_BASE 0x03860000 #define EXYNOS4_PRO_ID 0x10000000 +#define EXYNOS4_OP_MODE 0x10000008 #define EXYNOS4_SYSREG_BASE 0x10010000 #define EXYNOS4_POWER_BASE 0x10020000 #define EXYNOS4_SWRESET 0x10020400 diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c index ee2fc7971e..ac91c0a6fb 100644 --- a/board/samsung/common/board.c +++ b/board/samsung/common/board.c @@ -359,3 +359,17 @@ int board_usb_cleanup(int index, enum usb_init_type init) #endif return 0; } + +/** + * mmc_get_env_dev() - read boot MMC device id from XOM[7:5] pins. + */ +int mmc_get_env_dev(void) +{ + u32 mode = readl(EXYNOS4_OP_MODE) & 0x1C; + + if (mode == 0x04) + return 2; /* MMC2: SD */ + + /* MMC0: eMMC or unknown */ + return 0; +}