From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 6 Dec 2011 14:23:35 +0000 (+0000)
Subject: Merge branch 'mxs/saif' into next/drivers
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3642a0a2c7d2d1949988d0fd004a8039c1f3d02f;p=mv-sheeva.git

Merge branch 'mxs/saif' into next/drivers

Conflicts:
	drivers/net/ethernet/cadence/Kconfig
---

3642a0a2c7d2d1949988d0fd004a8039c1f3d02f
diff --cc arch/arm/mach-mmp/gplugd.c
index 933420a7c3b,4665767a4f7..e266f66a467
--- a/arch/arm/mach-mmp/gplugd.c
+++ b/arch/arm/mach-mmp/gplugd.c
@@@ -182,9 -182,8 +182,9 @@@ static void __init gplugd_init(void
  
  	/* on-chip devices */
  	pxa168_add_uart(3);
- 	pxa168_add_ssp(0);
+ 	pxa168_add_ssp(1);
  	pxa168_add_twsi(0, NULL, ARRAY_AND_SIZE(gplugd_i2c_board_info));
 +	platform_device_register(&pxa168_device_gpio);
  
  	pxa168_add_eth(&gplugd_eth_platform_data);
  }
diff --cc arch/arm/mach-mmp/include/mach/gpio-pxa.h
index 9b79937d781,99b4ce1b656..0e135a599f3
--- a/arch/arm/mach-mmp/include/mach/gpio-pxa.h
+++ b/arch/arm/mach-mmp/include/mach/gpio-pxa.h
@@@ -8,8 -7,10 +8,8 @@@
  #define GPIO_REGS_VIRT	(APB_VIRT_BASE + 0x19000)
  
  #define BANK_OFF(n)	(((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
- #define GPIO_REG(x)	(GPIO_REGS_VIRT + (x))
+ #define GPIO_REG(x)	(*(volatile u32 *)(GPIO_REGS_VIRT + (x)))
  
 -#define NR_BUILTIN_GPIO		IRQ_GPIO_NUM
 -
  #define gpio_to_bank(gpio)	((gpio) >> 5)
  
  /* NOTE: these macros are defined here to make optimization of
diff --cc drivers/net/ethernet/cadence/Kconfig
index a2e150059bc,b48378a41e4..db931916da0
--- a/drivers/net/ethernet/cadence/Kconfig
+++ b/drivers/net/ethernet/cadence/Kconfig
@@@ -5,8 -5,9 +5,9 @@@
  config HAVE_NET_MACB
  	bool
  
 -config NET_ATMEL
 -	bool "Atmel devices"
 +config NET_CADENCE
 +	bool "Cadence devices"
+ 	default y
  	depends on HAVE_NET_MACB || (ARM && ARCH_AT91RM9200)
  	---help---
  	  If you have a network (Ethernet) card belonging to this class, say Y.