diff options
| author | Olof Johansson <olof@lixom.net> | 2018-12-01 02:09:13 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-12-01 02:09:13 +0300 |
| commit | 4abc79424f3e44ccfbbca88d02544142110763e5 (patch) | |
| tree | c83d131b91306d6978fe2ccf2f908f0bb22e1c3a /arch/arm64/boot/dts/altera | |
| parent | e3d3781393d4351c254ccc3ba75e17d82167f66c (diff) | |
| parent | 8bb4f3f55961954154967d4747686ababb67df0d (diff) | |
| download | linux-4abc79424f3e44ccfbbca88d02544142110763e5.tar.xz | |
Merge tag 'socfpga_dts_updates_for_v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt
SoCFPGA DTS updates for v5.0
- Use SPDX license identifier for all SoCFPGA DTS files.
- Remove dma-mask property as it has been deprecated.
- Use tabs in DTS files.
- Use the specific "altr,stratix10-rst-mgr" property for the Stratix10
reset manager.
* tag 'socfpga_dts_updates_for_v5.0' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
arm64: dts: stratix10: use "altr,stratix10-rst-mgr" binding
ARM: dts: socfpga: use tabs for indentation
arm: dts: socfpga: remove dma-mask property
arm: dts: socfpga*.dts*: use SPDX-License-Identifier
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/altera')
| -rw-r--r-- | arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi index fef7351e9f67..09b5f61a440f 100644 --- a/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +++ b/arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi @@ -311,9 +311,8 @@ rst: rstmgr@ffd11000 { #reset-cells = <1>; - compatible = "altr,rst-mgr"; + compatible = "altr,stratix10-rst-mgr"; reg = <0xffd11000 0x1000>; - altr,modrst-offset = <0x20>; }; spi0: spi@ffda4000 { |