Doug / smarc-fsl-linux-kernel

06 Aug, 2013

2 commits

17 Jul, 2013

2 commits

03 Jul, 2013

1 commit

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

    Pull ARM SoC device tree changes from Arnd Bergmann:
    "These changes from 30 individual branches for the most part update
    device tree files, but there are also a few source code changes that
    have crept in this time, usually in order to atomically move over a
    driver from using hardcoded data to DT probing.

    A number of platforms change their DT files to use the C preprocessor,
    which is causing a bit of churn, but that is hopefully only this once"

    * tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (372 commits)
    ARM: at91: dt: rm9200ek: add spi support
    ARM: at91: dt: rm9200: add spi support
    ARM: at91/DT: at91sam9n12: add SPI DMA client infos
    ARM: at91/DT: sama5d3: add SPI DMA client infos
    ARM: at91/DT: fix SPI compatibility string
    ARM: Kirkwood: Fix the internal register ranges translation
    ARM: dts: bcm281xx: change comment to C89 style
    ARM: mmc: bcm281xx SDHCI driver (dt mods)
    ARM: nomadik: add the new clocks to the device tree
    clk: nomadik: implement the Nomadik clocks properly
    ARM: dts: omap5-uevm: Provide USB Host PHY clock frequency
    ARM: dts: omap4-panda: Fix DVI EDID reads
    ARM: dts: omap4-panda: Add USB Host support
    arm: mvebu: enable mini-PCIe connectors on Armada 370 RD
    ARM: shmobile: irqpin: add a DT property to enable masking on parent
    ARM: dts: AM43x EPOS EVM support
    ARM: dts: OMAP5: Add bandgap DT entry
    ARM: dts: AM33XX: Add pinmux configuration for CPSW to am335x EVM
    ARM: dts: AM33XX: Add pinmux configuration for CPSW to EVMsk
    ARM: dts: AM33XX: Add pinmux configuration for CPSW to beaglebone
    ...

    Linus Torvalds
     

05 Jun, 2013

1 commit

04 Jun, 2013

1 commit

  • 744fdc8dc   ARM: shmobile: r8a7740: Prepare for reference DT setup ... Browse Code »

    We need three steps to prepare for the new Armadillo reference DT board code:
    - Split the device list into r8a7740_early_devices used by the old platform
    data setup (board-armadillo.c) and r8a7740_devices_dt used by both
    setup variants.
    - Introduce new r8a7740_init_delay() to be more flexible about calling
    shmobile_setup_delay().
    - For the generic r8a7740 support, we switch to device tree setup for
    the GIC, the irqpin devices and the I2C controllers.

    This is slightly similar to commit 3b00f9342623a5ebc
    "ARM: shmobile: sh73a0: Do not use early devices with DT reference"

    Signed-off-by: Bastian Hecht
    Signed-off-by: Simon Horman

    Bastian Hecht
     

08 May, 2013

1 commit

  • 1bf25e78a   Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull ARM SoC late cleanups from Arnd Bergmann:
    "These are cleanups and smaller changes that either depend on earlier
    feature branches or came in late during the development cycle. We
    normally try to get all cleanups early, so these are the exceptions:

    - A follow-up on the clocksource reworks, hopefully the last time we
    need to merge clocksource subsystem changes through arm-soc.

    A first set of patches was part of the original 3.10 arm-soc
    cleanup series because of interdependencies with timer drivers now
    moved out of arch/arm.

    - Migrating the SPEAr13xx platform away from using auxdata for DMA
    channel descriptions towards using information in device tree,
    based on the earlier SPEAr multiplatform series

    - A few follow-ups on the Atmel SAMA5 support and other changes for
    Atmel at91 based on the larger at91 reworks.

    - Moving the armada irqchip implementation to drivers/irqchip

    - Several OMAP cleanups following up on the larger series already
    merged in 3.10."

    * tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits)
    ARM: OMAP4: change the device names in usb_bind_phy
    ARM: OMAP2+: Fix mismerge for timer.c between ff931c82 and da4a686a
    ARM: SPEAr: conditionalize SMP code
    ARM: arch_timer: Silence debug preempt warnings
    ARM: OMAP: remove unused variable
    serial: amba-pl011: fix !CONFIG_DMA_ENGINE case
    ata: arasan: remove the need for platform_data
    ARM: at91/sama5d34ek.dts: remove not needed compatibility string
    ARM: at91: dts: add MCI DMA support
    ARM: at91: dts: add i2c dma support
    ARM: at91: dts: set #dma-cells to the correct value
    ARM: at91: suspend both memory controllers on at91sam9263
    irqchip: armada-370-xp: slightly cleanup irq controller driver
    irqchip: armada-370-xp: move IRQ handler to avoid forward declaration
    irqchip: move IRQ driver for Armada 370/XP
    ARM: mvebu: move L2 cache initialization in init_early()
    devtree: add binding documentation for sp804
    ARM: integrator-cp: convert use CLKSRC_OF for timer init
    ARM: versatile: use OF init for sp804 timer
    ARM: versatile: add versatile dtbs to dtbs target
    ...

    Linus Torvalds
     

