1. 23 May, 2014 2 commits
    • Arnd Bergmann's avatar
      Merge branch 'at91/cleanup' into next/dt · d5cd8605
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/boot/dts/at91sam9rl.dtsi
      
      Needed as a dependency for the at91/dt2 branch
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      d5cd8605
    • Arnd Bergmann's avatar
      Merge tag 'sti-dt-for-v3.16-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/dt · 21c27cab
      Arnd Bergmann authored
      Merge "ARM: STi: DT changes for v3.16, v3" from Maxime Coquelin:
      
      Please consider these STi DT updates for v3.16.
      
      This 3rd version takes into account Olof's comments on the v2:
              - Fix upper-cases in labels and node names
              - Sort compatibles order from specific to generic
              - Sort dts entries in Makefile
      
      It also adds support for the B2020 revision E board for STiH416 SoC.
      
      Note that two reset patches are part of this pull request, in order to avoid
      compilation breakage.
      Adding these two patches in this pull request has been accepted by Philipp Zabel.
      
      * tag 'sti-dt-for-v3.16-1' of git://git.stlinux.com/devel/kernel/linux-sti: (23 commits)
        ARM: sti: stih41x: Provide a proper header for this DTSI file
        ARM: sti: stih416: Enable board LED support for B2020 RevE
        ARM: sti: stih416: Add support for B2020 RevE
        ARM: STi: DT: STiH41x Add clk_ignore_unused to bootargs
        ARM: STi: DT: STiH415: 415 DT Entry for clockgen A9
        ARM: STi: DT: STiH415: Remove unused CLK_S_GMAC0_PHY & CLK_S_ETH1_PHY fixed clocks
        ARM: STi: DT: STiH415: Remove unused CLK_S_ICN_REG_0 fixed clock
        ARM: STi: DT: STiH415: 415 DT Entry for clockgen A0/1/10/11/12
        ARM: STi: DT: STiH416: 416 DT Entry for clockgen A9/DDR/GPU
        ARM: STi: DT: STiH416: 416 DT Entry for clockgen B/C/D/E/F
        ARM: STi: DT: STiH416: Remove unused CLK_S_GMAC0_PHY & CLK_S_ETH1_PHY fixed clocks
        ARM: STi: DT: STiH416: Remove unused CLK_S_ICN_REG_0 fixed clock
        ARM: STi: DT: STiH416: 416 DT Entry for clockgen A0/1/10/11/12
        ARM: STi: DT: STiH41x: Rename CLK_SYSIN into clk_sysin
        ARM: STi: DT: add keyscan for stih41x-b2000
        ARM: STi: DT: add keyscan for stih416
        ARM: STi: DT: add keyscan for stih415
        driver: reset: sti: add keyscan for stih416
        driver: reset: sti: add keyscan for stih415
        ARM: dts: STiH407: Add B2120 board support
        ...
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      21c27cab
  2. 22 May, 2014 2 commits
    • Olof Johansson's avatar
      Merge tag 'samsung-dt' of... · dee1c20c
      Olof Johansson authored
      Merge tag 'samsung-dt' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      Samsung DT updates for v3.16
      
      - exynos4
        : add missing pinctrls
      
      - exynos4412-trats2
        : update camera nodes and add rear camera nodes
        : rename alias for i2c_ak8975 label
        Update camera nodes for exynos4 and exynos4412-trats2
      
      - exynos5250
        : update DWC3 usb controller and enable to use generic USB DRD phy
      
      - exynos5250-snow
        : enable dp-controller, fimd, hdmi and pwm backlight
        : add sound node and Vbus regulator for USB 3.0
        : add tps65090 power regulator
        : add pinctrl for EC irq and i2c-arbitrator
      
      - exynos5420
        : change to correct compatible string for hdmi
        : add PD entry to MFC codec and enable DWC3 and USB 3.0 PHY
        : add MFC memory banks for smdk5420 and arndale-octa boards
      
      - exynos5420-peach-pit
        : add support exynos5420 based peach-pit board
        : add sound node and Vbus regulatro for USB 3.0
        : enable dp-controller, fimd
      - exynos5420-smdk5420
        : add Vbus regulatro for USB 3.0
      
      - use generic DT bindings for map SYSRAM
      
      [olof: Fixed up conflict with a fix for 4212 secondary CPU startup, carrying
      over the fix to the reworked code]
      
      * tag 'samsung-dt' of http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (32 commits)
        ARM: dts: Add MFC memory banks to exynos5420 boards
        ARM: dts: enable dp-controller for exynos5420-peach-pit board
        ARM: dts: enable fimd for exynos5420 based peach-pit board
        ARM: dts: enable dp-controller for exynos5250-snow board
        ARM: dts: enable fimd for exynos5250-snow board
        ARM: dts: enable pwm backlight for exynos5250-snow
        ARM: dts: Add pwmX_out pinctrl nodes to exynos5250
        ARM: dts: Add Vbus regulator for USB 3.0 on exynos5420-smdk5420
        ARM: dts: Add Vbus regulator for USB 3.0 on exynos5420-peach-pit
        ARM: dts: Add Vbus regulator for USB 3.0 on exynos5250-snow
        ARM: dts: Add PD entry to MFC codec on exynos5420
        ARM: dts: Add sound node for exynos5420-peach-pit board
        ARM: dts: Add sound node for exynos5250-snow board
        ARM: dts: Update DWC3 usb controller to use new phy driver for exynos5250
        ARM: dts: Enable support for generic USB DRD phy for exynos5250
        ARM: dts: Enable support for DWC3 controller for exynos5420
        ARM: dts: Enable support for USB 3.0 PHY controller for exynos5420
        ARM: dts: enable hdmi for exynos5420-peach-pit board
        ARM: dts: change to correct compatible string for exynos5420 hdmi
        ARM: dts: enable hdmi for exynos5250 based snow board
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      dee1c20c
    • Olof Johansson's avatar
      Merge commit '702b691e' into next/dt · 89f6dfac
      Olof Johansson authored
      Merging in Samsung fixes for 3.15-rc to avoid an annoying context conflict
      with new DT code.
      
      * commit '702b691e':
        ARM: dts: Remove g2d_pd node for exynos5420
        ARM: dts: Remove mau_pd node for exynos5420
        ARM: exynos_defconfig: enable HS-I2C to fix for mmc partition mount
        ARM: dts: disable MDMA1 node for exynos5420
        ARM: EXYNOS: fix the secondary CPU boot of exynos4212
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      89f6dfac
  3. 21 May, 2014 26 commits
  4. 20 May, 2014 5 commits
    • Olof Johansson's avatar
      Merge tag 'renesas-dt3-for-v3.16' of... · 0673836c
      Olof Johansson authored
      Merge tag 'renesas-dt3-for-v3.16' 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.16" from Simon
      Horman:
      
      r8a7791 (R-Car M2), r8a7779 (R-Car H1), r8a7778 (R-Car M1),
      r8a7740 (R-Mobile A1) and r8a73a4 (R-Mobile APE6) SoCs
      * Move interrupt-parent property to root node
      
      r8a7791 (R-Car M2) and r8a7790 (R-Car H2) SoCs
      * Add GPIO clocks
      
      r8a7791 (R-Car M2) based Henninger board
      * Add MSIOF0, QSPI and SDHI0/2 support
      * Specify EXTAL frequency
      
      r8a7779 (R-Car H1) based Marzen board
      * Set SMSC lan to use irq-push-pull
      
      r8a7740 (R-Mobile A1) SoC
      * Remove duplicate interrupt-parent property
      
      r8a7740 (R-Mobile A1) based Armadillo800 EVA board
      * Add Ethernet support
      
      * tag 'renesas-dt3-for-v3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        ARM: shmobile: r8a7740 dtsi: Remove duplicate interrupt-parent property
        ARM: shmobile: marzen-reference: Set SMSC lan to use irq-push-pull
        ARM: shmobile: r8a7791 dtsi: Add GPIO clocks
        ARM: shmobile: r8a7790 dtsi: Add GPIO clocks
        ARM: shmobile: dts: Move interrupt-parent property to root node
        ARM: shmobile: armadillo-reference dts: Add Ethernet support
        ARM: shmobile: r8a7740 dtsi: Add Ethernet support
        ARM: shmobile: henninger: add MSIOF0 DT support
        ARM: shmobile: henninger: add QSPI DT support
        ARM: shmobile: henninger: add SDHI0/2 DT support
        ARM: shmobile: henninger: specify EXTAL frequency
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      0673836c
    • Olof Johansson's avatar
      Merge tag 'at91-dt2' of git://github.com/at91linux/linux-at91 into next/dt · 5669aab8
      Olof Johansson authored
      Merge "at91: DT for 3.16 #2" from Nicolas Ferre:
      
      3.16: second DT series:
      - at91sam9rl and at91sam9261 fixes about PLL ranges
      - at91sam9261 more comprehensive support for SSC
      - sama5d3 Xplained: addition of pull-ups, PWM and PMIC (regulator)
      
      * tag 'at91-dt2' of git://github.com/at91linux/linux-at91:
        ARM: at91/dt: at91-sama5d3_xplained: add the regulator device node
        ARM: at91: add 2 PWM outputs to SAMA5D3 Xplained
        ARM: at91: add PWM pinctrl to SAMA5D3
        ARM: at91: add pull-up to i2c[02] on SAMA5D3 Xplained
        ARM: at91/dt: sam9rl: Fix PLL output range and mck divisors
        ARM: at91/dt: sam9261: Add ssc2, SSC clocks and pcks
        ARM: at91/dt: sam9261: Fix PLL output ranges and other clocks divisors
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      5669aab8
    • Olof Johansson's avatar
      Merge tag 'keystone-dts' of... · 4831ddfd
      Olof Johansson authored
      Merge tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt
      
      Merge "ARM: Keystone DTS updates for 3.16" from Santosh Shilimkar:
      
      Keystone DTS updates for 3.16
      
      - Few of address cell warning fixes.
      - Add Lamarr and Edision EVM NOR flash and NAND devices.
      - Update dts to make use of dma-ranges and dma-coherent properties.
      
      * tag 'keystone-dts' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
        ARM: dts: keystone-evm: add spi nor flash support
        ARM: dts: k2l-evm: add AEMIF/NAND device entry
        ARM: dts: k2e-evm: add AEMIF/NAND device entry
        ARM: dts: keystone: Update USB node for dma properties
        ARM: dts: keystone: Use dma-ranges property
        ARM: dts: keystone: add cell's information to spi nodes
        ARM: dts: keystone: move i2c0 device node from SoC to board files
        ARM: dts: keystone: add cell's information to i2c nodes
        ARM: dts: keystone: drop address and size cells from GIC node
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      4831ddfd
    • Olof Johansson's avatar
      Merge tag 'v3.16-rockchip-dt' of... · 80c2e887
      Olof Johansson authored
      Merge tag 'v3.16-rockchip-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
      
      Merge "ARM: rockchip: devicetree changes for v3.16" from Heiko Stübner:
      
      Addition of missing board compatible names and their vendor-prefixes
      as well as the dts portions of the pinctrl rework.
      
      * tag 'v3.16-rockchip-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
        ARM: dts: rockchip: convert pinctrl nodes to new bindings
        ARM: dts: rockchip: add root compatible properties
        of: add mundoreader and radxa vendor prefixes
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      80c2e887
    • Olof Johansson's avatar
      Merge tag 'mvebu-dt-3.16' of git://git.infradead.org/linux-mvebu into next/dt · 61e810d3
      Olof Johansson authored
      Merge "ARM: mvebu: DT changes for v3.16" from Jason Cooper:
      
      mvebu DT changes for v3.16
      
       - kirkwood
          - rework nsa3x0 board to add nsa320
          - large cleanup to facilitate use in barebox
          - guruplug phy updates
          - audio updates for t5325
      
       - mvebu
          - use clocks vice clock-frequency for uart nodes
      
          - armada 375/380/385
             - add watchdog node
             - add coherency fabric
             - add smp support
             - add sdhci
             - add ahci
             - add thermal sensor
      
          - armada 370/XP
             - and pmsu
      
      * tag 'mvebu-dt-3.16' of git://git.infradead.org/linux-mvebu: (35 commits)
        ARM: Kirkwood: t5325: Use simple card to instantiate audio
        ARM: Kirkwood: DT: Add missing #sound-dai-cells property
        ARM: Kirkwood: Add node for audio codec
        ARM: dts: kirkwood: set Guruplug phy-connection-type to rgmii-id
        ARM: dts: kirkwood: set Guruplug ethernet PHY compatible
        ARM: dts: kirkwood: set default pinctrl for I2C1 on 6282
        ARM: dts: kirkwood: set default pinctrl for I2C0
        ARM: dts: kirkwood: set default pinctrl for NAND
        ARM: dts: kirkwood: set default pinctrl for SPI0
        ARM: dts: kirkwood: set default pinctrl for UART0/1
        ARM: dts: kirkwood: set default pinctrl for GBE1
        ARM: dts: kirkwood: consolidate common pinctrl settings
        ARM: dts: kirkwood: add pinctrl node to common SoC include
        ARM: dts: kirkwood: rename pin-controller nodes
        ARM: dts: kirkwood: remove clock-frequency properties from UART nodes
        ARM: dts: kirkwood: add stdout-path property to all boards
        ARM: dts: kirkwood: add node labels
        ARM: mvebu: Enable the thermal sensor in Armada 380/385 SoC
        ARM: mvebu: Enable the thermal sensor in Armada 375 SoC
        ARM: mvebu: don't use clocks property in UART node for Netgear RN2120
        ...
      Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
      61e810d3
  5. 19 May, 2014 5 commits