Doug / smarc-fsl-linux-kernel

22 Feb, 2013

1 commit

  • bab588fcf   Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC-specific updates from Arnd Bergmann:
    "This is a larger set of new functionality for the existing SoC
    families, including:

    - vt8500 gains support for new CPU cores, notably the Cortex-A9 based
    wm8850

    - prima2 gains support for the "marco" SoC family, its SMP based
    cousin

    - tegra gains support for the new Tegra4 (Tegra114) family

    - socfpga now supports a newer version of the hardware including SMP

    - i.mx31 and bcm2835 are now using DT probing for their clocks

    - lots of updates for sh-mobile

    - OMAP updates for clocks, power management and USB

    - i.mx6q and tegra now support cpuidle

    - kirkwood now supports PCIe hot plugging

    - tegra clock support is updated

    - tegra USB PHY probing gets implemented diffently"

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (148 commits)
    ARM: prima2: remove duplicate v7_invalidate_l1
    ARM: shmobile: r8a7779: Correct TMU clock support again
    ARM: prima2: fix __init section for cpu hotplug
    ARM: OMAP: Consolidate OMAP USB-HS platform data (part 3/3)
    ARM: OMAP: Consolidate OMAP USB-HS platform data (part 1/3)
    arm: socfpga: Add SMP support for actual socfpga harware
    arm: Add v7_invalidate_l1 to cache-v7.S
    arm: socfpga: Add entries to enable make dtbs socfpga
    arm: socfpga: Add new device tree source for actual socfpga HW
    ARM: tegra: sort Kconfig selects for Tegra114
    ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
    ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
    ARM: tegra: Fix build error for gic update
    ARM: tegra: remove empty tegra_smp_init_cpus()
    ARM: shmobile: Register ARM architected timer
    ARM: MARCO: fix the build issue due to gic-vic-to-irqchip move
    ARM: shmobile: r8a7779: Correct TMU clock support
    ARM: mxs_defconfig: Select CONFIG_DEVTMPFS_MOUNT
    ARM: mxs: decrease mxs_clockevent_device.min_delta_ns to 2 clock cycles
    ARM: mxs: use apbx bus clock to drive the timers on timrotv2
    ...

    Linus Torvalds
     

10 Feb, 2013

1 commit

26 Jan, 2013

1 commit

  • c1d1cd597   ARM: OMAP2+: omap_device: remove obsolete pm_lats and early_device code ... Browse Code »

    Remove now-obsolete code from arch/arm/mach-omap2/omap_device.c. This
    mostly consists of removing the first attempt at device PM latency
    handling. This was never really used, has been replaced by the common
    dev_pm_qos code, and needs to go away as part of the DT conversion.
    Also, the early platform_device creation code has been removed, as it
    appears to be unused.

    Signed-off-by: Paul Walmsley
    Cc: Kevin Hilman

    Paul Walmsley
     

12 Jan, 2013

1 commit

  • b76c8b19b   ARM: OMAP2+: Use omap initcalls ... Browse Code »

    This way the initcalls don't run on other SoCs on multiplatform
    kernels. Otherwise we'll get something like this when booting
    on vexpress:

    omap_hwmod: _ensure_mpu_hwmod_is_setup: MPU initiator hwmod mpu not yet registered
    ...
    WARNING: at arch/arm/mach-omap2/pm.c:82 _init_omap_device+0x74/0x94()
    _init_omap_device: could not find omap_hwmod for mpu
    ...
    omap-dma-engine omap-dma-engine: OMAP DMA engine driver
    ...

    Tested-by: Ezequiel Garcia
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

21 Dec, 2012

1 commit

  • 6f8c9d213   ARM: OMAP2+: Trivial fix for IOMMU merge issue ... Browse Code »

    Commit 787314c35fbb ("Merge tag 'iommu-updates-v3.8' of
    git://git./linux/kernel/git/joro/iommu") did not account for the changed
    header location.

    The headers were made local to mach-omap2 as they are specific to omap2+
    only, and we wanted to get most of the #include headers fixed
    up anyways for the ARM multiplatform support.

    We attempted to avoid this kind of merge conflict early on by setting up
    a minimal git branch shared by the arm-soc tree and the iommu tree, but
    looks like we still hit a merge issue there as the branches got merged
    as various topic branches.

    Cc: Joerg Roedel
    Signed-off-by: Tony Lindgren
    Signed-off-by: Linus Torvalds

    Tony Lindgren
     

04 Dec, 2012

2 commits

  • ebf7cda0f   iommu/omap: Adapt to runtime pm ... Browse Code »

    Use runtime PM functionality interfaced with hwmod enable/idle
    functions, to replace direct clock operations and sysconfig
    handling.

    Due to reset sequence, pm_runtime_[get|put]_sync must be used, to
    avoid possible operations with the module under reset. Because of
    this and given that the driver uses spin_locks to protect their
    critical sections, we must use pm_runtime_irq_safe in order for the
    runtime ops to be happy, otherwise might_sleep_if checks in runtime
    framework will complain.

    The remaining pm_runtime out of iommu_enable and iommu_disable
    corresponds to paths that can be accessed through debugfs, some of
    them doesn't work if the module is not enabled first, but in future
    if the mmu is idled withouth freeing, these are needed to debug.

    Signed-off-by: Omar Ramirez Luna
    Tested-by: Ohad Ben-Cohen
    Acked-by: Tony Lindgren
    Signed-off-by: Joerg Roedel

    Omar Ramirez Luna
     
  • 72b15b6ae   iommu/omap: Migrate to hwmod framework ... Browse Code »

    Use hwmod data and device attributes to build and register an
    omap device for iommu driver.

    - Update the naming convention in isp module.
    - Remove unneeded check for number of resources, as this is now
    handled by omap_device and prevents driver from loading.
    - Now unused, remove platform device and resource data, handling
    of sysconfig register for softreset purposes, use default
    latency structure.
    - Use hwmod API for reset handling.

    Signed-off-by: Omar Ramirez Luna
    Tested-by: Ohad Ben-Cohen
    Signed-off-by: Joerg Roedel

    Omar Ramirez Luna
     

21 Nov, 2012

1 commit

  • 2ab7c8481   ARM: OMAP2+: Move iommu/iovmm headers to platform_data ... Browse Code »

    Move iommu/iovmm headers from plat/ to platform_data/ as part of the
    single zImage work.

    Partially based on an earlier version by Ido Yariv .

    Cc: Ido Yariv
    Cc: Laurent Pinchart
    Cc: Omar Ramirez Luna
    Acked-by: Mauro Carvalho Chehab
    Acked-by: Ohad Ben-Cohen
    Acked-by: Joerg Roedel
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

13 Sep, 2012

1 commit

  • 7d7e1eba7   ARM: OMAP2+: Prepare for irqs.h removal ... Browse Code »

    As the interrupts should only be defined in the platform_data, and
    eventually coming from device tree, there's no need to define them
    in header files.

    Let's remove the hardcoded references to irqs.h and fix up the includes
    so we don't rely on headers included in irqs.h. Note that we're
    defining OMAP_INTC_START as 0 to the interrupts. This will be needed
    when we enable SPARSE_IRQ. For some drivers we need to add
    #include for now until these drivers are fixed to
    remove cpu_is_omapxxxx() usage.

    While at it, sort som of the includes the standard way, and add
    the trailing commas where they are missing in the related data
    structures.

    Note that for drivers/staging/tidspbridge we just define things
    locally.

    Cc: Paul Walmsley
    Signed-off-by: Tony Lindgren

    Tony Lindgren
     

13 May, 2012

1 commit

  • 778d02e9b   ARM: OMAP4: fix irq and clock name for dsp-iommu ... Browse Code »

    Irq and clock names were wrong for dsp iommu configuration
    for omap4.

    - Renamed tesla_ick to dsp_fck:
    This is required because the new naming convention introduced
    by: commit 0e43327 "OMAP4 clock: Fix clock names and align
    with hwmod names"

    - Renamed INT_44XX_DSP_MMU to OMAP44XX_IRQ_TESLA_MMU.
    Naming convention adopted since: commit e927f8d "omap4: Add
    auto-generated irq and dma headers"

    - dsp-iommu is enabled by default.

    Signed-off-by: Juan Gutierrez
    Signed-off-by: Ohad Ben-Cohen

    Juan Gutierrez
     

05 Mar, 2012

1 commit

  • 134d12fae   ARM: OMAP: fix iommu, not mailbox ... Browse Code »

    For some weird (freudian?) reason, commit 435792d "ARM: OMAP: make
    iommu subsys_initcall to fix builtin omap3isp" unintentionally changed
    the mailbox's initcall instead of the iommu's.

    Fix that.

    Reported-by: Fernando Guzman Lugo
    Signed-off-by: Ohad Ben-Cohen
    Cc: Laurent Pinchart
    Cc: Joerg Roedel
    Cc: Tony Lindgren
    Signed-off-by: Joerg Roedel

    Ohad Ben-Cohen
     

08 Nov, 2011

1 commit

  • a1bcc1dce   ARM: OMAP: Fix export.h or module.h includes ... Browse Code »

    Commit 32aaeffbd4a7457bf2f7448b33b5946ff2a960eb (Merge branch
    'modsplit-Oct31_2011'...) caused some build errors. Fix these
    and make sure we always have export.h or module.h included
    for MODULE_ and EXPORT_SYMBOL users:

    $ grep -rl ^MODULE_ arch/arm/*omap*/*.c | xargs \
    grep -L linux/module.h
    arch/arm/mach-omap2/dsp.c
    arch/arm/mach-omap2/mailbox.c
    arch/arm/mach-omap2/omap-iommu.c
    arch/arm/mach-omap2/smartreflex.c

    Also check we either have export.h or module.h included
    for the files exporting symbols:

    $ grep -rl EXPORT_SYMBOL arch/arm/*omap*/*.c | xargs \
    grep -L linux/export.h | xargs grep -L linux/module.h

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

    Tony Lindgren
     

04 Jul, 2011

1 commit

  • fee17d4fd   OMAP4: iommu: fix clock name ... Browse Code »

    0e43327 "OMAP4: clock: Fix clock names and align with hwmod names"
    renamed ducati_ick to ipu_fck.

    Update OMAP4's iommu_device accordingly, so that omap_iommu_probe
    doesn't break when calling clk_get.

    Signed-off-by: Ohad Ben-Cohen

    Ohad Ben-Cohen
     

16 Dec, 2010

2 commits

29 Jun, 2010

1 commit

14 May, 2010

2 commits