diff options
| author | Tom Rini <trini@konsulko.com> | 2021-04-19 11:34:17 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-04-19 11:34:17 -0400 |
| commit | 5fa1e2ffebcb78f6e249c2b2b9a0430b440fa4c6 (patch) | |
| tree | f417181c6497517985895c9d40d674f8911fc43a /arch | |
| parent | 58b504e5e1f382891b8a58bb4103046c858c758e (diff) | |
| parent | b0080ae1bbfe78caf9cc43cef2b8fdcc75cc4320 (diff) | |
Merge tag 'u-boot-atmel-2021.07-b' of https://source.denx.de/u-boot/custodians/u-boot-atmel
Second set of u-boot-atmel features for 2021.07 cycle:
This small feature set include support for 5th PIO bank on pio4 pinctrl
driver and a fix for the SPL on sama5d3.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/sama5d3.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/dts/sama7g5.dtsi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/dts/sama5d3.dtsi b/arch/arm/dts/sama5d3.dtsi index 6ed218eaad..42c30e9f30 100644 --- a/arch/arm/dts/sama5d3.dtsi +++ b/arch/arm/dts/sama5d3.dtsi @@ -1320,6 +1320,7 @@ reg = <0xfffffe30 0xf>; interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>; clocks = <&mck>; + u-boot,dm-pre-reloc; }; watchdog@fffffe40 { diff --git a/arch/arm/dts/sama7g5.dtsi b/arch/arm/dts/sama7g5.dtsi index 0cb6eaf5d0..b951aff43e 100644 --- a/arch/arm/dts/sama7g5.dtsi +++ b/arch/arm/dts/sama7g5.dtsi @@ -63,7 +63,7 @@ #size-cells = <1>; pioA: pinctrl@e0014000 { - compatible = "atmel,sama5d2-gpio"; + compatible = "microchip,sama7g5-gpio"; reg = <0xe0014000 0x800>; gpio-controller; #gpio-cells = <2>; |