diff options
| author | oscardagrach | 2018-06-18 13:10:08 -0500 |
|---|---|---|
| committer | Wei Xu | 2018-07-17 12:02:30 +0100 |
| commit | f0ab786fad36940211b7e5e9b0a9cc977de2f01d (patch) | |
| tree | ae0a85a564d39ac9378f0ac99f0dfda194bee274 /arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | |
| parent | 52ac6f2a8825116410bbe55fa3d1aea33774431b (diff) | |
arm64: dts: hikey960: Clean up MMC properties and move to proper file
Certain properties should be moved to the board file to reflect
the specific properties of the board, and not the SoC. Move these
properties to proper location and organize properties in both files.
Signed-off-by: Ryan Grachek <ryan@edited.us>
Signed-off-by: Wei Xu <xuwei5@hisilicon.com>
Diffstat (limited to 'arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts')
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index 1b2cabe3f478..7b8cbaf58bf0 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -574,20 +574,36 @@ }; &dwmmc1 { + bus-width = <0x4>; + cap-sd-highspeed; + sd-uhs-sdr12; + sd-uhs-sdr25; + sd-uhs-sdr50; + sd-uhs-sdr104; + disable-wp; + cd-inverted; + cd-gpios = <&gpio25 3 0>; + pinctrl-names = "default"; + pinctrl-0 = <&sd_pmx_func + &sd_clk_cfg_func + &sd_cfg_func>; vmmc-supply = <&ldo16>; vqmmc-supply = <&ldo9>; status = "okay"; }; &dwmmc2 { /* WIFI */ - broken-cd; - /* WL_EN */ - vmmc-supply = <&wlan_en>; + bus-width = <0x4>; non-removable; + broken-cd; cap-power-off-card; keep-power-in-suspend; - #address-cells = <0x1>; - #size-cells = <0x0>; + pinctrl-names = "default"; + pinctrl-0 = <&sdio_pmx_func + &sdio_clk_cfg_func + &sdio_cfg_func>; + /* WL_EN */ + vmmc-supply = <&wlan_en>; status = "ok"; wlcore: wlcore@2 { |