Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Nov 3, 2011
  1. Linux-omap rebuilt: Updated to current mainline with arm-soc merged

    authored
    $ git checkout -b tmp-rebuild-1320282868 linus
    $ git merge -m "Merge fixes testing-misc cleanup dt soc board testing-board cbus" fixes testing-misc cleanup dt soc board testing-board cbus
    $ git merge -s ours master
    $ git checkout master
    $ git merge tmp-rebuild-1320282868
    
    To view the changes since the last rebuild, please do
    $ git diff f2620b7..d87d773 arch/arm/*omap*/
    
    Merge branch 'master' into tmp-rebuild-1320282868
  2. Merge fixes testing-misc cleanup dt soc board testing-board cbus

    authored
    Merge branches 'fixes', 'testing-misc', 'cleanup', 'dt', 'soc', 'board', 'testing-board' and 'cbus' into tmp-rebuild-1320282868
  3. Merge branch 'linus' into cbus

    authored
    Conflicts:
    	arch/arm/mach-omap1/board-nokia770.c
  4. ARM: OMAP2: Fix H4 matrix keyboard warning

    authored
    Convert to use matrix keyboard to remove the warning
    "Please update the board to use matrix-keypad driver".
    
    Based on similar setup in palmtc.c. Note that this
    patch is compile tested only because of lack of working
    hardware.
    
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  5. ARM: OMAP1: Fix warnings about enabling 32 KiHz timer

    authored
    Fix "Enable 32kHz OS timer in order to allow sleep states in idle"
    warning. We are now compiling in bothe MPU timer and 32 KiHz timer,
    so this warning is only valid when MPU_TIMER is set and OMAP_DM_TIMER
    is not set.
    
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  6. @tomba

    ARM: OMAP: change get_context_loss_count ret value to int

    tomba authored committed
    get_context_loss_count functions return context loss count as u32, and
    zero means an error. However, zero is also returned when context has
    never been lost and could also be returned when the context loss count
    has wrapped and goes to zero.
    
    Change the functions to return an int, with negative value meaning an
    error.
    
    OMAP HSMMC code uses omap_pm_get_dev_context_loss_count(), but as the
    hsmmc code handles the returned value as an int, with negative value
    meaning an error, this patch actually fixes hsmmc code also.
    
    Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
    Acked-by: Kevin Hilman <khilman@ti.com>
    Acked-by: Paul Walmsley <paul@pwsan.com>
    [tony@atomide.com: updated to fix a warning with recent dmtimer changes]
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  7. @bcousson

    ARM: OMAP2+: timer: Remove omap_device_pm_latency

    bcousson authored committed
    Remove the structure since a default one is now available.
    
    Signed-off-by: Benoit Cousson <b-cousson@ti.com>
    Cc: Kevin Hilman <khilman@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  8. @bcousson

    ARM: OMAP2+: clock data: Remove redundant timer clkdev

    bcousson authored committed
    The commit 318c3e1
    added some "fck" clock alias to timer devices that are
    not needed anymore since hwmod framework will create
    them automatically.
    
    A warning was added to highlight and thus fix the redundancy.
    
    [    0.616424]  omap_timer.1: alias fck already exists
    [    0.621948]  omap_timer.2: alias fck already exists
    [    0.627380]  omap_timer.3: alias fck already exists
    [    0.632781]  omap_timer.4: alias fck already exists
    [    0.638214]  omap_timer.5: alias fck already exists
    [    0.643615]  omap_timer.6: alias fck already exists
    [    0.649078]  omap_timer.7: alias fck already exists
    [    0.654479]  omap_timer.8: alias fck already exists
    [    0.659881]  omap_timer.9: alias fck already exists
    [    0.665283]  omap_timer.10: alias fck already exists
    [    0.670776]  omap_timer.11: alias fck already exists
    
    Remove all the clkdev entries for timer fck alias.
    
    Signed-off-by: Benoit Cousson <b-cousson@ti.com>
    Cc: Tarun Kanti DebBarma <tarun.kanti@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  9. @balajitk

    ARM: OMAP4: hsmmc: configure SDMMC1_DR0 properly

    balajitk authored committed
    Fix the typo, instead it should be SDMMC1
    USBC1 is not related to MMC1 I/Os
    
    Signed-off-by: Balaji T K <balajitk@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  10. @balajitk

    ARM: OMAP4: hsmmc: Fix Pbias configuration on regulator OFF

    balajitk authored committed
    MMC1 data line IO's are powered down in before set regulator function.
    IO's should not be powered ON when regulator is OFF.
    Keep the IO's in power pown mode after regulator OFF otherwise VMODE_ERROR
    interrupt is generated due to mismatch in input (regulator)
    voltage and MMC IO drive voltage.
    Delete incorrect comments which are not applicable for OMAP4.
    
    Signed-off-by: Balaji T K <balajitk@ti.com>
    Signed-off-by: Kishore Kadiyala <kishore.kadiyala@ti.com>
    Reported-by: Viswanath Puttagunta <vishp@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  11. ARM: OMAP: Devkit8000: Remove double omap_mux_init_gpio

    Thomas Weber authored committed
    Remove the init of card detect pin because
    omap_mux_init_gpio() is called during hsmmc initialization
    for the write protect and card detect pin.
    
    Signed-off-by: Thomas Weber <weber@corscience.de>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  12. @bsteinsbo

    ARM: OMAP: usb: musb: OMAP: Delete unused function

    bsteinsbo authored committed
    Not in use anymore.
    
    Signed-off-by: Bjarne Steinsbo <bsteinsbo@gmail.com>
    Acked-by: Felipe Balbi <balbi@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  13. ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex fr…

    Paul Walmsley authored committed
    …om common list
    
    Commit d6504ac ("OMAP2+: hwmod:
    remove OMAP_CHIP*") tests the inverse condition of what it should be
    testing for the return value from omap_hwmod_register().  This causes
    several IP blocks to not be registered on several OMAP3 family devices.
    
    Fixing that bug also unmasked another bug, originally reported by
    Chase Maupin <chase.maupin@ti.com> and then subsequently by Abhilash K
    V <abhilash.kv@ti.com>, which caused SmartReflex IP blocks to be
    registered on SoCs that don't support them.
    
    Thanks to Russell King - ARM Linux <linux@arm.linux.org.uk> for comments
    on a previous version of the patch.
    
    Signed-off-by: Paul Walmsley <paul@pwsan.com>
    Cc: Chase Maupin <chase.maupin@ti.com>
    Cc: Abhilash K V <abhilash.kv@ti.com>
    Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
Commits on Nov 2, 2011
  1. ARM:OMAP4 add Phytec phyCORE-OMAP4 board

    Jan Weitzel authored committed
    This adds support for the Phytec OMAP4430 board called phyCORE-OMAP4 PCM049.
    
    Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
    [tony@atomide.com: updated for timer and twl cleanup, and to select the board by default]
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  2. @verygreen

    Initial B&N Nook Color (encore) support

    verygreen authored committed
    Bare-bones board file, comes with serial console, gpio keys,
    MMC/SDCard and USB (peripheral) support.
    
    Signed-off-by: Oleg Drokin <green@linuxhacker.ru>
    [tony@atomide.com: updated for irq and timer cleanup and to select the board by default]
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  3. arm:omap:am33xx: Update common omap platform files

    Afzal Mohammed authored committed
    This patch updates the common platform files with AM335X device
    support (AM33XX family).
    
    The approach taken in this patch is,
    AM33XX device will be considered as OMAP3 variant, and a separate
    SoC class created for AM33XX family of devices with a subclass type
    for AM335X device, which is newly added device in the family.
    
    This means, cpu_is_omap34xx(), cpu_is_am33xx() and cpu_is_am335x()
    checks will return success on AM335X device.
    A kernel config option CONFIG_SOC_OMAPAM33XX is added under OMAP3
    to include support for AM33XX build.
    
    Also, cpu_mask and RATE_IN_XXX flags have crossed 8 bit hence
    struct clksel_rate.flags, struct prcm_config.flags and cpu_mask
    are changed to u16 from u8.
    
    Signed-off-by: Afzal Mohammed <afzal@ti.com>
    Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Cc: Hemant Pedanekar <hemantp@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  4. ARM: OMAP: AM3517: Support for MMC1 voltages

    Abhilash K V authored committed
    This patch fixes the following error message which appears
    while intializing MMC1 on the AM3517 EVM base-board:
        mmc0: host doesn't support card's voltages
        mmc0: error -22 whilst initialising SD card
    The ocr_mask, which enumerates the volatges supported by the
    MMC card was not being indicated before, assuming that a separate
    Vcc regulator maybe another controllable regulator driver would be
    doing this. This patch statically specifies a subset of the voltages
    supported by the MMC driver, which are provided by the current fixed
    voltage regulator on AM3517 EVM.
    
    Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Signed-off-by: Abhilash K V <abhilash.kv@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  5. ARM: OMAP: AM3517EVM: Add support for base-board MMC slot

    Vaibhav Hiremath authored committed
    Add support for base-board MMC slot
    
    Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
    Signed-off-by: Abhilash K V <abhilash.kv@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  6. net: Add back alignment for size for __alloc_skb

    authored
    Commit 87fb4b7 (net: more
    accurate skb truesize) changed the alignment of size. This
    can cause problems at least on some machines with NFS root:
    
    Unhandled fault: alignment exception (0x801) at 0xc183a43a
    Internal error: : 801 [#1] PREEMPT
    Modules linked in:
    CPU: 0    Not tainted  (3.1.0-08784-g5eeee4a #733)
    pc : [<c02fbba0>]    lr : [<c02fbb9c>]    psr: 60000013
    sp : c180fef8  ip : 00000000  fp : c181f580
    r10: 00000000  r9 : c044b28c  r8 : 00000001
    r7 : c183a3a0  r6 : c1835be0  r5 : c183a412  r4 : 000001f2
    r3 : 00000000  r2 : 00000000  r1 : ffffffe6  r0 : c183a43a
    Flags: nZCv  IRQs on  FIQs on  Mode SVC_32  ISA ARM  Segment kernel
    Control: 0005317f  Table: 10004000  DAC: 00000017
    Process swapper (pid: 1, stack limit = 0xc180e270)
    Stack: (0xc180fef8 to 0xc1810000)
    fee0:                                                       00000024 00000000
    ff00: 00000000 c183b9c0 c183b8e0 c044b28c c0507ccc c019dfc4 c180ff2c c0503cf8
    ff20: c180ff4c c180ff4c 00000000 c1835420 c182c740 c18349c0 c05233c0 00000000
    ff40: 00000000 c00e6bb8 c180e000 00000000 c04dd82c c0507e7c c050cc18 c183b9c0
    ff60: c05233c0 00000000 00000000 c01f34f4 c0430d70 c019d364 c04dd898 c04dd898
    ff80: c04dd82c c0507e7c c180e000 00000000 c04c584c c01f4918 c04dd898 c04dd82c
    ffa0: c04ddd28 c180e000 00000000 c0008758 c181fa60 3231d82c 00000037 00000000
    ffc0: 00000000 c04dd898 c04dd82c c04ddd28 00000013 00000000 00000000 00000000
    ffe0: 00000000 c04b2224 00000000 c04b21a0 c001056c c001056c 00000000 00000000
    Function entered at [<c02fbba0>] from [<c019dfc4>]
    Function entered at [<c019dfc4>] from [<c01f34f4>]
    Function entered at [<c01f34f4>] from [<c01f4918>]
    Function entered at [<c01f4918>] from [<c0008758>]
    Function entered at [<c0008758>] from [<c04b2224>]
    Function entered at [<c04b2224>] from [<c001056c>]
    Code: e1a00005 e3a01028 ebfa7cb0 e35a0000 (e5858028)
    
    Here PC is at __alloc_skb and &shinfo->dataref is unaligned because
    skb->end can be unaligned without this patch.
    
    As explained by Eric Dumazet <eric.dumazet@gmail.com>, this happens
    only with SLOB, and not with SLAB or SLUB:
    
    * Eric Dumazet <eric.dumazet@gmail.com> [111102 15:56]:
    >
    > Your patch is absolutely needed, I completely forgot about SLOB :(
    >
    > since, kmalloc(386) on SLOB gives exactly ksize=386 bytes, not nearest
    > power of two.
    >
    > [   60.305763] malloc(size=385)->ffff880112c11e38 ksize=386 -> nsize=2
    > [   60.305921] malloc(size=385)->ffff88007c92ce28 ksize=386 -> nsize=2
    > [   60.306898] malloc(size=656)->ffff88007c44ad28 ksize=656 -> nsize=272
    > [   60.325385] malloc(size=656)->ffff88007c575868 ksize=656 -> nsize=272
    > [   60.325531] malloc(size=656)->ffff88011c777230 ksize=656 -> nsize=272
    > [   60.325701] malloc(size=656)->ffff880114011008 ksize=656 -> nsize=272
    > [   60.346716] malloc(size=385)->ffff880114142008 ksize=386 -> nsize=2
    > [   60.346900] malloc(size=385)->ffff88011c777690 ksize=386 -> nsize=2
    
    Acked-by: Eric Dumazet <eric.dumazet@gmail.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  7. @phytec

    omap_hsmmc: fix missing parenthesis in pr_info

    phytec authored committed
    In commit a3c76eb (mmc: replace printk with appropriate
    display macro) the opening parenthesis of pr_info was missing.
    
    Signed-off-by: Juergen Kilb <J.Kilb@phytec.de>
  8. PM / OPP: Fix build when CONFIG_PM_OPP is not set

    authored
    Commit 03ca370 (PM / OPP: Add
    OPP availability change notifier) does not compile if CONFIG_PM_OPP
    is not set:
    
    arch/arm/plat-omap/omap-pm-noop.o: In function `opp_get_notifier':
    include/linux/opp.h:103: multiple definition of `opp_get_notifier'
    include/linux/opp.h:103: first defined here
    
    Also fix incorrect comment.
    
    Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
    Cc: Kyungmin Park <kyungmin.park@samsung.com>
    Cc: Mike Turquette <mturquette@ti.com>
    Cc: Kevin Hilman <khilman@ti.com>
    Cc: Rafael J. Wysocki <rjw@sisk.pl>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
  9. ARM: OMAP2+ i2c NACK without STP

    Jan Weitzel authored committed
    On OMAP4 OMAP_I2C_STAT_NACK is causing a timeout on the next access.
    The isr cleans all flags in OMAP_I2C_CON_REG by setting OMAP_I2C_CON_STP
    OMAP_I2C_CON_STP is also set in omap_i2c_xfer_msg on the last message.
    
    According to the TI TSR the sequence for OMAP_I2C_STAT_NACK and
    OMAP_I2C_STAT_AL are nearly the same.
    Removing the OMAP_I2C_CON_STP part in the isr fix the problem.
    Tested on OMAP4430 and OMAP3530 (here NACK was not a problem)
    Fixes also booting on 2430sdp.
    
    Signed-off-by: Jan Weitzel <j.weitzel@phytec.de>
    Acked-by: Tony Lindgren <tony@atomide.com>
  10. @torvalds

    Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * '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).
  11. @torvalds

    Merge branch 'next/dt' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * '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}
  12. @torvalds

    Merge branch 'next/cleanup2' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * '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
  13. @torvalds

    Merge branch 'next/cross-platform' of git://git.linaro.org/people/arn…

    torvalds authored
    …d/arm-soc
    
    * '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
  14. @torvalds

    Merge branch 'next/devel' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * '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
  15. @torvalds

    Merge branch 'next/board' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * '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
      ...
  16. @torvalds

    Merge branch 'next/deletion' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * '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}
  17. @torvalds

    Merge branch 'next/pm' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * 'next/pm' of git://git.linaro.org/people/arnd/arm-soc: (66 commits)
      ARM: CSR: PM: use outer_resume to resume L2 cache
      ARM: CSR: call l2x0_of_init to init L2 cache of SiRFprimaII
      ARM: OMAP: voltage: voltage layer present, even when CONFIG_PM=n
      ARM: CSR: PM: add sleep entry for SiRFprimaII
      ARM: CSR: PM: save/restore irq status in suspend cycle
      ARM: CSR: PM: save/restore timer status in suspend cycle
      OMAP4: PM: TWL6030: add cmd register
      OMAP4: PM: TWL6030: fix ON/RET/OFF voltages
      OMAP4: PM: TWL6030: address 0V conversions
      OMAP4: PM: TWL6030: fix uv to voltage for >0x39
      OMAP4: PM: TWL6030: fix voltage conversion formula
      omap: voltage: add a stub header file for external/regulator use
      OMAP2+: VC: more registers are per-channel starting with OMAP5
      OMAP3+: voltage: update nominal voltage in voltdm_scale() not VC post-scale
      OMAP3+: voltage: rename omap_voltage_get_nom_volt -> voltdm_get_voltage
      OMAP3+: voltdm: final removal of omap_vdd_info
      OMAP3+: voltage: move/rename curr_volt from vdd_info into struct voltagedomain
      OMAP3+: voltage: rename scale and reset functions using voltdm_ prefix
      OMAP3+: VP: combine setting init voltage into common function
      OMAP3+: VP: remove unused omap_vp_get_curr_volt()
      ...
    
    Fix up trivial conflict in arch/arm/mach-prima2/l2x0.c (code removal vs
    edit)
  18. @torvalds

    Merge branch 'next/timer' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * 'next/timer' of git://git.linaro.org/people/arnd/arm-soc:
      clocksource: fixup ux500 build problems
      ARM: omap: use __devexit_p in dmtimer driver
      ARM: ux500: Reprogram timers upon resume
      ARM: plat-nomadik: timer: Export reset functions
      ARM: plat-nomadik: timer: Add support for periodic timers
      ARM: ux500: Move timer code to separate file
      ARM: ux500: add support for clocksource DBX500 PRCMU
      clocksource: add DBX500 PRCMU Timer support
      ARM: plat-nomadik: MTU sched_clock as an option
      ARM: OMAP: dmtimer: add error handling to export APIs
      ARM: OMAP: dmtimer: low-power mode support
      ARM: OMAP: dmtimer: skip reserved timers
      ARM: OMAP: dmtimer: pm_runtime support
      ARM: OMAP: dmtimer: switch-over to platform device driver
      ARM: OMAP: dmtimer: platform driver
      ARM: OMAP2+: dmtimer: convert to platform devices
      ARM: OMAP1: dmtimer: conversion to platform devices
      ARM: OMAP2+: dmtimer: add device names to flck nodes
      ARM: OMAP: Add support for dmtimer v2 ip
  19. @torvalds

    Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * 'next/driver' of git://git.linaro.org/people/arnd/arm-soc:
      hw_random: add driver for atmel true hardware random number generator
      ARM: at91: at91sam9g45: add trng clock and platform device
      MX53 Enable the AHCI SATA on MX53 SMD board
      MX53 Enable the AHCI SATA on MX53 LOCO board
      MX53 Enable the AHCI SATA on MX53 ARD board
      AHCI Add the AHCI SATA feature on the MX53 platforms
      Fix pata imx resource
      ARM: imx: Define functions for registering PATA
      ARM: imx: Add PATA clock support
      ARM: imx: Add PATA resources for other i.MX processors
      imx: efika: Enable pata.
      imx51: add pata clock
      imx51: add pata device
    
    Fix up trivial conflict (new selects next to each other from separate
    branches for EFIKA_COMMON) in arch/arm/mach-mx5/Kconfig
  20. @torvalds

    Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc: (125 commits)
      ARM: mach-mxs: fix machines' initializers order
      mmc: mxcmmc: explicitly includes mach/hardware.h
      arm/imx: explicitly includes mach/hardware.h in pm-imx27.c
      arm/imx: remove mx27_setup_weimcs() from mx27.h
      arm/imx: explicitly includes mach/hardware.h in mach-kzm_arm11_01.c
      arm/imx: remove mx31_setup_weimcs() from mx31.h
      ARM: tegra: devices.c should include devices.h
      ARM: tegra: cpu-tegra: unexport two functions
      ARM: tegra: cpu-tegra: sparse type fix
      ARM: tegra: dma: staticify some tables and functions
      ARM: tegra: tegra2_clocks: don't export some tables
      ARM: tegra: tegra_powergate_is_powered should be static
      ARM: tegra: tegra_rtc_read_ms should be static
      ARM: tegra: tegra_init_cache should be static
      ARM: tegra: pcie: 0 -> NULL changes
      ARM: tegra: pcie: include board.h
      ARM: tegra: pcie: don't cast __iomem pointers
      ARM: tegra: tegra2_clocks: 0 -> NULL changes
      ARM: tegra: tegra2_clocks: don't cast __iomem pointers
      ARM: tegra: timer: don't cast __iomem pointers
      ...
    
    Fix up trivial conflicts in
      arch/arm/mach-omap2/Makefile,
      arch/arm/mach-u300/{Makefile.boot,core.c}
      arch/arm/plat-{mxc,omap}/devices.c
  21. @torvalds

    Merge branch 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc

    torvalds authored
    * 'next/fixes' of git://git.linaro.org/people/arnd/arm-soc: (28 commits)
      ARM: pxa/cm-x300: properly set bt_reset pin
      ARM: mmp: rename SHEEVAD to GPLUGD
      ARM: imx: Fix typo 'MACH_MX31_3DS_MXC_NAND_USE_BBT'
      ARM: i.MX28: shift frac value in _CLK_SET_RATE
      plat-mxc: iomux-v3.h: implicitly enable pull-up/down when that's desired
      ARM: mx5: fix clock usage for suspend
      ARM: pxa: use correct __iomem annotations
      ARM: pxa: sharpsl pm needs SPI
      ARM: pxa: centro and treo680 need palm27x
      ARM: pxa: make pxafb_smart_*() empty when not enabled
      ARM: pxa: select POWER_SUPPLY on raumfeld
      ARM: pxa: pxa95x is incompatible with earlier pxa
      ARM: pxa: CPU_FREQ_TABLE is needed for CPU_FREQ
      ARM: pxa: pxa95x/saarb depends on pxa3xx code
      ARM: pxa: allow selecting just one of TREO680/CENTRO
      ARM: pxa: export symbols from pxa3xx-ulpi
      ARM: pxa: make zylonite_pxa*_init declaration match code
      ARM: pxa/z2: fix building error of pxa27x_cpu_suspend() no longer available
      ARM: at91: add defconfig for at91sam9g45 family
      ARM: at91: remove dependency for Atmel PWM driver selector in Kconfig
      ...
  22. @arndb

    Merge branch 'imx/imx6q' into next/soc

    arndb authored
    Conflicts:
    	Documentation/devicetree/bindings/arm/fsl.txt
    	arch/arm/Kconfig
    	arch/arm/Kconfig.debug
    	arch/arm/plat-mxc/include/mach/common.h
Something went wrong with that request. Please try again.