]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'arm-soc/for-next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 04:58:59 +0000 (14:58 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Wed, 26 Sep 2012 04:58:59 +0000 (14:58 +1000)
Conflicts:
Documentation/devicetree/bindings/usb/platform-uhci.txt
arch/arm/mach-davinci/davinci.h
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-tegra/devices.c
arch/arm/mach-ux500/cpu-db8500.c
arch/arm/mach-vt8500/bv07.c
arch/arm/mach-vt8500/devices-vt8500.c
arch/arm/mach-vt8500/devices-wm8505.c
arch/arm/mach-vt8500/devices.c
arch/arm/mach-vt8500/devices.h
arch/arm/mach-vt8500/wm8505_7in.c
drivers/clocksource/Makefile
drivers/dma/mmp_tdma.c
drivers/i2c/busses/i2c-omap.c
drivers/input/keyboard/omap-keypad.c
drivers/mfd/db8500-prcmu.c
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/omap.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
drivers/spi/spi-davinci.c
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/video/msm/mddi.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp_hw.h
drivers/video/omap/lcd_ams_delta.c
drivers/video/omap2/dss/dispc.c
drivers/w1/masters/omap_hdq.c
sound/soc/omap/igep0020.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap3beagle.c
sound/soc/omap/omap3evm.c
sound/soc/omap/overo.c

186 files changed:
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/boot/dts/imx51.dtsi
arch/arm/boot/dts/imx53.dtsi
arch/arm/boot/dts/imx6q.dtsi
arch/arm/configs/kzm9g_defconfig
arch/arm/include/asm/io.h
arch/arm/include/asm/timex.h
arch/arm/kernel/Makefile
arch/arm/kernel/bios32.c
arch/arm/kernel/setup.c
arch/arm/kernel/smp.c
arch/arm/mach-at91/at91rm9200_devices.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/at91sam9rl_devices.c
arch/arm/mach-davinci/davinci.h
arch/arm/mach-davinci/devices.c
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/include/mach/da8xx.h
arch/arm/mach-exynos/mach-nuri.c
arch/arm/mach-exynos/mach-origen.c
arch/arm/mach-exynos/mach-smdk4x12.c
arch/arm/mach-exynos/mach-smdkv310.c
arch/arm/mach-exynos/mach-universal_c210.c
arch/arm/mach-exynos/platsmp.c
arch/arm/mach-imx/Kconfig
arch/arm/mach-imx/clk-imx51-imx53.c
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-integrator/core.c
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-mxs/mach-mxs.c
arch/arm/mach-nomadik/board-nhk8815.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-am3517evm.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/board-rx51-peripherals.c
arch/arm/mach-omap2/board-zoom-peripherals.c
arch/arm/mach-omap2/mcbsp.c
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
arch/arm/mach-omap2/twl-common.c
arch/arm/mach-omap2/twl-common.h
arch/arm/mach-omap2/usb-host.c
arch/arm/mach-pxa/sharpsl_pm.c
arch/arm/mach-pxa/stargate2.c
arch/arm/mach-s3c24xx/mach-smdk2416.c
arch/arm/mach-s3c64xx/mach-anw6410.c
arch/arm/mach-s3c64xx/mach-crag6410.c
arch/arm/mach-s3c64xx/mach-hmt.c
arch/arm/mach-s3c64xx/mach-mini6410.c
arch/arm/mach-s3c64xx/mach-ncp.c
arch/arm/mach-s3c64xx/mach-real6410.c
arch/arm/mach-s3c64xx/mach-smdk6410.c
arch/arm/mach-s5p64x0/mach-smdk6440.c
arch/arm/mach-s5p64x0/mach-smdk6450.c
arch/arm/mach-s5pc100/mach-smdkc100.c
arch/arm/mach-s5pv210/mach-goni.c
arch/arm/mach-s5pv210/mach-smdkv210.c
arch/arm/mach-shmobile/board-ap4evb.c
arch/arm/mach-shmobile/board-armadillo800eva.c
arch/arm/mach-shmobile/board-kzm9g.c
arch/arm/mach-shmobile/board-mackerel.c
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-shmobile/include/mach/r8a7779.h
arch/arm/mach-shmobile/pm-rmobile.c
arch/arm/mach-shmobile/pm-sh7372.c
arch/arm/mach-shmobile/smp-emev2.c
arch/arm/mach-tegra/pcie.c
arch/arm/mach-u300/core.c
arch/arm/mach-u300/i2c.c
arch/arm/mm/cache-l2x0.c
arch/arm/plat-mxc/include/mach/devices-common.h
arch/arm/plat-omap/include/plat/usb.h
arch/arm/plat-samsung/clock.c
arch/powerpc/sysdev/fsl_msi.c
drivers/Makefile
drivers/clk/Makefile
drivers/clocksource/Makefile
drivers/crypto/ux500/hash/hash_core.c
drivers/dma/ep93xx_dma.c
drivers/dma/imx-dma.c
drivers/dma/imx-sdma.c
drivers/dma/mmp_tdma.c
drivers/dma/omap-dma.c
drivers/dma/tegra20-apb-dma.c
drivers/gpio/Kconfig
drivers/gpio/Makefile
drivers/gpio/gpio-pxa.c
drivers/i2c/busses/Kconfig
drivers/i2c/busses/i2c-davinci.c
drivers/i2c/busses/i2c-imx.c
drivers/i2c/busses/i2c-omap.c
drivers/input/keyboard/omap-keypad.c
drivers/input/touchscreen/s3c2410_ts.c
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/media/platform/davinci/vpbe_venc.c
drivers/media/platform/omap/omap_vout.c
drivers/media/platform/omap3isp/isp.c
drivers/media/platform/s5p-fimc/mipi-csis.c
drivers/media/platform/soc_camera/mx1_camera.c
drivers/media/platform/soc_camera/mx2_camera.c
drivers/media/platform/soc_camera/mx3_camera.c
drivers/media/platform/soc_camera/pxa_camera.c
drivers/mfd/twl-core.c
drivers/mmc/host/davinci_mmc.c
drivers/mmc/host/mxcmmc.c
drivers/mmc/host/omap_hsmmc.c
drivers/mmc/host/pxamci.c
drivers/mmc/host/sdhci-esdhc-imx.c
drivers/mmc/host/sdhci-tegra.c
drivers/mtd/nand/ams-delta.c
drivers/mtd/nand/davinci_nand.c
drivers/mtd/nand/mxc_nand.c
drivers/mtd/nand/omap2.c
drivers/mtd/nand/orion_nand.c
drivers/mtd/nand/pxa3xx_nand.c
drivers/mtd/nand/s3c2410.c
drivers/net/can/mscan/mpc5xxx_can.c
drivers/pinctrl/Kconfig
drivers/pinctrl/Makefile
drivers/remoteproc/omap_remoteproc.c
drivers/spi/Kconfig
drivers/spi/spi-davinci.c
drivers/spi/spi-omap2-mcspi.c
drivers/spi/spi-s3c64xx.c
drivers/spi/spi-tegra.c
drivers/staging/tidspbridge/core/dsp-clock.c
drivers/staging/tidspbridge/core/tiomap3430.c
drivers/staging/tidspbridge/core/tiomap3430_pwr.c
drivers/staging/tidspbridge/core/wdt.c
drivers/staging/tidspbridge/rmgr/drv_interface.c
drivers/tty/serial/imx.c
drivers/usb/Kconfig
drivers/usb/gadget/pxa27x_udc.c
drivers/usb/gadget/s3c2410_udc.c
drivers/usb/host/Kconfig
drivers/usb/host/ehci-mxc.c
drivers/usb/host/ehci-s5p.c
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci-nxp.c
drivers/usb/host/ohci-pxa27x.c
drivers/usb/musb/da8xx.c
drivers/usb/musb/tusb6010_omap.c
drivers/usb/musb/ux500_dma.c
drivers/usb/otg/isp1301_omap.c
drivers/video/Kconfig
drivers/video/da8xx-fb.c
drivers/video/ep93xx-fb.c
drivers/video/imxfb.c
drivers/video/msm/mddi.c
drivers/video/msm/mddi_client_nt35399.c
drivers/video/msm/mdp.c
drivers/video/msm/mdp_hw.h
drivers/video/omap2/dss/dispc.c
drivers/video/omap2/omapfb/omapfb-main.c
include/linux/i2c/twl.h
include/linux/leds.h
include/linux/mfd/twl6040.h
include/linux/mod_devicetable.h
include/linux/platform_data/asoc-ti-mcbsp.h
include/linux/platform_data/remoteproc-omap.h
sound/soc/cirrus/ep93xx-ac97.c
sound/soc/cirrus/ep93xx-i2s.c
sound/soc/cirrus/ep93xx-pcm.c
sound/soc/fsl/imx-pcm-dma.c
sound/soc/fsl/imx-ssi.c
sound/soc/omap/am3517evm.c
sound/soc/omap/mcbsp.c
sound/soc/omap/omap-abe-twl6040.c
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-mcpdm.c
sound/soc/omap/omap-pcm.c
sound/soc/omap/zoom2.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 52ed4d1ff4edfd284d49766f19261eeab035fbdd,35e5895ba3df31856c73193a6bf79f791d54f985..f3990b04fecf4661216c9cf321dc817c72e1a0b7
                                compatible = "fsl,imx6q-ccm";
                                reg = <0x020c4000 0x4000>;
                                interrupts = <0 87 0x04 0 88 0x04>;