12 Apr, 2013

1 commit

  • 0583fe478   ARM: convert arm/arm64 arch timer to use CLKSRC_OF init ... Browse Code »

    This converts arm and arm64 to use CLKSRC_OF DT based initialization for
    the arch timer. A new function arch_timer_arch_init is added to allow for
    arch specific setup.

    This has a side effect of enabling sched_clock on omap5 and exynos5. There
    should not be any reason not to use the arch timers for sched_clock.

    Signed-off-by: Rob Herring
    Cc: Russell King
    Cc: Kukjin Kim
    Cc: Tony Lindgren
    Cc: Simon Horman
    Cc: Magnus Damm
    Cc: Catalin Marinas
    Cc: Will Deacon
    Cc: John Stultz
    Cc: Thomas Gleixner
    Cc: linux-samsung-soc@vger.kernel.org
    Cc: linux-omap@vger.kernel.org
    Cc: linux-sh@vger.kernel.org
    Acked-by: Santosh Shilimkar

    Rob Herring
     

02 Apr, 2013

1 commit

  • 0b7d78202   ARM: shmobile: r8a7740: Migrate from INTC to GIC ... Browse Code »

    With the added capabilty of the intc_irqpin driver to handle shared
    external IRQs, all prerequisites are fulfilled and we are ready to
    migrate completely to GIC. This includes the following steps:

    - Kconfig: select ARM_GIC and RENESAS_INTC_IRQPIN
    - intc-r8a7740: Throw out all legacy INTC code and init the GIC. We need
    to mask out all shared IRQs as it is needed by the
    shared intc_irqpin driver.
    - setup-r8a7740: Add 4 irqpin devices to handle external IRQs and update
    all IRQ numbers to point to the GIC SPI.
    - board-armadillo: Update all IRQ numbers to point to the GIC SPI.
    - pfc-r8a7740: Update all IRQ numbers of the GPIOs to point to the GIC
    SPI.

    Signed-off-by: Bastian Hecht
    Acked-by: Kuninori Morimoto
    Signed-off-by: Simon Horman

    Bastian Hecht
     

27 Feb, 2013

1 commit

  • f6c0ffa8f   Merge tag 'iommu-updates-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu ... Browse Code »

    Pull IOMMU Updates from Joerg Roedel:
    "Besides some fixes and cleanups in the code there are three more
    important changes to point out this time:

    * New IOMMU driver for the ARM SHMOBILE platform
    * An IOMMU-API extension for non-paging IOMMUs (required for
    upcoming PAMU driver)
    * Rework of the way the Tegra IOMMU driver accesses its
    registetrs - register windows are easier to extend now.

    There are also a few changes to non-iommu code, but that is acked by
    the respective maintainers."

    * tag 'iommu-updates-v3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (23 commits)
    iommu/tegra: assume CONFIG_OF in SMMU driver
    iommu/tegra: assume CONFIG_OF in gart driver
    iommu/amd: Remove redundant NULL check before dma_ops_domain_free().
    iommu/amd: Initialize device table after dma_ops
    iommu/vt-d: Zero out allocated memory in dmar_enable_qi
    iommu/tegra: smmu: Fix incorrect mask for regbase
    iommu/exynos: Make exynos_sysmmu_disable static
    ARM: mach-shmobile: r8a7740: Add IPMMU device
    ARM: mach-shmobile: sh73a0: Add IPMMU device
    ARM: mach-shmobile: sh7372: Add IPMMU device
    iommu/shmobile: Add iommu driver for Renesas IPMMU modules
    iommu: Add DOMAIN_ATTR_WINDOWS domain attribute
    iommu: Add domain window handling functions
    iommu: Implement DOMAIN_ATTR_PAGING attribute
    iommu: Check for valid pgsize_bitmap in iommu_map/unmap
    iommu: Make sure DOMAIN_ATTR_MAX is really the maximum
    iommu/tegra: smmu: Change SMMU's dependency on ARCH_TEGRA
    iommu/tegra: smmu: Use helper function to check for valid register offset
    iommu/tegra: smmu: Support variable MMIO ranges/blocks
    iommu/tegra: Add missing spinlock initialization
    ...

    Linus Torvalds
     

