Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33d71d26 authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Copy over headers from arch/ppc to arch/powerpc that we need 



To build arch/powerpc without including asm-ppc/ we need these files
in asm-powerpc/

Moved some headers under arch/powerpc/platforms if they were only used by
platform or driver files and fixed up the source file includes to match
the new locations

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent ed16c20d

arch/powerpc/platforms/chrp/gg2.h

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 *  include/asm-ppc/gg2.h -- VLSI VAS96011/12 `Golden Gate 2' register definitions

 *

 *  Copyright (C) 1997 Geert Uytterhoeven

 *

 *  This file is based on the following documentation:

 *

 *	The VAS96011/12 Chipset, Data Book, Edition 1.0

 *	VLSI Technology, Inc.

 *

 *  This file is subject to the terms and conditions of the GNU General Public

 *  License.  See the file COPYING in the main directory of this archive

 *  for more details.

 */



#ifndef _ASMPPC_GG2_H

#define _ASMPPC_GG2_H



    /*

     *  Memory Map (CHRP mode)

     */



#define GG2_PCI_MEM_BASE	0xc0000000	/* Peripheral memory space */

#define GG2_ISA_MEM_BASE	0xf7000000	/* Peripheral memory alias */

#define GG2_ISA_IO_BASE		0xf8000000	/* Peripheral I/O space */

#define GG2_PCI_CONFIG_BASE	0xfec00000	/* PCI configuration space */

#define GG2_INT_ACK_SPECIAL	0xfec80000	/* Interrupt acknowledge and */

						/* special PCI cycles */

#define GG2_ROM_BASE0		0xff000000	/* ROM bank 0 */

#define GG2_ROM_BASE1		0xff800000	/* ROM bank 1 */





    /*

     *  GG2 specific PCI Registers

     */



extern void __iomem *gg2_pci_config_base;	/* kernel virtual address */



#define GG2_PCI_BUSNO		0x40	/* Bus number */

#define GG2_PCI_SUBBUSNO	0x41	/* Subordinate bus number */

#define GG2_PCI_DISCCTR		0x42	/* Disconnect counter */

#define GG2_PCI_PPC_CTRL	0x50	/* PowerPC interface control register */

#define GG2_PCI_ADDR_MAP	0x5c	/* Address map */

#define GG2_PCI_PCI_CTRL	0x60	/* PCI interface control register */

#define GG2_PCI_ROM_CTRL	0x70	/* ROM interface control register */

#define GG2_PCI_ROM_TIME	0x74	/* ROM timing */

#define GG2_PCI_CC_CTRL		0x80	/* Cache controller control register */

#define GG2_PCI_DRAM_BANK0	0x90	/* Control register for DRAM bank #0 */

#define GG2_PCI_DRAM_BANK1	0x94	/* Control register for DRAM bank #1 */

#define GG2_PCI_DRAM_BANK2	0x98	/* Control register for DRAM bank #2 */

#define GG2_PCI_DRAM_BANK3	0x9c	/* Control register for DRAM bank #3 */

#define GG2_PCI_DRAM_BANK4	0xa0	/* Control register for DRAM bank #4 */

#define GG2_PCI_DRAM_BANK5	0xa4	/* Control register for DRAM bank #5 */

#define GG2_PCI_DRAM_TIME0	0xb0	/* Timing parameters set #0 */

#define GG2_PCI_DRAM_TIME1	0xb4	/* Timing parameters set #1 */

#define GG2_PCI_DRAM_CTRL	0xc0	/* DRAM control */

#define GG2_PCI_ERR_CTRL	0xd0	/* Error control register */

#define GG2_PCI_ERR_STATUS	0xd4	/* Error status register */

					/* Cleared when read */



#endif /* _ASMPPC_GG2_H */

arch/powerpc/platforms/chrp/pci.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <asm/irq.h>

#include <asm/hydra.h>

#include <asm/prom.h>

#include <asm/gg2.h>

#include <asm/machdep.h>

#include <asm/sections.h>

#include <asm/pci-bridge.h>
@@ -21,6 +20,7 @@ 
#include <asm/rtas.h>



#include "chrp.h"

#include "gg2.h"



/* LongTrail */

void __iomem *gg2_pci_config_base;

arch/powerpc/platforms/chrp/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include <asm/io.h>

#include <asm/pgtable.h>

#include <asm/prom.h>

#include <asm/gg2.h>

#include <asm/pci-bridge.h>

#include <asm/dma.h>

#include <asm/machdep.h>
@@ -51,6 +50,7 @@ 
#include <asm/xmon.h>



#include "chrp.h"

#include "gg2.h"



void rtas_indicator_progress(char *, unsigned short);

arch/powerpc/platforms/embedded6xx/linkstation.c

+2 −1
Original line number Diff line number Diff line
@@ -18,9 +18,10 @@ 
#include <asm/time.h>

#include <asm/prom.h>

#include <asm/mpic.h>

#include <asm/mpc10x.h>

#include <asm/pci-bridge.h>



#include "mpc10x.h"



static struct mtd_partition linkstation_physmap_partitions[] = {

	{

		.name   = "mtd_firmimg",

arch/powerpc/platforms/embedded6xx/ls_uart.c

+2 −1
Original line number Diff line number Diff line
@@ -4,10 +4,11 @@ 
#include <linux/serial_reg.h>

#include <linux/serial_8250.h>

#include <asm/io.h>

#include <asm/mpc10x.h>

#include <asm/prom.h>

#include <asm/termbits.h>



#include "mpc10x.h"



static void __iomem *avr_addr;

static unsigned long avr_clock;