diff options
author | Olof Johansson <olof@lixom.net> | 2020-09-26 09:46:09 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2020-09-26 09:46:10 -0700 |
commit | 39d601ba9a4dd9996d841dc89334d88920b8730a (patch) | |
tree | 34a89d40a246c749eba74dfde06d7ae5355a9e5e /arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | |
parent | 5f37a0d90360b97d5c01f8570a177ef36428f6f4 (diff) | |
parent | a665b2c1d28403e385054447cc319095527bedde (diff) | |
download | lwn-39d601ba9a4dd9996d841dc89334d88920b8730a.tar.gz lwn-39d601ba9a4dd9996d841dc89334d88920b8730a.zip |
Merge tag 'hisi-arm64-dt-for-5.10' of git://github.com/hisilicon/linux-hisi into arm/dt
ARM64: DT: Hisilicon ARM64 SoCs DT updates for 5.10
- Change the status properties from "ok" to "okay" for
all the hisilicon SoCs
- Update the SP805 nodes to have the correct clocks and
clock names for the hi3660 and hi6220 SoCs
* tag 'hisi-arm64-dt-for-5.10' of git://github.com/hisilicon/linux-hisi:
arm64: dts: hisilicon: Fix SP805 clocks
arm64: dts: hisilicon: replace status value "ok" by "okay"
Link: https://lore.kernel.org/r/5F617134.3050705@hisilicon.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts')
-rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index c1b614dabb8e..963300eede17 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -530,7 +530,7 @@ rt1711h: rt1711h@4e { compatible = "richtek,rt1711h"; reg = <0x4e>; - status = "ok"; + status = "okay"; interrupt-parent = <&gpio27>; interrupts = <3 IRQ_TYPE_LEVEL_LOW>; pinctrl-names = "default"; @@ -570,7 +570,7 @@ }; adv7533: adv7533@39 { - status = "ok"; + status = "okay"; compatible = "adi,adv7533"; reg = <0x39>; adi,dsi-lanes = <4>; @@ -656,7 +656,7 @@ &sdio_cfg_func>; /* WL_EN */ vmmc-supply = <&wlan_en>; - status = "ok"; + status = "okay"; wlcore: wlcore@2 { compatible = "ti,wl1837"; |