diff options
author | Tom Rini <trini@konsulko.com> | 2016-06-06 13:24:23 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-06-06 13:39:43 -0400 |
commit | d77fa2ff766bbb4b867e791187f78b6033071613 (patch) | |
tree | b1116470884e46c0a66c49525771cf9b49c3835d /arch/arm/dts/exynos54xx.dtsi | |
parent | 65eac4cc54921f9496061b0e0f0a7e159b42a3c6 (diff) | |
parent | 086e13c5f6f79a68246d6b803cf4736cb6815e44 (diff) | |
download | blackbird-obmc-uboot-d77fa2ff766bbb4b867e791187f78b6033071613.tar.gz blackbird-obmc-uboot-d77fa2ff766bbb4b867e791187f78b6033071613.zip |
Merge http://git.denx.de/u-boot-samsung
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
configs/peach-pi_defconfig
configs/peach-pit_defconfig
Diffstat (limited to 'arch/arm/dts/exynos54xx.dtsi')
-rw-r--r-- | arch/arm/dts/exynos54xx.dtsi | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/dts/exynos54xx.dtsi b/arch/arm/dts/exynos54xx.dtsi index daa6a33c5b..b4ddf53a2e 100644 --- a/arch/arm/dts/exynos54xx.dtsi +++ b/arch/arm/dts/exynos54xx.dtsi @@ -49,7 +49,7 @@ status = "disabled"; }; - i2c@12CA0000 { + hsi2c_4: i2c@12CA0000 { #address-cells = <1>; #size-cells = <0>; compatible = "samsung,exynos5-hsi2c"; @@ -178,7 +178,7 @@ samsung,pwm-out-gpio = <&gpb2 0 GPIO_ACTIVE_HIGH>; }; - dp@145b0000 { + dp: dp@145b0000 { samsung,lt-status = <0>; samsung,master-mode = <0>; @@ -197,6 +197,13 @@ mem-type = "ddr3"; }; + pwm: pwm@12dd0000 { + compatible = "samsung,exynos4210-pwm"; + reg = <0x12dd0000 0x100>; + samsung,pwm-outputs = <0>, <1>, <2>, <3>; + #pwm-cells = <3>; + }; + xhci1: xhci@12400000 { compatible = "samsung,exynos5250-xhci"; reg = <0x12400000 0x10000>; |