]> 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>
Thu, 13 Oct 2011 00:17:28 +0000 (11:17 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 13 Oct 2011 00:17:31 +0000 (11:17 +1100)
Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/kernel/smp.c
arch/arm/mach-at91/board-usb-a9260.c
arch/arm/mach-ep93xx/Makefile.boot
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-nuc93x/Makefile.boot
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-u300/Makefile.boot
arch/arm/plat-mxc/include/mach/gpio.h
arch/arm/plat-omap/Kconfig

36 files changed:
1  2 
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/kernel/head.S
arch/arm/mach-at91/at91cap9_devices.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_devices.c
arch/arm/mach-at91/at91sam9g45_devices.c
arch/arm/mach-at91/board-usb-a926x.c
arch/arm/mach-davinci/da850.c
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm644x.c
arch/arm/mach-davinci/dm646x.c
arch/arm/mach-exynos4/Kconfig
arch/arm/mach-imx/mach-mx27ads.c
arch/arm/mach-msm/board-msm8x60.c
arch/arm/mach-mxs/include/mach/gpio.h
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-ldp.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-tegra/board-paz00.h
arch/arm/mach-tegra/board-seaboard.h
arch/arm/mach-tegra/board-trimslice.c
arch/arm/mach-u300/Kconfig
arch/arm/mach-u300/Makefile.boot
arch/arm/mach-u300/core.c
arch/arm/mach-ux500/board-mop500-pins.c
arch/arm/mach-ux500/board-mop500.c
arch/arm/mach-vexpress/hotplug.c
arch/arm/plat-mxc/include/mach/gpio.h
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/devices.c

index bb2b5badd1bc71fd492f195ca4d3a192048f3838,c1c9dc0750de23b60386cbcb837ee27603b84d38..fc5b1c38c8243b065c96835d942a7a7098d91657
@@@ -212,11 -212,20 +212,24 @@@ config ARM_PATCH_PHYS_VIR
          this feature (eg, building a kernel for a single machine) and
          you need to shrink the kernel to the minimal size.
  
+ config NEED_MACH_MEMORY_H
+       bool
+       help
+         Select this when mach/memory.h is required to provide special
+         definitions for this platform.  The need for mach/memory.h should
+         be avoided when possible.
+ config PHYS_OFFSET
+       hex "Physical address of main memory"
+       depends on !ARM_PATCH_PHYS_VIRT && !NEED_MACH_MEMORY_H
+       help
+         Please provide the physical address corresponding to the
+         location of main memory in your system.
  
 +config GENERIC_BUG
 +      def_bool y
 +      depends on BUG
 +
  source "init/Kconfig"
  
  source "kernel/Kconfig.freezer"
@@@ -386,7 -400,7 +404,8 @@@ config ARCH_FOOTBRIDG
        select CPU_SA110
        select FOOTBRIDGE
        select GENERIC_CLOCKEVENTS
 +      select HAVE_IDE
+       select NEED_MACH_MEMORY_H
        help
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
@@@ -675,7 -703,7 +710,8 @@@ config ARCH_RP
        select NO_IOPORT
        select ARCH_SPARSEMEM_ENABLE
        select ARCH_USES_GETTIMEOFFSET
 +      select HAVE_IDE
+       select NEED_MACH_MEMORY_H
        help
          On the Acorn Risc-PC, Linux can support the internal IDE disk and
          CD-ROM interface, serial and parallel port, and the floppy drive.
@@@ -694,7 -722,7 +730,8 @@@ config ARCH_SA110
        select HAVE_SCHED_CLOCK
        select TICK_ONESHOT
        select ARCH_REQUIRE_GPIOLIB
 +      select HAVE_IDE
+       select NEED_MACH_MEMORY_H
        help
          Support for StrongARM 11x0 based boards.
  
@@@ -841,7 -873,7 +882,8 @@@ config ARCH_U30
        select CLKDEV_LOOKUP
        select HAVE_MACH_CLKDEV
        select GENERIC_GPIO
 +      select ARCH_REQUIRE_GPIOLIB
+       select NEED_MACH_MEMORY_H
        help
          Support for ST-Ericsson U300 series mobile platforms.
  
Simple merge
index aa65a72333dd5b2c9fa7512d4d7f66edd1e01676,673c806cc1060068ba6fedf563d1e6f81d2b6f50..efa8bdb6794cad3116f6b200898e09683be17f8b
@@@ -263,10 -234,10 +263,10 @@@ __create_page_tables
         * This allows debug messages to be output
         * via a serial console before paging_init.
         */
-       addruart r7, r3
+       addruart r7, r3, r0
  
 -      mov     r3, r3, lsr #20
 -      mov     r3, r3, lsl #2
 +      mov     r3, r3, lsr #SECTION_SHIFT
 +      mov     r3, r3, lsl #PMD_ORDER
  
        add     r0, r4, r3
        rsb     r3, r3, #0x4000                 @ PTRS_PER_PGD*sizeof(long)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 9221f54778be8a8fbbac896364a7434e3266096a,e51cb83bd090ad1754ab3b04eeab3e64a0b213d4..47c476ed9ed848ada652921d19a005b1d45991d9
@@@ -116,3 -149,14 +149,16 @@@ MACHINE_START(MSM8X60_FFA, "QCT MSM8X6
        .init_machine = msm8x60_init,
        .timer = &msm_timer,
  MACHINE_END
+ #ifdef CONFIG_OF
+ /* TODO: General device tree support for all MSM. */
+ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
++      .fixup = msm8x60_fixup,
++      .reserve = msm8x60_reserve,
+       .map_io = msm8x60_map_io,
+       .init_irq = msm8x60_init_irq,
+       .init_machine = msm8x60_dt_init,
+       .timer = &msm_timer,
+       .dt_compat = msm8x60_fluid_match,
+ MACHINE_END
+ #endif /* CONFIG_OF */
index bb11e63261e491fb36c750787487c23bce2dc313,56025aa0a639ea68d7b523c147004215dc0010cf..01ee648b1c7e1e17aa34ba96bc86ae4eba67bba4
  #ifndef __MACH_MXS_GPIO_H__
  #define __MACH_MXS_GPIO_H__
  
- #define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
 -#include <asm-generic/gpio.h>
--
- #define irq_to_gpio(irq)      ((irq) - MXS_GPIO_IRQ_START)
 -/* use gpiolib dispatchers */
 -#define gpio_get_value                __gpio_get_value
 -#define gpio_set_value                __gpio_set_value
 -#define gpio_cansleep         __gpio_cansleep
 -#define gpio_to_irq           __gpio_to_irq
--
  #endif /* __MACH_MXS_GPIO_H__ */
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 42ce8639b90cc38ef5a1c79e053d089ed86dcd0b,86057c3fb9a0d574c9cfebe4e51c847dc8560b93..2dc189998b152f69816f31b12bb6f5f0e44014aa
  #ifndef _MACH_TEGRA_BOARD_PAZ00_H
  #define _MACH_TEGRA_BOARD_PAZ00_H
  
- #define TEGRA_GPIO_SD1_CD             TEGRA_GPIO_PV5
- #define TEGRA_GPIO_SD1_WP             TEGRA_GPIO_PH1
- #define TEGRA_GPIO_SD1_POWER          TEGRA_GPIO_PT3
- #define TEGRA_ULPI_RST                        TEGRA_GPIO_PV0
 +#include <mach/gpio-tegra.h>
 +
+ /* SDCARD */
+ #define TEGRA_GPIO_SD1_CD     TEGRA_GPIO_PV5
+ #define TEGRA_GPIO_SD1_WP     TEGRA_GPIO_PH1
+ #define TEGRA_GPIO_SD1_POWER  TEGRA_GPIO_PT3
+ /* ULPI */
+ #define TEGRA_ULPI_RST                TEGRA_GPIO_PV0
+ /* WIFI */
+ #define TEGRA_WIFI_PWRN               TEGRA_GPIO_PK5
+ #define TEGRA_WIFI_RST                TEGRA_GPIO_PD1
+ #define TEGRA_WIFI_LED                TEGRA_GPIO_PD0
  
  void paz00_pinmux_init(void);
  
index 15b6c57361bed412bf43e4de17ced72e4c0a5f60,d06c3342e2c4ed2f2d9003b921d6943450ab93d2..4c45d4ca3c491a29bef6ece84393845cfcf54a4b
  #ifndef _MACH_TEGRA_BOARD_SEABOARD_H
  #define _MACH_TEGRA_BOARD_SEABOARD_H
  
 +#include <mach/gpio-tegra.h>
 +
+ #define SEABOARD_GPIO_TPS6586X(_x_)   (TEGRA_NR_GPIOS + (_x_))
+ #define SEABOARD_GPIO_WM8903(_x_)     (SEABOARD_GPIO_TPS6586X(4) + (_x_))
  #define TEGRA_GPIO_SD2_CD             TEGRA_GPIO_PI5
  #define TEGRA_GPIO_SD2_WP             TEGRA_GPIO_PH1
  #define TEGRA_GPIO_SD2_POWER          TEGRA_GPIO_PI6
Simple merge
Simple merge
index 69357affbd77f9eb2799ee4b16fadbf2b382ae28,a06bb0deadfe2f2a39eeddbc2cd4937184d4b626..87811de0bd947cb4b516f54185e71b745562dc22
@@@ -1,15 -1,4 +1,4 @@@
- # Note: the following conditions must always be true:
- #   ZRELADDR == virt_to_phys(TEXTADDR)
- #   PARAMS_PHYS must be within 4MB of ZRELADDR
- #   INITRD_PHYS must be in RAM
- ifdef CONFIG_MACH_U300_SINGLE_RAM
-      zreladdr-y       += 0x28E08000
-   params_phys-y       := 0x28E00100
- else
-      zreladdr-y       += 0x48008000
-   params_phys-y       := 0x48000100
- endif
 -   zreladdr-y := 0x48008000
++   zreladdr-y += 0x48008000
+ params_phys-y := 0x48000100
  # This isn't used.
- #initrd_phys-y        := 0x29800000
+ #initrd_phys-y        := 0x48800000
Simple merge
Simple merge
index 3668cf91d2dedb0a443d9b2b6f1bff903c411c7d,2866ed8c4b05fd142ef99f49788ed816e7df7ab3..813ee08f96e6a3d7f7052a45be2e92e68e347b3c
@@@ -63,9 -62,15 +63,9 @@@ static inline void platform_do_lowpower
         * code will have already disabled interrupts
         */
        for (;;) {
 -              /*
 -               * here's the WFI
 -               */
 -              asm(".word      0xe320f003\n"
 -                  :
 -                  :
 -                  : "memory", "cc");
 +              wfi();
  
-               if (pen_release == cpu) {
+               if (pen_release == cpu_logical_map(cpu)) {
                        /*
                         * OK, proper wakeup, we're done
                         */
index 3e1ffc8b8f0c2d56283bdbc92b476bb07f86196d,44af0064ba1a96485d30bece8ee4d3a3183e0369..593ce13adfa7a50c22bbc9e5d67c06e1de96497f
  
  #include <linux/spinlock.h>
  #include <mach/hardware.h>
 -#include <asm-generic/gpio.h>
 -
 -/* use gpiolib dispatchers */
 -#define gpio_get_value                __gpio_get_value
 -#define gpio_set_value                __gpio_set_value
 -#define gpio_cansleep         __gpio_cansleep
 -#define gpio_to_irq           __gpio_to_irq
  
- /* There's a off-by-one betweem the gpio bank number and the gpiochip */
- /* range e.g. GPIO_1_5 is gpio 5 under linux */
- #define IMX_GPIO_NR(bank, nr)         (((bank) - 1) * 32 + (nr))
- #define gpio_to_irq(gpio)     (MXC_GPIO_IRQ_START + (gpio))
- #define irq_to_gpio(irq)      ((irq) - MXC_GPIO_IRQ_START)
  #endif
index 5b605a9eb0916634ab9e6e2b30ba8c55d24bce52,6d49d2f1d841a41c93a6cc4c91292fe53ef59999..f42ef7d8575588c78c8db0ea60a502144cab7f58
@@@ -14,7 -14,7 +14,8 @@@ config ARCH_OMAP
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
 +      select HAVE_IDE
+       select HAVE_MACH_MEMORY_H
        help
          "Systems based on omap7xx, omap15xx or omap16xx"
  
index 64c3bd4aa54ecbd43c9d4f6eeccaaf97fa0001e1,bd9a06b3ee890e662077ea52dad43289b392c4a4..acd132c296473b839964e2211a50f368baabd39d
  #include <plat/tc.h>
  #include <plat/board.h>
  #include <plat/mmc.h>
 -#include <mach/gpio.h>
  #include <plat/menelaus.h>
- #include <plat/mcbsp.h>
  #include <plat/omap44xx.h>
  
- /*-------------------------------------------------------------------------*/
- #if defined(CONFIG_OMAP_MCBSP) || defined(CONFIG_OMAP_MCBSP_MODULE)
- static struct platform_device **omap_mcbsp_devices;
- void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
-                       struct omap_mcbsp_platform_data *config, int size)
- {
-       int i;
-       omap_mcbsp_devices = kzalloc(size * sizeof(struct platform_device *),
-                                    GFP_KERNEL);
-       if (!omap_mcbsp_devices) {
-               printk(KERN_ERR "Could not register McBSP devices\n");
-               return;
-       }
-       for (i = 0; i < size; i++) {
-               struct platform_device *new_mcbsp;
-               int ret;
-               new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);
-               if (!new_mcbsp)
-                       continue;
-               platform_device_add_resources(new_mcbsp, &res[i * res_count],
-                                       res_count);
-               new_mcbsp->dev.platform_data = &config[i];
-               ret = platform_device_add(new_mcbsp);
-               if (ret) {
-                       platform_device_put(new_mcbsp);
-                       continue;
-               }
-               omap_mcbsp_devices[i] = new_mcbsp;
-       }
- }
- #else
- void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
-                       struct omap_mcbsp_platform_data *config, int size)
- {  }
- #endif
- /*-------------------------------------------------------------------------*/
  #if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
                defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)