From patchwork Mon Nov 22 21:47:24 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Haiying Wang X-Patchwork-Id: 72594 X-Patchwork-Delegate: galak@kernel.crashing.org 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 4E7A6B70F9 for ; Tue, 23 Nov 2010 08:46:46 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 03EF2281AC; Mon, 22 Nov 2010 22:46:45 +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 I8U3eODrvbYG; Mon, 22 Nov 2010 22:46:44 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F1F6D281AF; Mon, 22 Nov 2010 22:46:41 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 0A861281B1 for ; Mon, 22 Nov 2010 22:46:40 +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 9W+UUDJdWVqq for ; Mon, 22 Nov 2010 22:46:38 +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 VA3EHSOBE005.bigfish.com (va3ehsobe005.messaging.microsoft.com [216.32.180.31]) by theia.denx.de (Postfix) with ESMTPS id 072C0281AF for ; Mon, 22 Nov 2010 22:46:30 +0100 (CET) Received: from mail4-va3-R.bigfish.com (10.7.14.246) by VA3EHSOBE005.bigfish.com (10.7.40.25) with Microsoft SMTP Server id 14.1.225.8; Mon, 22 Nov 2010 21:46:29 +0000 Received: from mail4-va3 (localhost.localdomain [127.0.0.1]) by mail4-va3-R.bigfish.com (Postfix) with ESMTP id 1DF36F3024B for ; Mon, 22 Nov 2010 21:46:29 +0000 (UTC) X-SpamScore: 3 X-BigFish: VS3(zzc8kzz1202hzz8275bhz2dh2a8h668h67dh685h61h) X-Spam-TCS-SCL: 0:0 X-Forefront-Antispam-Report: KIP:(null); UIP:(null); IPVD:NLI; H:az33egw02.freescale.net; RD:az33egw02.freescale.net; EFVD:NLI Received: from mail4-va3 (localhost.localdomain [127.0.0.1]) by mail4-va3 (MessageSwitch) id 1290462387752484_14171; Mon, 22 Nov 2010 21:46:27 +0000 (UTC) Received: from VA3EHSMHS029.bigfish.com (unknown [10.7.14.238]) by mail4-va3.bigfish.com (Postfix) with ESMTP id AFA52940050 for ; Mon, 22 Nov 2010 21:46:27 +0000 (UTC) Received: from az33egw02.freescale.net (192.88.158.103) by VA3EHSMHS029.bigfish.com (10.7.99.39) with Microsoft SMTP Server (TLS) id 14.1.225.8; Mon, 22 Nov 2010 21:46:23 +0000 Received: from de01smr02.am.mot.com (de01smr02.freescale.net [10.208.0.151]) by az33egw02.freescale.net (8.14.3/8.14.3) with ESMTP id oAMLkMN1021345 for ; Mon, 22 Nov 2010 14:46:22 -0700 (MST) Received: from haiying-laptop.am.freescale.net (haiying-laptop.am.freescale.net [10.29.200.208]) by de01smr02.am.mot.com (8.13.1/8.13.0) with ESMTP id oAMM3xRJ007265; Mon, 22 Nov 2010 16:04:03 -0600 (CST) From: To: Date: Mon, 22 Nov 2010 16:47:24 -0500 Message-ID: <1290462446-1459-5-git-send-email-Haiying.Wang@freescale.com> X-Mailer: git-send-email 1.7.3.1.50.g1e633 In-Reply-To: <1290462446-1459-1-git-send-email-Haiying.Wang@freescale.com> References: <1290462446-1459-1-git-send-email-Haiying.Wang@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Subject: [U-Boot] [PATCH 5/7] powerpc/p1021: add more P1021 defines. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.9 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 From: Haiying Wang Signed-off-by: Haiying Wang --- arch/powerpc/include/asm/immap_85xx.h | 6 ++++++ arch/powerpc/include/asm/immap_qe.h | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/immap_85xx.h b/arch/powerpc/include/asm/immap_85xx.h index 30c64eb..9eb106c 100644 --- a/arch/powerpc/include/asm/immap_85xx.h +++ b/arch/powerpc/include/asm/immap_85xx.h @@ -1963,6 +1963,12 @@ typedef struct ccsr_gur { u8 res10b[76]; par_io_t qe_par_io[7]; u8 res10c[1600]; +#elif defined(CONFIG_P1021) + u8 res10b1[12]; + u32 iovselsr; + u8 res10b2[60]; + par_io_t qe_par_io[3]; + u8 res10c[1496]; #else u8 res10b[1868]; #endif diff --git a/arch/powerpc/include/asm/immap_qe.h b/arch/powerpc/include/asm/immap_qe.h index 531cfc8..74c9013 100644 --- a/arch/powerpc/include/asm/immap_qe.h +++ b/arch/powerpc/include/asm/immap_qe.h @@ -3,7 +3,7 @@ * The Internal Memory Map for devices with QE on them. This * is the superset of all QE devices (8360, etc.). * - * Copyright (c) 2006-2009 Freescale Semiconductor, Inc. + * Copyright (c) 2006-2010 Freescale Semiconductor, Inc. * Author: Shlomi Gridih * * This program is free software; you can redistribute it and/or modify it @@ -588,6 +588,9 @@ typedef struct qe_immap { #elif defined(CONFIG_MPC8569) u8 muram[0x20000]; /* 0x1_0000 - 0x3_0000 Multi-user RAM */ u8 res17[0x10000]; /* 0x3_0000 - 0x4_0000 */ +#elif defined(CONFIG_P1021) + u8 muram[0x06000]; /* 0x1_0000 - 0x1_6000 Multi-user RAM */ + u8 res17[0x1a000]; /* 0x1_6000 - 0x3_0000 */ #else u8 muram[0xC000]; /* 0x110000 - 0x11C000 Multi-user RAM */ u8 res17[0x24000]; /* 0x11C000 - 0x140000 */ @@ -601,13 +604,15 @@ extern qe_map_t *qe_immr; #define QE_MURAM_SIZE 0x10000UL #elif defined(CONFIG_MPC8569) #define QE_MURAM_SIZE 0x20000UL +#elif defined(CONFIG_P1021) +#define QE_MURAM_SIZE 0x6000UL #elif defined(CONFIG_MPC8360) #define QE_MURAM_SIZE 0xc000UL #elif defined(CONFIG_MPC832x) #define QE_MURAM_SIZE 0x4000UL #endif -#if defined(CONFIG_MPC8323) +#if defined(CONFIG_MPC8323) || defined(CONFIG_P1021) #define MAX_QE_RISC 1 #define QE_NUM_OF_SNUM 28 #elif defined(CONFIG_MPC8569)