From patchwork Tue Sep 3 12:57:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Przemyslaw Marczak X-Patchwork-Id: 272235 X-Patchwork-Delegate: promsoft@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id CEEFD2C008F for ; Tue, 3 Sep 2013 22:58:38 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 714564A066; Tue, 3 Sep 2013 14:58:37 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Yja4GTAzDtEv; Tue, 3 Sep 2013 14:58:37 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B51C84A068; Tue, 3 Sep 2013 14:58:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 56CB84A068 for ; Tue, 3 Sep 2013 14:58:30 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qGo2t3zztRQg for ; Tue, 3 Sep 2013 14:58:25 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mailout4.w1.samsung.com (mailout4.w1.samsung.com [210.118.77.14]) by theia.denx.de (Postfix) with ESMTP id 316724A066 for ; Tue, 3 Sep 2013 14:58:18 +0200 (CEST) Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout4.w1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MSJ007H6VXT1I00@mailout4.w1.samsung.com> for u-boot@lists.denx.de; Tue, 03 Sep 2013 13:58:16 +0100 (BST) X-AuditID: cbfec7f4-b7f0a6d000007b1b-59-5225dce86f55 Received: from eusync4.samsung.com ( [203.254.199.214]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 88.BE.31515.8ECD5225; Tue, 03 Sep 2013 13:58:16 +0100 (BST) Received: from AMDC1186.digital.local ([106.116.147.185]) by eusync4.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MSJ0074JW11HN70@eusync4.samsung.com>; Tue, 03 Sep 2013 13:58:16 +0100 (BST) From: Przemyslaw Marczak To: u-boot@lists.denx.de Date: Tue, 03 Sep 2013 14:57:52 +0200 Message-id: <1378213073-25692-1-git-send-email-p.marczak@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJJMWRmVeSWpSXmKPExsVy+t/xa7ov7qgGGfRflbc42/SG3aLjSAuj xY7LN1gsJi+ez2zxdm8nuwOrx9k7Oxg9+rasYvQ4fmM7UwBzFJdNSmpOZllqkb5dAldG3+Xv LAWrBCv2vTdqYDzK18XIySEhYCLRMv86E4QtJnHh3nq2LkYuDiGBpYwSEy8+ZoVw+pgk1v54 wAxSxSZgILHn0hkwW0RAQuJX/1VGkCJmgV5GibOfZ7GDJIQFgiV+nJ7ECGKzCKhKTHjbzNLF yMHBK+Aq8aqhEsSUEFCQmDPJZgIj9wJGhlWMoqmlyQXFSem5hnrFibnFpXnpesn5uZsYId7/ soNx8TGrQ4wCHIxKPLwce1WChFgTy4orcw8xSnAwK4nw8p9SDRLiTUmsrEotyo8vKs1JLT7E yMTBKdXAuFHatOiMlPiaeG8uVRNXnibBRblqZ+30/iU38DvMV/OcsC91p2vXT1V1Fen/8Yc8 s68YM5c0WBi6+17InFo5+Yzb/9KoW4cqSlWUpLt+aS1vac371rEjbibPVA07nfezO99HHtGq m8nsdeu/deXKXIsKXXNeVd4e1t9+JXNP/za/V2dwMU2JpTgj0VCLuag4EQBd3Cpa3AEAAA== Cc: trini@ti.com, Kyungmin Park , Przemyslaw Marczak Subject: [U-Boot] [PATCH] arm:mmc:goni/exynos: Fix wrong mmc base register devices offset. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de On s5pc1xx mmc devices offset is multiply of 0x100000, wrong value was 0x10000. Register offset always points to mmc 0 before this change. Add macro definition of mmc dev register offset to s5pc1xx and exynos mmc. Signed-off-by: Przemyslaw Marczak Signed-off-by: Kyungmin Park CC: Minkyu Kang Acked-by: Jaehoon Chung --- arch/arm/include/asm/arch-exynos/mmc.h | 6 +++++- arch/arm/include/asm/arch-s5pc1xx/mmc.h | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-exynos/mmc.h b/arch/arm/include/asm/arch-exynos/mmc.h index 96610b8..98312d1 100644 --- a/arch/arm/include/asm/arch-exynos/mmc.h +++ b/arch/arm/include/asm/arch-exynos/mmc.h @@ -8,6 +8,8 @@ #ifndef __ASM_ARCH_MMC_H_ #define __ASM_ARCH_MMC_H_ +#define S5P_MMC_DEV_OFFSET 0x10000 + #define SDHCI_CONTROL2 0x80 #define SDHCI_CONTROL3 0x84 #define SDHCI_CONTROL4 0x8C @@ -55,7 +57,9 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width); static inline unsigned int s5p_mmc_init(int index, int bus_width) { - unsigned int base = samsung_get_base_mmc() + (0x10000 * index); + unsigned int base = samsung_get_base_mmc() + + (S5P_MMC_DEV_OFFSET * index); + return s5p_sdhci_init(base, index, bus_width); } #endif diff --git a/arch/arm/include/asm/arch-s5pc1xx/mmc.h b/arch/arm/include/asm/arch-s5pc1xx/mmc.h index 96610b8..55ff10b 100644 --- a/arch/arm/include/asm/arch-s5pc1xx/mmc.h +++ b/arch/arm/include/asm/arch-s5pc1xx/mmc.h @@ -8,6 +8,8 @@ #ifndef __ASM_ARCH_MMC_H_ #define __ASM_ARCH_MMC_H_ +#define S5P_MMC_DEV_OFFSET 0x100000 + #define SDHCI_CONTROL2 0x80 #define SDHCI_CONTROL3 0x84 #define SDHCI_CONTROL4 0x8C @@ -55,7 +57,9 @@ int s5p_sdhci_init(u32 regbase, int index, int bus_width); static inline unsigned int s5p_mmc_init(int index, int bus_width) { - unsigned int base = samsung_get_base_mmc() + (0x10000 * index); + unsigned int base = samsung_get_base_mmc() + + (S5P_MMC_DEV_OFFSET * index); + return s5p_sdhci_init(base, index, bus_width); } #endif