diff options
| author | Tom Rini <trini@konsulko.com> | 2020-07-11 11:50:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-07-11 11:50:49 -0400 |
| commit | 610e1487c8921d266f5cb304bfb66eb71f1dc7dc (patch) | |
| tree | 68991565dbed957030795ef3229020e1207709d3 /arch/arm/dts/uniphier-pro4.dtsi | |
| parent | 4a9146c29573dbfa661918280d9522a01f6ca919 (diff) | |
| parent | 5785950369cd68d4409bf4d0e34d4b1894e5d0e9 (diff) | |
Merge tag 'uniphier-v2020.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2020.10
- remove workaround for Cortex-A72
- increase U-Boot proper size to 2MB
- sync DT with Linux
- add system bus controller driver
- improve serial driver
- add reset assertion to Denali NAND driver
Diffstat (limited to 'arch/arm/dts/uniphier-pro4.dtsi')
| -rw-r--r-- | arch/arm/dts/uniphier-pro4.dtsi | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/dts/uniphier-pro4.dtsi b/arch/arm/dts/uniphier-pro4.dtsi index d006b45f7a..9dae4e9b23 100644 --- a/arch/arm/dts/uniphier-pro4.dtsi +++ b/arch/arm/dts/uniphier-pro4.dtsi @@ -75,6 +75,8 @@ compatible = "socionext,uniphier-scssi"; status = "disabled"; reg = <0x54006000 0x100>; + #address-cells = <1>; + #size-cells = <0>; interrupts = <0 39 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_spi0>; @@ -426,6 +428,14 @@ }; }; + xdmac: dma-controller@5fc10000 { + compatible = "socionext,uniphier-xdmac"; + reg = <0x5fc10000 0x5300>; + interrupts = <0 188 4>; + dma-channels = <16>; + #dma-cells = <2>; + }; + aidet: interrupt-controller@5fc20000 { compatible = "socionext,uniphier-pro4-aidet"; reg = <0x5fc20000 0x200>; |