+                               #clock-cells = <1>;
                        };
  
 -                      anatop@020c8000 {
 -                              compatible = "fsl,imx6q-anatop";
 +                      anatop: anatop@020c8000 {
 +                              compatible = "fsl,imx6q-anatop", "syscon", "simple-bus";
                                reg = <0x020c8000 0x1000>;
                                interrupts = <0 49 0x04 0 54 0x04 0 127 0x04>;
  
Simple merge
Simple merge
index 5e711722ebf45433331c5792cbb7de3e301713a4,963342acebb7200445970aeb51907e6cdf2eceed..e44bd28bdb4f22499e122ff723f629ccd8656740
  #define _ASMARM_TIMEX_H
  
  #include <asm/arch_timer.h>
+ #ifdef CONFIG_ARCH_MULTIPLATFORM
+ #define CLOCK_TICK_RATE 1000000
+ #else
  #include <mach/timex.h>
+ #endif
  
 -typedef unsigned long cycles_t;
 -
  #ifdef ARCH_HAS_READ_CURRENT_TIMER
  #define get_cycles()  ({ cycles_t c; read_current_timer(&c) ? 0 : c; })
 -#else
 -#define get_cycles()  (0)
  #endif
  
 +#include <asm-generic/timex.h>
 +
  #endif
index 3319aca0e0a34c0c9326e23929dcb1a6d1d1d533,d81f3a6d9ad84df7917d2a1edefb68b0dcae6ac9..5dfef9d97ed92b960d8d359997a20108759d60c8
@@@ -19,11 -19,8 +19,10 @@@ obj-y               := elf.o entry-armv.o entry-comm
                   process.o ptrace.o return_address.o sched_clock.o \
                   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o
  
 -obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += compat.o
 +obj-$(CONFIG_ATAGS)           += atags_parse.o
 +obj-$(CONFIG_ATAGS_PROC)      += atags_proc.o
 +obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
  
- obj-$(CONFIG_LEDS)            += leds.o
  obj-$(CONFIG_OC_ETM)          += etm.o
  obj-$(CONFIG_CPU_IDLE)                += cpuidle.o
  obj-$(CONFIG_ISA_DMA_API)     += dma.o
Simple merge
Simple merge
index a0217e3a464549b64a5b7074a1a05fbd5159e0e0,aa4ffe6e5ecfbd9a8feeedf1c002ca50861ae541..d100eacdb7983f8e490a8dc88d4f830b7fab3b8c
  #include <linux/percpu.h>
  #include <linux/clockchips.h>
  #include <linux/completion.h>
 +#include <linux/cpufreq.h>
  
  #include <linux/atomic.h>
+ #include <asm/smp.h>
  #include <asm/cacheflush.h>
  #include <asm/cpu.h>
  #include <asm/cputype.h>
   */
  struct secondary_data secondary_data;
  
+ /*
+  * control for which core is the next to come out of the secondary
+  * boot "holding pen"
+  */
+ volatile int __cpuinitdata pen_release = -1;
  enum ipi_msg_type {
 -      IPI_TIMER = 2,
 +      IPI_WAKEUP,
 +      IPI_TIMER,
        IPI_RESCHEDULE,
        IPI_CALL_FUNC,
        IPI_CALL_FUNC_SINGLE,
Simple merge
index 8661b2013527f12b33e6c9d081ccea3314ba47af,a37fc44e29bc05b2c52d796bf4ace69cb6800601..acb545aebcf1a474bd912844c9096efb2123c309
  #include <linux/davinci_emac.h>
  #include <linux/platform_device.h>
  #include <linux/spi/spi.h>
 +#include <linux/platform_data/davinci_asp.h>
  
- #include <mach/keyscan.h>
 -#include <mach/asp.h>
+ #include <linux/platform_data/keyscan-davinci.h>
  #include <mach/hardware.h>
 +#include <mach/edma.h>
  
  #include <media/davinci/vpfe_capture.h>
  #include <media/davinci/vpif_types.h>
Simple merge
index e47a3f0e8ac48643a2c47867ae523855c04329ca,adbde33eca015a640217ed1335671645cd874449..a255434908dbcfebb1a1b8a3a946860db7e9f4bf
@@@ -26,7 -26,8 +26,7 @@@
  #include <mach/time.h>
  #include <mach/serial.h>
  #include <mach/common.h>
- #include <mach/spi.h>
 -#include <mach/asp.h>
+ #include <linux/platform_data/spi-davinci.h>
  #include <mach/gpio-davinci.h>
  
  #include "davinci.h"
index f473745d6e3cbe5ca940ca6694eabe00f6e41207,719e22f2a37e42bd4bc11bcf28bc86f629a79adf..b680c832e0ba87758f1f29aeb502109ce2699268
@@@ -29,8 -29,9 +29,8 @@@
  #include <mach/time.h>
  #include <mach/serial.h>
  #include <mach/common.h>
- #include <mach/keyscan.h>
- #include <mach/spi.h>
 -#include <mach/asp.h>
+ #include <linux/platform_data/keyscan-davinci.h>
+ #include <linux/platform_data/spi-davinci.h>
  #include <mach/gpio-davinci.h>
  
  #include "davinci.h"
index c74a6abef187f9c7e7bf7b61e0e4c81034fb58bb,33e78ae2a254d3106f97a42dcf68aa2cebc076c2..c9ee723c56f35a78628dc0a4a78c08bd63a4f6c3
  
  #include <mach/serial.h>
  #include <mach/edma.h>
- #include <mach/i2c.h>
- #include <mach/mmc.h>
- #include <mach/usb.h>
 -#include <mach/asp.h>
  #include <mach/pm.h>
- #include <mach/spi.h>
+ #include <linux/platform_data/i2c-davinci.h>
+ #include <linux/platform_data/mmc-davinci.h>
+ #include <linux/platform_data/usb-davinci.h>
+ #include <linux/platform_data/spi-davinci.h>
  
  extern void __iomem *da8xx_syscfg0_base;
  extern void __iomem *da8xx_syscfg1_base;
Simple merge
Simple merge
index ee069b47ef262d9d68d279ff05d9098451d59a53,7a265d1a82d3e6e172799fe2dfc52d16b4217f7c..730f1ac65928ed832a52fdb2cf0e8b80f2ae4d60
  #include <plat/devs.h>
  #include <plat/fb.h>
  #include <plat/gpio-cfg.h>
- #include <plat/iic.h>
+ #include <linux/platform_data/i2c-s3c2410.h>
  #include <plat/keypad.h>
  #include <plat/mfc.h>
 -#include <plat/regs-fb.h>
  #include <plat/regs-serial.h>
  #include <plat/sdhci.h>
  
Simple merge
Simple merge
Simple merge
index e81f17a70f0092574410c731454c09f9bce84c84,e5165a84f93f7ff8467f5b7c981a083518fffff4..a0bf84803eacee45978fc1b1deef41076db17f19
@@@ -456,7 -461,10 +462,11 @@@ int __init mx53_clocks_init(unsigned lo
        clk_register_clkdev(clk[ssi1_ipg_gate], NULL, "63fcc000.ssi");
        clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "50014000.ssi");
        clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "63fd0000.ssi");
 +      clk_register_clkdev(clk[nfc_gate], NULL, "63fdb000.nand");
+       clk_register_clkdev(clk[can1_ipg_gate], "ipg", "53fc8000.can");
+       clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can");
+       clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can");
+       clk_register_clkdev(clk[can2_serial_gate], "per", "53fcc000.can");
  
        /* set SDHC root clock to 200MHZ*/
        clk_set_rate(clk[esdhc_a_podf], 200000000);
index eaf56b4f71f2a8e2c5c17ba5fdee30dad21f5e64,36979d3dfe341aa2cc3d41d0b1742bd1ef261a1a..47c91f7185d2fb7cdef048388e5cf82620e68a87
  #include <linux/of_address.h>
  #include <linux/of_irq.h>
  #include <linux/of_platform.h>
- #include <linux/pinctrl/machine.h>
  #include <linux/phy.h>
 +#include <linux/regmap.h>
  #include <linux/micrel_phy.h>
 -#include <linux/mfd/anatop.h>
 +#include <linux/mfd/syscon.h>
  #include <asm/cpuidle.h>
  #include <asm/smp_twd.h>
  #include <asm/hardware/cache-l2x0.h>
Simple merge
index ff1255ae712151fb0df7331f7f68a07870cf099d,2215d96cd7357b0c28a5cfc9ad72f1a990bddc29..d5b5435a09aed30896817ce1930c1af6ab4aa88a
@@@ -162,8 -155,26 +158,9 @@@ static void __init ap_map_io(void
  {
        iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
        vga_base = PCI_MEMORY_VADDR;
+       pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));
  }
  
 -#define INTEGRATOR_SC_VALID_INT       0x003fffff
 -
 -static void __init ap_init_irq(void)
 -{
 -      /* Disable all interrupts initially. */
 -      /* Do the core module ones */
 -      writel(-1, VA_CMIC_BASE + IRQ_ENABLE_CLEAR);
 -
 -      /* do the header card stuff next */
 -      writel(-1, VA_IC_BASE + IRQ_ENABLE_CLEAR);
 -      writel(-1, VA_IC_BASE + FIQ_ENABLE_CLEAR);
 -
 -      fpga_irq_init(VA_IC_BASE, "SC", IRQ_PIC_START,
 -              -1, INTEGRATOR_SC_VALID_INT, NULL);
 -      integrator_clk_init(false);
 -}
 -
  #ifdef CONFIG_PM
  static unsigned long ic_irq_enable;
  
index f51363e2d6feb0f7e22179c89c15b1d27e30d683,3df5fc36936172ce4cf3e47dc4cf6a87918f6917..6870a1fbcd7870233d20746d1ab892d10c989161
  
  #define INTCP_PA_CLCD_BASE            0xc0000000
  
- #define INTCP_VA_CTRL_BASE            IO_ADDRESS(INTEGRATOR_CP_CTL_BASE)
 -#define INTCP_VA_CIC_BASE             __io_address(INTEGRATOR_HDR_BASE + 0x40)
 -#define INTCP_VA_PIC_BASE             __io_address(INTEGRATOR_IC_BASE)
 -#define INTCP_VA_SIC_BASE             __io_address(INTEGRATOR_CP_SIC_BASE)
 -
 -#define INTCP_ETH_SIZE                        0x10
 -
+ #define INTCP_VA_CTRL_BASE            __io_address(INTEGRATOR_CP_CTL_BASE)
  #define INTCP_FLASHPROG                       0x04
  #define CINTEGRATOR_FLASHPROG_FLVPPEN (1 << 0)
  #define CINTEGRATOR_FLASHPROG_FLWREN  (1 << 1)
Simple merge
index 66862fb981f953107d8409fd1b3418e8fdb5f6fc,381c08027df43a0b7faddf8a374d60112fcb4125..b71789a87a5989c8b2e7e652d0d4e18ca23ce02f
@@@ -34,9 -33,8 +34,9 @@@
  
  #include <plat/gpio-nomadik.h>
  #include <plat/mtu.h>
 +#include <plat/pincfg.h>
  
- #include <mach/nand.h>
+ #include <linux/platform_data/mtd-nomadik-nand.h>
  #include <mach/fsmc.h>
  
  #include "cpu-8815.h"
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index ca07264bd3ae7633d370e3ba9047988fd8153bf4,3945c5017085abdb72cfd61532fb33c864df23c4..ed85fb898c7fd62b8526d0bf1e0bea1d23ff26fd
  #include "common.h"
  #include <plat/dma.h>
  #include <plat/gpmc.h>
- #include <plat/onenand.h>
- #include <plat/gpmc-smc91x.h>
 +#include <plat/omap-pm.h>
+ #include "gpmc-smc91x.h"
  
- #include <mach/board-rx51.h>
+ #include "board-rx51.h"
  
  #include <sound/tlv320aic3x.h>
  #include <sound/tpa6130a2-plat.h>
index a7d3b04807448c3bfa29cc408a09af1ea964488a,6bcc107b9fc37facbafeac687e31f281f2a1bb57..67f8540c8e07a912a87460311afc0f3a0e5c094e
@@@ -245,10 -245,13 +246,7 @@@ static int zoom_twl_gpio_setup(struct d
        return ret;
  }
  
 -/* EXTMUTE callback function */
 -static void zoom2_set_hs_extmute(int mute)
 -{
 -      gpio_set_value(ZOOM2_HEADSET_EXTMUTE_GPIO, mute);
 -}
 -
  static struct twl4030_gpio_platform_data zoom_gpio_data = {
-       .gpio_base      = OMAP_MAX_GPIO_LINES,
-       .irq_base       = TWL4030_GPIO_IRQ_BASE,
-       .irq_end        = TWL4030_GPIO_IRQ_END,
        .setup          = zoom_twl_gpio_setup,
  };
  
@@@ -274,9 -277,9 +272,9 @@@ static int __init omap_i2c_init(void
  
                codec_data->ramp_delay_value = 3;       /* 161 ms */
                codec_data->hs_extmute = 1;
 -              codec_data->set_hs_extmute = zoom2_set_hs_extmute;
 +              codec_data->hs_extmute_gpio = ZOOM2_HEADSET_EXTMUTE_GPIO;
        }
-       omap_pmic_init(1, 2400, "twl5030", INT_34XX_SYS_NIRQ, &zoom_twldata);
+       omap_pmic_init(1, 2400, "twl5030", 7 + OMAP_INTC_START, &zoom_twldata);
        omap_register_i2c_bus(2, 400, NULL, 0);
        omap_register_i2c_bus(3, 400, NULL, 0);
        return 0;
index d57a3578bf039e2142ea4a89bf2aade44463eae8,7d47407d6d461892cf2deb57c20a5a050335ac04..37f8f948047baace501bc6ef4b09f551aa7c9cfa
  #include <linux/clk.h>
  #include <linux/err.h>
  #include <linux/io.h>
 +#include <linux/of.h>
  #include <linux/platform_device.h>
  #include <linux/slab.h>
+ #include <linux/platform_data/asoc-ti-mcbsp.h>
  
- #include <mach/irqs.h>
  #include <plat/dma.h>
- #include <plat/cpu.h>
- #include <plat/mcbsp.h>
  #include <plat/omap_device.h>
  #include <linux/pm_runtime.h>
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 96478f05fc003096b5875a8429389077cffb6843,db2787aa1e5e7fb5ee61dff9d5c62a861d1d76aa..f30d7fccbfeedd4e2a22e00703b3933231b03157
  #include <plat/clock.h>
  #include <plat/devs.h>
  #include <plat/cpu.h>
- #include <plat/nand.h>
+ #include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <plat/sdhci.h>
- #include <plat/udc.h>
+ #include <linux/platform_data/usb-s3c2410_udc.h>
  #include <linux/platform_data/s3c-hsudc.h>
  
 -#include <plat/regs-fb-v4.h>
  #include <plat/fb.h>
  
  #include <plat/common-smdk.h>
index f7a108bafd4cf6928b466c080f4e1c2c79fc2149,15c58dfc4584f655b630b45d58798155551a4639..99e82ac81b694ce69e27c7e5c8b3a53fc8cef473
@@@ -43,8 -42,9 +43,8 @@@
  #include <asm/mach-types.h>
  
  #include <plat/regs-serial.h>
- #include <plat/iic.h>
+ #include <linux/platform_data/i2c-s3c2410.h>
  #include <plat/fb.h>
 -#include <plat/regs-fb-v4.h>
  
  #include <plat/clock.h>
  #include <plat/devs.h>
Simple merge
Simple merge
index 96ebcc5944c3860a45dabd065eeed85e1952cb5c,09311cc40115d7dbf25c40dfe98bd45c5ea0a289..07c349cca33329fad68fbb253cfa5915e8783237
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/fb.h>
- #include <plat/nand.h>
+ #include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <plat/regs-serial.h>
- #include <plat/ts.h>
+ #include <linux/platform_data/touchscreen-s3c2410.h>
 -#include <plat/regs-fb-v4.h>
  
  #include <video/platform_lcd.h>
 +#include <video/samsung_fimd.h>
  
  #include "common.h"
  
Simple merge
index 76d3ffbe9a92f59fa9c6bbd1871e2aabdcde0652,6daca203e72b3eaea40d0792b0b8fd972918606d..7476f7c722ab18d86d7625caa0b5c6e7d41c3b1f
  #include <plat/cpu.h>
  #include <plat/devs.h>
  #include <plat/fb.h>
- #include <plat/nand.h>
+ #include <linux/platform_data/mtd-nand-s3c2410.h>
  #include <plat/regs-serial.h>
- #include <plat/ts.h>
+ #include <linux/platform_data/touchscreen-s3c2410.h>
 -#include <plat/regs-fb-v4.h>
  
  #include <video/platform_lcd.h>
 +#include <video/samsung_fimd.h>
  
  #include "common.h"
  
index d1378d76e1510ec2861b3826cd4c1663ae79a360,2547a8846472180016b0bd24e42f4eb53b009b20..da1a771a29e9f1493ce192d35fde34f6fa23ed01
  #include <plat/devs.h>
  #include <plat/cpu.h>
  #include <plat/adc.h>
- #include <plat/ts.h>
+ #include <linux/platform_data/touchscreen-s3c2410.h>
  #include <plat/keypad.h>
  #include <plat/backlight.h>
 -#include <plat/regs-fb-v4.h>
  
  #include "common.h"
  
Simple merge
Simple merge
index c3dcafa559b116ec4a400690910b623f697b329b,5d2c0934928b8b85f63fc525247fad486ef8da2a..dba7384a87bde67d48256dd3e0a95cc61735be55
  #include <plat/devs.h>
  #include <plat/cpu.h>
  #include <plat/fb.h>
- #include <plat/iic.h>
- #include <plat/ata.h>
+ #include <linux/platform_data/i2c-s3c2410.h>
+ #include <linux/platform_data/ata-samsung_cf.h>
  #include <plat/adc.h>
  #include <plat/keypad.h>
- #include <plat/ts.h>
- #include <plat/audio.h>
+ #include <linux/platform_data/touchscreen-s3c2410.h>
+ #include <linux/platform_data/asoc-s3c.h>
  #include <plat/backlight.h>
 -#include <plat/regs-fb-v4.h>
  
  #include "common.h"
  
Simple merge
Simple merge
index 264340a60f65ca9584de004d361525d8cd303027,bc3b5da59e256ffd050ee6bbfb9168fcc5f6cb22..790dc68c431250a8ae7021bf622102826471ba16
@@@ -1224,20 -1226,11 +1226,20 @@@ static struct i2c_board_info i2c1_devic
  };
  
  
