diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 13:13:45 +0200 |
| commit | 9cce00617bf67a462eabd8c473c423f78414a8e8 (patch) | |
| tree | 950cab0665633f390ad04b9b2b5147f10a4be896 /arch/mips/dts | |
| parent | ba465b6c4dc4b0729e98f1581a13ad7e01032461 (diff) | |
| parent | 642f8fbed8b4c55d56a0934b803146009539905e (diff) | |
| download | barebox-9cce00617bf67a462eabd8c473c423f78414a8e8.tar.gz barebox-9cce00617bf67a462eabd8c473c423f78414a8e8.tar.xz | |
Merge branch 'for-next/rtc'
Conflicts:
arch/mips/dts/jz4755.dtsi
commands/Makefile
Diffstat (limited to 'arch/mips/dts')
| -rw-r--r-- | arch/mips/dts/jz4755.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/dts/jz4755.dtsi b/arch/mips/dts/jz4755.dtsi index 718463548b..b83d884a24 100644 --- a/arch/mips/dts/jz4755.dtsi +++ b/arch/mips/dts/jz4755.dtsi @@ -13,6 +13,11 @@ reg = <0xb0002000 0x10>; }; + rtc: rtc@10003000 { + compatible = "ingenic,jz4740-rtc"; + reg = <0xb0003000 0x38>; + }; + serial0: serial@b0030000 { compatible = "ingenic,jz4740-uart"; reg = <0xb0030000 0x20>; |