From patchwork Tue Jun 25 10:12:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Gang X-Patchwork-Id: 254108 X-Patchwork-Delegate: afleming@freescale.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 99D002C0182 for ; Tue, 25 Jun 2013 20:28:32 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2F7AC4A028; Tue, 25 Jun 2013 12:28:29 +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 j7M1hfw6pGb6; Tue, 25 Jun 2013 12:28:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A0CD84A029; Tue, 25 Jun 2013 12:28:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A75234A01C for ; Tue, 25 Jun 2013 12:28:11 +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 bqdmUJRk+2mV for ; Tue, 25 Jun 2013 12:28:05 +0200 (CEST) X-Greylist: delayed 907 seconds by postgrey-1.27 at theia; Tue, 25 Jun 2013 12:27:57 CEST X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 BL_NJABL=ERR(-1.5) (only DNSBL check requested) Received: from db8outboundpool.messaging.microsoft.com (mail-db8lp0186.outbound.messaging.microsoft.com [213.199.154.186]) by theia.denx.de (Postfix) with ESMTPS id 92C624A021 for ; Tue, 25 Jun 2013 12:27:57 +0200 (CEST) Received: from mail28-db8-R.bigfish.com (10.174.8.249) by DB8EHSOBE028.bigfish.com (10.174.4.91) with Microsoft SMTP Server id 14.1.225.23; Tue, 25 Jun 2013 10:12:49 +0000 Received: from mail28-db8 (localhost [127.0.0.1]) by mail28-db8-R.bigfish.com (Postfix) with ESMTP id 5C665C4012A for ; Tue, 25 Jun 2013 10:12:49 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1f42h1ee6h1de0h1fdah1202h1e76h1d1ah1d2ah1fc6hzz8275bhz2dh2a8h668h839he5bhf0ah1288h12a5h12a9h12bdh12e5h137ah139eh13b6h1441h1504h1537h162dh1631h1758h1898h18e1h1946h19b5h1ad9h1b0ah1d0ch1d2eh1d3fh1dfeh1dffh1e23h1155h) Received: from mail28-db8 (localhost.localdomain [127.0.0.1]) by mail28-db8 (MessageSwitch) id 137215516732409_7939; Tue, 25 Jun 2013 10:12:47 +0000 (UTC) Received: from DB8EHSMHS030.bigfish.com (unknown [10.174.8.244]) by mail28-db8.bigfish.com (Postfix) with ESMTP id 03446940045 for ; Tue, 25 Jun 2013 10:12:47 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB8EHSMHS030.bigfish.com (10.174.4.40) with Microsoft SMTP Server (TLS) id 14.16.227.3; Tue, 25 Jun 2013 10:12:44 +0000 Received: from tx30smr01.am.freescale.net (10.81.153.31) by 039-SN1MMR1-004.039d.mgd.msft.net (10.84.1.14) with Microsoft SMTP Server (TLS) id 14.2.328.11; Tue, 25 Jun 2013 10:12:33 +0000 Received: from linux.ap.freescale.net (linux.ap.freescale.net [10.192.208.199]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id r5PACI0P004247; Tue, 25 Jun 2013 03:12:31 -0700 From: Liu Gang To: , Date: Tue, 25 Jun 2013 18:12:13 +0800 Message-ID: <1372155134-30283-2-git-send-email-Gang.Liu@freescale.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372155134-30283-1-git-send-email-Gang.Liu@freescale.com> References: <1372155134-30283-1-git-send-email-Gang.Liu@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% Cc: R58495@freescale.com, r61911@freescale.com Subject: [U-Boot] [PATCH 2/3] powerpc/b4860: Correct LIODN assignment for SRIO 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 For B4, the SRIO LIODN registers are in SRIO address space and not in GUTs. Signed-off-by: Liu Gang --- arch/powerpc/cpu/mpc85xx/b4860_ids.c | 4 ++-- arch/powerpc/include/asm/config_mpc85xx.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/b4860_ids.c b/arch/powerpc/cpu/mpc85xx/b4860_ids.c index 0f4e82e..f910486 100644 --- a/arch/powerpc/cpu/mpc85xx/b4860_ids.c +++ b/arch/powerpc/cpu/mpc85xx/b4860_ids.c @@ -57,8 +57,8 @@ struct qportal_info qp_info[CONFIG_SYS_QMAN_NUM_PORTALS] = { #ifdef CONFIG_SYS_SRIO struct srio_liodn_id_table srio_liodn_tbl[] = { - SET_SRIO_LIODN_1(1, 307), - SET_SRIO_LIODN_1(2, 387), + SET_SRIO_LIODN_BASE(1, 307), + SET_SRIO_LIODN_BASE(2, 387), }; int srio_liodn_tbl_sz = ARRAY_SIZE(srio_liodn_tbl); #endif diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 1d46b14..bfcabab 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -590,6 +590,7 @@ #define CONFIG_SYS_FSL_SRIO_MAX_PORTS 2 #define CONFIG_SYS_FSL_SRIO_OB_WIN_NUM 9 #define CONFIG_SYS_FSL_SRIO_IB_WIN_NUM 5 +#define CONFIG_SYS_FSL_SRIO_LIODN #else #define CONFIG_MAX_CPUS 2 #define CONFIG_SYS_FSL_CORES_PER_CLUSTER 2