1. 11 Jun, 2015 9 commits
    • Kevin Hilman's avatar
      Merge tag 'samsung-dt-4' of... · 7d5a0ff5
      Kevin Hilman authored
      Merge tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      Samsung another DT udpates for v4.2
      
      - use labels for overriding nodes for all of exynos stuff
        (by Krzysztof Kozlowski)
      
      - add sysmmu nodes for exynos SoCs (by Marek Szyprowski)
      
      - for exynos5422-odroidxu3
        : enalbe wake alarm of S2MPS11 RTC
        : Hook up PWM and use it for LEDs
        : add support for Odroid XU3 Lite
      
      - remove duplicated i2c7 for exynos5250-snow
      - add JPEG codec nodes for exynos5420
      - add vendor prefix for Hardkernel
      
      * tag 'samsung-dt-4' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (33 commits)
        ARM: dts: add sysmmu nodes for exynos5420
        ARM: dts: add sysmmu nodes for exynos5250
        ARM: dts: add sysmmu nodes for exynos4415
        ARM: dts: add sysmmu nodes for exynos3250
        ARM: dts: add sysmmu nodes for exynos4
        ARM: dts: Add Odroid XU3 Lite support
        of: Add vendor prefix for Hardkernel
        ARM: dts: odroidxu3: Enable wake alarm of S2MPS11 RTC
        ARM: dts: exynos5420: add nodes for jpeg codec
        ARM: dts: s3c2416: Use labels for overriding nodes in SMDK2416
        ARM: dts: s3c2416: Add labels to S3C2416 nodes
        ARM: dts: Use labels for overriding nodes in exynos5422-odroidxu3
        ARM: dts: Use labels for overriding nodes in exynos5440 boards
        ARM: dts: Use labels for overriding nodes in exynos5420-smdk5420
        ARM: dts: Use labels for overriding nodes in exynos542x
        ARM: dts: Use labels for overriding nodes in exynos5420-arndale-octa
        ARM: dts: Remove duplicated I2C7 nodes in exynos5250-snow
        ARM: dts: Use labels for overriding nodes in exynos5250
        ARM: dts: Add labels to exynos5 nodes
        ARM: dts: exynos5422-odroidxu3: Hook up PWM and use it for LEDs
        ...
      7d5a0ff5
    • Kevin Hilman's avatar
      Merge tag 'v4.1-rc6' into next/dt · ecdf94da
      Kevin Hilman authored
      Linux 4.1-rc6
      
       Conflicts:
      	arch/arm/boot/dts/zynq-7000.dtsi
      
      Resolution summary:
      
       Mainline had an earlier version of the commit, resolve in favor of the
       newer patch in next/dt branch.
      ecdf94da
    • Kevin Hilman's avatar
      Merge tag 'samsung-dt-3' of... · e28f23d8
      Kevin Hilman authored
      Merge tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt
      
      Samsung DT updates for v4.2
      
      - for exyos3250
        : use s3c6410-rtc instead of exynos3250-rtc
        : add JPEG codec node and support it on exynos3250-rinato
        : use s3c-rtc clock id for exynos3250-rinato and monk boards
      
      - for exynos4
        : add JPEG codec node and syscon property to MIPI DPHY
        : remove obsolete MIPI DPHY reg property
        : enable s3c-rtc on exynos4412-trats2
      
      - for exynos5
        : add syscon property to MIPI DPHY for exynos5420
        : enable s3c-rtc on exynos5420-arndale-octa
        : add missing irq pinctrl for max77686 on exynos5250-smdk5250
      
        : clk: add bindings for 32kHz clocks from s2mps11
        : fix pinctrl for s2mps11-irq on exynos5420-arndale-octa
      
      - for exynos5422-odroidxu3
        : add mmc detect gpio and LEDs
        : add HS400 support, simple-audio-card and rtc_src clock
      
      * tag 'samsung-dt-3' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
        ARM: dts: Add syscon property to the MIPI DPHY for exynos4415
        ARM: dts: Remove obsolete MIPI DPHY 'reg' property for exynos4
        ARM: dts: Use last parent for clocks during power domain on/off
        ARM: dts: add support JPEG codec for exynos3250-rinato
        ARM: dts: support simple-audio-card for exynos5420 and exynos5422-odroidxu3
        ARM: dts: add jpeg-codec node for exynos4 and exynos4x12
        ARM: dts: Enable S3C RTC on exynos4412-trats2 and exynos5420-arndale-octa
        ARM: dts: Use define for s3c-rtc clock id for exynos3250-monk
        ARM: dts: Use define for s3c-rtc clock id for exynos3250-rinato
        ARM: dts: Use s3c6410-rtc instead of exynos3250-rtc for exynos3250/4415
        ARM: dts: add 'rtc_src' clock to rtc node for exynos5422-odroidxu3
        clk: samsung: Add bindings for 32kHz clocks from s2mps11
        ARM: dts: fix pinctrl for s2mps11-irq on exynos5420-arndale-octa
        ARM: dts: Add syscon property to the MIPI phy in exynos5420
        ARM: dts: Add HS400 support for exynos5422-odroidxu3
        ARM: dts: Add LEDs for exynos5422-odroidxu3
        ARM: dts: add mmc detect gpio for exynos5422-odroidxu3
        ARM: dts: add JPEG codec device node for exynos3250
        ARM: dts: Add missing irq pinctrl for max77686 on smdk5250
      e28f23d8
    • Linus Walleij's avatar
      ARM: nomadik: set proper compatible for accelerometer · 386f56bb
      Linus Walleij authored
      Adjust device tree entry to the proper registered compatible
      string for LIS3LV02DL.
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      386f56bb
    • Linus Walleij's avatar
      ARM64: juno: add GPIO keys · 53bdd72c
      Linus Walleij authored
      The Juno board has two keys connected to a PL061 GPIO block,
      in accordance to DDI0524B "ARM Versatile Express Juno Development
      Platform" revision 1.0, table 2-4 "GPIO (0) and GPIO (1) used
      for additional user key entry". By trial-and-error I found that
      these are connected to the two keys named "power" and "home"
      on the motherboard.
      
      Register the GPIO block and these two keys in the device tree
      using the PL061 GPIO driver and the generic gpio keys.
      
      - Map POWER, HOME, VOL+ and VOL- to the obvious input events.
      - Map RLOCK to KEY_SCREENLOCK/KEY_COFFEE unless someone can
        explain better what this is for.
      - Map the NMI button to KEY_SYSREQ as this is used like so
        in the SYSREQ debugging hack.
      Acked-by: default avatarLiviu Dudau <Liviu.Dudau@arm.com>
      Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      53bdd72c
    • ludovic.desroches@atmel.com's avatar
      ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodes · aabbe8f1
      ludovic.desroches@atmel.com authored
      The xdmac channel configuration is done in one cell not two. This error
      prevents from probing devices correctly.
      Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
      Fixes: 83906783 ("ARM: at91/dt: sama5d4: add aes, sha and tdes nodes")
      Cc: stable@vger.kernel.org # 4.1
      Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
      Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
      aabbe8f1
    • Kevin Hilman's avatar
      Merge tag 'hi6620-dt-for-4.2' of git://github.com/hisilicon/linux-hisi into next/dt · 7c37905e
      Kevin Hilman authored
      ARM64: DT: Hisilicon hi6220 soc and hikey board updates for 4.2
      
      - Added the devicetree bindings document for hi6220 SoC
      - Added the devicetree bindings document for hi6220 clock
      - Added dts files for hi6220 SoC and hikey board
      
      * tag 'hi6620-dt-for-4.2' of git://github.com/hisilicon/linux-hisi:
        arm64: dts: Add dts files for Hisilicon Hi6220 SoC
        clk: hi6220: Document devicetree bindings for hi6220 clock
        arm64: hi6220: Document devicetree bindings for Hisilicon hi6220 SoC
      7c37905e
    • Kevin Hilman's avatar
      Merge tag 'at91-dt4' of... · 36d32ed9
      Kevin Hilman authored
      Merge tag 'at91-dt4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt
      
      Fourth batch of DT changes for 4.2:
      - rtc node for at91sam9rl/at91sam9rlek
      - move to stdout-path for console on kizbox and all Atmel's boards
      - Addition of the Acme Systems' Arietta G25
      - two little fixes for Kizbox and sama5d4ek
      
      * tag 'at91-dt4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
        ARM: at91/dt: sama5d4ek: mci0 uses slot 0
        ARM: at91/dt: kizbox: fix mismatch LED PWM device
        ARM: at91/dt: Add Acme Arietta G25
        ARM: at91/dt: sama5d4 xplained: use stdout-path
        ARM: at91/dt: sama5d4ek: use stdout-path
        ARM: at91/dt: sama5d3 xplained: use stdout-path
        ARM: at91/dt: sama5d3xek: use stdout-path
        ARM: at91/dt: at91sam9x5ek: use stdout-path
        ARM: at91/dt: at91sam9rlek: use stdout-path
        ARM: at91/dt: at91sam9n12ek: use stdout-path
        ARM: at91/dt: at91sam9m10g45ek use stdout-path
        ARM: at91/dt: at91sam9g20ek: use stdout-path
        ARM: at91/dt: at91sam9263ek: use stdout-path
        ARM: at91/dt: at91sam9261ek: use stdout-path
        ARM: at91/dt: at91rm9200ek: use stdout-path
        ARM: at91/dt: kizbox: use stdout-path
        ARM: at91/dt: at91sam9rlek: add RTC
        ARM: at91/dt: at91sam9rl: fix rtc node
      36d32ed9
    • Kevin Hilman's avatar
      Merge tag 'imx-dt-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt · b3182ff6
      Kevin Hilman authored
      The i.MX device tree changes for 4.2:
       - Add device tree for i.MX7D SoC and imx7d-sdb board
       - New i.MX6 board support: Armadeus Systems APF6, Gateworks GW5510,
         and aristainetos2 boards
       - Change LVDS to use simple-panel for nitrogen6x and sabrelite boards
       - Add Wifi/Bluetooth devices support for cubox-i board
       - Remove unused regulators and correct OTG roles setting for
         imx6sl-warp board
       - Add I2C support for imx23-olinuxino board
       - Move imx6qdl HDMI device to a better place
       - Add power-domain for imx6qdl CODA device
      
      * tag 'imx-dt-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (24 commits)
        ARM: dts: imx6dl: add imx6dl gpt specific compatible string
        ARM: dts: imx6: add DT for aristainetos2 board
        ARM: dts: cubox-i/hummingboard: Fix the license text
        ARM: dts: sabrelite: use simple-panel instead of display-timings for LVDS0
        ARM: dts: nitrogen6x: use simple-panel instead of display-timings for LVDS0
        ARM: dts: add imx7d-sdb support
        ARM: dts: add imx7d soc dtsi file
        ARM: dts: Armadeus Systems APF6 family support (i.MX6)
        ARM: dts: vf610: Nomenclature fixup for PTC12 pin used in RMII mode.
        ARM: dts: cubox-i: add support for Broadcom Wifi/Bluetooth devices
        Document: dt: binding: imx: update document for imx7d support
        ARM: dts: imx6qdl: Add power-domain phandle to CODA device node
        ARM: dts: Gateworks GW5510 support (i.MX6)
        ARM: dts: imx6sl-warp: Fix OTG roles
        ARM: dts: imx6sl-warp: Remove USB regulators
        ARM: dts: imx6sl-warp: Remove unused regulator
        ARM: dts: add pinfunc include file to support imx7d
        ARM: mxs: fix in tree users of ssd1306
        ARM: dts: imx6qdl-hummingboard: Add PCIe support
        ARM: dts: imx23-olinuxino: Add i2c support
        ...
      b3182ff6
  2. 10 Jun, 2015 12 commits
  3. 06 Jun, 2015 3 commits
  4. 05 Jun, 2015 3 commits
  5. 04 Jun, 2015 13 commits