From: Olof Johansson Date: Thu, 29 Jan 2015 21:54:26 +0000 (-0800) Subject: Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux... X-Git-Tag: v4.0-rc1~69^2~6 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=a35306d3ad45df81fedbe65a1cc8214b91d03aca;p=linux.git Merge tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/dt Merge "Samsung 2nd DT updates for v3.20" from Kukjin Kim: - for all of Samsung SoCs : use generic power domain bindings : add 'dr_mode' property for hsotg/dwc2 devices - exynos3250-rinato and exynos3250-monk : add regulator-haptic - exynos5422-odroidxu3 : reduce total RAM by 22 MiB because last 22 MiB for secure monitor cannot be accessed by kernel : add on-board INA231 sensors and LDO26 of PMIC for the sensors * tag 'samsung-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: ARM: dts: reduce total RAM by 22 MiB for exynos5422-odroidxu3 ARM: dts: add on-board INA231 sensors for exynos5422-odroidxu3 ARM: dts: Add regulator-haptic node for exynos3250-monk ARM: dts: Add regulator-haptic node for exynos3250-rinato ARM: dts: add 'dr_mode' property to hsotg devices for exynos boards ARM: dts: convert to generic power domain bindings for exynos DT Signed-off-by: Olof Johansson --- a35306d3ad45df81fedbe65a1cc8214b91d03aca