| Message ID | 20200207141324.3188898-1-enric.balletbo@collabora.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6f7e1c1929e0ae0d088cc1f7b5174a8faa7bd711 |
| Headers | show |
| Series | arm64: dts: rk3399: Remove extcon unit address and extcon-cells from Gru | expand |
Am Freitag, 7. Februar 2020, 15:13:24 CET schrieb Enric Balletbo i Serra: > The cros-ec-extcon has no reg property so remove the unit address from > the DT node to make DT compiler happy. > > While here, remove the inexistent extcon-cells property from the extcon > nodes. > > Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> applied for 5.7 Thanks Heiko
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi index 7cd6d470c1cb..1384dabbdf40 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi @@ -291,11 +291,9 @@ cros_ec_pwm: ec-pwm { #pwm-cells = <1>; }; - usbc_extcon1: extcon@1 { + usbc_extcon1: extcon1 { compatible = "google,extcon-usbc-cros-ec"; google,usb-port-id = <1>; - - #extcon-cells = <0>; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi index dd5624975c9b..2f3997740068 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi @@ -570,11 +570,9 @@ i2c_tunnel: i2c-tunnel { #size-cells = <0>; }; - usbc_extcon0: extcon@0 { + usbc_extcon0: extcon0 { compatible = "google,extcon-usbc-cros-ec"; google,usb-port-id = <0>; - - #extcon-cells = <0>; }; }; };
The cros-ec-extcon has no reg property so remove the unit address from the DT node to make DT compiler happy. While here, remove the inexistent extcon-cells property from the extcon nodes. Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> --- Thanks to the Dafna's work and Rob's review I got noticed that the old txt binding was wrong, and also, that the current cros-ec-extcon node in Gru is wrong, so sending this patch now that is fresh in our minds and update the node accordingly. There is an extcon-cells property that seems to not exist and is not documented, so remove it. For reference, see https://lkml.org/lkml/2020/2/5/176. arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 4 +--- arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-)