Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (407 commits)
  [ARM] pxafb: add support for overlay1 and overlay2 as framebuffer devices
  [ARM] pxafb: cleanup of the timing checking code
  [ARM] pxafb: cleanup of the color format manipulation code
  [ARM] pxafb: add palette format support for LCCR4_PAL_FOR_3
  [ARM] pxafb: add support for FBIOPAN_DISPLAY by dma braching
  [ARM] pxafb: allow pxafb_set_par() to start from arbitrary yoffset
  [ARM] pxafb: allow video memory size to be configurable
  [ARM] pxa: add document on the MFP design and how to use it
  [ARM] sa1100_wdt: don't assume CLOCK_TICK_RATE to be a constant
  [ARM] rtc-sa1100: don't assume CLOCK_TICK_RATE to be a constant
  [ARM] pxa/tavorevb: update board support (smartpanel LCD + keypad)
  [ARM] pxa: Update eseries defconfig
  [ARM] 5352/1: add w90p910-plat config file
  [ARM] s3c: S3C options should depend on PLAT_S3C
  [ARM] mv78xx0: implement GPIO and GPIO interrupt support
  [ARM] Kirkwood: implement GPIO and GPIO interrupt support
  [ARM] Orion: share GPIO IRQ handling code
  [ARM] Orion: share GPIO handling code
  [ARM] s3c: define __io using the typesafe version
  [ARM] S3C64XX: Ensure CPU_V6 is selected
  ...

1 files changed, 21 insertions, 17 deletions

diff --git a/arch/arm/mach-ks8695/devices.c b/arch/arm/mach-ks8695/devices.c
index 4bd251482c8f..36ab0fd3d9b6 100644
--- a/arch/arm/mach-ks8695/devices.c
+++ b/arch/arm/mach-ks8695/devices.c
@@ -25,19 +25,20 @@
 #include <mach/regs-wan.h>
 #include <mach/regs-lan.h>
 #include <mach/regs-hpna.h>
+#include <mach/regs-switch.h>
+#include <mach/regs-misc.h>
 
 
 /* --------------------------------------------------------------------
  *  Ethernet
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_ARM_KS8695_ETHER) || defined(CONFIG_ARM_KS8695_ETHER_MODULE)
 static u64 eth_dmamask = 0xffffffffUL;
 
 static struct resource ks8695_wan_resources[] = {
         [0] = {
-                .start  = KS8695_WAN_VA,
-                .end    = KS8695_WAN_VA + 0x00ff,
+                .start  = KS8695_WAN_PA,
+                .end    = KS8695_WAN_PA + 0x00ff,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -58,6 +59,12 @@ static struct resource ks8695_wan_resources[] = {
                 .end    = KS8695_IRQ_WAN_LINK,
                 .flags  = IORESOURCE_IRQ,
         },
+        [4] = {
+                .name   = "WAN PHY",
+                .start  = KS8695_MISC_PA,
+                .end    = KS8695_MISC_PA + 0x1f,
+                .flags  = IORESOURCE_MEM,
+        },
 };
 
 static struct platform_device ks8695_wan_device = {
@@ -74,8 +81,8 @@ static struct platform_device ks8695_wan_device = {
 
 static struct resource ks8695_lan_resources[] = {
         [0] = {
-                .start  = KS8695_LAN_VA,
-                .end    = KS8695_LAN_VA + 0x00ff,
+                .start  = KS8695_LAN_PA,
+                .end    = KS8695_LAN_PA + 0x00ff,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -90,6 +97,12 @@ static struct resource ks8695_lan_resources[] = {
                 .end    = KS8695_IRQ_LAN_TX_STATUS,
                 .flags  = IORESOURCE_IRQ,
         },
+        [3] = {
+                .name   = "LAN SWITCH",
+                .start  = KS8695_SWITCH_PA,
+                .end    = KS8695_SWITCH_PA + 0x4f,
+                .flags  = IORESOURCE_MEM,
+        },
 };
 
 static struct platform_device ks8695_lan_device = {
@@ -106,8 +119,8 @@ static struct platform_device ks8695_lan_device = {
 
 static struct resource ks8695_hpna_resources[] = {
         [0] = {
-                .start  = KS8695_HPNA_VA,
-                .end    = KS8695_HPNA_VA + 0x00ff,
+                .start  = KS8695_HPNA_PA,
+                .end    = KS8695_HPNA_PA + 0x00ff,
                 .flags  = IORESOURCE_MEM,
         },
         [1] = {
@@ -149,18 +162,12 @@ void __init ks8696_add_device_hpna(void)
 {
         platform_device_register(&ks8695_hpna_device);
 }
-#else
-void __init ks8695_add_device_wan(void) {}
-void __init ks8695_add_device_lan(void) {}
-void __init ks8696_add_device_hpna(void) {}
-#endif
 
 
 /* --------------------------------------------------------------------
  *  Watchdog
  * -------------------------------------------------------------------- */
 
-#if defined(CONFIG_KS8695_WATCHDOG) || defined(CONFIG_KS8695_WATCHDOG_MODULE)
 static struct platform_device ks8695_wdt_device = {
         .name           = "ks8695_wdt",
         .id             = -1,
@@ -171,9 +178,6 @@ static void __init ks8695_add_device_watchdog(void)
 {
         platform_device_register(&ks8695_wdt_device);
 }
-#else
-static void __init ks8695_add_device_watchdog(void) {}
-#endif
 
 
 /* --------------------------------------------------------------------
@@ -190,7 +194,7 @@ void __init ks8695_init_leds(u8 cpu_led, u8 timer_led)
         gpio_direction_output(cpu_led, 1);
         gpio_direction_output(timer_led, 1);
 
-        ks8695_leds_cpu   = cpu_led;
+        ks8695_leds_cpu   = cpu_led;
         ks8695_leds_timer = timer_led;
 }
 #else