1. 20 5月, 2014 4 次提交
    • O
      Merge tag 'renesas-clock2-for-v3.16' of... · fd46edb9
      Olof Johansson 提交于
      Merge tag 'renesas-clock2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
      
      Merge "Second Round of Renesas ARM Based SoC Clock Updates for v3.16" from
      Simon Horman:
      
      r8a7791 (R-Car M2) SoC
      * Correct SYS-DMAC clock defines
      
      r8a7740 (R-Mobile A1) SoC
      * Correct name of DT Ethernet clock
      
      * tag 'renesas-clock2-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: r8a7791: Correct SYS-DMAC clock defines
        ARM: shmobile: r8a7740: Correct name of DT Ethernet clock
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      fd46edb9
    • O
      Merge branch 'cleanup/kconfig' into next/soc · 5fe0163a
      Olof Johansson 提交于
      Bring in the cleanup branch due to conflicts in new additions. Should really
      have been the base before the other branch, but this way works too.
      
      * cleanup/kconfig:
        ARM: qcom: clean-up unneeded kconfig selects
        ARM: bcm: clean-up unneeded kconfig selects
        ARM: mvebu: clean-up unneeded kconfig selects
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      5fe0163a
    • O
      Merge tag 'mvebu-soc-3.16' of git://git.infradead.org/linux-mvebu into next/soc · 5df22a61
      Olof Johansson 提交于
      Merge "ARM: mvebu: SoC changes for v3.16" from Jason Cooper:
      
      mvebu SoC changes for v3.16
      
       - Armada 375/38x coherency support
       - Armada 375/38x SMP support
       - mvebu PMSU and CPU reset support
       - Armada 370/XP cpuidle support
       - kirkwood remove platform init of audio device
       - small fixes and cleanup for new SoC (375/38x)
      
      Note:
       - due to complex deps, cpuidle changes Acked by appropriate maintainer for
         going though arm-soc tree.
      
      * tag 'mvebu-soc-3.16' of git://git.infradead.org/linux-mvebu: (46 commits)
        ARM: mvebu: Fix pmsu compilation when ARMv6 is selected
        ARM: mvebu: conditionalize Armada 375 coherency workaround
        ARM: mvebu: conditionalize Armada 375 SMP workaround
        ARM: mvebu: add Armada 375 A0 revision definition
        ARM: mvebu: initialize mvebu-soc-id earlier
        ARM: mvebu: fix thermal quirk SoC revision check
        ARM: Kirkwood: t5325: Remove platform device to instantiate audio
        ARM: Kirkwood: Remove platform driver for codec
        ARM: mvebu: Add thermal quirk for the Armada 375 DB board
        ARM: mvebu: Select HAVE_ARM_TWD only if SMP is enabled
        ARM: mvebu: fix the name of the parameter used in mvebu_get_soc_id
        ARM: mvebu: remove unnecessary ifdef around l2x0_of_init
        ARM: mvebu: register the cpuidle driver for the Armada XP SoCs
        cpuidle: mvebu: Add initial CPU idle support for Armada 370/XP SoC
        ARM: mvebu: Register notifier callback for the cpuidle transition
        ARM: mvebu: refine which files are build in mach-mvebu
        ARM: mvebu: Add the PMSU related part of the cpu idle functions
        ARM: mvebu: Allow to power down L2 cache controller in idle mode
        ARM: mvebu: Low level function to disable HW coherency support
        ARM: mvebu: Split low level functions to manipulate HW coherency
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      5df22a61
    • O
      Merge tag 'mvebu-soc-orion5x-3.16' of git://git.infradead.org/linux-mvebu into next/soc · c15c1199
      Olof Johansson 提交于
      Merge "ARM: mvebu: SoC orion5x DT conversion for v3.16" from Jason Cooper:
      
      mvebu SoC orion5x DT conversion for v3.16
      
       - orion5x
          - convert to DT
      
      * tag 'mvebu-soc-orion5x-3.16' of git://git.infradead.org/linux-mvebu: (29 commits)
        ARM: orion: remove no longer needed gpio DT code
        ARM: orion: remove no longer needed DT IRQ code
        ARM: orion5x: convert Maxtor Shared Storage II to the Device Tree
        ARM: orion5x: convert d2net to Device Tree
        ARM: orion5x: convert RD-88F5182 to Device Tree
        ARM: orion5x: remove unneeded code for edmini_v2
        ARM: orion5x: keep TODO list in edmini_v2 DT
        ARM: orion5x: use DT to describe NOR on edmini_v2
        ARM: orion5x: use DT to describe EHCI on edmini_v2
        ARM: orion5x: use DT to describe I2C devices on edmini_v2
        ARM: orion5x: convert edmini_v2 to DT pinctrl
        ARM: orion5x: add standard pinctrl configs for sata0 and sata1
        ARM: orion5x: add Device Bus description at SoC level
        ARM: orion5x: update I2C description at SoC level
        ARM: orion5x: enable pinctrl driver at SoC level
        ARM: orion5x: switch to DT interrupts and timer
        ARM: orion: switch to a per-platform handle_irq() function
        ARM: orion5x: convert to use 'clocks' property for UART controllers
        ARM: orion5x: switch to use the clock driver for DT platforms
        ARM: orion5x: add interrupt for Ethernet in Device Tree
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      c15c1199
  2. 17 5月, 2014 1 次提交
    • O
      Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/soc · 05983ed4
      Olof Johansson 提交于
      Merge "at91: cleanup for 3.16 #1" from Nicolas Ferre:
      
      First cleanup series for 3.15
      - localize GPIO header in mach-at91 directory
      - big update on the CCF front with main and slow clocks
      - a cleanup of ADC and touchscreen driver with unification on IIO and
        removal of old driver
      
      [olof: Most of this branch is new code, not cleanups, so I'm merging this into
      the SoC branch in spite of the branch name]
      
      * tag 'at91-cleanup' of git://github.com/at91linux/linux-at91: (28 commits)
        ARM: at91/dt: at91-cosino_mega2560 remove useless tsadcc node
        ARM: at91: remove atmel_tsadcc platform_data
        Input: atmel_tsadcc: remove driver
        ARM: at91: remove atmel_tsadcc from sama5_defconfig
        ARM: at91: sam9rl: switch from atmel_tsadcc to at91_adc
        ARM: at91: sam9g45: switch from atmel_tsadcc to at91_adc
        ARM: at91: sam9rlek add touchscreen support through at91_adc
        ARM: at91: sam9rl: add at91_adc to support adc and touchscreen
        iio: adc: at91: add sam9rl support
        iio: adc: at91: remove unused include from include/mach
        ARM: at91: sam9m10g45ek: Add touchscreen support through at91_adc
        iio: adc: at91_adc: Add support for touchscreens without TSMR
        iio: adc: at91: cleanup platform_data
        ARM: at91: sam9260: remove unused platform_data
        ARM: at91: sam9g45: remove unused platform_data
        ARM: at91/dt: define sam9rlek crystal frequencies
        ARM: at91/dt: move at91sam9rl SoC to the new slow/main clock models
        ARM: at91/dt: define main xtal frequency of the at91sam9261ek board
        ARM: at91/dt: move at91sam9261 SoC to the new main clock model
        ARM: at91/dt: add xtal frequencies to sama5d3 xplained board
        ...
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      05983ed4
  3. 13 5月, 2014 1 次提交
  4. 11 5月, 2014 1 次提交
  5. 09 5月, 2014 31 次提交
  6. 08 5月, 2014 2 次提交