diff options
| author | John Stultz <john.stultz@linaro.org> | 2020-08-25 18:38:39 +0000 |
|---|---|---|
| committer | Yongqin Liu <yongqin.liu@linaro.org> | 2020-08-29 15:49:11 +0800 |
| commit | 319b25c57e722992763703bff69417ec99a8db64 (patch) | |
| tree | 7712329ae1ef6d623add6cfa04c31bea721f6715 | |
| parent | 31cdeb79c069834e0fd79c297fb34c136295f6f9 (diff) | |
ANDROID: dts: hi3660: Fix duplicate adv7533 nodesandroid-hikey-linaro-4.14-pmwg-20201019-170022-319b25c57e72
The adv7533 node had a duplicate entry in the hi3660.dtsi
which is misplaced as that hardware is board specific and
not soc specific.
A recent changes upstream were backported to -stable which
recently broke the driver from loading properly, so this
patch moves the details from the incorrect node into its
proper place, resolving the issue.
Test: boot tested with hikey/hikey960 aosp-master-throttled-copped#6749029 builds
Fixes: 274f4e9c575a ("arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Iffe78badb08a1a49ed99fb8ab2257cb95e368f3f
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 11 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 20 |
2 files changed, 11 insertions, 20 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts index 28b618cd40f4..1968e919856e 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts +++ b/arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts @@ -350,12 +350,23 @@ status = "ok"; compatible = "adi,adv7533"; reg = <0x39>; + v1p2-supply = <&ldo3>; + vdd-supply = <&ldo3>; + interrupt-parent = <&gpio1>; + interrupts = <1 2>; + pd-gpio = <&gpio5 1 0>; + sel-gpio = <&gpio2 4 0>; adi,dsi-lanes = <4>; + adi,disable-timing-generator; + #sound-dai-cells = <0>; ports { #address-cells = <1>; #size-cells = <0>; port@0 { reg = <0>; + adv7533_in: endpoint@0 { + remote-endpoint = <&dsi_out0>; + }; }; port@1 { reg = <1>; diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi index 36e8f3fa4033..69cf595822dc 100644 --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi @@ -523,26 +523,6 @@ snk_ignore_mismatch_current; }; }; - adv7533: adv7533@39 { - status = "ok"; - compatible = "adi,adv7533"; - reg = <0x39>; - v1p2-supply = <&ldo3>; - vdd-supply = <&ldo3>; - interrupt-parent = <&gpio1>; - interrupts = <1 2>; - pd-gpio = <&gpio5 1 0>; - sel-gpio = <&gpio2 4 0>; - adi,dsi-lanes = <4>; - adi,disable-timing-generator; - #sound-dai-cells = <0>; - - port { - adv7533_in: endpoint { - remote-endpoint = <&dsi_out0>; - }; - }; - }; }; pd_dpm { |