Skip to content
  1. Mar 29, 2014
  2. Mar 27, 2014
  3. Mar 21, 2014
  4. Mar 19, 2014
  5. Mar 18, 2014
    • Arnd Bergmann's avatar
      Merge tag 'DT-for-v3.15-part-1-v2' of git://git.stlinux.com/devel/kernel/linux-sti into next/dt · 98907c2d
      Arnd Bergmann authored
      Merge "STi DT changes part 1 v2" from Srinivas Kandagatla:
      
      Patches : 01-02 are DT patches, adding interrupt support to pin
      controller driver, Driver changes are already going via Linus W's
      pinctrl tree.
      
      Patches: 03 - 06 are DT patches for reset/softreset controller. Reset
      controller driver is Acked by Philipp Zabel.
      
      Patches: 07, 08 are DT patches, adding Ethernet controller support
      patches, actual driver changes are already in v3.14-rc4 via Dave Millers
      net tree.
      
      Patches: 09, 10 are DT patches for IR driver support, actual IR driver
      is already available since v3.12. Reason for the delay is due to
      dependency on reset controller driver/headers.
      
      * tag 'DT-for-v3.15-part-1-v2' of git://git.stlinux.com/devel/kernel/linux-sti
      
      :
        ARM: STi: STIH416: Add IR support.
        ARM: STi: STIH415: Add IR support.
        ARM: STi: STiH416: Add ethernet support.
        ARM: STi: STiH415: Add ethernet support.
        ARM: STi: STiH416: Add soft reset controller support.
        ARM: STi: STiH416: Add reset controller support.
        ARM: STi: STiH415: Add soft reset controller support.
        ARM: STi: STiH415: Add reset controller support.
        ARM: STi: STiH415: Add interrupt support for pin controller
        ARM: STi: STiH416: Add interrupt support for pin controller
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      98907c2d
  6. Mar 17, 2014
    • Arnd Bergmann's avatar
      Merge tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm into next/dt · 22261b22
      Arnd Bergmann authored
      Merge "ARM: mach-bcm: dt updates for 3.15 - part 2" from Matt Porter:
      
      - BCM21664 SoC support
      - BCM59056 PMU support
      - BCM281xx reboot fix
      
      * tag 'armsoc/for-3.15/dt-2' of git://github.com/broadcom/mach-bcm
      
      :
        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
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      22261b22
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.15/dt-overo-signed' of... · 38edc2da
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
      
      Updates to the .dts files to support more Gumstix boards.
      
      These are sent separately from the rest of the .dts changes
      as these depend on the fixes merged into v3.14-rc4, and
      needed a bit more time to get updated on the fixes.
      
      * tag 'omap-for-v3.15/dt-overo-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap
      
      :
        ARM: dts: Add support for the Overo Summit
        ARM: dts: Add support for the Overo Chestnut43
        ARM: dts: Add support for the Overo Alto35
        ARM: dts: Add support for the Overo Gallop43
        ARM: dts: Add support for the Overo Palo43
        ARM: dts: overo: Add LIS33DE accelerometer
        ARM: dts: overo: Create a file for common Gumstix peripherals
        ARM: dts: overo: Push uart3 pinmux down to expansion board
        ARM: dts: omap3-tobi: Add AT24C01 EEPROM
        ARM: dts: omap3-tobi: Use include file omap-gpmc-smsc9221
        ARM: dts: omap: Add common file for SMSC9221
        ARM: dts: omap3-overo: Add HSUSB PHY
        ARM: dts: omap3-overo: Enable WiFi/BT combo
        ARM: dts: omap3-overo: Add missing pinctrl
        ARM: dts: omap3-tobi: Add missing pinctrl
        ARM: dts: overo: reorganize include files
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      
      Conflicts:
      	arch/arm/boot/dts/omap3-overo.dtsi
      38edc2da
    • Arnd Bergmann's avatar
      Merge tag 'omap-for-v3.15/dt-part3' of... · 937b5991
      Arnd Bergmann authored
      Merge tag 'omap-for-v3.15/dt-part3' of git://git.kernel.org/pub/scm/linux/kernel/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: default avatarArnd Bergmann <arnd@arndb.de>
      937b5991
    • Arnd Bergmann's avatar
      Merge tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux into next/dt · a38f8913
      Arnd Bergmann authored
      Pull "Allwinner DT additions for 3.15, take 2" from Maxime Ripard:
      
        - Two new boards: INet 97F Rev 02 and A10-OLinuXino-LIME
        - Addition of the I2C for the A31
        - Addition USB Host mode for the A10, A10s, A13 and A20
        - Addition of SATA support for the A10 and A20
        - Change of compatible for the watchdog
      
      * tag 'sunxi-dt-for-3.15-2' of https://github.com/mripard/linux
      
      : (23 commits)
        ARM: sunxi: dt: Update the watchdog compatibles
        ARM: sun6i: colombus: Enable the I2C controllers
        ARM: sun6i: Enable the I2C muxing options
        ARM: sun6i: Enable the I2C controllers
        ARM: sun4i: dt: Add support for the INet-97F_Rev_02 board
        ARM: sun4i: dt: Add support for the A10-OLinuXino-LIME board
        ARM: sun7i: dt: Add USB host nodes to a20-olinuxino-micro dts
        ARM: sun7i: dt: Add USB host nodes to cubieboard2 dts
        ARM: sun7i: dt: Add USB host nodes to cubietruck dts
        ARM: sun5i: dt: Add USB host nodes to a13-olinuxino-micro
        ARM: sun5i: dt: Add USB host nodes to a10s-olinuxino-micro
        ARM: sun5i: dt: Add USB host nodes to A13-Olinuxino
        ARM: sun4i: dt: Add USB host nodes to pcduino.dts
        ARM: sun4i: dt: Add USB host nodes to mini-xplus dts
        ARM: sun4i: dt: Add USB host nodes to hackberry dts
        ARM: sun4i: dt: Add USB host nodes to cubieboard dts
        ARM: sun4i: dt: Add USB host nodes to Mele A1000 dts
        ARM: sun7i: dt: Add USB host bindings
        ARM: sun5i: dt: Add USB host bindings
        ARM: sun4i: dt: Add USB host bindings
        ...
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      a38f8913
    • Arnd Bergmann's avatar
      Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt · 542798cd
      Arnd Bergmann authored
      Merge "First batch of AT91 DT material for 3.15" from Nicolas Ferre:
      
      - activate DMA for NAND flash controller
      - some binding documentation update for usba and ADC (iio) drivers
      - removal of some deprecated ADC (iio) properties
      
      * tag 'at91-dt' of git://github.com/at91linux/linux-at91
      
      :
        ARM: at91/dt: at91-cosino: remove useless adc properties
        ARM: at91/dt: sama5d3: remove useless adc properties
        ARM: at91/dt: at91sam9x5: remove useless adc properties
        ARM: at91/dt: at91sam9g45: remove useless adc properties
        ARM: at91/dt: at91sam9260: remove useless adc properties
        ARM: at91/dt: at91-ariag25: remove useless adc properties
        Documentation: dt: iio: move arm/atmel-adc.txt to iio/adc/at91_adc.txt
        Documentation: dt: iio: improve atmel-adc documentation
        ARM: at91: sama5d3: get rid of atmel_tsadcc driver
        ARM: at91/DT: atmel_usba correct atmel,vbus-gpio meaning
        ARM: at91/DT: add NAND + DMA property
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      542798cd
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu into next/dt · 0f4d5641
      Arnd Bergmann authored
      Merge "mvebu dt changes for v3.15 (incremental #5)" from Jason Cooper:
      
       - mvebu
      
          - 38x
             - add 2GHz fixed clock, core divider clock, and nand controller
      
          - 385
             - add nand controller and partitions to 385-DB board
      
      * tag 'mvebu-dt-3.15-5' of git://git.infradead.org/linux-mvebu
      
      :
        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
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      0f4d5641
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu into next/dt · 64d865f4
      Arnd Bergmann authored
      Merge "mvebu dt changes for v3.15 (incremental #4)" from Jason Cooper:
      
       - dove
          - add system controller node
          - drop pinctrl PMU reg property _before_ it hits mainline and becomes ABI
      
       - mvebu
          - XP/370
             - change default PCIe apertures
             - switch GP and DB boards internal registers to 0xf1000000
             - correct RAM size on Matrix board
          - 385
             - correct phy connection type for DB board
             - add RD board
      
      * tag 'mvebu-dt-3.15-4' of git://git.infradead.org/linux-mvebu
      
      :
        ARM: dove: drop pinctrl PMU reg property
        ARM: mvebu: add Device Tree for the Armada 385 RD board
        ARM: mvebu: use the correct phy connection mode on Armada 385 DB
        ARM: mvebu: the Armada XP Matrix board has 4 GB
        ARM: mvebu: switch the Armada XP GP to use internal registers at 0xf1000000
        ARM: mvebu: switch the Armada XP DB to use internal registers at 0xf1000000
        ARM: mvebu: change the default PCIe apertures for Armada 370/XP
        ARM: dove: add system controller node
      
      Conflicts:
      	arch/arm/boot/dts/Makefile
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      64d865f4
    • Arnd Bergmann's avatar
      Merge branch 'mvebu/soc3' into next/dt · 54cab10f
      Arnd Bergmann authored
      
      
      The dts Makefile has a bunch of nasty conflicts, attempt to resolve
      these now to avoid trouble later.
      
      Conflicts:
      	arch/arm/boot/dts/Makefile
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      54cab10f
    • Arnd Bergmann's avatar
      Merge tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu into next/dt · e887ae25
      Arnd Bergmann authored
      Merge "mvebu dt changes for v3.15 (incremental pull #3)" from Jason Cooper:
      
       - mvebu
          - merge armada 375, 380, 385 boards (mvebu/dt-3xx)
      
       - kirkwood
          - Add many Synology NAS boards
          - add board HP T5325
          - add L2 cache node
          - add system-controller node
          - add audio node
      
       - dove
          - add pinctrl and global-config register
      
      Depends:
       - tags/mvebu-dt-fixes-3.14 (mvebu/dt-fixes)
          - removed dove PMU interrupt controller
      
      Conflicts:
       - mvebu/soc (arch/arm/boot/dts/Makefile)
          - add/add conflict.
          - move CONFIG_ARCH_LPC32XX to alphabetical order (after KIRKWOOD)
      
      * tag 'mvebu-dt-3.15-3' of git://git.infradead.org/linux-mvebu
      
      :
        ARM: kirkwood: Add dts file describing HP T5325 thin client
        ARM: kirkwood: Add i2c alias so setting bus number
        ARM: kirkwood: Add audio node to kirkwood.dtsi
        ARM: mvebu: select dtbs from MACH_ARMADA_*
        ARM: dove: add global-config register node
        ARM: dove: add additional pinctrl registers
        ARM: mvebu: Instantiate system controller in kirkwood.dtsi
        ARM: kirkwood: Instantiate L2 cache from DT.
        ARM: mvebu: use macros for interrupt flags on Armada 375/38x
        ARM: mvebu: use GIC_{SPI,PPI} in Armada 375/38x DTs
        ARM: mvebu: use C preprocessor include for Armada 375/38x DTs
        ARM: Kirkwood: Add support for many Synology NAS devices
        DT: i2c: Trivial: Add sii,s35390a
        DT: Vendor prefixes: Add ricoh, qnap, sii and synology
        ARM: dove: dt: revert PMU interrupt controller node
        ARM: mvebu: add Device Tree for the Armada 385 DB board
        ARM: mvebu: add Device Tree description of the Armada 380/385 SoCs
        ARM: mvebu: add Device Tree for the Armada 375 DB board
        ARM: mvebu: add Device Tree description of the Armada 375 SoC
        ARM: mvebu: dt: add missing alias 'eth3' on Armada XP mv78260
      
      Conflicts:
      	Documentation/devicetree/bindings/vendor-prefixes.txt
      	arch/arm/boot/dts/Makefile
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      e887ae25
    • Arnd Bergmann's avatar
      Merge tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux into next/dt · 3c883ef3
      Arnd Bergmann authored
      Merge "Two more dt related efm32 fixes" from Uwe Kleine-König:
      
      * tag 'efm32-next' of git://git.pengutronix.de/git/ukl/linux
      
      :
        ARM: efm32: properly namespace i2c location property
        ARM: efm32: fix unit address part in USART2 device nodes' names
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      3c883ef3
    • Arnd Bergmann's avatar
      Merge branch 'efm32/cleanup' into next/dt · 8d445234
      Arnd Bergmann authored
      
      
      Dependency for efm32/dt branch.
      
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      8d445234
    • Olof Johansson's avatar
      Merge tag 'renesas-dt4-for-v3.15' of... · c5d326c2
      Olof Johansson authored
      Merge tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Merge "Fourth Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
      Horman:
      
      * r8a7791 (R-Car M2) based koelsch board
        - Add SDHI devices
        - Add ethernet
      
      * r8a7791 (R-Car M2) SoC
        - Correct clock index for i2c5
      
      * r8a7790 (R-Car H2) based lager board
        - Add ethernet
      
      * tag 'renesas-dt4-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      :
        ARM: shmobile: Add SDHI devices for Koelsch DTS
        ARM: shmobile: Add SDHI devices to r8a7791 DTSI
        ARM: shmobile: r8a7791: fix clock index for i2c5
        ARM: shmobile: koelsch: add Ether DT support
        ARM: shmobile: r8a7791: add Ether DT support
        ARM: shmobile: lager: add Ether DT support
        ARM: shmobile: r8a7790: add Ether DT support
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      c5d326c2
    • Olof Johansson's avatar
      Merge tag 'renesas-dt3-for-v3.15' of... · 46d34000
      Olof Johansson authored
      Merge tag 'renesas-dt3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
      
      Merge "Third Round of Renesas ARM Based SoC DT Updates for v3.15" from Simon
      Horman:
      
      * r7s72100 SoC (RZ/A1H)
        - Add nodes for i2c controllers to DT
      
      * r7s72100 (RZ/A1H) based Genmai board
        - genmai: adapt dts to use native i2c driver
      
      * r8a7791 SoC (R-Car M2)
        - Remove superfluous interrupt-parents
      
      * r8a7791 (R-Car M2) based Koelsch board
        - Add i2c2 bus to DT
        - Add DU device to DT
      
      * r8a7790 SoC (R-Car H2)
        - Add i2c aliases
        - Remove superfluous interrupt-parents
        - Add QSPI node
      
      * r8a7790 SoC (R-Car M2) based Lager
        - Add DU, SDHI0/1 and QSPI to DT
      
      * r8a7778 SoC (R-Car M1)
        - Remove duplicate i2c nodes
      
      * tag 'renesas-dt3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      :
        ARM: shmobile: genmai: adapt dts to use native i2c driver
        ARM: shmobile: r7s72100: add nodes for i2c controllers to dtsi
        ARM: shmobile: r8a7791: add i2c2 bus to koelsch dt
        ARM: shmobile: r8a7791: add i2c master nodes to dtsi
        ARM: shmobile: r8a7790: add i2c aliases to dtsi
        ARM: shmobile: r8a7790: remove superfluous interrupt-parents
        ARM: shmobile: r8a7791: remove superfluous interrupt-parents
        ARM: shmobile: koelsch-reference: Add DU device to DTS
        ARM: shmobile: lager: Add DU device to DTS
        ARM: shmobile: r8a7778 dtsi: Remove duplicate i2c nodes
        ARM: shmobile: lager: add SDHI0/2 support on DTS
        ARM: shmobile: lager dts: Add QSPI nodes
        ARM: shmobile: r8a7790 dtsi: Add QSPI node
      
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      46d34000
  7. Mar 15, 2014
  8. Mar 14, 2014
  9. Mar 13, 2014