Commit 01a8ab4e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents f02635ea 8d26c139

arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts

+1 −2
Original line number Diff line number Diff line
@@ -581,8 +581,7 @@ 
	sd-uhs-sdr50;

	sd-uhs-sdr104;

	disable-wp;

	cd-inverted;

	cd-gpios = <&gpio25 3 0>;

	cd-gpios = <&gpio25 3 GPIO_ACTIVE_LOW>;

	pinctrl-names = "default";

	pinctrl-0 = <&sd_pmx_func

		     &sd_clk_cfg_func

arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts

+1 −3
Original line number Diff line number Diff line 
// 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/;

arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi

+1 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * DTS File for HiSilicon Hi3798cv200 SoC.

 *

 * Copyright (c) 2016-2017 HiSilicon Technologies Co., Ltd.

 *

 * Released under the GPLv2 only.

 * SPDX-License-Identifier: GPL-2.0

 */



#include <dt-bindings/clock/histb-clock.h>

arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

+1 −1
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ 
		reset-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;

		clocks = <&pmic>;

		clock-names = "ext_clock";

		post-power-on-delay-ms = <10>;

		power-off-delay-us = <10>;

	};
@@ -300,7 +301,6 @@ 


		dwmmc_0: dwmmc0@f723d000 {

			cap-mmc-highspeed;

			mmc-hs200-1_8v;

			non-removable;

			bus-width = <0x8>;

			vmmc-supply = <&ldo19>;

arch/arm64/boot/dts/hisilicon/hi6220.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -319,6 +319,8 @@ 
			clock-names = "uartclk", "apb_pclk";

			pinctrl-names = "default";

			pinctrl-0 = <&uart1_pmx_func &uart1_cfg_func1 &uart1_cfg_func2>;

			dmas = <&dma0 8 &dma0 9>;

			dma-names = "rx", "tx";

			status = "disabled";

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE