| Message ID | 20210929173343.v2.1.Ib7e63ae17e827ce0636a09d5dec9796043e4f80a@changeid (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/3] arm64: dts: sc7180: Factor out ti-sn65dsi86 support | expand |
Hi, On Wed, Sep 29, 2021 at 5:35 PM Philip Chen <philipchen@chromium.org> wrote: > > Factor out ti-sn65dsi86 edp bridge as a separate dts fragment. > This helps us introduce the second source edp bridge later. > > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > Signed-off-by: Philip Chen <philipchen@chromium.org> > --- > > Changes in v2: > - Move edp_brij_i2c completely out of sc7180-trogdor.dtsi to the > bridge dts fragment, so that we can cleanly assign different > edp bridge in every board rev. > > .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 1 + > .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 1 + > .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 1 + > .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 + > .../dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 90 +++++++++++++++++++ > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 86 ------------------ > 6 files changed, 94 insertions(+), 86 deletions(-) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > index a758e4d22612..1d13fba3bd2f 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > @@ -11,6 +11,7 @@ > ap_h1_spi: &spi0 {}; > > #include "sc7180-trogdor.dtsi" > +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" It looks like you're missing homestar, aren't you? I'd expect that after applying your change that: git grep -A1 include.*sc7180-trogdor.dtsi ...should show your new include right after all includes of sc7180-trogdor.dtsi, but I don't see it for homestar. Other than that this looks good to me. Feel free to add my Reviewed-by.
Hi On Thu, Sep 30, 2021 at 9:22 AM Doug Anderson <dianders@chromium.org> wrote: > > Hi, > > On Wed, Sep 29, 2021 at 5:35 PM Philip Chen <philipchen@chromium.org> wrote: > > > > Factor out ti-sn65dsi86 edp bridge as a separate dts fragment. > > This helps us introduce the second source edp bridge later. > > > > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > > Signed-off-by: Philip Chen <philipchen@chromium.org> > > --- > > > > Changes in v2: > > - Move edp_brij_i2c completely out of sc7180-trogdor.dtsi to the > > bridge dts fragment, so that we can cleanly assign different > > edp bridge in every board rev. > > > > .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 1 + > > .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 1 + > > .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 1 + > > .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 + > > .../dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 90 +++++++++++++++++++ > > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 86 ------------------ > > 6 files changed, 94 insertions(+), 86 deletions(-) > > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > > index a758e4d22612..1d13fba3bd2f 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > > @@ -11,6 +11,7 @@ > > ap_h1_spi: &spi0 {}; > > > > #include "sc7180-trogdor.dtsi" > > +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" > > It looks like you're missing homestar, aren't you? I'd expect that > after applying your change that: > > git grep -A1 include.*sc7180-trogdor.dtsi > > ...should show your new include right after all includes of > sc7180-trogdor.dtsi, but I don't see it for homestar. I can't find homestar dts file in my upstream checkout. But I found: https://patchwork.kernel.org/project/linux-arm-msm/patch/20210909122053.1.Ieafda79b74f74a2b15ed86e181c06a3060706ec5@changeid/ ...Is it merged anywhere? > > Other than that this looks good to me. Feel free to add my Reviewed-by.
Hi, On Thu, Oct 7, 2021 at 3:29 PM Philip Chen <philipchen@chromium.org> wrote: > > Hi > > On Thu, Sep 30, 2021 at 9:22 AM Doug Anderson <dianders@chromium.org> wrote: > > > > Hi, > > > > On Wed, Sep 29, 2021 at 5:35 PM Philip Chen <philipchen@chromium.org> wrote: > > > > > > Factor out ti-sn65dsi86 edp bridge as a separate dts fragment. > > > This helps us introduce the second source edp bridge later. > > > > > > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > > > Signed-off-by: Philip Chen <philipchen@chromium.org> > > > --- > > > > > > Changes in v2: > > > - Move edp_brij_i2c completely out of sc7180-trogdor.dtsi to the > > > bridge dts fragment, so that we can cleanly assign different > > > edp bridge in every board rev. > > > > > > .../boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 1 + > > > .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 1 + > > > .../boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 1 + > > > .../arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 + > > > .../dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 90 +++++++++++++++++++ > > > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 86 ------------------ > > > 6 files changed, 94 insertions(+), 86 deletions(-) > > > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi > > > > > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > > > index a758e4d22612..1d13fba3bd2f 100644 > > > --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > > > +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi > > > @@ -11,6 +11,7 @@ > > > ap_h1_spi: &spi0 {}; > > > > > > #include "sc7180-trogdor.dtsi" > > > +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" > > > > It looks like you're missing homestar, aren't you? I'd expect that > > after applying your change that: > > > > git grep -A1 include.*sc7180-trogdor.dtsi > > > > ...should show your new include right after all includes of > > sc7180-trogdor.dtsi, but I don't see it for homestar. > > I can't find homestar dts file in my upstream checkout. > But I found: https://patchwork.kernel.org/project/linux-arm-msm/patch/20210909122053.1.Ieafda79b74f74a2b15ed86e181c06a3060706ec5@changeid/ > ...Is it merged anywhere? The device trees need to be posted against the Qualcomm tree. git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git It should be in the for-next branch there. -Doug
diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi index a758e4d22612..1d13fba3bd2f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi @@ -11,6 +11,7 @@ ap_h1_spi: &spi0 {}; #include "sc7180-trogdor.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" /* Deleted nodes from trogdor.dtsi */ diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 00535aaa43c9..27b26a782af9 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -11,6 +11,7 @@ ap_h1_spi: &spi0 {}; #include "sc7180-trogdor.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" &ap_sar_sensor { semtech,cs0-ground; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi index a246dbd74cc1..e7c7cad14989 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi @@ -11,6 +11,7 @@ ap_h1_spi: &spi0 {}; #include "sc7180-trogdor.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" / { thermal-zones { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts index 2b522f9e0d8f..457c25499863 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts @@ -13,6 +13,7 @@ ap_h1_spi: &spi0 {}; #include "sc7180-trogdor.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" / { model = "Google Trogdor (rev1+)"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi new file mode 100644 index 000000000000..97d5e45abd1d --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Trogdor dts fragment for the boards with TI sn65dsi86 edp bridge + * + * Copyright 2021 Google LLC. + */ + +&dsi0_out { + remote-endpoint = <&sn65dsi86_in>; + data-lanes = <0 1 2 3>; +}; + +edp_brij_i2c: &i2c2 { + status = "okay"; + clock-frequency = <400000>; + + sn65dsi86_bridge: bridge@2d { + compatible = "ti,sn65dsi86"; + reg = <0x2d>; + pinctrl-names = "default"; + pinctrl-0 = <&edp_brij_en>, <&edp_brij_irq>; + gpio-controller; + #gpio-cells = <2>; + + interrupt-parent = <&tlmm>; + interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; + + enable-gpios = <&tlmm 104 GPIO_ACTIVE_HIGH>; + + vpll-supply = <&pp1800_edp_vpll>; + vccio-supply = <&pp1800_brij_vccio>; + vcca-supply = <&pp1200_brij>; + vcc-supply = <&pp1200_brij>; + + clocks = <&rpmhcc RPMH_LN_BB_CLK3>; + clock-names = "refclk"; + + no-hpd; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + sn65dsi86_in: endpoint { + remote-endpoint = <&dsi0_out>; + }; + }; + + port@1 { + reg = <1>; + sn65dsi86_out: endpoint { + data-lanes = <0 1>; + remote-endpoint = <&panel_in_edp>; + }; + }; + }; + + aux-bus { + panel: panel { + /* Compatible will be filled in per-board */ + power-supply = <&pp3300_dx_edp>; + backlight = <&backlight>; + hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>; + + port { + panel_in_edp: endpoint { + remote-endpoint = <&sn65dsi86_out>; + }; + }; + }; + }; + }; +}; + +&tlmm { + edp_brij_irq: edp-brij-irq { + pinmux { + pins = "gpio11"; + function = "gpio"; + }; + + pinconf { + pins = "gpio11"; + drive-strength = <2>; + bias-pull-down; + }; + }; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index 0f2b3c00e434..702139e89a80 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -602,15 +602,6 @@ &camcc { &dsi0 { status = "okay"; vdda-supply = <&vdda_mipi_dsi0_1p2>; - - ports { - port@1 { - endpoint { - remote-endpoint = <&sn65dsi86_in>; - data-lanes = <0 1 2 3>; - }; - }; - }; }; &dsi_phy { @@ -618,70 +609,6 @@ &dsi_phy { vdds-supply = <&vdda_mipi_dsi0_pll>; }; -edp_brij_i2c: &i2c2 { - status = "okay"; - clock-frequency = <400000>; - - sn65dsi86_bridge: bridge@2d { - compatible = "ti,sn65dsi86"; - reg = <0x2d>; - pinctrl-names = "default"; - pinctrl-0 = <&edp_brij_en>, <&edp_brij_irq>; - gpio-controller; - #gpio-cells = <2>; - - interrupt-parent = <&tlmm>; - interrupts = <11 IRQ_TYPE_LEVEL_HIGH>; - - enable-gpios = <&tlmm 104 GPIO_ACTIVE_HIGH>; - - vpll-supply = <&pp1800_edp_vpll>; - vccio-supply = <&pp1800_brij_vccio>; - vcca-supply = <&pp1200_brij>; - vcc-supply = <&pp1200_brij>; - - clocks = <&rpmhcc RPMH_LN_BB_CLK3>; - clock-names = "refclk"; - - no-hpd; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - sn65dsi86_in: endpoint { - remote-endpoint = <&dsi0_out>; - }; - }; - - port@1 { - reg = <1>; - sn65dsi86_out: endpoint { - data-lanes = <0 1>; - remote-endpoint = <&panel_in_edp>; - }; - }; - }; - - aux-bus { - panel: panel { - /* Compatible will be filled in per-board */ - power-supply = <&pp3300_dx_edp>; - backlight = <&backlight>; - hpd-gpios = <&sn65dsi86_bridge 2 GPIO_ACTIVE_HIGH>; - - port { - panel_in_edp: endpoint { - remote-endpoint = <&sn65dsi86_out>; - }; - }; - }; - }; - }; -}; - ap_sar_sensor_i2c: &i2c5 { clock-frequency = <400000>; @@ -1245,19 +1172,6 @@ pinconf { }; }; - edp_brij_irq: edp-brij-irq { - pinmux { - pins = "gpio11"; - function = "gpio"; - }; - - pinconf { - pins = "gpio11"; - drive-strength = <2>; - bias-pull-down; - }; - }; - en_pp3300_codec: en-pp3300-codec { pinmux { pins = "gpio83";