diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-01 17:43:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-01 17:43:06 -0400 |
| commit | 20a41043fb3985879ec2ce2ef1deddcda7fa4c99 (patch) | |
| tree | 0a3c53dccba6b5ef1835a10039fdaa9ad4214c9a /arch/arm/dts/uniphier-ph1-pro5.dtsi | |
| parent | d90bb439335386b3ae6ada89b89720cc66ec9352 (diff) | |
| parent | e64a6b11411befbaf166443d02d8b10e06852f6a (diff) | |
| download | blackbird-obmc-uboot-20a41043fb3985879ec2ce2ef1deddcda7fa4c99.tar.gz blackbird-obmc-uboot-20a41043fb3985879ec2ce2ef1deddcda7fa4c99.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-uniphier
Diffstat (limited to 'arch/arm/dts/uniphier-ph1-pro5.dtsi')
| -rw-r--r-- | arch/arm/dts/uniphier-ph1-pro5.dtsi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/dts/uniphier-ph1-pro5.dtsi b/arch/arm/dts/uniphier-ph1-pro5.dtsi index bd1b4b1b66..05f961f588 100644 --- a/arch/arm/dts/uniphier-ph1-pro5.dtsi +++ b/arch/arm/dts/uniphier-ph1-pro5.dtsi @@ -355,6 +355,11 @@ clock-frequency = <400000>; }; + aidet@5fc20000 { + compatible = "simple-mfd", "syscon"; + reg = <0x5fc20000 0x200>; + }; + emmc: sdhc@68400000 { compatible = "socionext,uniphier-sdhc"; status = "disabled"; @@ -431,7 +436,7 @@ }; &pinctrl { - compatible = "socionext,ph1-pro5-pinctrl", "syscon"; + compatible = "socionext,uniphier-pro5-pinctrl"; }; &sysctrl { |
