diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:19:49 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:20:03 +0100 |
| commit | 87503c012a7d0003a423b0f557ecd3ff55f2c0cc (patch) | |
| tree | 95c95bf711c7f8ef269ecff62a92f004cbbfb578 /arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | |
| parent | 75ed0b2d2d961171f764a3902fa78a8147c4b7d7 (diff) | |
| parent | 519904a42ff8c2ed23651f33c256d009c656a50b (diff) | |
Merge tag 'uniphier-dt64-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into arm/dt
UniPhier ARM64 SoC DT updates for v5.1
- Add PCI Express controller nodes
* tag 'uniphier-dt64-v5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
arm64: dts: uniphier: sort labels in the same order as in dtsi
arm64: dts: uniphier: Add PCIe host controller and PHY nodes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts')
| -rw-r--r-- | arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts index d7ae28afef7d..9ca692ed1b2b 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-global.dts @@ -145,10 +145,10 @@ }; }; -&nand { +&usb { status = "okay"; }; -&usb { +&nand { status = "okay"; }; |