diff options
| author | Tom Rini <trini@konsulko.com> | 2015-11-05 07:46:45 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-11-05 07:46:45 -0500 |
| commit | 60b25259a5540686add02cf6c94cd7494a3e2d23 (patch) | |
| tree | abccf513238a9bab314b4672858512801da85580 /arch/arm/dts | |
| parent | 1674942ad777bc1ae26fe93684836dcd8820f47f (diff) | |
| parent | 58cb44cf6623faeebd9b04ac44cf11d2eb39ea36 (diff) | |
| download | blackbird-obmc-uboot-60b25259a5540686add02cf6c94cd7494a3e2d23.tar.gz blackbird-obmc-uboot-60b25259a5540686add02cf6c94cd7494a3e2d23.zip | |
Merge git://git.denx.de/u-boot-samsung
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/exynos5422-odroidxu3.dts | 12 | ||||
| -rw-r--r-- | arch/arm/dts/exynos54xx.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/dts/exynos5800-peach-pi.dts | 1 |
3 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/dts/exynos5422-odroidxu3.dts b/arch/arm/dts/exynos5422-odroidxu3.dts index d0a8621fda..690c747289 100644 --- a/arch/arm/dts/exynos5422-odroidxu3.dts +++ b/arch/arm/dts/exynos5422-odroidxu3.dts @@ -31,6 +31,18 @@ 0xb0000000 0xea00000>; }; + adc@12D10000 { + u-boot,dm-pre-reloc; + status = "okay"; + }; + + i2c@12CA0000 { + s2mps11_pmic@66 { + compatible = "samsung,s2mps11-pmic"; + reg = <0x66>; + }; + }; + ehci@12110000 { samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>; }; diff --git a/arch/arm/dts/exynos54xx.dtsi b/arch/arm/dts/exynos54xx.dtsi index bd3619d751..daa6a33c5b 100644 --- a/arch/arm/dts/exynos54xx.dtsi +++ b/arch/arm/dts/exynos54xx.dtsi @@ -42,6 +42,13 @@ xhci1 = "/xhci@12400000"; }; + adc@12D10000 { + compatible = "samsung,exynos-adc-v2"; + reg = <0x12D10000 0x100>; + interrupts = <0 106 0>; + status = "disabled"; + }; + i2c@12CA0000 { #address-cells = <1>; #size-cells = <0>; diff --git a/arch/arm/dts/exynos5800-peach-pi.dts b/arch/arm/dts/exynos5800-peach-pi.dts index 1d7ff23c93..76826dc23b 100644 --- a/arch/arm/dts/exynos5800-peach-pi.dts +++ b/arch/arm/dts/exynos5800-peach-pi.dts @@ -12,6 +12,7 @@ / { model = "Samsung/Google Peach Pi board based on Exynos5800"; + cpu-model = "Exynos5800"; compatible = "google,pit-rev#", "google,pit", "google,peach", "samsung,exynos5800", "samsung,exynos5"; |
