1. 03 11月, 2011 33 次提交
  2. 02 11月, 2011 7 次提交
    • L
      Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc · 994c0e99
      Linus Torvalds 提交于
      * 'next/soc' of git://git.linaro.org/people/arnd/arm-soc: (21 commits)
        MAINTAINERS: add ARM/FREESCALE IMX6 entry
        arm/imx: merge i.MX3 and i.MX6
        arm/imx6q: add suspend/resume support
        arm/imx6q: add device tree machine support
        arm/imx6q: add smp and cpu hotplug support
        arm/imx6q: add core drivers clock, gpc, mmdc and src
        arm/imx: add gic_handle_irq function
        arm/imx6q: add core definitions and low-level debug uart
        arm/imx6q: add device tree source
        ARM: highbank: add suspend support
        ARM: highbank: Add cpu hotplug support
        ARM: highbank: add SMP support
        MAINTAINERS: add Calxeda Highbank ARM platform
        ARM: add Highbank core platform support
        ARM: highbank: add devicetree source
        ARM: l2x0: add empty l2x0_of_init
        picoxcell: add a definition of VMALLOC_END
        picoxcell: remove custom ioremap implementation
        picoxcell: add the DTS for the PC7302 board
        picoxcell: add the DTS for pc3x2 and pc3x3 devices
        ...
      
      Fix up trivial conflicts in arch/arm/Kconfig, and some more header file
      conflicts in arch/arm/mach-omap2/board-generic.c (as per an ealier merge
      by Arnd).
      994c0e99
    • L
      Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc · 367069f1
      Linus Torvalds 提交于
      * 'next/dt' of git://git.linaro.org/people/arnd/arm-soc:
        ARM: gic: use module.h instead of export.h
        ARM: gic: fix irq_alloc_descs handling for sparse irq
        ARM: gic: add OF based initialization
        ARM: gic: add irq_domain support
        irq: support domains with non-zero hwirq base
        of/irq: introduce of_irq_init
        ARM: at91: add at91sam9g20 and Calao USB A9G20 DT support
        ARM: at91: dt: at91sam9g45 family and board device tree files
        arm/mx5: add device tree support for imx51 babbage
        arm/mx5: add device tree support for imx53 boards
        ARM: msm: Add devicetree support for msm8660-surf
        msm_serial: Add devicetree support
        msm_serial: Use relative resources for iomem
      
      Fix up conflicts in arch/arm/mach-at91/{at91sam9260.c,at91sam9g45.c}
      367069f1
    • L
      Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc · 81a3c10c
      Linus Torvalds 提交于
      * 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc: (31 commits)
        ARM: OMAP: Warn if omap_ioremap is called before SoC detection
        ARM: OMAP: Move set_globals initialization to happen in init_early
        ARM: OMAP: Map SRAM later on with ioremap_exec()
        ARM: OMAP: Remove calls to SRAM allocations for framebuffer
        ARM: OMAP: Avoid cpu_is_omapxxxx usage until map_io is done
        ARM: OMAP1: Use generic map_io, init_early and init_irq
        arm/dts: OMAP3+: Add mpu, dsp and iva nodes
        arm/dts: OMAP4: Add a main ocp entry bound to l3-noc driver
        ARM: OMAP2+: l3-noc: Add support for device-tree
        ARM: OMAP2+: board-generic: Add i2c static init
        ARM: OMAP2+: board-generic: Add DT support to generic board
        arm/dts: Add support for OMAP3 Beagle board
        arm/dts: Add initial device tree support for OMAP3 SoC
        arm/dts: Add support for OMAP4 SDP board
        arm/dts: Add support for OMAP4 PandaBoard
        arm/dts: Add initial device tree support for OMAP4 SoC
        ARM: OMAP: omap_device: Add a method to build an omap_device from a DT node
        ARM: OMAP: omap_device: Add omap_device_[alloc|delete] for DT integration
        of: Add helpers to get one string in multiple strings property
        ARM: OMAP2+: devices: Remove all omap_device_pm_latency structures
        ...
      
      Fix up trivial header file conflicts in arch/arm/mach-omap2/board-generic.c
      81a3c10c
    • L
      Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc · 6585dea1
      Linus Torvalds 提交于
      * 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
        arm/imx: use Kconfig choice for low-level debug UART selection
        ARM: realview: use Kconfig choice for debug UART selection
        ARM: plat-samsung: use Kconfig choice for debug UART selection
        ARM: versatile: convert logical CPU numbers to physical numbers
        ARM: ux500: convert logical CPU numbers to physical numbers
        ARM: shmobile: convert logical CPU numbers to physical numbers
        ARM: msm: convert logical CPU numbers to physical numbers
        ARM: exynos4: convert logical CPU numbers to physical numbers
      
      Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
      ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug
      6585dea1
    • L
      Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc · 16ee792e
      Linus Torvalds 提交于
      * 'next/devel' of git://git.linaro.org/people/arnd/arm-soc: (50 commits)
        ARM: tegra: update defconfig
        arm/tegra: Harmony: Configure PMC for low-level interrupts
        arm/tegra: device tree support for ventana board
        arm/tegra: add support for ventana pinmuxing
        arm/tegra: prepare Seaboard pinmux code for derived boards
        arm/tegra: pinmux: ioremap registers
        gpio/tegra: Convert to a platform device
        arm/tegra: Convert pinmux driver to a platform device
        arm/dt: Tegra: Add pinmux node to tegra20.dtsi
        arm/tegra: Prep boards for gpio/pinmux conversion to pdevs
        ARM: mx5: fix clock usage for suspend
        ARM i.MX entry-macro.S: remove now unused code
        ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER
        ARM i.MX tzic: add handle_irq function
        ARM i.MX avic: add handle_irq function
        ARM: mx25: Add the missing IIM base definition
        ARM i.MX avic: convert to use generic irq chip
        mx31moboard: Add poweroff support
        ARM: mach-qong: Add watchdog support
        ARM: davinci: AM18x: Add wl1271/wlan support
        ...
      
      Fix up conflicts in:
      	arch/arm/mach-at91/at91sam9g45.c
      	arch/arm/mach-mx5/devices-imx53.h
      	arch/arm/plat-mxc/include/mach/memory.h
      16ee792e
    • L
      Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc · f906fb1d
      Linus Torvalds 提交于
      * 'next/board' of git://git.linaro.org/people/arnd/arm-soc: (34 commits)
        ep93xx: add support Vision EP9307 SoM
        ARM: mxs: Add initial support for DENX MX28
        ARM: EXYNOS4: Add support SMDK4412 Board
        ARM: EXYNOS4: Add MCT support for EXYNOS4412
        ARM: EXYNOS4: Add functions for gic interrupt handling
        ARM: EXYNOS4: Add support clock for EXYNOS4412
        ARM: EXYNOS4: Add support new EXYNOS4412 SoC
        ARM: EXYNOS4: Add support MCT PPI for EXYNOS4212
        ARM: EXYNOS4: Add support PPI in external GIC
        ARM: EXYNOS4: convert boot_params to atag_offset
        ixp4xx: support omicron ixp425 based boards
        ARM: EXYNOS4: Add support SMDK4212 Board
        ARM: EXYNOS4: Add support PM for EXYNOS4212
        ARM: EXYNOS4: Add support clock for EXYNOS4212
        ARM: EXYNOS4: Add support new EXYNOS4212 SoC
        at91: USB-A9G20 C01 & C11 board support
        at91: merge board USB-A9260 and USB-A9263 together
        at91: add support for RSIs EWS board
        ARM: SAMSUNG: Fix mask value for S5P64X0 CPU IDs
        ARM: SAMSUNG: Fix mask for S3C64xx CPU IDs
        ...
      f906fb1d
    • L
      Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc · 510597e2
      Linus Torvalds 提交于
      * 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc:
        ARM: mach-nuc93x: delete
      
      Fix up trivial delete/edit conflicts in
      	arch/arm/mach-nuc93x/{Makefile.boot,mach-nuc932evb.c,time.c}
      510597e2