Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (249 commits)
  powerpc: Fix pte_update for CONFIG_PTE_64BIT and !PTE_ATOMIC_UPDATES
  powerpc: Fix a build problem on ppc32 with new DMA_ATTRs
  ibm_newemac: Add MII mode support to the EMAC RGMII bridge.
  powerpc: Don't spin on sync instruction at boot time
  powerpc: Add VSX load/store alignment exception handler
  powerpc: fix giveup_vsx to save registers correctly
  powerpc: support for latencytop
  powerpc: Remove unnecessary condition when sanity-checking WIMG bits
  powerpc: Add PPC_FEATURE_PSERIES_PERFMON_COMPAT
  powerpc: Add driver for Barrier Synchronization Register
  powerpc: mman.h export fixups
  powerpc/fsl: update crypto node definition and device tree instances
  powerpc/fsl: Refactor device bindings
  powerpc/85xx: Minor fixes for 85xxds and 8536ds board.
  powerpc: Add 82xx/83xx/86xx to 6xx Multiplatform
  powerpc/85xx: publish of device for cds platforms
  powerpc/booke: don't reinitialize time base
  powerpc/86xx: Refactor pic init
  powerpc/CPM: Add i2c pins to dts and board setup
  cpm_uart: Support uart_wait_until_sent()
  ...

1 files changed, 0 insertions, 95 deletions

diff --git a/arch/ppc/platforms/prpmc750.h b/arch/ppc/platforms/prpmc750.h
deleted file mode 100644
index c4dcff09d7ca..000000000000
--- a/arch/ppc/platforms/prpmc750.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * arch/ppc/platforms/prpmc750.h
- *
- * Definitions for Motorola PrPMC750 board support
- *
- * Author: Matt Porter <mporter@mvista.com>
- *
- * 2001-2004 (c) MontaVista, Software, Inc.  This file is licensed under
- * the terms of the GNU General Public License version 2.  This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-#ifdef __KERNEL__
-#ifndef __ASM_PRPMC750_H__
-#define __ASM_PRPMC750_H__
-
-/*
- * Due to limitations imposed by legacy hardware (primarily IDE controllers),
- * the PrPMC750 carrier board operates using a PReP address map.
- *
- * From Processor (physical) -> PCI:
- *   PCI Mem Space: 0xc0000000 - 0xfe000000 -> 0x00000000 - 0x3e000000 (768 MB)
- *   PCI I/O Space: 0x80000000 - 0x90000000 -> 0x00000000 - 0x10000000 (256 MB)
- *      Note: Must skip 0xfe000000-0xfe400000 for CONFIG_HIGHMEM/PKMAP area
- *
- * From PCI -> Processor (physical):
- *   System Memory: 0x80000000 -> 0x00000000
- */
-
-#define PRPMC750_ISA_IO_BASE            PREP_ISA_IO_BASE
-#define PRPMC750_ISA_MEM_BASE           PREP_ISA_MEM_BASE
-
-/* PCI Memory space mapping info */
-#define PRPMC750_PCI_MEM_SIZE           0x30000000U
-#define PRPMC750_PROC_PCI_MEM_START     PRPMC750_ISA_MEM_BASE
-#define PRPMC750_PROC_PCI_MEM_END       (PRPMC750_PROC_PCI_MEM_START +  \
-                                         PRPMC750_PCI_MEM_SIZE - 1)
-#define PRPMC750_PCI_MEM_START          0x00000000U
-#define PRPMC750_PCI_MEM_END            (PRPMC750_PCI_MEM_START +       \
-                                         PRPMC750_PCI_MEM_SIZE - 1)
-
-/* PCI I/O space mapping info */
-#define PRPMC750_PCI_IO_SIZE            0x10000000U
-#define PRPMC750_PROC_PCI_IO_START      PRPMC750_ISA_IO_BASE
-#define PRPMC750_PROC_PCI_IO_END        (PRPMC750_PROC_PCI_IO_START +   \
-                                         PRPMC750_PCI_IO_SIZE - 1)
-#define PRPMC750_PCI_IO_START           0x00000000U
-#define PRPMC750_PCI_IO_END             (PRPMC750_PCI_IO_START +        \
-                                         PRPMC750_PCI_IO_SIZE - 1)
-
-/* System memory mapping info */
-#define PRPMC750_PCI_DRAM_OFFSET        PREP_PCI_DRAM_OFFSET
-#define PRPMC750_PCI_PHY_MEM_OFFSET     (PRPMC750_ISA_MEM_BASE-PRPMC750_PCI_MEM_START)
-
-/* Register address definitions */
-#define PRPMC750_HAWK_SMC_BASE          0xfef80000U
-#define PRPMC750_HAWK_PPC_REG_BASE      0xfeff0000U
-
-#define PRPMC750_BASE_BAUD              1843200
-#define PRPMC750_SERIAL_0               0xfef88000
-#define PRPMC750_SERIAL_0_DLL           (PRPMC750_SERIAL_0 + (UART_DLL << 4))
-#define PRPMC750_SERIAL_0_DLM           (PRPMC750_SERIAL_0 + (UART_DLM << 4))
-#define PRPMC750_SERIAL_0_LCR           (PRPMC750_SERIAL_0 + (UART_LCR << 4))
-
-#define PRPMC750_STATUS_REG             0xfef88080
-#define PRPMC750_BAUDOUT_MASK           0x02
-#define PRPMC750_MONARCH_MASK           0x01
-
-#define PRPMC750_MODRST_REG             0xfef880a0
-#define PRPMC750_MODRST_MASK            0x01
-
-#define PRPMC750_PIRQ_REG               0xfef880b0
-#define PRPMC750_SEL1_MASK              0x02
-#define PRPMC750_SEL0_MASK              0x01
-
-#define PRPMC750_TBEN_REG               0xfef880c0
-#define PRPMC750_TBEN_MASK              0x01
-
-/* UART Defines. */
-#define RS_TABLE_SIZE  4
-
-/* Rate for the 1.8432 Mhz clock for the onboard serial chip */
-#define BASE_BAUD  (PRPMC750_BASE_BAUD / 16)
-
-#define STD_COM_FLAGS ASYNC_BOOT_AUTOCONF
-
-#define SERIAL_PORT_DFNS \
-        { 0, BASE_BAUD, PRPMC750_SERIAL_0, 1, STD_COM_FLAGS, \
-                iomem_base: (unsigned char *)PRPMC750_SERIAL_0, \
-                iomem_reg_shift: 4, \
-                io_type: SERIAL_IO_MEM } /* ttyS0 */
-
-#endif                          /* __ASM_PRPMC750_H__ */
-#endif                          /* __KERNEL__ */