From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 6 Aug 2010 17:10:25 +0000 (+0100)
Subject: Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f165eb77f49cb6f6e86e2f2f09183904b2965d19;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'devel' of git://git./linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable

Conflicts:
	arch/arm/mach-pxa/palmt5.c
	arch/arm/mach-pxa/palmtreo.c
---

f165eb77f49cb6f6e86e2f2f09183904b2965d19
diff --cc arch/arm/mach-pxa/palmt5.c
index 5e92d84fe50,731ee7bc361..1c281995f65
--- a/arch/arm/mach-pxa/palmt5.c
+++ b/arch/arm/mach-pxa/palmt5.c
@@@ -378,30 -172,6 +173,11 @@@ static inline void palmt5_keys_init(voi
  /******************************************************************************
   * Machine init
   ******************************************************************************/
- static struct platform_device *devices[] __initdata = {
- #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
- 	&palmt5_pxa_keys,
- #endif
- 	&palmt5_backlight,
- 	&power_supply,
- 	&palmt5_asoc,
- 	&palmt5_gpio_vbus,
- };
- 
- /* setup udc GPIOs initial state */
- static void __init palmt5_udc_init(void)
- {
- 	if (!gpio_request(GPIO_NR_PALMT5_USB_PULLUP, "UDC Vbus")) {
- 		gpio_direction_output(GPIO_NR_PALMT5_USB_PULLUP, 1);
- 		gpio_free(GPIO_NR_PALMT5_USB_PULLUP);
- 	}
- }
- 
 +static void __init palmt5_reserve(void)
 +{
 +	memblock_reserve(0xa0200000, 0x1000);
 +}
 +
  static void __init palmt5_init(void)
  {
  	pxa2xx_mfp_config(ARRAY_AND_SIZE(palmt5_pin_config));
diff --cc arch/arm/mach-pxa/palmtreo.c
index 3d0c9cc2a40,da592dcf5ee..52defd5e42e
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@@ -588,60 -398,9 +399,15 @@@ static inline void palmtreo_leds_init(v
  /******************************************************************************
   * Machine init
   ******************************************************************************/
- static struct platform_device *treo_devices[] __initdata = {
- 	&treo_backlight,
- 	&power_supply,
- };
- 
- #ifdef CONFIG_MACH_TREO680
- static struct platform_device *treo680_devices[] __initdata = {
- 	&treo680_leds,
- };
- #endif /* CONFIG_MACH_TREO680 */
- 
- #ifdef CONFIG_MACH_CENTRO
- static struct platform_device *centro_devices[] __initdata = {
- 	&centro_leds,
- };
- #endif /* CONFIG_MACH_CENTRO */
- 
- /* setup udc GPIOs initial state */
- static void __init treo_udc_init(void)
- {
- 	if (!gpio_request(GPIO_NR_TREO_USB_PULLUP, "UDC Vbus")) {
- 		gpio_direction_output(GPIO_NR_TREO_USB_PULLUP, 1);
- 		gpio_free(GPIO_NR_TREO_USB_PULLUP);
- 	}
- }
- 
- static void __init treo_lcd_power_init(void)
- {
- 	int ret;
- 
- 	ret = gpio_request(GPIO_NR_TREO_LCD_POWER, "LCD POWER");
- 	if (ret) {
- 		pr_err("Treo680: LCD power GPIO request failed!\n");
- 		return;
- 	}
- 
- 	ret = gpio_direction_output(GPIO_NR_TREO_LCD_POWER, 0);
- 	if (ret) {
- 		pr_err("Treo680: setting LCD power GPIO direction failed!\n");
- 		gpio_free(GPIO_NR_TREO_LCD_POWER);
- 		return;
- 	}
- 
- 	treo_lcd_screen.pxafb_lcd_power = treo_lcd_power;
- }
- 
 +static void __init treo_reserve(void)
 +{
 +	memblock_reserve(0xa0000000, 0x1000);
 +	memblock_reserve(0xa2000000, 0x1000);
 +}
 +
- static void __init treo_init(void)
+ static void __init palmphone_common_init(void)
  {
+ 	pxa2xx_mfp_config(ARRAY_AND_SIZE(treo_pin_config));
  	pxa_set_ffuart_info(NULL);
  	pxa_set_btuart_info(NULL);
  	pxa_set_stuart_info(NULL);
@@@ -699,9 -448,7 +456,8 @@@ MACHINE_START(CENTRO, "Palm Centro 685"
  	.io_pg_offst    = io_p2v(0x40000000),
  	.boot_params    = 0xa0000100,
  	.map_io         = pxa_map_io,
 +	.reserve	= treo_reserve,
  	.init_irq       = pxa27x_init_irq,
  	.timer          = &pxa_timer,
-        .init_machine   = centro_init,
 -       .init_machine	= centro_init,
++	.init_machine	= centro_init,
  MACHINE_END
- #endif /* CONFIG_MACH_CENTRO */