• Kevin Hilman's avatar
    Merge tag 'armsoc-drivers' into test-merge · 32270e80
    Kevin Hilman authored
    ARM: SoC: driver updates for v4.2
    
    Some of these are for drivers/soc, where we're now putting
    SoC-specific drivers these days. Some are for other driver subsystems
    where we have received acks from the appropriate maintainers.
    
    Some highlights:
    
    - simple-mfd: document DT bindings and misc updates
    - migrate mach-berlin to simple-mfd for clock, pinctrl and reset
    - memory: support for Tegra132 SoC
    - memory: introduce tegra EMC driver for scaling memory frequency
    - misc. updates for ARM CCI and CCN busses
    
     Conflicts:
    	arch/arm64/boot/dts/arm/juno-motherboard.dtsi
    
     Trivial add/add conflict with our dt branch.
     Resolution: take both sides.
    
    # gpg: Signature made Wed Jun 24 21:32:17 2015 PDT using RSA key ID D3FBC665
    # gpg: Good signature from "Kevin Hilman <khilman@deeprootsystems.com>"
    # gpg:                 aka "Kevin Hilman <khilman@linaro.org>"
    # gpg:                 aka "Kevin Hilman <khilman@kernel.org>"
    
    # Conflicts:
    #	arch/arm64/boot/dts/arm/juno-motherboard.dtsi
    32270e80
berlin2q.dtsi 14 KB