p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJcWB5TAAoJEAvIV27ZiWZcTqAQAIfGVimt3HQyC+k/pz8rS6XD
 VSnRGUDx69qmrnVqzP9nk+KmAz4LRDndLSYlaxgAtabWsR3s8nH9EM0f2uD4j1gl
 07B9wUH0VKxbJCleGVTHGoeLp+MSPDWiDxHfFdnip3x8Xf9rWk/781We9lAe9GVs
 i1xC2/79OtSJdjSZ56SBv8X+tGl3XCVxQ9mKU1X+8OBc+R799Ml4onM/oOexH7PY
 jOWSsMhOS53bYqd0Ja1Q3soi1IYaEZoqqo2OadH405jJ0Zxs8EN1sRt4JUs8Un9u
 gMmDLziXE8aGnCGiGV9OwM3CXgVyv41lA9hR8grUI7ciHc1YEeVskEx5lQBRLUoA
 OWK2BykRw8T8ISKERvniJXM2tgDt7HhusFcmr7fVthzeJryA0+KeVMoeZo/o35C+
 a5klKriCdh1eqNR9G0LB3F+j1xwQZp61wc6aL3iSTg+UCLiXKrQSuW5GJAnL5OtO
 +Z6JUifanxtqMklD7IKhcmJOzoSMtp6GJGFTFz1NT6QKNwO7eJd2vSKvuSghD5jS
 KZ1CT8HkQJ6i7CKmv3mTv0AhB/Q1wOJdG2n7T6nvESypdUjsb50lQJrWSVXsl3XH
 e52lKzuYHkI6h6SQTJkzZUOQoBvsYSuNFBJEFpB628ynLHWU16rBFbdEMup5I68g
 ToqnOaND2qXmcij8nykS
 =ZFkH
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Arnd Bergmann 2019-02-15 15:37:07 +01:00
parent f02635eaf5 8d26c1390a
commit 01a8ab4e5e
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts
View File

@ -581,8 +581,7 @@ &dwmmc1 {
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

4
arch/arm64/boot/dts/hisilicon/hi3798cv200-poplar.dts
View File

@ -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/;

4
arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi
View File

@ -1,10 +1,8 @@
// 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>

2
arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts
View File

@ -118,6 +118,7 @@ wl1835_pwrseq: wl1835-pwrseq {
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 @@ gpio15: gpio@f702b000 {
dwmmc_0: dwmmc0@f723d000 {
cap-mmc-highspeed;
mmc-hs200-1_8v;
non-removable;
bus-width = <0x8>;
vmmc-supply = <&ldo19>;

2
arch/arm64/boot/dts/hisilicon/hi6220.dtsi
View File

@ -319,6 +319,8 @@ uart1: uart@f7111000 {
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";
};