From: Linus Torvalds Date: Thu, 21 Feb 2013 23:33:45 +0000 (-0800) Subject: Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc X-Git-Tag: upstream/snapshot3+hdmi~5686 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6c5096e5538b455bc3bea2b02588c380f070d8c6;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git Merge tag 'boards' of git://git./linux/kernel/git/arm/arm-soc Pull ARM SoC board specific changes from Arnd Bergmann: "These updates are all for board specific code, including - defconfig updates for shmobile, davinci, bcm2835, imx, omap and tegra - SD/MMC and I2C support on bcm2835 (Raspberry PI) - minor updates for PXA - shmobile updates to GPIO usage in board files - More things in OMAP board files are moved over to device tree probing - Better support for audio devices on some OMAP platforms" * tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (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() ... --- 6c5096e5538b455bc3bea2b02588c380f070d8c6 diff --cc arch/arm/configs/omap2plus_defconfig index 5be2e4b,76938cb..b16bae2 --- 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 3a76a47,fae66e3..1f50a65 --- 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-3430sdp.c index 15a3914,e7ef311..ce812de --- a/arch/arm/mach-omap2/board-3430sdp.c +++ b/arch/arm/mach-omap2/board-3430sdp.c @@@ -25,7 -25,7 +25,8 @@@ #include #include #include + #include +#include #include #include diff --cc arch/arm/mach-omap2/board-4430sdp.c index 508e275,918b73b..35f3ad0 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c @@@ -24,13 -24,14 +24,15 @@@ #include #include #include + #include #include #include + #include +#include #include #include +#include -#include #include #include #include diff --cc arch/arm/mach-omap2/board-cm-t35.c index 10054e3,eec635e..af2bb21 --- a/arch/arm/mach-omap2/board-cm-t35.c +++ b/arch/arm/mach-omap2/board-cm-t35.c @@@ -723,9 -722,8 +723,9 @@@ static void __init cm_t3x_common_init(v cm_t35_init_ethernet(); cm_t35_init_led(); cm_t35_init_display(); - omap_twl4030_audio_init("cm-t3x"); + omap_twl4030_audio_init("cm-t3x", NULL); + usb_bind_phy("musb-hdrc.0.auto", 0, "twl4030_usb"); usb_musb_init(NULL); cm_t35_init_usbh(); cm_t35_init_camera(); diff --cc arch/arm/mach-omap2/board-omap3beagle.c index 70bc1fc,2a6e8ad..c3558f9 --- a/arch/arm/mach-omap2/board-omap3beagle.c +++ b/arch/arm/mach-omap2/board-omap3beagle.c @@@ -429,9 -448,10 +449,10 @@@ static struct platform_device *omap3_be &leds_gpio, &keys_gpio, &madc_hwmon, + &leds_pwm, }; -static const struct usbhs_omap_board_data usbhs_bdata __initconst = { +static struct usbhs_omap_platform_data usbhs_bdata __initdata = { .port_mode[0] = OMAP_USBHS_PORT_MODE_UNUSED, .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, diff --cc arch/arm/mach-omap2/board-zoom-peripherals.c index dc5498b,0745bd9..cdc0c10 --- a/arch/arm/mach-omap2/board-zoom-peripherals.c +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c @@@ -20,7 -20,7 +20,8 @@@ #include #include #include + #include +#include #include #include diff --cc arch/arm/mach-pxa/palmtreo.c index a29849d,c181a60a..d82a50b --- a/arch/arm/mach-pxa/palmtreo.c +++ b/arch/arm/mach-pxa/palmtreo.c @@@ -395,8 -391,41 +395,38 @@@ 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 ******************************************************************************/ static void __init treo_reserve(void) @@@ -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