diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 15:37:07 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 15:37:43 +0100 |
| commit | 01a8ab4e5e3f597316041685426715017b656586 (patch) | |
| tree | 2fe20158ff6d618333ac887ecb7981ff26c4cb5a /arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts | |
| parent | f02635eaf5749c2d344e165ec81bb8a2bce4cb20 (diff) | |
| parent | 8d26c1390aec795d492b8de5e4437751e8805a1d (diff) | |
Merge tag 'hisi-arm64-dt-for-5.1v2' of git://github.com/hisilicon/linux-hisi into arm/dt
ARM64: DT: Hisilicon SoCs DT updates for 5.1
* Hi6220 SoC and related boards:
- Add DMA entries to enable DMA for Bluetooth transfers
- Add power-on delay to make wifi stable
- Revert HS200 mode to avoid eMMC controller resets and block read failures
* Hi3660 SoC and related boards:
- Fix SD card detection via setting cd-gpios correctly
* Hi3798 SoC and related boards:
- Fix malformed SPDX license identifier
* tag 'hisi-arm64-dt-for-5.1v2' of git://github.com/hisilicon/linux-hisi:
arm64: dts: hikey: Revert "Enable HS200 mode on eMMC"
arm64: dts: hikey: Give wifi some time after power-on
arm64: dts: hi3798cv200: fix malformed SPDX license identifier
arm64: dts: hikey960: fix SDcard detection
arm64: dts: hikey: Add DMA entries for Bluetooth UART
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts')
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts index 32716c96b457..c563d3eb2d98 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts @@ -1,10 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0 /* * DTS File for HiSilicon Poplar Development Board * * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd. - * - * Released under the GPLv2 only. - * SPDX-License-Identifier: GPL-2.0 */ /dts-v1/; |