- #define GPIO_PORT9CR  0xE6051009
- #define GPIO_PORT10CR 0xE605100A
- #define USCCR1                0xE6058144
+ #define GPIO_PORT9CR  IOMEM(0xE6051009)
+ #define GPIO_PORT10CR IOMEM(0xE605100A)
+ #define USCCR1                IOMEM(0xE6058144)
  static void __init ap4evb_init(void)
  {
 +      struct pm_domain_device domain_devices[] = {
 +              { "A4LC", &lcdc1_device, },
 +              { "A4LC", &lcdc_device, },
 +              { "A4MP", &fsi_device, },
 +              { "A3SP", &sh_mmcif_device, },
 +              { "A3SP", &sdhi0_device, },
 +              { "A3SP", &sdhi1_device, },
 +              { "A4R", &ceu_device, },
 +      };
        u32 srcr4;
        struct clk *clk;
  
Simple merge
index c76776a3e70da10aaf2027537f5630b020c3f505,62783b5d881389d405653ba9ea2550e2b6252e0a..0c27c810cf99d0906b655f298091ffab257644fc
@@@ -1402,30 -1404,14 +1404,30 @@@ static struct i2c_board_info i2c1_devic
        },
  };
  
- #define GPIO_PORT9CR  0xE6051009
- #define GPIO_PORT10CR 0xE605100A
- #define GPIO_PORT167CR        0xE60520A7
- #define GPIO_PORT168CR        0xE60520A8
- #define SRCR4         0xe61580bc
- #define USCCR1                0xE6058144
+ #define GPIO_PORT9CR  IOMEM(0xE6051009)
+ #define GPIO_PORT10CR IOMEM(0xE605100A)
+ #define GPIO_PORT167CR        IOMEM(0xE60520A7)
+ #define GPIO_PORT168CR        IOMEM(0xE60520A8)
+ #define SRCR4         IOMEM(0xe61580bc)
+ #define USCCR1                IOMEM(0xE6058144)
  static void __init mackerel_init(void)
  {
 +      struct pm_domain_device domain_devices[] = {
 +              { "A4LC", &lcdc_device, },
 +              { "A4LC", &hdmi_lcdc_device, },
 +              { "A4LC", &meram_device, },
 +              { "A4MP", &fsi_device, },
 +              { "A3SP", &usbhs0_device, },
 +              { "A3SP", &usbhs1_device, },
 +              { "A3SP", &nand_flash_device, },
 +              { "A3SP", &sh_mmcif_device, },
 +              { "A3SP", &sdhi0_device, },
 +#if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 +              { "A3SP", &sdhi1_device, },
 +#endif
 +              { "A3SP", &sdhi2_device, },
 +              { "A4R", &ceu_device, },
 +      };
        u32 srcr4;
        struct clk *clk;
  
index eb89293fff4d36068a7fc3baf305bd7010209799,f80f9c549393e14e1c5c35673ab0707d7c641eed..e675ef94ab93a96f5ccddb829e9051adf3ef4056
@@@ -81,13 -73,10 +75,8 @@@ extern void r8a7779_pinmux_init(void)
  extern void r8a7779_pm_init(void);
  extern void r8a7740_meram_workaround(void);
  
- extern unsigned int r8a7779_get_core_count(void);
- extern int r8a7779_platform_cpu_kill(unsigned int cpu);
- extern void r8a7779_secondary_init(unsigned int cpu);
- extern int r8a7779_boot_secondary(unsigned int cpu);
- extern void r8a7779_smp_prepare_cpus(void);
  extern void r8a7779_register_twd(void);
  
 -extern void shmobile_init_late(void);
 -
  #ifdef CONFIG_SUSPEND
  int shmobile_suspend_init(void);
  #else
@@@ -100,10 -89,15 +89,21 @@@ int shmobile_cpuidle_init(void)
  static inline int shmobile_cpuidle_init(void) { return 0; }
  #endif
  
 +static inline void shmobile_init_late(void)
 +{
 +      shmobile_suspend_init();
 +      shmobile_cpuidle_init();
 +}
 +
+ extern void shmobile_cpu_die(unsigned int cpu);
+ extern int shmobile_cpu_disable(unsigned int cpu);
+ #ifdef CONFIG_HOTPLUG_CPU
+ extern int shmobile_cpu_is_dead(unsigned int cpu);
+ #else
+ static inline int shmobile_cpu_is_dead(unsigned int cpu) { return 1; }
+ #endif
+ extern void shmobile_smp_init_cpus(unsigned int ncores);
  #endif /* __ARCH_MACH_COMMON_H */
index 7ad47977d2e7ba15e1b0674b0b96c292e050dd3d,f504c5e81b476a8647c2659a1847e30c9d31a9bf..499f52d2a4a193acbcf659af657aed58d7e27ffb
@@@ -347,9 -347,19 +347,11 @@@ extern int r8a7779_sysc_power_down(stru
  extern int r8a7779_sysc_power_up(struct r8a7779_pm_ch *r8a7779_ch);
  
  #ifdef CONFIG_PM
 -extern struct r8a7779_pm_domain r8a7779_sh4a;
 -extern struct r8a7779_pm_domain r8a7779_sgx;
 -extern struct r8a7779_pm_domain r8a7779_vdp1;
 -extern struct r8a7779_pm_domain r8a7779_impx3;
 -
 -extern void r8a7779_init_pm_domain(struct r8a7779_pm_domain *r8a7779_pd);
 -extern void r8a7779_add_device_to_domain(struct r8a7779_pm_domain *r8a7779_pd,
 -                                      struct platform_device *pdev);
 +extern void __init r8a7779_init_pm_domains(void);
  #else
 -#define r8a7779_init_pm_domain(pd) do { } while (0)
 -#define r8a7779_add_device_to_domain(pd, pdev) do { } while (0)
 +static inline void r8a7779_init_pm_domains(void) {}
  #endif /* CONFIG_PM */
  
+ extern struct smp_operations r8a7779_smp_ops;
  #endif /* __ASM_R8A7779_H__ */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index e68d0998d55fa74652b94380d91e566ae8ea030e,bd20588c356b47703cc18aa0a78f29094126813b..87ee140fefaa94b5b14f8ff94dcc5fdaaaf4e07a
@@@ -4,9 -4,7 +4,8 @@@
  #define       __ASM_ARCH_OMAP_USB_H
  
  #include <linux/io.h>
 +#include <linux/platform_device.h>
  #include <linux/usb/musb.h>
- #include <plat/board.h>
  
  #define OMAP3_HS_USB_PORTS    3
  
index d1116e2dfbeaf57ccd0c2a1aff9ce413d9b57f2a,7938fbce825e3052dc62f3a413e84b7aa0a887b5..012bbd0b8d81063fa7db1547f440b7ca97adca74
@@@ -144,10 -144,9 +144,10 @@@ long clk_round_rate(struct clk *clk, un
  
  int clk_set_rate(struct clk *clk, unsigned long rate)
  {
 +      unsigned long flags;
        int ret;
  
-       if (IS_ERR(clk))
+       if (IS_ERR_OR_NULL(clk))
                return -EINVAL;
  
        /* We do not default just do a clk->rate = rate as
@@@ -174,13 -173,12 +174,13 @@@ struct clk *clk_get_parent(struct clk *
  
  int clk_set_parent(struct clk *clk, struct clk *parent)
  {
 +      unsigned long flags;
        int ret = 0;
  
-       if (IS_ERR(clk))
+       if (IS_ERR_OR_NULL(clk) || IS_ERR_OR_NULL(parent))
                return -EINVAL;
  
 -      spin_lock(&clocks_lock);
 +      spin_lock_irqsave(&clocks_lock, flags);
  
        if (clk->ops && clk->ops->set_parent)
                ret = (clk->ops->set_parent)(clk, parent);
index 7e2b2f2e3ecde13f9e95c88801297d09c49a2583,51ffafae561ea5a4a12da1f401c76da164811fff..63c5f04ea580177649aba38d101cb3f86b40cb35
@@@ -509,14 -506,12 +509,14 @@@ static const struct of_device_id fsl_of
        },
        {
                .compatible = "fsl,ipic-msi",
-               .data = (void *)&ipic_msi_feature,
+               .data = &ipic_msi_feature,
        },
 +#ifdef CONFIG_EPAPR_PARAVIRT
        {
                .compatible = "fsl,vmpic-msi",
-               .data = (void *)&vmpic_msi_feature,
+               .data = &vmpic_msi_feature,
        },
 +#endif
        {}
  };
  
Simple merge
Simple merge
index 65919901a301174b42aa291f6070985906563e21,d496a55f6bb0c3061746559813e6d7dbc015aee7..cccde85e2d6c6f11b09647de1a07c63a702b4361
@@@ -13,4 -13,4 +13,5 @@@ obj-$(CONFIG_DW_APB_TIMER)    += dw_apb_ti
  obj-$(CONFIG_DW_APB_TIMER_OF) += dw_apb_timer_of.o
  obj-$(CONFIG_CLKSRC_DBX500_PRCMU)     += clksrc-dbx500-prcmu.o
  obj-$(CONFIG_ARMADA_370_XP_TIMER)     += time-armada-370-xp.o
 +obj-$(CONFIG_CLKSRC_ARM_GENERIC)      += arm_generic.o
+ obj-$(CONFIG_ARCH_BCM2835)    += bcm2835_timer.o
Simple merge
Simple merge
Simple merge
Simple merge
index 889a7fd845f9a261b02966342c64d799391bbee0,07fa48688ba918d18f2f3dafc9f6ff181838fbbc..05ce16fdf5b2d26bf1f510d2423da7a654f677d0
@@@ -19,8 -19,7 +19,8 @@@
  #include <linux/platform_device.h>
  #include <linux/device.h>
  #include <mach/regs-icu.h>
- #include <mach/sram.h>
 +#include <linux/of_device.h>
+ #include <linux/platform_data/dma-mmp_tdma.h>
  
  #include "dmaengine.h"
  
Simple merge
Simple merge
Simple merge
index 1d382954172f7ad4f95c15d439acdfa7496d7ec6,45de77bd09eaf4d88602b250051b1085ad4bd021..9aeed67073261f94702d8a873542bfff78ab2261
@@@ -68,9 -68,9 +69,10 @@@ obj-$(CONFIG_GPIO_TPS6586X)  += gpio-tps
  obj-$(CONFIG_GPIO_TPS65910)   += gpio-tps65910.o
  obj-$(CONFIG_GPIO_TPS65912)   += gpio-tps65912.o
  obj-$(CONFIG_GPIO_TWL4030)    += gpio-twl4030.o
 +obj-$(CONFIG_GPIO_TWL6040)    += gpio-twl6040.o
  obj-$(CONFIG_GPIO_UCB1400)    += gpio-ucb1400.o
  obj-$(CONFIG_GPIO_VR41XX)     += gpio-vr41xx.o
+ obj-$(CONFIG_GPIO_VT8500)     += gpio-vt8500.o
  obj-$(CONFIG_GPIO_VX855)      += gpio-vx855.o
  obj-$(CONFIG_GPIO_WM831X)     += gpio-wm831x.o
  obj-$(CONFIG_GPIO_WM8350)     += gpio-wm8350.o
Simple merge
Simple merge
index 85ce548ff1526672fe383c663e97a75814704ce7,79a2542d8c41564b1c2b7a337e23a8a0282cda4f..6a0a5531944994803b94cbbe95b8badf7bdbb42c
  #include <linux/slab.h>
  #include <linux/cpufreq.h>
  #include <linux/gpio.h>
 +#include <linux/of_i2c.h>
 +#include <linux/of_device.h>
  
  #include <mach/hardware.h>
- #include <mach/i2c.h>
+ #include <linux/platform_data/i2c-davinci.h>
  
  /* ----- global defines ----------------------------------------------- */
  
Simple merge
index c78431a4970a814a814baac01a518c0f1e7112c8,a0e49f6aaf96eaa81ac712a4a279fafbdf13af95..0b0254312d21f7f39e902e15c8862334d41045ad
@@@ -1051,11 -943,12 +1051,12 @@@ omap_i2c_probe(struct platform_device *
  {
        struct omap_i2c_dev     *dev;
        struct i2c_adapter      *adap;
 -      struct resource         *mem, *irq, *ioarea;
 +      struct resource         *mem;
-       struct omap_i2c_bus_platform_data *pdata = pdev->dev.platform_data;
+       const struct omap_i2c_bus_platform_data *pdata =
+               pdev->dev.platform_data;
        struct device_node      *node = pdev->dev.of_node;
        const struct of_device_id *match;
 -      irq_handler_t isr;
 +      int irq;
        int r;
  
        /* NOTE: driver uses the static register mapping */
index b03c5b9548640fe572411306ed206d81f29bfe43,6d6b1427ae12fd6ce932c9188aba37ac44a3d321..4a5fcc8026f5630670f03cfdde498721eb55d97c
@@@ -421,10 -346,9 +346,9 @@@ err4
  err3:
        device_remove_file(&pdev->dev, &dev_attr_enable);
  err2:
 -      for (i = row_idx - 1; i >=0; i--)
 +      for (i = row_idx - 1; i >= 0; i--)
                gpio_free(row_gpios[i]);
- err1:
 -      for (i = col_idx - 1; i >=0; i--)
 +      for (i = col_idx - 1; i >= 0; i--)
                gpio_free(col_gpios[i]);
  
        kfree(omap_kp);
Simple merge
Simple merge
Simple merge
Simple merge
index c5e1eebcd5888bdf6186f27e17213d33dee08401,3dfd3473269de965bb0500acd2ef5512ebe9269f..20636772c09bd2aa2b794f44c3029e1f57559578
  #include <linux/io.h>
  #include <linux/irq.h>
  #include <linux/delay.h>
 +#include <linux/dmaengine.h>
  #include <linux/dma-mapping.h>
 +#include <linux/edma.h>
  #include <linux/mmc/mmc.h>
  
- #include <mach/mmc.h>
+ #include <linux/platform_data/mmc-davinci.h>
 -#include <mach/edma.h>
  
  /*
   * Register Definitions
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index df1ab7dc3440876f8d99014f57cadd64dee81b88,f1deb1ee2c954c2a15a0c8a60aaf91bc0c9eccb9..945047ad09527ca6a9328f34866ddd5a3a7e7dd8
  #include <linux/mtd/nand.h>
  #include <linux/mtd/partitions.h>
  #include <linux/slab.h>
 +#include <linux/of_device.h>
  
- #include <mach/nand.h>
- #include <mach/aemif.h>
+ #include <linux/platform_data/mtd-davinci.h>
+ #include <linux/platform_data/mtd-davinci-aemif.h>
  
  /*
   * This is a device driver for the NAND flash controller found on the
Simple merge
Simple merge
index 9ee436d309329fd04464cd6643b343ab1f1e5b88,131b58a133f148b2f70cdb711c708f529d84c87d..aefaf8cd31ef86f802e09273760fb47638067292
@@@ -21,7 -21,8 +21,7 @@@
  #include <linux/err.h>
  #include <asm/io.h>
  #include <asm/sizes.h>
- #include <plat/orion_nand.h>
 -#include <mach/hardware.h>
+ #include <linux/platform_data/mtd-orion_nand.h>
  
  static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
  {
Simple merge
index 792cee8462219626732982daa7b8849b9783b666,d8040619ad8dfca48fc460305b782cc771a06008..295e4bedad960a0efe653dc893fe0f1e0270f2f1
  #include <linux/mtd/nand_ecc.h>
  #include <linux/mtd/partitions.h>
  
 -#include <asm/io.h>
 -
  #include <plat/regs-nand.h>
- #include <plat/nand.h>
+ #include <linux/platform_data/mtd-nand-s3c2410.h>
  
 -#ifdef CONFIG_MTD_NAND_S3C2410_HWECC
 -static int hardware_ecc = 1;
 -#else
 -static int hardware_ecc = 0;
 -#endif
 -
 -#ifdef CONFIG_MTD_NAND_S3C2410_CLKSTOP
 -static const int clock_stop = 1;
 -#else
 -static const int clock_stop = 0;
 -#endif
 -
 -
  /* new oob placement block for use with hardware ecc generation
   */
  
Simple merge
Simple merge
Simple merge
Simple merge
index dd73a7c3cf7dd0d9817fd84811c7663987a7eaa3,2d198a01a41024a338b405c78b19d34d6829caf0..d0518cec25f5a7fd76545770be0e0175710a7cef
@@@ -371,16 -364,9 +371,16 @@@ config SPI_STMP3XX
        help
          SPI driver for Freescale STMP37xx/378x SoC SSP interface
  
 +config SPI_MXS
 +      tristate "Freescale MXS SPI controller"
 +      depends on ARCH_MXS
 +      select STMP_DEVICE
 +      help
 +        SPI driver for Freescale MXS devices.
 +
  config SPI_TEGRA
        tristate "Nvidia Tegra SPI controller"
-       depends on ARCH_TEGRA && (TEGRA_SYSTEM_DMA || TEGRA20_APB_DMA)
+       depends on ARCH_TEGRA && TEGRA20_APB_DMA
        help
          SPI driver for NVidia Tegra SoCs
  
index c1ec52d467147858cd2a1ff23a9670fee3335655,3afe2f4f5b8eb231bae471d6e4bdd5d48d385dae..147dfa87a64b6260b52f71b62d7880ec6905fdfb
@@@ -32,7 -30,8 +32,7 @@@
  #include <linux/spi/spi_bitbang.h>
  #include <linux/slab.h>
  
- #include <mach/spi.h>
+ #include <linux/platform_data/spi-davinci.h>
 -#include <mach/edma.h>
  
  #define SPI_NO_RESOURCE               ((resource_size_t)-1)
  
Simple merge
Simple merge
Simple merge
index e5adad08f1c4ffe3a9b5f90cf5fb1f9b7b590f34,453ef748bf45c3460162245eeecdcd05da832520..1dce36fb828f1d24ebcd8ea4d19c5c86d9587c88
@@@ -25,8 -25,7 +25,8 @@@
  #include <dspbridge/host_os.h>
  
  
- #define INT_34XX_WDT3_IRQ             36
 +#define OMAP34XX_WDT3_BASE            (0x49000000 + 0x30000)
+ #define INT_34XX_WDT3_IRQ             (36 + NR_IRQS)
  
  static struct dsp_wdt_setting dsp_wdt;
  
Simple merge
Simple merge
Simple merge
Simple merge
index b1deb0fd41970a43c5248bf82b76d9d81d154ff5,276add2358a18bb14fd82c681a676fd73fb743ce..3f1431d37e1c836f88b32aff5b002fb9cf4efa0b
@@@ -292,7 -292,7 +292,7 @@@ config USB_OHCI_HC
        depends on USB && USB_ARCH_HAS_OHCI
        select ISP1301_OMAP if MACH_OMAP_H2 || MACH_OMAP_H3
        select USB_OTG_UTILS if ARCH_OMAP
-       depends on USB_ISP1301 || !(ARCH_LPC32XX || ARCH_PNX4008)
 -      select USB_ISP1301 if ARCH_LPC32XX
++      depends on USB_ISP1301 || !ARCH_LPC32XX
        ---help---
          The Open Host Controller Interface (OHCI) is a standard for accessing
          USB 1.1 host controller hardware.  It does more in hardware than Intel's
Simple merge
Simple merge
Simple merge
Simple merge
index 77f4402aca03e0a16a9875431df8ec51bd60e311,955c410d59b69680fab2efc99dedb55fdafb4e79..2bf11440b010443290f2cbd6795cf22ddf561b0d
  #include <linux/signal.h>
  #include <linux/platform_device.h>
  #include <linux/clk.h>
 +#include <linux/of_platform.h>
 +#include <linux/of_gpio.h>
  #include <mach/hardware.h>
- #include <mach/ohci.h>
- #include <mach/pxa3xx-u2d.h>
+ #include <linux/platform_data/usb-ohci-pxa27x.h>
+ #include <linux/platform_data/usb-pxa3xx-ulpi.h>
  
  /*
   * UHC: USB Host Controller (OHCI-like) register definitions
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index d43e178fae273ead19b8707baf3890b47c84ac18,bf73f048006183da73d75377faddce1d143917d2..35ac9e8bee63f13a30133382dca3a8f43aa7a25d
  #include <linux/clk.h>
  #include <linux/io.h>
  #include <linux/sched.h>
- #include <mach/msm_fb.h>
 -#include <mach/msm_iomap.h>
 -#include <mach/irqs.h>
 -#include <mach/board.h>
+ #include <linux/platform_data/video-msm_fb.h>
  #include "mddi_hw.h"
  
  #define FLAG_DISABLE_HIBERNATION 0x0001
index 7570908a2d2c44c89d1663f379ca9853f831f044,d1f881e8030ed42828c690dcab66fe7bb3f99cb6..f2566c19e71cb10442e42552e9c492b5a3ba1db8
@@@ -25,7 -25,8 +25,7 @@@
  #include <linux/major.h>
  #include <linux/slab.h>
  
- #include <mach/msm_fb.h>
 -#include <mach/msm_iomap.h>
+ #include <linux/platform_data/video-msm_fb.h>
  #include <linux/platform_device.h>
  #include <linux/export.h>
  
index 2a841374263056a17e2754c4317c8f896d7efc2d,a0bacf581b32896deb3186168c08808791e733fa..35848d7410015f60ca5c64272557091cb5dc39a8
@@@ -15,7 -15,8 +15,7 @@@
  #ifndef _MDP_HW_H_
  #define _MDP_HW_H_
  
- #include <mach/msm_fb.h>
 -#include <mach/msm_iomap.h>
+ #include <linux/platform_data/video-msm_fb.h>
  
  struct mdp_info {
        struct mdp_device mdp_dev;
index d512c389741e0acdbf18a74a66e157ca908018ee,ee9e29639dcc4323c5d1d87b31390da0a1ad5373..32e09ebfa30c350906210f0a7dd847d9583c55d9
@@@ -37,6 -37,9 +37,8 @@@
  #include <linux/platform_device.h>
  #include <linux/pm_runtime.h>
  
 -#include <plat/clock.h>
+ #include <plat/cpu.h>
  #include <video/omapdss.h>
  
  #include "dss.h"
Simple merge
Simple merge
index 8991532d439133f596f37c46a34a514148fa6881,ba43d4806b833e48fe7d67df559e6849c1253817..a8eff4ad9be5f63197435653c05690cfe3e38186
@@@ -194,13 -192,8 +194,12 @@@ struct twl6040_vibra_data 
        int vddvibr_uV;                 /* VDDVIBR volt, set 0 for fixed reg */
  };
  
 +struct twl6040_gpo_data {
 +      int gpio_base;
 +};
 +
  struct twl6040_platform_data {
        int audpwron_gpio;      /* audio power-on gpio */
-       unsigned int irq_base;
  
        struct twl6040_codec_data *codec;
        struct twl6040_vibra_data *vibra;
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index bc06175e636716283a71b75c4ab35a0c2191461a,a681a9a8b8463824618a8c671d7cd12d6501006f..afb8d4f1bedfac70eb98492ce5b4c023bb9d0752
  #include <linux/delay.h>
  #include <linux/io.h>
  #include <linux/slab.h>
 +#include <linux/pm_runtime.h>
  
- #include <plat/mcbsp.h>
+ #include <linux/platform_data/asoc-ti-mcbsp.h>
+ #include <plat/cpu.h>
  
  #include "mcbsp.h"
  
Simple merge
index fef2f5933bb262f65f9c268da9c30d64daef3ee0,1b18627763cede8ba823b90d93fc127f105758dd..a6ee157478593f1e5eb338e51597df176308a953
@@@ -34,7 -32,9 +34,8 @@@
  #include <sound/initval.h>
  #include <sound/soc.h>
  
- #include <plat/mcbsp.h>
+ #include <plat/cpu.h>
 -#include <plat/dma.h>
+ #include <linux/platform_data/asoc-ti-mcbsp.h>
  #include "mcbsp.h"
  #include "omap-mcbsp.h"
  #include "omap-pcm.h"
Simple merge
index a2636f6b836210ea8b55645e5906114535fb904f,b309941798850d1143aaf5c4bfdf8c67a5967e09..340874ebf9ae79cb550cbfe54e81850802448e16
  #include <sound/core.h>
  #include <sound/pcm.h>
  #include <sound/pcm_params.h>
 +#include <sound/dmaengine_pcm.h>
  #include <sound/soc.h>
  
 -#include <plat/dma.h>
+ #include <plat/cpu.h>
  #include "omap-pcm.h"
  
  static const struct snd_pcm_hardware omap_pcm_hardware = {
Simple merge