Merge branch 'for-rmk-realview' of git://linux-arm.org/linux-2.6 into devel
Russell King [Mon, 1 Dec 2008 17:53:45 +0000 (17:53 +0000)]
1  2 
arch/arm/Kconfig
arch/arm/mach-realview/Kconfig
arch/arm/mach-realview/core.c
arch/arm/mach-realview/core.h
arch/arm/mach-realview/include/mach/memory.h
arch/arm/mach-realview/realview_eb.c
arch/arm/mach-realview/realview_pb1176.c
arch/arm/mach-realview/realview_pb11mp.c
arch/arm/mm/Kconfig

Simple merge
Simple merge
@@@ -28,8 -28,8 +28,9 @@@
  #include <linux/clocksource.h>
  #include <linux/clockchips.h>
  #include <linux/io.h>
+ #include <linux/smc911x.h>
  
 +#include <asm/clkdev.h>
  #include <asm/system.h>
  #include <mach/hardware.h>
  #include <asm/irq.h>
Simple merge
  /*
   * Physical DRAM offset.
   */
+ #ifdef CONFIG_REALVIEW_HIGH_PHYS_OFFSET
+ #define PHYS_OFFSET           UL(0x70000000)
+ #else
  #define PHYS_OFFSET           UL(0x00000000)
+ #endif
  
 -/*
 - * Virtual view <-> DMA view memory address translations
 - * virt_to_bus: Used to translate the virtual address to an
 - *              address suitable to be passed to set_dma_addr
 - * bus_to_virt: Used to convert an address for DMA operations
 - *              to an address that the kernel can use.
 - */
 -#define __virt_to_bus(x)      ((x) - PAGE_OFFSET)
 -#define __bus_to_virt(x)      ((x) + PAGE_OFFSET)
 -
  #endif
Simple merge
@@@ -265,8 -258,10 +258,8 @@@ static void __init realview_pb1176_init
        l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000, 0xfe000fff);
  #endif
  
 -      clk_register(&realview_clcd_clk);
 -
        realview_flash_register(&realview_pb1176_flash_resource, 1);
-       platform_device_register(&realview_pb1176_smsc911x_device);
+       realview_eth_register(NULL, realview_pb1176_smsc911x_resources);
  
        for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
                struct amba_device *d = amba_devs[i];
@@@ -312,9 -304,11 +304,9 @@@ static void __init realview_pb11mp_init
        l2x0_init(__io_address(REALVIEW_TC11MP_L220_BASE), 0x00790000, 0xfe000fff);
  #endif
  
 -      clk_register(&realview_clcd_clk);
 -
        realview_flash_register(realview_pb11mp_flash_resource,
                                ARRAY_SIZE(realview_pb11mp_flash_resource));
-       platform_device_register(&realview_pb11mp_smsc911x_device);
+       realview_eth_register(NULL, realview_pb11mp_smsc911x_resources);
        platform_device_register(&realview_i2c_device);
        platform_device_register(&realview_pb11mp_cf_device);
  
Simple merge