22 Feb, 2013

2 commits

  • 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
     
  • 7ae1c76ee   Merge tag 'sh-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc ... Browse Code »

    Pull sh-mobile pinctrl conversion from Arnd Bergmann:
    "This is another cleanup series, containing the move of the Renesas
    SH-Mobile pin controller code from arch/arm/mach-shmobile over to the
    generic pinctrl subsystem, changing it over to the common interfaces
    in the process.

    Based on agreement between Olof, Paul Mundt, Linus Walleij and Simon,
    we're merging this large branch of pinctrl conversion through arm-soc,
    even though it contains the corresponding conversions for arch/sh.
    Main reason for this is tight dependencies (that will now mostly be
    broken) between the arch/sh and mach-shmobile implementations.

    There will be more of this in 3.10 to do device-tree bindings, but
    this is the initial conversion."

    * tag 'sh-pinmux' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (81 commits)
    sh-pfc: sh_pfc_probe() sizeof() fix
    sh-pfc: Move sh_pfc.h from include/linux/ to driver directory
    sh-pfc: Remove pinmux_info definition
    sh: Remove unused sh_pfc_register_info() function
    sh: shx3: pinmux: Use driver-provided pinmux info
    sh: sh7786: pinmux: Use driver-provided pinmux info
    sh: sh7785: pinmux: Use driver-provided pinmux info
    sh: sh7757: pinmux: Use driver-provided pinmux info
    sh: sh7734: pinmux: Use driver-provided pinmux info
    sh: sh7724: pinmux: Use driver-provided pinmux info
    sh: sh7723: pinmux: Use driver-provided pinmux info
    sh: sh7722: pinmux: Use driver-provided pinmux info
    sh: sh7720: pinmux: Use driver-provided pinmux info
    sh: sh7269: pinmux: Use driver-provided pinmux info
    sh: sh7264: pinmux: Use driver-provided pinmux info
    sh: sh7203: pinmux: Use driver-provided pinmux info
    ARM: shmobile: sh73a0: Use driver-provided pinmux info
    ARM: shmobile: sh7372: Use driver-provided pinmux info
    ARM: shmobile: r8a7779: Use driver-provided pinmux info
    ARM: shmobile: r8a7740: Use driver-provided pinmux info
    ...

    Linus Torvalds
     

06 Feb, 2013

1 commit

  • f671e0224   ARM: mach-shmobile: r8a7740: Add IPMMU device ... Browse Code »

    This patch adds an IPMMU device and notifies the IPMMU driver which
    devices are connected via the IPMMU module. All devices connected to the main
    memory bus via the IPMMU module MUST be registered when SHMOBILE_IPMMU and
    SHMOBILE_IOMMU are enabled because physical address cannot be used
    while the IPMMU module's MMU function is enabled.

    Signed-off-by: Hideki EIRAKU
    Acked-by: Paul Mundt
    Acked-by: Simon Horman
    Signed-off-by: Joerg Roedel

    Hideki EIRAKU
     

25 Jan, 2013

3 commits

25 Dec, 2012

