1. 19 Jun, 2013 1 commit
    • Arnd Bergmann's avatar
      Merge tag 'integrator-pci-for-arm-soc' of... · 596fd95e
      Arnd Bergmann authored
      Merge tag 'integrator-pci-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator into next/soc
      
      From Linus Walleij:
      
      This is a patch series that:
      - Pulls the Integrator/AP PCI bridge driver into one file
      - Adds full device tree support for it
      - Keeps ATAG support around for the time being
      
      * tag 'integrator-pci-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator:
        ARM: integrator: basic PCIv3 device tree support
        ARM: integrator: move static ioremapping into PCIv3 driver
        ARM: integrator: move VGA base assignment
        ARM: integrator: remap PCIv3 base dynamically
        ARM: integrator: move V3 register definitions into driver
        ARM: integrator: move PCI base address grab to probe
        ARM: integrator: grab PCI error IRQ in probe()
        ARM: integrator: convert PCIv3 bridge to platform device
        ARM: integrator: merge PCIv3 driver into one file
        ARM: pci: create pci_common_init_dev()
        Documentation/devicetree: add a small note on PCI
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      596fd95e
  2. 18 Jun, 2013 1 commit
  3. 17 Jun, 2013 3 commits
  4. 15 Jun, 2013 4 commits
    • Linus Walleij's avatar
      ARM: integrator: basic PCIv3 device tree support · f55b2b56
      Linus Walleij authored
      This registers the memory ranges for I/O, non-prefetched and
      prefetched memory and configuration space for the PCIv3 bridge
      and let us fetch these basic memory resources from the device
      tree in the device tree boot path. Remove the stepping stone
      platform device. This is an either/or approach - the platform
      data path is mutually exclusive to the plain platform data
      path and provided addresses from the device tree have to be
      correct.
      
      This adds the interrupt-map property to the PCIv3 DTS file
      and makes the bridge obtain mappings from the device tree.
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      f55b2b56
    • Olof Johansson's avatar
      Merge tag 'tegra-for-3.11-soc' of... · 7bf15412
      Olof Johansson authored
      Merge tag 'tegra-for-3.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra into next/soc
      
      From Stephen Warren:
      ARM: tegra: core SoC support enhancements
      
      This branch contains fixes and enhancement for core Tegra Soc support:
      * CPU hotplug support for Tegra114.
      * Some preliminary work on Tegra114 CPU sleep modes.
      * Minor fix for EMC table DT parsing.
      
      * tag 'tegra-for-3.11-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-tegra:
        ARM: tegra: don't pass CPU ID to tegra_{set,clear}_cpu_in_lp2
        ARM: tegra: cpuidle: using IS_ENABLED for multi SoCs management in init func
        ARM: tegra: hook tegra_tear_down_cpu function in the PM suspend init function
        ARM: tegra: cpuidle: move the init function behind the suspend init function
        ARM: tegra: remove ifdef in the tegra_resume
        ARM: tegra: add cpu_disable for hotplug
        ARM: tegra114: add CPU hotplug support
        clk: tegra114: implement wait_for_reset and disable_clock for tegra_cpu_car_ops
        ARM: tegra114: add power up sequence for warm boot CPU
        ARM: tegra: make tegra_resume can work for Tegra114
        ARM: tegra: skip SCU and PL310 code when CPU is not Cortex-A9
        ARM: tegra: add an assembly marco to check Tegra SoC ID
        ARM: tegra: emc: correction of ram-code parsing from dt
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      7bf15412
    • Olof Johansson's avatar
      Merge tag 'renesas-soc2-for-v3.11' of... · 677b5c48
      Olof Johansson authored
      Merge tag 'renesas-soc2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
      
      From Simon Horman:
      Second Round of Renesas ARM-based SoC updates for v3.11
      
      * Ether device name updates for r8a7778 and r8a7779 Sergei Shtylyov
      * Extended clock and driver coverage for r8a7778 by Goda-san and Morimoto-san
      * Extended clock and coverage for r8a73a4 and r8a7790 by  Guennadi Liakhovetski
      * HSCIF support for r8a7790 by Ulrich Hecht
      
      * tag 'renesas-soc2-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: r8a7790: add clock definitions and aliases for MMCIF and SDHI
        ARM: shmobile: r8a73a4: add clock definitions and aliases for MMCIF and SDHI
        ARM: shmobile: r8a7778: add support MMC driver
        ARM: shmobile: r8a7778: add support HSPI driver
        ARM: shmobile: r8a7778: add support I2C driver
        ARM: shmobile: r8a7778: add support MMC clock
        ARM: shmobile: r8a7778: add support HSPI clock
        ARM: shmobile: r8a7778: add support I2C clock
        ARM: shmobile: r8a7790: HSCIF support
        ARM: shmobile: r8a7778: fix Ether device name
        ARM: shmobile: r8a7779: fix Ether device name
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      
      Conflicts:
      	arch/arm/mach-shmobile/clock-r8a7778.c
      	arch/arm/mach-shmobile/include/mach/r8a7778.h
      677b5c48
    • Olof Johansson's avatar
      Merge tag 'renesas-phy-rcar-usb-for-v3.11' of... · a1149269
      Olof Johansson authored
      Merge tag 'renesas-phy-rcar-usb-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
      
      From Simon Horman:
      Renesas USB updates for v3.11
      
      These updates are by Sergei Shtylyov to clean-up USB support
      present for R8A7779/Marzen and then extend USB support coverage to
      R8A7778/BOCK-W.
      
      * tag 'renesas-phy-rcar-usb-for-v3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: BOCK-W: add USB support
        ARM: shmobile: r8a7778: add USB support
        phy-rcar-usb: add R8A7778 support
        phy-rcar-usb: handle platform data
        ARM: shmobile: Marzen: pass platform data to USB PHY device
        phy-rcar-usb: add platform data
        phy-rcar-usb: correct base address
        ARM: shmobile: r8a7779: remove USB PHY 2nd memory resource
        phy-rcar-usb: remove EHCI internal buffer setup
        ARM: shmobile: r8a7779: setup EHCI internal buffer
        ehci-platform: add pre_setup() method to platform data
        ARM: shmobile: Marzen: move USB EHCI, OHCI, and PHY devices to R8A7779 code
      
      Conflicts:
      	arch/arm/mach-shmobile/board-marzen.c
      	arch/arm/mach-shmobile/setup-r8a7778.c
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      a1149269
  5. 14 Jun, 2013 4 commits
    • Olof Johansson's avatar
      Merge tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux into next/soc · 5ae13ef4
      Olof Johansson authored
      mvebu register map changes for v3.11
      
      This series removes the hardcoded register base address for mvebu.
      
      Depends:
       - mvebu/fixes-non-critical (up to tags/fixes-non-3.11-1)
       - mvebu/cleanup (up to tags/cleanup-3.11-3)
      
      * tag 'regmap-3.11' of git://git.infradead.org/users/jcooper/linux:
        arm: mvebu: disable DEBUG_LL/EARLY_PRINTK in defconfig
        arm: mvebu: add another earlyprintk Kconfig option
        arm: mvebu: don't hardcode the physical address for mvebu-mbus
        arm: mvebu: don't hardcode a physical address in headsmp.S
        arm: mvebu: remove hardcoded static I/O mapping
        arm: mvebu: move cache and mvebu-mbus initialization later
        arm: mvebu: avoid hardcoded virtual address in coherency code
        arm: mvebu: remove dependency of SMP init on static I/O mapping
        arm: mvebu: fix length of Ethernet registers area in .dtsi
        arm: mvebu: fix length of SATA registers area in .dtsi
        arm: mvebu: mark functions of armada-370-xp.c as static
        ARM: mvebu: Remove init_irq declaration in machine description
        ARM: Orion: Remove redundant init_dma_coherent_pool_size()
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      5ae13ef4
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.11/omap5-signed' of... · 01758fe6
      Olof Johansson authored
      Merge tag 'omap-for-v3.11/omap5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
      
      From Tony Lindgren:
      Omap5 SoC data via Paul Walmsley <paul@pwsan.com:
      
      Add support for the OMAP5 SoC family.
      
      As part of the transition to DT, no board files will be used
      for OMAP5.  The hwmod data is gradually being transitioned
      away from arch/arm/mach-omap2: IRQ, DMA, and memory map data
      has been moved to DT.  Hopefully the dev_attr and clock role
      data will be the next step.
      
      Basic test logs are available here, although not for OMAP5,
      since I don't have an OMAP5 board:
      http://www.pwsan.com/omap/testlogs/omap5_v3.10/20130608130949/
      
      * tag 'omap-for-v3.11/omap5-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP5: Remove unused include for ocp2scp
        ARM: OMAP5: Enable build and frameowrk initialisations
        ARM: OMAP5: voltagedomain data: Add OMAP5 voltage domain data
        ARM: OMAP5: hwmod data: Create initial OMAP5 SOC hwmod data
        ARM: OMAP5: powerdomain data: Add OMAP54XX data and update the header
        ARM: OMAP5: clockdomain data: Add OMAP54XX data and update the header
        ARM: OMAP5: SCRM: Add OMAP54XX header file.
        ARM: OMAP5: PRCM: Add OMAP54XX local MPU PRCM registers
        ARM: OMAP4+: PRCM MPU: Move function prototypes to common header for re-use
        ARM: OMAP5: CM: Add OMAP54XX register and bitfield files
        ARM: OMAP4+: CM: Move function prototypes to common header for re-use
        ARM: OMAP5: PRM: Add OMAP54XX register and bitfield files
        ARM: OMAP4+: PRM: Move function prototypes to common header for re-use
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      01758fe6
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.11/soc-signed' of... · 10f8902b
      Olof Johansson authored
      Merge tag 'omap-for-v3.11/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
      
      From Tony Lindgren:
      Omap SoC changes. Mostly improves am33xx support, and adds
      minimal support for am43x SoCs.
      
      * tag 'omap-for-v3.11/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP2+: AM43x: SRAM base and size
        ARM: OMAP2+: AM43x: GP or HS ?
        ARM: OMAP2+: AM43x: early init
        ARM: OMAP2+: AM43x: static mapping
        ARM: OMAP2+: AM437x: SoC revision detection
        ARM: OMAP2+: AM43x: soc_is support
        ARM: OMAP2+: AM43x: kbuild
        ARM: OMAP2+: AM43x: Kconfig
        ARM: OMAP2+: separate out OMAP4 restart
        ARM: AM33XX: clk: Add clock node for EHRPWM TBCLK
        ARM: OMAP3: clock data: get rid of unused USB host clock aliases and dummies
        ARM: OMAP2+: AM33xx: Add missing reset status info to GFX hwmod
        + Linux 3.10-rc5
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      10f8902b
    • Olof Johansson's avatar
      Merge tag 'omap-for-v3.11/pm-signed' of... · eb25862d
      Olof Johansson authored
      Merge tag 'omap-for-v3.11/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc
      
      From Tony Lindgren:
      Omap PM changes via Kevin Hilman <khilman@linaro.org>:
      
      OMAP PM cleanups for v3.10
      
      * tag 'omap-for-v3.11/pm-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
        ARM: OMAP4+: PM: Consolidate OMAP4 PM code to re-use it for OMAP5
        ARM: OMAP4+: Make secondary_startup function name more consistent
        ARM: OMAP4+: PM: Consolidate MPU subsystem PM code for re-use
        ARM: OMAP4: PM: Avoid expensive cpu_suspend() path for all CPU power states except off
      eb25862d
  6. 13 Jun, 2013 10 commits
  7. 12 Jun, 2013 12 commits
  8. 11 Jun, 2013 5 commits
    • Dinh Nguyen's avatar
      ARM: socfpga: Add syscon to be part of socfpga · 1780db9e
      Dinh Nguyen authored
      SOCFPGA has a system manager register block can be accessed by using
      the syscon driver.
      Signed-off-by: default avatarDinh Nguyen <dinguyen@altera.com>
      Cc: Pavel Machek <pavel@denx.de>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Olof Johansson <olof@lixom.net>
      Cc: <linux@arm.linux.org.uk>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      1780db9e
    • Dinh Nguyen's avatar
      ARM: socfpga: Add support to gate peripheral clocks · 825f0c26
      Dinh Nguyen authored
      Add support to gate the clocks that directly feed peripherals. For clocks
      with multiple parents, add the ability to determine the correct parent,
      and also set parents. Also add support to calculate and set the clocks'
      rate.
      Signed-off-by: default avatarDinh Nguyen <dinguyen@altera.com>
      Reviewed-by: default avatarPavel Machek <pavel@denx.de>
      Acked-by: default avatarMike Turquette <mturquette@linaro.org>
      Cc: Mike Turquette <mturquette@linaro.org>
      CC: Arnd Bergmann <arnd@arndb.de>
      CC: Olof Johansson <olof@lixom.net>
      Cc: Pavel Machek <pavel@denx.de>
      CC: <linux@arm.linux.org.uk>
      
      v4:
      - Add Acked-by: Mike Turquette
      
      v3:
      - Addressed comments from Pavel
      
      v2:
      - Fix space/indent errors
      - Add streq for strcmp == 0
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      825f0c26
    • Olof Johansson's avatar
      Merge branch 'clps711x/soc' into next/soc · ea36b022
      Olof Johansson authored
      From Alexander Shiyan, this is a series of cleanups of clps711x, movig it
      closer to multiplatform and cleans up a bunch of old code.
      
      * clps711x/soc:
        ARM: clps711x: Update defconfig
        ARM: clps711x: Add support for SYSCON driver
        ARM: clps711x: edb7211: Control LCD backlight via PWM
        ARM: clps711x: edb7211: Add support for I2C
        ARM: clps711x: Optimize interrupt handling
        ARM: clps711x: Add clocksource framework
        ARM: clps711x: Replace "arch_initcall" in common code with ".init_early"
        ARM: clps711x: Move specific definitions from hardware.h to boards files
        ARM: clps711x: p720t: Define PLD registers as GPIOs
        ARM: clps711x: autcpu12: Move remaining specific definitions to board file
        ARM: clps711x: autcpu12: Special driver for handling memory is removed
        ARM: clps711x: autcpu12: Add support for NOR flash
        ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file
        ARM: clps711x: Set PLL clock to zero if we work from 13 mHz source
        ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency
        ARM: clps711x: Re-add GPIO support
        GPIO: clps711x: Add DT support
        GPIO: clps711x: Rewrite driver for using generic GPIO code
        + Linux 3.10-rc4
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      ea36b022
    • Alexander Shiyan's avatar
      ARM: clps711x: Update defconfig · 70423a37
      Alexander Shiyan authored
      Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      70423a37
    • Alexander Shiyan's avatar
      ARM: clps711x: Add support for SYSCON driver · 6597619f
      Alexander Shiyan authored
      This patch adds support for SYSCON driver for CLPS711X targets.
      At this time there are no users for this driver, but it is will
      be used as start point to use in CLPS711X drivers and remove
      <mach/xx> dependencies.
      Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      6597619f