30 May, 2018

1 commit

  • [ Upstream commit ba6887836178d43b3665b9da075c2c5dfe1d207c ]

    We need to enable PM runtime on omap1 also as otherwise we
    will get errors:

    omap_timer omap_timer.1: omap_dm_timer_probe: pm_runtime_get_sync failed!
    omap_timer: probe of omap_timer.1 failed with error -13
    ...

    We are checking for OMAP_TIMER_NEEDS_RESET flag elsewhere so this is
    safe to do.

    Cc: Aaro Koskinen
    Cc: Keerthy
    Cc: Ladislav Michl
    Signed-off-by: Tony Lindgren
    Signed-off-by: Sasha Levin
    Signed-off-by: Greg Kroah-Hartman

    Tony Lindgren
     

08 Apr, 2018

1 commit

  • commit eb85a355c3afd9379f5953cfe2df73632d14c884 upstream.

    We are still using custom SRAM code for some SoCs and are not marking
    the PM code mapped to SRAM as read-only and executable after we're
    done. With CONFIG_DEBUG_WX=y, we will get "Found insecure W+X mapping
    at address" warning.

    Let's fix this issue the same way as commit 728bbe75c82f ("misc: sram:
    Introduce support code for protect-exec sram type") is doing for
    drivers/misc/sram-exec.c.

    On omap3, we need to restore SRAM when returning from off mode after
    idle, so init time configuration is not enough.

    And as we no longer have users for omap_sram_push_address() we can
    make it static while at it.

    Note that eventually we should be using sram-exec.c for all SoCs.

    Cc: stable@vger.kernel.org # v4.12+
    Cc: Dave Gerlach
    Reported-by: Pavel Machek
    Signed-off-by: Tony Lindgren
    Signed-off-by: Greg Kroah-Hartman

    Tony Lindgren
     

02 Nov, 2017

