From patchwork Wed Jul 12 09:43:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 787111 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3x6vRK4hz2z9s65 for ; Wed, 12 Jul 2017 19:53:49 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 673C0C21FAB; Wed, 12 Jul 2017 09:51:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DC5A4C21FD0; Wed, 12 Jul 2017 09:44:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 10EEFC21FC9; Wed, 12 Jul 2017 09:43:50 +0000 (UTC) Received: from pegase1.c-s.fr (pegase1.c-s.fr [93.17.236.30]) by lists.denx.de (Postfix) with ESMTPS id 0C0DCC21F9C for ; Wed, 12 Jul 2017 09:43:46 +0000 (UTC) Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 3x6vCW03Y4z9ttBq; Wed, 12 Jul 2017 11:43:35 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id e4TEsEoE29Xf; Wed, 12 Jul 2017 11:43:34 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 3x6vCV6fTzz9ttBV; Wed, 12 Jul 2017 11:43:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 6484D8B830; Wed, 12 Jul 2017 11:43:45 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id 63wvZ63kktfj; Wed, 12 Jul 2017 11:43:45 +0200 (CEST) Received: from pc13941vm.idsi0.si.c-s.fr (po15451.idsi0.si.c-s.fr [172.25.231.8]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 3C4B98B7FE; Wed, 12 Jul 2017 11:43:45 +0200 (CEST) Received: by pc13941vm.idsi0.si.c-s.fr (Postfix, from userid 0) id 03D286A666; Wed, 12 Jul 2017 11:43:44 +0200 (CEST) Message-Id: In-Reply-To: References: From: Christophe Leroy To: Wolfgang Denk , Heiko Schocher , Tom Rini Date: Wed, 12 Jul 2017 11:43:44 +0200 (CEST) Cc: u-boot@lists.denx.de Subject: [U-Boot] [PATCH 14/14] powerpc: Remove 8260 remainders X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" Signed-off-by: Christophe Leroy --- MAINTAINERS | 6 ------ arch/powerpc/include/asm/processor.h | 14 -------------- drivers/i2c/soft_i2c.c | 4 ---- drivers/serial/serial.c | 3 --- include/ioports.h | 7 ++----- 5 files changed, 2 insertions(+), 32 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 1e8d7d9bb6..1778a76736 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -324,12 +324,6 @@ S: Maintained T: git git://git.denx.de/u-boot-mpc8xx.git F: arch/powerpc/cpu/mpc8xx/ -POWERPC MPC82XX -M: Wolfgang Denk -S: Maintained -T: git git://git.denx.de/u-boot-mpc82xx.git -F: arch/powerpc/cpu/mpc82*/ - POWERPC MPC83XX M: Mario Six S: Maintained diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h index 30ac4f8c10..baf38f8441 100644 --- a/arch/powerpc/include/asm/processor.h +++ b/arch/powerpc/include/asm/processor.h @@ -978,18 +978,6 @@ #define PVR_850 PVR_821 #define PVR_860 PVR_821 #define PVR_7400 0x000C0000 -#define PVR_8240 0x00810100 - -/* - * PowerQUICC II family processors report different PVR values depending - * on silicon process (HiP3, HiP4, HiP7, etc.) - */ -#define PVR_8260 PVR_8240 -#define PVR_8260_HIP3 0x00810101 -#define PVR_8260_HIP4 0x80811014 -#define PVR_8260_HIP7 0x80822011 -#define PVR_8260_HIP7R1 0x80822013 -#define PVR_8260_HIP7RA 0x80822014 /* * MPC 52xx @@ -1345,8 +1333,6 @@ void ll_puts(const char *); void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val); int prt_83xx_rsr(void); -int prt_8260_rsr(void); -int prt_8260_clks(void); #endif /* ndef ASSEMBLY*/ diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c index a21e4a2627..4fd5551a22 100644 --- a/drivers/i2c/soft_i2c.c +++ b/drivers/i2c/soft_i2c.c @@ -17,10 +17,6 @@ */ #include -#ifdef CONFIG_MPC8260 /* only valid for MPC8260 */ -#include -#include -#endif #if defined(CONFIG_AT91FAMILY) #include #include diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c index 87542f92df..cc4bdcb834 100644 --- a/drivers/serial/serial.c +++ b/drivers/serial/serial.c @@ -133,9 +133,6 @@ serial_initfunc(marvell_serial_initialize); serial_initfunc(max3100_serial_initialize); serial_initfunc(mcf_serial_initialize); serial_initfunc(ml2_serial_initialize); -serial_initfunc(mpc5xx_serial_initialize); -serial_initfunc(mpc8260_scc_serial_initialize); -serial_initfunc(mpc8260_smc_serial_initialize); serial_initfunc(mpc85xx_serial_initialize); serial_initfunc(mpc8xx_serial_initialize); serial_initfunc(mxc_serial_initialize); diff --git a/include/ioports.h b/include/ioports.h index 1134ea5208..1cd3ceb37a 100644 --- a/include/ioports.h +++ b/include/ioports.h @@ -1,14 +1,12 @@ /* - * definitions for MPC8260 I/O Ports - * - * (in addition to those provided in ) + * definitions for MPC8xxx I/O Ports * * Murray.Jensen@cmst.csiro.au, 20-Oct-00 */ /* * this structure mirrors the layout of the five port registers in - * the internal memory map - see iop8260_t in + * the internal memory map */ typedef struct { unsigned int pdir; /* Port Data Direction Register (35-3) */ @@ -46,7 +44,6 @@ typedef struct { /* * a table that contains configuration information for all 32 pins - * of all four MPC8260 I/O ports. * * NOTE: in the second dimension of this table, index 0 refers to pin 31 * and index 31 refers to pin 0. this made the code in the table look more