diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-04 10:21:51 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-04 10:21:51 -0400 |
| commit | c27178ba3649f539c9f1890ea147f4c5415f63b5 (patch) | |
| tree | 56ba0e3b96d99f609d033f6fc3f2bebb981c1e04 /arch | |
| parent | 1b6ae82a5abb4cbedb0d6cb262526173f4efa486 (diff) | |
| parent | d32cbefc8ac82bd0206f806efb07df82c4b92d5b (diff) | |
Merge tag 'u-boot-atmel-fixes-2020.07-a' of https://gitlab.denx.de/u-boot/custodians/u-boot-atmel
First set of u-boot-atmel fixes for 2020.07 cycle
This set includes just two small commits that fix a build warning and
add a missing serial node.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/sama5d2.dtsi | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/dts/sama5d2.dtsi b/arch/arm/dts/sama5d2.dtsi index 5adc47b906..6fb2cb25f9 100644 --- a/arch/arm/dts/sama5d2.dtsi +++ b/arch/arm/dts/sama5d2.dtsi @@ -746,6 +746,14 @@ status = "disabled"; }; + uart4: serial@fc00c000 { + compatible = "atmel,at91sam9260-usart"; + reg = <0xfc00c000 0x100>; + clocks = <&uart4_clk>; + clock-names = "usart"; + status = "disabled"; + }; + i2c1: i2c@fc028000 { compatible = "atmel,sama5d2-i2c"; reg = <0xfc028000 0x100>; |