From patchwork Fri Nov 2 17:39:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vipin Kumar X-Patchwork-Id: 196690 X-Patchwork-Delegate: vipin.kumar@st.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 71E232C00D0 for ; Sat, 3 Nov 2012 05:02:07 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 45B2E4AB68; Fri, 2 Nov 2012 19:01:51 +0100 (CET) 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 MNp3xaTMTszH; Fri, 2 Nov 2012 19:01:50 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3D09E4A99C; Fri, 2 Nov 2012 19:00:46 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 11F004A99C for ; Fri, 2 Nov 2012 19:00:44 +0100 (CET) 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 1s8B7lE8sORa for ; Fri, 2 Nov 2012 19:00:34 +0100 (CET) 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 eu1sys200aog116.obsmtp.com (eu1sys200aog116.obsmtp.com [207.126.144.141]) by theia.denx.de (Postfix) with ESMTPS id 2711A4A8B7 for ; Fri, 2 Nov 2012 19:00:07 +0100 (CET) Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob116.postini.com ([207.126.147.11]) with SMTP ID DSNKUJQKJpGOLDoG82shE6sMn/vyCEhtErnr@postini.com; Fri, 02 Nov 2012 18:00:08 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 7C88D170; Fri, 2 Nov 2012 17:34:47 +0000 (GMT) Received: from Webmail-ap.st.com (eapex1hubcas2.st.com [10.80.176.10]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id AC858107D; Fri, 2 Nov 2012 17:43:00 +0000 (GMT) Received: from localhost (10.251.136.62) by Webmail-ap.st.com (10.80.176.7) with Microsoft SMTP Server (TLS) id 8.3.245.1; Sat, 3 Nov 2012 01:42:59 +0800 From: Vipin Kumar To: Date: Fri, 2 Nov 2012 23:09:38 +0530 Message-ID: <98b1ae8a0646cc444f3f57a102bf5e1b0adb6993.1351877185.git.vipin.kumar@st.com> X-Mailer: git-send-email 1.7.10.rc2.10.gb47606 In-Reply-To: References: MIME-Version: 1.0 Cc: sr@denx.de, spear-devel@list.st.com Subject: [U-Boot] [SPEAr Fixes PATCH 05/11] spear: Append MISC_ as prefix to misc register bitmasks 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: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Signed-off-by: Vipin Kumar --- arch/arm/cpu/arm926ejs/spear/cpu.c | 4 ++-- arch/arm/cpu/arm926ejs/spear/spear600.c | 22 +++++++++------------- arch/arm/include/asm/arch-spear/misc.h | 10 ++++++++-- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/arch/arm/cpu/arm926ejs/spear/cpu.c b/arch/arm/cpu/arm926ejs/spear/cpu.c index 1301608..311f31b 100644 --- a/arch/arm/cpu/arm926ejs/spear/cpu.c +++ b/arch/arm/cpu/arm926ejs/spear/cpu.c @@ -44,8 +44,8 @@ int arch_cpu_init(void) periph1_clken |= MISC_UART0ENB; periph_clk_cfg = readl(&misc_p->periph_clk_cfg); - periph_clk_cfg &= ~CONFIG_SPEAR_UARTCLKMSK; - periph_clk_cfg |= CONFIG_SPEAR_UART48M; + periph_clk_cfg &= ~MISC_UARTCLKMSK; + periph_clk_cfg |= MISC_UART48M; writel(periph_clk_cfg, &misc_p->periph_clk_cfg); #endif #if defined(CONFIG_DESIGNWARE_ETH) diff --git a/arch/arm/cpu/arm926ejs/spear/spear600.c b/arch/arm/cpu/arm926ejs/spear/spear600.c index f4ec10a..bd8cb7a 100644 --- a/arch/arm/cpu/arm926ejs/spear/spear600.c +++ b/arch/arm/cpu/arm926ejs/spear/spear600.c @@ -138,8 +138,9 @@ void soc_init(void) */ static u32 read_bootstrap(void) { - return (readl(CONFIG_SPEAR_BOOTSTRAPCFG) >> CONFIG_SPEAR_BOOTSTRAPSHFT) - & CONFIG_SPEAR_BOOTSTRAPMASK; + struct misc_regs *misc_p = (struct misc_regs *)CONFIG_SPEAR_MISCBASE; + + return readl(&misc_p->auto_cfg_reg) & MISC_BOOTSTRAPMASK; } int snor_boot_selected(void) @@ -148,16 +149,13 @@ int snor_boot_selected(void) if (SNOR_BOOT_SUPPORTED) { /* Check whether SNOR boot is selected */ - if ((bootstrap & CONFIG_SPEAR_ONLYSNORBOOT) == - CONFIG_SPEAR_ONLYSNORBOOT) + if ((bootstrap & MISC_ONLYSNORBOOT) == MISC_ONLYSNORBOOT) return TRUE; - if ((bootstrap & CONFIG_SPEAR_NORNANDBOOT) == - CONFIG_SPEAR_NORNAND8BOOT) + if ((bootstrap & MISC_NORNANDBOOT) == MISC_NORNAND8BOOT) return TRUE; - if ((bootstrap & CONFIG_SPEAR_NORNANDBOOT) == - CONFIG_SPEAR_NORNAND16BOOT) + if ((bootstrap & MISC_NORNANDBOOT) == MISC_NORNAND16BOOT) return TRUE; } @@ -170,12 +168,10 @@ int nand_boot_selected(void) if (NAND_BOOT_SUPPORTED) { /* Check whether NAND boot is selected */ - if ((bootstrap & CONFIG_SPEAR_NORNANDBOOT) == - CONFIG_SPEAR_NORNAND8BOOT) + if ((bootstrap & MISC_NORNANDBOOT) == MISC_NORNAND8BOOT) return TRUE; - if ((bootstrap & CONFIG_SPEAR_NORNANDBOOT) == - CONFIG_SPEAR_NORNAND16BOOT) + if ((bootstrap & MISC_NORNANDBOOT) == MISC_NORNAND16BOOT) return TRUE; } @@ -194,7 +190,7 @@ int usb_boot_selected(void) if (USB_BOOT_SUPPORTED) { /* Check whether USB boot is selected */ - if (!(bootstrap & CONFIG_SPEAR_USBBOOT)) + if (!(bootstrap & MISC_USBBOOT)) return TRUE; } diff --git a/arch/arm/include/asm/arch-spear/misc.h b/arch/arm/include/asm/arch-spear/misc.h index 89f7964..2696203 100644 --- a/arch/arm/include/asm/arch-spear/misc.h +++ b/arch/arm/include/asm/arch-spear/misc.h @@ -137,12 +137,18 @@ struct misc_regs { #define MISC_SOCCFG30 0x0000000C #define MISC_SOCCFG31 0x0000000D #define MISC_NANDDIS 0x00020000 +#define MISC_BOOTSTRAPMASK 0x000B0000 +#define MISC_ONLYSNORBOOT 0x000A0000 +#define MISC_NORNANDBOOT 0x000B0000 +#define MISC_NORNAND8BOOT 0x00080000 +#define MISC_NORNAND16BOOT 0x00090000 +#define MISC_USBBOOT 0x00080000 /* PERIPH_CLK_CFG value */ #define MISC_GPT3SYNTH 0x00000400 #define MISC_GPT4SYNTH 0x00000800 -#define CONFIG_SPEAR_UART48M 0 -#define CONFIG_SPEAR_UARTCLKMSK (0x1 << 4) +#define MISC_UART48M 0x00000000 +#define MISC_UARTCLKMSK 0x00000010 /* PRSC_CLK_CFG value */ /*