1 commit

  • 6bb27d734   ARM: delete struct sys_timer ... Browse Code »

    Now that the only field in struct sys_timer is .init, delete the struct,
    and replace the machine descriptor .timer field with the initialization
    function itself.

    This will enable moving timer drivers into drivers/clocksource without
    having to place a public prototype of each struct sys_timer object into
    include/linux; the intent is to create a single of_clocksource_init()
    function that determines which timer driver to initialize by scanning
    the device dtree, much like the proposed irqchip_init() at:
    http://www.spinics.net/lists/arm-kernel/msg203686.html

    Includes mach-omap2 fixes from Igor Grinberg.

    Tested-by: Robert Jarzmik
    Signed-off-by: Stephen Warren

    Stephen Warren
     

13 Dec, 2012

1 commit

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

    Pull ARM SoC updates from Olof Johansson:
    "This contains the bulk of new SoC development for this merge window.

    Two new platforms have been added, the sunxi platforms (Allwinner A1x
    SoCs) by Maxime Ripard, and a generic Broadcom platform for a new
    series of ARMv7 platforms from them, where the hope is that we can
    keep the platform code generic enough to have them all share one mach
    directory. The new Broadcom platform is contributed by Christian
    Daudt.

    Highbank has grown support for Calxeda's next generation of hardware,
    ECX-2000.

    clps711x has seen a lot of cleanup from Alexander Shiyan, and he's
    also taken on maintainership of the platform.

    Beyond this there has been a bunch of work from a number of people on
    converting more platforms to IRQ domains, pinctrl conversion, cleanup
    and general feature enablement across most of the active platforms."

    Fix up trivial conflicts as per Olof.

    * tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (174 commits)
    mfd: vexpress-sysreg: Remove LEDs code
    irqchip: irq-sunxi: Add terminating entry for sunxi_irq_dt_ids
    clocksource: sunxi_timer: Add terminating entry for sunxi_timer_dt_ids
    irq: versatile: delete dangling variable
    ARM: sunxi: add missing include for mdelay()
    ARM: EXYNOS: Avoid early use of of_machine_is_compatible()
    ARM: dts: add node for PL330 MDMA1 controller for exynos4
    ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
    ARM: EXYNOS: add UART3 to DEBUG_LL ports
    ARM: S3C24XX: Add clkdev entry for camif-upll clock
    ARM: SAMSUNG: Add s3c24xx/s3c64xx CAMIF GPIO setup helpers
    ARM: sunxi: Add missing sun4i.dtsi file
    pinctrl: samsung: Do not initialise statics to 0
    ARM i.MX6: remove gate_mask from pllv3
    ARM i.MX6: Fix ethernet PLL clocks
    ARM i.MX6: rename PLLs according to datasheet
    ARM i.MX6: Add pwm support
    ARM i.MX51: Add pwm support
    ARM i.MX53: Add pwm support
    ARM: mx5: Replace clk_register_clkdev with clock DT lookup
    ...

    Linus Torvalds
     

13 Nov, 2012

1 commit

06 Nov, 2012

2 commits

04 Sep, 2012

3 commits

07 Jul, 2012

4 commits

  • 755d57b22   ARM: mach-shmobile: r8a7740 generic board support via DT ... Browse Code »

    Add generic DT board support for the r8a7740 SoC.

    SCIF serial ports and timers are kept as regular
    platform devices. Other on-chip and on-board devices
    should be configured via the device tree.

    At this point there is no interrupt controller support
    in place but such code will be added over time when
    proper IRQ domain support has been added to INTC.

    Signed-off-by: Magnus Damm
    Signed-off-by: Rafael J. Wysocki

    Magnus Damm
     
  • a330ce3cd   ARM: shmobile: r8a7740: add A4LC pm domain support ... Browse Code »

    This patch adds basic A4LC pm domain support.
    Now, below devices can be controled by PM

    MERAM, LCDC, VOU, ICBS, SDENC-Link

    Signed-off-by: Kuninori Morimoto
    Acked-by: Magnus Damm
    Signed-off-by: Rafael J. Wysocki

    Kuninori Morimoto
     
  • 802a5639a   ARM: shmobile: r8a7740: add A3SP pm domain support ... Browse Code »

    This patch adds basic A3SP pm domain support.
    Now, below devices can be controled by PM

    DMAC1/2/3, IPMMU, DDM, FLCTL, SYS-HPB, BBIF1, MSIOF1/2,
    SCIFA,SCIFB, IIC1, IrDA, USBH, USBDMAC, SDHI0/1/2, TPU,
    DREQPAK (Sys), MMCIF, RSPI, SIM, USBF

    Signed-off-by: Kuninori Morimoto
    Acked-by: Magnus Damm
    Signed-off-by: Rafael J. Wysocki

    Kuninori Morimoto
     
  • 8459293c2   ARM: shmobile: r8a7740: add A4S pm domain support ... Browse Code »

    This patch adds basic A4S pm domain support.
    Now, below devices can be controled by PM

    Common-SHwy, Common-HPB, BSC, MFI, MMFROM, HS-SHwy,
    SYS-HPB, INTCA, DBSC, DDRPHY (Logic),
    ATAPI, GbEther, AXI-bus

    Signed-off-by: Kuninori Morimoto
    Acked-by: Magnus Damm
    Signed-off-by: Rafael J. Wysocki

    Kuninori Morimoto
     

