From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 19 Feb 2013 16:02:46 +0000 (+0100)
Subject: Merge branch 'next/boards' into for-next
X-Git-Tag: next-20130220~18^2~14
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d4a6b0e0dce67ecedde94ac61a1d44e1ba13957a;p=karo-tx-linux.git

Merge branch 'next/boards' into for-next

* next/boards: (55 commits)
  ARM: imx_v4_v5_defconfig: Add VPU support
  ARM: imx: configs: enable netfilter support
  ARM: OMAP2+: Fix twl section warnings related to omap_twl4030_audio_init
  ARM: OMAP2+: omap2plus_defconfig: enable omap1 rtc
  RX-51: Register twl4030-madc device
  RX-51: Add leds lp5523 names from Maemo 5 2.6.28 kernel
  ARM: OMAP2+: AM33XX: omap2plus_defconfig: Add support for few drivers
  ARM: OMAP1: nokia770: enable CBUS/Retu
  ARM: OMAP2+: omap2plus_defconfig: enable CMA allocator
  ARM: OMAP2+: omap2plus_defconfig: enable TFP410 chip support
  ARM: OMAP3: igep0020: simplify GPIO LEDs dependencies
  ARM: OMAP2+: craneboard: support the TPS65910 PMU
  ARM: OMAP2+: craneboard: support NAND device
  ARM: OMAP3: cm-t3517: add MMC support
  ARM: OMAP2+: Remove apollon board support
  ARM: shmobile: armadillo800eva: set clock rates before timer init
  ARM: tegra: defconfig updates
  ARM: shmobile: mackerel: Use gpio_request_one()
  ARM: shmobile: kzm9g: Use gpio_request_one()
  ARM: shmobile: bonito: Use gpio_request_one()
  ...

Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-apollon.c
---

d4a6b0e0dce67ecedde94ac61a1d44e1ba13957a
diff --cc arch/arm/configs/omap2plus_defconfig
index 5be2e4be802c,76938cb50b45..b16bae2c9a60
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -197,9 -208,18 +211,19 @@@ CONFIG_USB_ZERO=
  CONFIG_MMC=y
  CONFIG_MMC_UNSAFE_RESUME=y
  CONFIG_SDIO_UART=y
 +CONFIG_MMC_ARMMMCI=y
  CONFIG_MMC_OMAP=y
  CONFIG_MMC_OMAP_HS=y
+ CONFIG_NEW_LEDS=y
+ CONFIG_LEDS_GPIO=y
+ CONFIG_LEDS_TRIGGERS=y
+ CONFIG_LEDS_TRIGGER_TIMER=y
+ CONFIG_LEDS_TRIGGER_ONESHOT=y
+ CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+ CONFIG_LEDS_TRIGGER_BACKLIGHT=y
+ CONFIG_LEDS_TRIGGER_CPU=y
+ CONFIG_LEDS_TRIGGER_GPIO=y
+ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_DRV_TWL92330=y
  CONFIG_RTC_DRV_TWL4030=y
diff --cc arch/arm/mach-davinci/board-da850-evm.c
index 3a76a47df39c,fae66e37f6e6..1f50a653eb8c
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@@ -1565,16 -1551,10 +1551,15 @@@ static __init void da850_evm_init(void
  
  	da850_vpif_init();
  
 -	ret = da8xx_register_spi(1, da850evm_spi_info,
 -				 ARRAY_SIZE(da850evm_spi_info));
 +	ret = spi_register_board_info(da850evm_spi_info,
 +				      ARRAY_SIZE(da850evm_spi_info));
 +	if (ret)
 +		pr_warn("%s: spi info registration failed: %d\n", __func__,
 +			ret);
 +
 +	ret = da8xx_register_spi_bus(1, ARRAY_SIZE(da850evm_spi_info));
  	if (ret)
- 		pr_warning("da850_evm_init: spi 1 registration failed: %d\n",
- 				ret);
+ 		pr_warn("%s: SPI 1 registration failed: %d\n", __func__, ret);
  
  	ret = da850_register_sata(DA850EVM_SATA_REFCLKPN_RATE);
  	if (ret)
diff --cc arch/arm/mach-omap2/board-4430sdp.c
index f8eeef40efe8,918b73bd0215..79ad5c27d1c8
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@@ -24,9 -24,10 +24,11 @@@
  #include <linux/gpio_keys.h>
  #include <linux/regulator/machine.h>
  #include <linux/regulator/fixed.h>
+ #include <linux/pwm.h>
  #include <linux/leds.h>
  #include <linux/leds_pwm.h>
 +#include <linux/irqchip/arm-gic.h>
+ #include <linux/pwm_backlight.h>
  #include <linux/platform_data/omap4-keypad.h>
  #include <linux/usb/musb.h>
  
diff --cc arch/arm/mach-pxa/palmtreo.c
index a29849d181c8,c181a60a23f4..d82a50b4a803
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@@ -395,7 -391,40 +395,37 @@@ static void __init palmtreo_leds_init(v
  
  	platform_device_register(&palmtreo_leds);
  }
 -#else
 -static inline void palmtreo_leds_init(void) {}
 -#endif
  
+ /******************************************************************************
+  * diskonchip docg4 flash
+  ******************************************************************************/
+ #if defined(CONFIG_MACH_TREO680)
+ /* REVISIT: does the centro have this device also? */
+ #if IS_ENABLED(CONFIG_MTD_NAND_DOCG4)
+ static struct resource docg4_resources[] = {
+ 	{
+ 		.start	= 0x00000000,
+ 		.end	= 0x00001FFF,
+ 		.flags	= IORESOURCE_MEM,
+ 	},
+ };
+ 
+ static struct platform_device treo680_docg4_flash = {
+ 	.name   = "docg4",
+ 	.id     = -1,
+ 	.resource = docg4_resources,
+ 	.num_resources = ARRAY_SIZE(docg4_resources),
+ };
+ 
+ static void __init treo680_docg4_flash_init(void)
+ {
+ 	platform_device_register(&treo680_docg4_flash);
+ }
+ #else
+ static inline void treo680_docg4_flash_init(void) {}
+ #endif
+ #endif
+ 
  /******************************************************************************
   * Machine init
   ******************************************************************************/
@@@ -477,9 -458,9 +507,10 @@@ static void __init treo680_init(void
  {
  	pxa2xx_mfp_config(ARRAY_AND_SIZE(treo680_pin_config));
  	palmphone_common_init();
 +	treo680_gpio_init();
  	palm27x_mmc_init(GPIO_NR_TREO_SD_DETECT_N, GPIO_NR_TREO680_SD_READONLY,
  			GPIO_NR_TREO680_SD_POWER, 0);
+ 	treo680_docg4_flash_init();
  }
  #endif