1 commit

  • Many source files in the tree are missing licensing information, which
    makes it harder for compliance tools to determine the correct license.

    By default all files without license information are under the default
    license of the kernel, which is GPL version 2.

    Update the files which contain no license information with the 'GPL-2.0'
    SPDX license identifier. The SPDX identifier is a legally binding
    shorthand, which can be used instead of the full boiler plate text.

    This patch is based on work done by Thomas Gleixner and Kate Stewart and
    Philippe Ombredanne.

    How this work was done:

    Patches were generated and checked against linux-4.14-rc6 for a subset of
    the use cases:
    - file had no licensing information it it.
    - file was a */uapi/* one with no licensing information in it,
    - file was a */uapi/* one with existing licensing information,

    Further patches will be generated in subsequent months to fix up cases
    where non-standard license headers were used, and references to license
    had to be inferred by heuristics based on keywords.

    The analysis to determine which SPDX License Identifier to be applied to
    a file was done in a spreadsheet of side by side results from of the
    output of two independent scanners (ScanCode & Windriver) producing SPDX
    tag:value files created by Philippe Ombredanne. Philippe prepared the
    base worksheet, and did an initial spot review of a few 1000 files.

    The 4.13 kernel was the starting point of the analysis with 60,537 files
    assessed. Kate Stewart did a file by file comparison of the scanner
    results in the spreadsheet to determine which SPDX license identifier(s)
    to be applied to the file. She confirmed any determination that was not
    immediately clear with lawyers working with the Linux Foundation.

    Criteria used to select files for SPDX license identifier tagging was:
    - Files considered eligible had to be source code files.
    - Make and config files were included as candidates if they contained >5
    lines of source
    - File already had some variant of a license header in it (even if
    Reviewed-by: Philippe Ombredanne
    Reviewed-by: Thomas Gleixner
    Signed-off-by: Greg Kroah-Hartman

    Greg Kroah-Hartman
     

11 Nov, 2016

1 commit

  • All the boards booting with device tree use
    drivers/pinctrl-single.c instead.

    Note that mach-omap1 is still using the legacy mux,
    so let's move the related Kconfig options from plat-omap
    to mach-omap1.

    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

10 Nov, 2016

1 commit


01 Dec, 2015

3 commits


21 May, 2015

1 commit

  • Change interrupt numbering for sparse IRQ. We do this using
    a fixed offset until we can drop irqs.h once all it's users
    have been updated.

    Note that this depends on the GPIO fix for the MPUIO IRQs
    "gpio: omap: Fix regression for MPUIO interrupts".

    Also note that this patch adds some extra irq alloc warnings
    that will go away when we stop calling irq_alloc_descs
    in gpio-omap.c with a follow-up patch.

    Cc: Aaro Koskinen
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

03 Apr, 2015

2 commits

  • As part of addressing "y2038 problem" for in-kernel uses, this
    patch converts read_boot_clock() to read_boot_clock64() and
    read_persistent_clock() to read_persistent_clock64() using
    timespec64 by converting clock_access_fn to use timespec64.

    Signed-off-by: Xunlei Pang
    Signed-off-by: John Stultz
    Acked-by: Thierry Reding (for tegra part)
    Cc: Russell King
    Cc: Peter Zijlstra
    Cc: Thomas Gleixner
    Link: http://lkml.kernel.org/r/1427945681-29972-7-git-send-email-john.stultz@linaro.org
    Signed-off-by: Ingo Molnar

    Xunlei Pang
     
  • As part of addressing "y2038 problem" for in-kernel uses, this
    patch adds the y2038-safe omap_read_persistent_clock64() using
    timespec64.

    Because we rely on some subsequent changes to convert arm
    multiarch support, omap_read_persistent_clock() will be removed
    then.

    Also remove the needless spinlock, because
    read_persistent_clock() doesn't run simultaneously.

    Signed-off-by: Xunlei Pang
    Signed-off-by: John Stultz
    Acked-by: Tony Lindgren
    Cc: Peter Zijlstra
    Cc: Thomas Gleixner
    Link: http://lkml.kernel.org/r/1427945681-29972-5-git-send-email-john.stultz@linaro.org
    Signed-off-by: Ingo Molnar

    Xunlei Pang
     

31 Mar, 2015

1 commit


18 Mar, 2015

2 commits

  • Disable the pm_runtime of the device upon remove. This is
    added to balance the pm_runtime_enable() invoked in the probe.

    Signed-off-by: Suman Anna
    Signed-off-by: Tony Lindgren

    Suman Anna
     
  • The current OMAP dmtimer probe does not check for the return
    status of pm_runtime_get_sync() before initializing the timer
    registers. Any timer with missing hwmod data would return a
    failure here, and the access of registers without enabling the
    clocks for the timer would trigger a l3_noc interrupt and a
    kernel boot hang. Add proper checking so that the probe would
    return a failure graciously without hanging the kernel boot.

    Signed-off-by: Suman Anna
    Signed-off-by: Tony Lindgren

    Suman Anna
     

13 Mar, 2015

1 commit

  • Ingo requested this function be renamed to improve readability,
    so I've renamed __clocksource_updatefreq_scale() as well as the
    __clocksource_updatefreq_hz/khz() functions to avoid
    squishedtogethernames.

    This touches some of the sh clocksources, which I've not tested.

    The arch/arm/plat-omap change is just a comment change for
    consistency.

    Signed-off-by: John Stultz
    Cc: Daniel Lezcano
    Cc: Dave Jones
    Cc: Linus Torvalds
    Cc: Peter Zijlstra
    Cc: Prarit Bhargava
    Cc: Richard Cochran
    Cc: Stephen Boyd
    Cc: Thomas Gleixner
    Link: http://lkml.kernel.org/r/1426133800-29329-13-git-send-email-john.stultz@linaro.org
    Signed-off-by: Ingo Molnar

    John Stultz
     

08 Jan, 2015

1 commit


14 Oct, 2014

1 commit

  • Pull kbuild changes from Michal Marek:
    - fix for handling dependencies of *-objs targets by Masahiro Yamada
    - lots of cleanups in the kbuild machinery, also by Masahiro
    - fixes for the kconfig build to use an UTF-8 capable ncurses library
    if possible and to build on not-so-standard installs
    - some more minor fixes

    * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    kbuild: Do not reference *-n variables in the Makefile
    kbuild: simplify build, clean, modbuiltin shorthands
    kbuild: arm: Do not define "comma" twice
    kbuild: remove obj-n and lib-n handling
    kbuild: remove unnecessary variable initializaions
    kbuild: remove unnecessary "obj- := dummy.o" trick
    kbuild: handle C=... and M=... after entering into build directory
    kbuild: use $(Q) for sub-make target
    kbuild: fake the "Entering directory ..." message more simply
    kconfig/lxdialog: get ncurses CFLAGS with pkg-config
    kconfig: nconfig: fix multi-byte UTF handling
    kconfig: lxdialog: fix spelling
    kbuild: Make scripts executable
    kbuild: remove redundant clean-files from scripts/kconfig/Makefile
    kbuild: refactor script/kconfig/Makefile
    kbuild: handle the dependency of multi-objs hostprogs appropriately
    kbuild: handle multi-objs dependency appropriately

    Linus Torvalds
     

09 Oct, 2014

1 commit

  • Pull ARM SoC cleanups from Arnd Bergmann:
    "This time around, the cleanup branch contains mostly code removal. A
    number of board files for at91, imx and msm have become obsolete
    because of the DT conversion and are now ready to be removed. The
    OMAP platform has traditionally had its own DMA engine abstraction and
    as this is being phased out, a lot of the original code is now unused
    and can be removed as well.

    S3C24xx can be simplified now that the restart code is a proper device
    driver.

    Finally, a number of cleanups in shmobile are done to prepare for the
    addition of new code in other branches"

    * tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
    ARM: at91: Remove the support for the RSI EWS board
    arm: mach-omap2: Convert pr_warning to pr_warn
    ARM: OMAP: Remove unused pieces of legacy DMA API
    ARM: at91: remove board file for Acme Systems Fox G20
    ARM: orion5x: Convert pr_warning to pr_warn
    ARM: S3C24XX: remove separate restart code
    ARM: EXYNOS: Do not calculate boot address twice
    ARM: sunxi: Remove sun4i reboot code from mach directory
    ARM: imx: Remove mach-mxt_td60 board file
    ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
    ARM: shmobile: r8a7740: Clean up pm domain table
    ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
    ARM: shmobile: sh7372: Make domain_devices[] static __initdata
    ARM: shmobile: mackerel: Make domain_devices[] static __initdata
    clocksource: tcb_clksrc: sanitize IRQ request
    ARM: at91/tclib: mask interruptions at shutdown and probe
    ARM: at91/tclib: move initialization from alloc to probe
    ARM: at91/tclib: prefer using of devm_* functions
    ARM: clps711x: Switch CLPS711X subarch to use clk and clocksource driver
    ARM: shmobile: r8a7791 is now called "R-Car M2-W"
    ...

    Linus Torvalds
     

02 Oct, 2014

1 commit

  • Clearing obj-y, obj-m, obj-n, obj- in each Makefile is
    a useless habit.

    They are non-exported variables; therefore they are always empty
    whenever descending into each subdirectory.
    (Moreorver, obj-y and obj-m are also set to empty at the beginning
    of scripts/Makefile.build)

    Signed-off-by: Masahiro Yamada
    Acked-by: Nicolas Ferre
    Acked-by: Peter Foley
    Acked-by: Linus Walleij
    Signed-off-by: Michal Marek

    Masahiro Yamada
     

19 Sep, 2014

1 commit

  • We're moving to the dmaengine API, so let's remove the unused
    pieces of the omap legacy DMA code to make sure we don't get
    any new users for these:

    omap_set_dma_color_mode
    omap_set_dma_src_index
    omap_set_dma_dest_index
    omap_dma_unlink_lch
    omap_clear_dma
    omap_dma_running
    omap_dma_set_prio_lch
    omap_set_dma_dst_endian_type
    omap_set_dma_src_endian_type
    omap_get_dma_index
    omap_dma_disable_irq
    omap_request_dma_chain
    omap_free_dma_chain
    omap_dma_chain_a_transfer
    omap_start_dma_chain_transfers
    omap_stop_dma_chain_transfers
    omap_get_dma_chain_index
    omap_get_dma_chain_dst_pos
    omap_get_dma_chain_src_pos
    omap_modify_dma_chain_params
    omap_dma_chain_status

    Cc: Russell King
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

09 Sep, 2014

1 commit

  • Commit 21278aeafbfa ("ARM: use menuconfig for sub-arch menus") improved
    the sub-arch menus, but accidentally caused new warnings for omap1.
    This was because the commit added a menu entry around config ARCH_OMAP
    bool entry where the menu had depends on ARCH_MULTI_V6 || ARCH_MULTI_V7.

    As ARCH_OMAP is shared between omap1 and omap2plus, let's fix the
    issue by defining ARCH_OMAP in the shared plat-omap/Kconfig.

    Fixes: 21278aeafbfa ("ARM: use menuconfig for sub-arch menus")
    Reported-by: Andreas Ruprecht
    Signed-off-by: Tony Lindgren
    Signed-off-by: Arnd Bergmann

    Tony Lindgren
     

09 Aug, 2014

1 commit

  • Pull ARM SoC platform changes from Olof Johansson:
    "This is the bulk of new SoC enablement and other platform changes for
    3.17:

    - Samsung S5PV210 has been converted to DT and multiplatform
    - Clock drivers and bindings for some of the lower-end i.MX 1/2
    platforms
    - Kirkwood, one of the popular Marvell platforms, is folded into the
    mvebu platform code, removing mach-kirkwood
    - Hwmod data for TI AM43xx and DRA7 platforms
    - More additions of Renesas shmobile platform support
    - Removal of plat-samsung contents that can be removed with S5PV210
    being multiplatform/DT-enabled and the other two old platforms
    being removed

    New platforms (most with only basic support right now):

    - Hisilicon X5HD2 settop box chipset is introduced
    - Mediatek MT6589 (mobile chipset) is introduced
    - Broadcom BCM7xxx settop box chipset is introduced

    + as usual a lot other pieces all over the platform code"

    * tag 'soc-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (240 commits)
    ARM: hisi: remove smp from machine descriptor
    power: reset: move hisilicon reboot code
    ARM: dts: Add hix5hd2-dkb dts file.
    ARM: debug: Rename Hi3716 to HIX5HD2
    ARM: hisi: enable hix5hd2 SoC
    ARM: hisi: add ARCH_HISI
    MAINTAINERS: add entry for Broadcom ARM STB architecture
    ARM: brcmstb: select GISB arbiter and interrupt drivers
    ARM: brcmstb: add infrastructure for ARM-based Broadcom STB SoCs
    ARM: configs: enable SMP in bcm_defconfig
    ARM: add SMP support for Broadcom mobile SoCs
    Documentation: arm: misc updates to Marvell EBU SoC status
    Documentation: arm: add URLs to public datasheets for the Marvell Armada XP SoC
    ARM: mvebu: fix build without platforms selected
    ARM: mvebu: add cpuidle support for Armada 38x
    ARM: mvebu: add cpuidle support for Armada 370
    cpuidle: mvebu: add Armada 38x support
    cpuidle: mvebu: add Armada 370 support
    cpuidle: mvebu: rename the driver from armada-370-xp to mvebu-v7
    ARM: mvebu: export the SCU address
    ...

    Linus Torvalds
     

22 Jul, 2014

1 commit

  • we have currently 2 DMA drivers that try to co-exist.
    drivers/dma/omap-dma.c which registers it's own IRQ and is device tree
    aware and uses arch/arm/plat-omap/dma.c instance created by
    arch/arm/mach-omap2/dma.c to maintain channel usage (omap_request_dma).

    Currently both try to register interrupts and mach-omap2/plat-omap dma.c
    attempts to use the IRQ number registered by hwmod to register it's own
    interrupt handler.

    Now, there is no reasonable way of static allocating DMA irq in GIC
    SPI when we use crossbar. However, since the dma_chan structure is
    freed as a result of IRQ not being present due to devm allocation,
    maintaining information of channel by platform code fails at a later
    point in time when that region of memory is reused.

    So, if hwmod does not indicate an IRQ number, then, assume that
    dma-engine will take care of the interrupt handling.

    Signed-off-by: Nishanth Menon
    Signed-off-by: Tony Lindgren

    Nishanth Menon
     

01 Jul, 2014

1 commit


03 Jun, 2014

1 commit

  • Pull ARM SoC cleanups from Olof Johansson:
    "Cleanups for 3.16. Among these are:

    - a bunch of misc cleanups for Broadcom platforms, mostly
    housekeeping
    - enabling Common Clock Framework on the older s3c24xx Samsung
    chipsets
    - cleanup of the Versatile Express system controller code, moving it
    to syscon
    - power management cleanups for OMAP platforms

    plus a handful of other cleanups across the place"

    * tag 'cleanup-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (87 commits)
    ARM: kconfig: allow PCI support to be selected with ARCH_MULTIPLATFORM
    clk: samsung: fix build error
    ARM: vexpress: refine dependencies for new code
    clk: samsung: clk-s3c2410-dlck: do not use PNAME macro as it declares __initdata
    cpufreq: exynos: Fix the compile error
    ARM: S3C24XX: move debug-macro.S into the common space
    ARM: S3C24XX: use generic DEBUG_UART_PHY/_VIRT in debug macro
    ARM: S3C24XX: trim down debug uart handling
    ARM: compressed/head.S: remove s3c24xx special case
    ARM: EXYNOS: Remove unnecessary inclusion of cpu.h
    ARM: EXYNOS: Migrate Exynos specific macros from plat to mach
    ARM: EXYNOS: Remove exynos_subsys registration
    ARM: EXYNOS: Remove duplicate lines in Makefile
    ARM: EXYNOS: use v7_exit_coherency_flush macro for cache disabling
    ARM: OMAP4: PRCM: remove references to cm-regbits-44xx.h from PRCM core files
    ARM: OMAP3/4: PRM: add support of late_init call to prm_ll_ops
    ARM: OMAP3/OMAP4: PRM: add prm_features flags and add IO wakeup under it
    ARM: OMAP3/4: PRM: provide io chain reconfig function through irq setup
    ARM: OMAP2+: PRM: remove unnecessary cpu_is_XXX calls from prm_init / exit
    ARM: OMAP2+: PRCM: cleanup some header includes
    ...

    Linus Torvalds
     

17 May, 2014

1 commit

  • Commit 6ddeb6d84459 (dmaengine: omap-dma: move IRQ handling to omap-dma)
    added support for handling interrupts in the omap dmaengine driver
    instead of the legacy driver. Because of different handling for
    interrupts this however caused omap3 to hang eventually after hitting
    off-idle.

    Any of the virtual 32 DMA channels can be assigned to any of the
    four DMA interrupts. So commit 6ddeb6d84459 made the omap dmaengine
    driver to use the second DMA interrupt while keeping the legacy code
    still using the first DMA interrupt.

    This means we need to save and restore both IRQENABLE_L1 in addition
    to IRQENABLE_L0. As there is a chance that the DSP might be using
    IRQENABLE_L2 or IRQENABLE_L3 lines, let's not touch those until
    this has been confirmed. Let's just add a comment to the code for
    now.

    Fixes: 6ddeb6d84459 (dmaengine: omap-dma: move IRQ handling to omap-dma)
    Cc: Russell King
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

08 May, 2014

3 commits

  • All OMAP IP blocks expect LE data, but CPU may operate in BE mode.
    Need to use endian neutral functions to read/write h/w registers.
    I.e instead of __raw_read[lw] and __raw_write[lw] functions code
    need to use read[lw]_relaxed and write[lw]_relaxed functions.
    If the first simply reads/writes register, the second will byteswap
    it if host operates in BE mode.

    Changes are trivial sed like replacement of __raw_xxx functions
    with xxx_relaxed variant.

    Signed-off-by: Victor Kamensky
    Signed-off-by: Taras Kondratiuk
    Signed-off-by: Tony Lindgren

    Victor Kamensky
     
  • All OMAP IP blocks expect LE data, but CPU may operate in BE mode.
    Need to use endian neutral functions to read/write h/w registers.
    I.e instead of __raw_read[lw] and __raw_write[lw] functions code
    need to use read[lw]_relaxed and write[lw]_relaxed functions.
    If the first simply reads/writes register, the second will byteswap
    it if host operates in BE mode.

    Changes are trivial sed like replacement of __raw_xxx functions
    with xxx_relaxed variant.

    Signed-off-by: Victor Kamensky
    Signed-off-by: Taras Kondratiuk
    Signed-off-by: Tony Lindgren

    Victor Kamensky
     
  • All OMAP IP blocks expect LE data, but CPU may operate in BE mode.
    Need to use endian neutral functions to read/write h/w registers.
    I.e instead of __raw_read[lw] and __raw_write[lw] functions code
    need to use read[lw]_relaxed and write[lw]_relaxed functions.
    If the first simply reads/writes register, the second will byteswap
    it if host operates in BE mode.

    Changes are trivial sed like replacement of __raw_xxx functions
    with xxx_relaxed variant.

    Signed-off-by: Victor Kamensky
    Signed-off-by: Taras Kondratiuk
    Signed-off-by: Tony Lindgren

    Victor Kamensky
     

06 Apr, 2014

2 commits

  • Pull ARM SoC device tree changes from Arnd Bergmann:
    "A large part of the arm-soc patches are nowadays DT changes, adding
    support for new SoCs, boards and devices without changing kernel
    source. The plan is still to move the devicetree files out of the
    kernel tree and reduce the amount of churn going on here, but we keep
    finding reasons to delay doing that.

    Changes are really all over the place, with little sticking out
    particularly. We have contributions from a total of 116 people in
    this branch.

    Unfortunately, the size of this branch also causes a significant
    number of conflicts at the moment, typically when subsystem
    maintainers merge patches that change the driver at the same time as
    the dts files. In most cases this could be avoided because the dts
    changes are supposed to be compatible in both ways, and we are asking
    everyone to send ARM dts changes through our tree only"

    * tag 'dt-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (541 commits)
    dts: stmmac: Document the clocks property in the stmmac base document
    dts: socfpga: Add DTS entry for adding the stmmac glue layer for stmmac.
    ARM: STi: stih41x: Add support for the FSM Serial Flash Controller
    ARM: STi: stih416: Add support for the FSM Serial Flash Controller
    ARM: tegra: fix Dalmore pinctrl configuration
    ARM: dts: keystone: use common "ti,keystone" compatible instead of -evm
    ARM: dts: k2hk-evm: set ubifs partition size for 512M NAND
    ARM: dts: Build all keystone dt blobs
    ARM: dts: keystone: Fix control register range for clktsip
    ARM: dts: keystone: Fix domain register range for clkfftc1
    ARM: dts: bcm28155-ap: leave camldo1 on to fix reboot
    ARM: dts: add bcm590xx pmu support and enable for bcm28155-ap
    ARM: dts: bcm21664: Add device tree files.
    ARM: DT: bcm21664: Device tree bindings
    ARM: efm32: properly namespace i2c location property
    ARM: efm32: fix unit address part in USART2 device nodes' names
    ARM: mvebu: Enable NAND controller in Armada 385-DB
    ARM: mvebu: Add support for NAND controller in Armada 38x SoC
    ARM: mvebu: Add the Core Divider clock to Armada 38x SoCs
    ARM: mvebu: Add a 2 GHz fixed-clock on Armada 38x SoCs
    ...

    Linus Torvalds
     
  • Pull ARM SoC cleanups from Arnd Bergmann:
    "These cleanup patches are mainly move stuff around and should all be
    harmless. They are mainly split out so that other branches can be
    based on top to avoid conflicts.

    Notable changes are:

    - We finally remove all mach/timex.h, after CLOCK_TICK_RATE is no
    longer used (Uwe Kleine-König)
    - The Qualcomm MSM platform is split out into legacy mach-msm and
    new-style mach-qcom, to allow easier maintainance of the new
    hardware support without regressions (Kumar Gala)
    - A rework of some of the Kconfig logic to simplify multiplatform
    support (Rob Herring)
    - Samsung Exynos gets closer to supporting multiplatform (Sachin
    Kamat and others)
    - mach-bcm3528 gets merged into mach-bcm (Stephen Warren)
    - at91 gains some common clock framework support (Alexandre Belloni,
    Jean-Jacques Hiblot and other French people)"

    * tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (89 commits)
    ARM: hisi: select HAVE_ARM_SCU only for SMP
    ARM: efm32: allow uncompress debug output
    ARM: prima2: build reset code standalone
    ARM: at91: add PWM clock
    ARM: at91: move sam9261 SoC to common clk
    ARM: at91: prepare common clk transition for sam9261 SoC
    ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
    ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
    ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
    ARM: at91: dt: Add at91sam9261 dt SoC support
    ARM: at91: switch sam9rl to common clock framework
    ARM: at91/dt: define main clk frequency of at91sam9rlek
    ARM: at91/dt: define at91sam9rl clocks
    ARM: at91: prepare common clk transition for sam9rl SoCs
    ARM: at91: prepare sam9 dt boards transition to common clk
    ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
    ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
    ARM: at91: Add at91sam9rl DT SoC support
    ARM: at91: prepare at91sam9rl DT transition
    ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
    ...

    Linus Torvalds
     

04 Apr, 2014

2 commits


17 Mar, 2014

1 commit

  • …/git/tmlind/linux-omap into next/dt

    Pull "omap device tree changes for v3.15, part 3" from Tony Lindgren:

    Device tree related changes to the omap iommu driver as that
    is finally getting updated. Also few trivial board related
    .dts updates to add more devices.

    * tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
    ARM: dts: Add MMC2/SDIO/WLAN support for cm-t3530
    ARM: dts: am335x-evmsk: enable DMA controller for USB
    ARM: dts: OMAP5: Add IOMMU nodes
    ARM: dts: OMAP4: Add IOMMU nodes
    ARM: dts: OMAP3: Add IVA IOMMU node
    ARM: dts: OMAP3: Update ISP IOMMU node
    ARM: OMAP2+: extend iommu pdata-quirks to OMAP5
    ARM: OMAP5: hwmod data: add mmu data for ipu & dsp
    ARM: OMAP2+: use pdata quirks for iommu reset lines
    ARM: OMAP2+: change the ISP device archdata MMU name for DT
    ARM: OMAP3: fix iva mmu programming issues
    ARM: OMAP3: remove deprecated CONFIG_OMAP_IOMMU_IVA2

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>

    Arnd Bergmann
     

13 Mar, 2014

1 commit

  • CONFIG_OMAP_IOMMU_IVA2 was defined originally to avoid conflicting
    usage by tidspbridge and other iommu users. The same can be achieved
    by marking the DT node disabled, so remove this obsolete flag and
    the corresponding hwmod data can be enabled.

    Cc: Paul Walmsley
    Signed-off-by: Florian Vaussard
    [s-anna@ti.com: revise commit log]
    Signed-off-by: Suman Anna
    Acked-by: Laurent Pinchart
    Acked-by: Tony Lindgren
    Acked-by: Paul Walmsley
    Signed-off-by: Tony Lindgren

    Florian Vaussard
     

24 Feb, 2014

1 commit

  • This cleanup series gets rid of for platforms not using
    ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
    387798b (ARM: initial multiplatform support).)

    To make this work some code out of arch/arm needed to be adapted. The
    respective changes got acks by their maintainers to be taken via armsoc
    (with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).

    Compared to the previous pull request there was another patch added that
    fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
    squash this fix into the original commit to save him from the need to
    reverify the series.

    Conflicts:
    arch/arm/mach-at91/at91sam9260.c
    arch/arm/mach-at91/at91sam9261.c
    arch/arm/mach-at91/at91sam9263.c
    arch/arm/mach-at91/at91sam9rl.c
    arch/arm/mach-mmp/time.c
    arch/arm/mach-sa1100/time.c

    Uwe Kleine-König
     

19 Feb, 2014

1 commit

  • This cleanup series gets rid of for platforms not using
    ARCH_MULTIPLATFORM. (For multi-platform code it's already unused since
    387798b (ARM: initial multiplatform support).)

    To make this work some code out of arch/arm needed to be adapted. The
    respective changes got acks by their maintainers to be taken via armsoc
    (with Andrew Morton substituting for Alessandro Zummo as rtc maintainer).

    Compared to the previous pull request there was another patch added that
    fixes a (non-critical) regression on ixp4xx. Olof Johansson asked to not
    squash this fix into the original commit to save him from the need to
    reverify the series.

    * tag 'dropmachtimexh-v2' of git://git.pengutronix.de/git/ukl/linux:
    ARM: ixp4xx: fix timer latch calculation
    ARM: drop for !ARCH_MULTIPLATFORM, too
    ARM: rpc: stop using
    ARM: ixp4xx: stop using
    input: ixp4xx-beeper: don't use symbols from
    ARM: at91: don't use
    ARM: ep93xx: stop using mach/timex.h
    ARM: mmp: stop using mach/timex.h
    ARM: netx: stop using mach/timex.h
    ARM: sa1100: stop using mach/timex.h
    clocksource: sirf/marco+prima2: drop usage of CLOCK_TICK_RATE
    rtc: pxa: drop unused #define TIMER_FREQ
    rtc: at91sam9: include explicitly
    ARM/serial: at91: switch atmel serial to use gpiolib

    Signed-off-by: Olof Johansson

    Olof Johansson
     

21 Dec, 2013

2 commits

  • From Uwe Kleine-König:
    * efm32/soc: (1003 commits)
    ARM: device trees for Energy Micro's EFM32 Cortex-M3 SoCs
    ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs
    +Linux 3.13-rc4

    Signed-off-by: Kevin Hilman

    Kevin Hilman
     
  • While isn't used for multi-platform builds since long it
    still is for "normal" builds. As the previous patches fix all sites to
    not make use of this per-platform file, it can go now for good also for
    platforms that are not (yet) converted to multi-platform.

    While at it there are no users of CLOCK_TICK_RATE any more, so also drop
    the dummy #define.

    Signed-off-by: Uwe Kleine-König

    Uwe Kleine-König
     

27 Nov, 2013

1 commit

  • Enabling of Posted mode is seen to cause problems on dmtimer modules on AM33xx
    (much like other OMAPs). Reference discussions on forums [1] [2]. Earlier
    patch solving this on other OMAPs [3].

    For OMAP SoCs with this errata, the fix has been to not enable Posted mode.
    However, on some SoCs (atleast AM33xx) which carry this errata, Posted mode
    is enabled on reset. So we not only need to ignore enabling of the POSTED bit
    when the timer is requested, but also disable Posted mode if errata is present.

    [1] http://e2e.ti.com/support/arm/sitara_arm/f/791/t/285744.aspx
    [2] http://e2e.ti.com/support/arm/sitara_arm/f/791/t/270632.aspx
    [3] http://www.spinics.net/lists/linux-omap/msg81770.html

    Cc: stable@vgerk.kernel.org
    Reported-by: Russ Dill
    Cc: Santosh Shilimkar
    Signed-off-by: Joel Fernandes
    Signed-off-by: Tony Lindgren

    Joel Fernandes