30 Jun, 2012

4 commits

20 Jun, 2012

1 commit

  • d49679e59   ARM: shmobile: r8a7740: add MERAM work-around ... Browse Code »

    r8a7740 chip has lasting errata on MERAM buffer, and this patch adds
    its work-around on setup-r8a7740.c
    It solved CEU/VIO6C/2D-DMAC/VCP1/VPU5F/JPU/DISP memroy access error.

    But MERAM driver can't control this issue,
    since this work-around requires access to non-MERAM register address.
    So, This it will be called as board specific code at this point.

    Signed-off-by: Kuninori Morimoto
    Tested-by: Simon Horman
    Acked-by: Magnus Damm
    Signed-off-by: Rafael J. Wysocki

    Kuninori Morimoto
     

13 May, 2012

2 commits

30 Mar, 2012

1 commit

  • 12679a2d7   Merge branch 'for-linus' of git://git.linaro.org/people/rmk/linux-arm ... Browse Code »

    Pull more ARM updates from Russell King.

    This got a fair number of conflicts with the split, but
    also with some other sparse-irq and header file include cleanups. They
    all looked pretty trivial, though.

    * 'for-linus' of git://git.linaro.org/people/rmk/linux-arm: (59 commits)
    ARM: fix Kconfig warning for HAVE_BPF_JIT
    ARM: 7361/1: provide XIP_VIRT_ADDR for no-MMU builds
    ARM: 7349/1: integrator: convert to sparse irqs
    ARM: 7259/3: net: JIT compiler for packet filters
    ARM: 7334/1: add jump label support
    ARM: 7333/2: jump label: detect %c support for ARM
    ARM: 7338/1: add support for early console output via semihosting
    ARM: use set_current_blocked() and block_sigmask()
    ARM: exec: remove redundant set_fs(USER_DS)
    ARM: 7332/1: extract out code patch function from kprobes
    ARM: 7331/1: extract out insn generation code from ftrace
    ARM: 7330/1: ftrace: use canonical Thumb-2 wide instruction format
    ARM: 7351/1: ftrace: remove useless memory checks
    ARM: 7316/1: kexec: EOI active and mask all interrupts in kexec crash path
    ARM: Versatile Express: add NO_IOPORT
    ARM: get rid of asm/irq.h in asm/prom.h
    ARM: 7319/1: Print debug info for SIGBUS in user faults
    ARM: 7318/1: gic: refactor irq_start assignment
    ARM: 7317/1: irq: avoid NULL check in for_each_irq_desc loop
    ARM: 7315/1: perf: add support for the Cortex-A7 PMU
    ...

    Linus Torvalds
     

13 Mar, 2012

2 commits

26 Jan, 2012

1 commit

  • 250a27237   ARM: shmobile: remove NR_IRQS ... Browse Code »

    Remove NR_IRQS and explicitly include mach/irqs.h as needed. shmobile
    properly allocates irq_descs for each irqchip, so setting .nr_irqs for
    each machine is not needed.

    Signed-off-by: Rob Herring

    Rob Herring