moonjuice/kernel_arpi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ANDROID: dts: hi3660: Fix duplicate adv7533 nodes

Browse Source 
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.

Fixes: 274f4e9c57 ("arm64: dts: hisilicon: hikey: fixes to comply with adi, adv7533 DT binding")
Signed-off-by: John Stultz <john.stultz@linaro.org>
Change-Id: Iffe78badb08a1a49ed99fb8ab2257cb95e368f3f
(cherry picked from commit 623715b470c6c51e54344a274ca90df19556b56a)
This commit is contained in:
John Stultz
2020-08-25 18:38:39 +00:00
committed by YongQin Liu
parent eaf38dc2bb
commit 1d65a4b7a6
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -654,12 +654,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>;

20
arch/arm64/boot/dts/hisilicon/hi3660.dtsi
View File

@@ -446,26 +446,6 @@
pinctrl-0 = <&i2c1_pmx_func &i2c1_cfg_func>;
status = "ok";
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>;
};
};
};
};
i2c3: i2c@fdf0c000 {