* [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts @ 2021-10-29 22:27 Philip Chen 2021-10-29 22:27 ` [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output Philip Chen ` (3 more replies) 0 siblings, 4 replies; 12+ messages in thread From: Philip Chen @ 2021-10-29 22:27 UTC (permalink / raw) To: LKML Cc: swboyd, dianders, Philip Chen, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm The edp bridge dts fragment files use the macros defined in 'dt-bindings/gpio/gpio.h'. To help us more flexibly order the #include lines of dts files in a board-revision-specific dts file, let's include the gpio header in the bridge dts fragment files themselves. Signed-off-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 2 ++ arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 2 ++ 2 files changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi index a3d69540d4e4..6a84fba178d6 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-parade-ps8640.dtsi @@ -5,6 +5,8 @@ * Copyright 2021 Google LLC. */ +#include <dt-bindings/gpio/gpio.h> + / { pp3300_brij_ps8640: pp3300-brij-ps8640 { compatible = "regulator-fixed"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi index 97d5e45abd1d..6dbf413e4e5b 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi @@ -5,6 +5,8 @@ * Copyright 2021 Google LLC. */ +#include <dt-bindings/gpio/gpio.h> + &dsi0_out { remote-endpoint = <&sn65dsi86_in>; data-lanes = <0 1 2 3>; -- 2.33.1.1089.g2158813163f-goog ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output 2021-10-29 22:27 [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts Philip Chen @ 2021-10-29 22:27 ` Philip Chen 2021-10-29 23:16 ` Stephen Boyd ` (2 more replies) 2021-10-29 22:27 ` [PATCH v3 3/4] arm64: dts: sc7180: Support Lazor/Limozeen rev9 Philip Chen ` (2 subsequent siblings) 3 siblings, 3 replies; 12+ messages in thread From: Philip Chen @ 2021-10-29 22:27 UTC (permalink / raw) To: LKML Cc: swboyd, dianders, Philip Chen, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm MSM DSI host driver actually parses "data-lanes" in DT and compare it with the number of DSI lanes the bridge driver sets for mipi_dsi_device. So we need to always specify "data-lanes" for the DSI host output. As of now, "data-lanes" is added to ti-sn65dsi86 dts fragment, but missing in parade-ps8640 dts fragment, which requires a fixup. Since we'll do 4-lane DSI regardless of which bridge chip is used, instead of adding "data-lanes" to parade-ps8640 dts fragment, let's just move "data-lanes" from the bridge dts to sc7180-trogdor.dtsi. Signed-off-by: Philip Chen <philipchen@chromium.org> --- (no changes since v1) arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 1 - arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi index 6dbf413e4e5b..f869e6a343c1 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi @@ -9,7 +9,6 @@ &dsi0_out { remote-endpoint = <&sn65dsi86_in>; - data-lanes = <0 1 2 3>; }; edp_brij_i2c: &i2c2 { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi index d4f4441179fc..bd5909ffb3dc 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi @@ -603,6 +603,10 @@ &dsi0 { vdda-supply = <&vdda_mipi_dsi0_1p2>; }; +&dsi0_out { + data-lanes = <0 1 2 3>; +}; + &dsi_phy { status = "okay"; vdds-supply = <&vdda_mipi_dsi0_pll>; -- 2.33.1.1089.g2158813163f-goog ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output 2021-10-29 22:27 ` [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output Philip Chen @ 2021-10-29 23:16 ` Stephen Boyd 2021-10-29 23:24 ` Philip Chen 2021-11-01 17:09 ` Doug Anderson 2021-11-01 18:09 ` Stephen Boyd 2 siblings, 1 reply; 12+ messages in thread From: Stephen Boyd @ 2021-10-29 23:16 UTC (permalink / raw) To: LKML, Philip Chen Cc: dianders, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm Quoting Philip Chen (2021-10-29 15:27:41) > MSM DSI host driver actually parses "data-lanes" in DT and compare > it with the number of DSI lanes the bridge driver sets for > mipi_dsi_device. So we need to always specify "data-lanes" for the > DSI host output. As of now, "data-lanes" is added to ti-sn65dsi86 dts > fragment, but missing in parade-ps8640 dts fragment, which requires > a fixup. I don't see data-lanes required in the schema, and dsi_host_parse_lane_data() seems happy to continue without it. I do see that num_data_lanes isn't set though. Does this patch fix it? ----8<---- diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index e269df285136..f6fba07220e5 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c @@ -1696,6 +1696,7 @@ static int dsi_host_parse_lane_data(struct msm_dsi_host *msm_host, if (!prop) { DRM_DEV_DEBUG(dev, "failed to find data lane mapping, using default\n"); + msm_host->num_data_lanes = 4; return 0; } ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output 2021-10-29 23:16 ` Stephen Boyd @ 2021-10-29 23:24 ` Philip Chen 2021-10-29 23:35 ` Stephen Boyd [not found] ` <e91a6134-c2ce-6112-0818-ffd9483feeeb@quicinc.com> 0 siblings, 2 replies; 12+ messages in thread From: Philip Chen @ 2021-10-29 23:24 UTC (permalink / raw) To: Stephen Boyd Cc: LKML, dianders, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm Hi Stephen, On Fri, Oct 29, 2021 at 4:16 PM Stephen Boyd <swboyd@chromium.org> wrote: > > Quoting Philip Chen (2021-10-29 15:27:41) > > MSM DSI host driver actually parses "data-lanes" in DT and compare > > it with the number of DSI lanes the bridge driver sets for > > mipi_dsi_device. So we need to always specify "data-lanes" for the > > DSI host output. As of now, "data-lanes" is added to ti-sn65dsi86 dts > > fragment, but missing in parade-ps8640 dts fragment, which requires > > a fixup. > > I don't see data-lanes required in the schema, and > dsi_host_parse_lane_data() seems happy to continue without it. I do see > that num_data_lanes isn't set though. Does this patch fix it? The problem I see is from dsi_host_attach(). If there is no "data-lanes" in DT, num_data_lanes would be 0. Then dsi_host_attach() would return -EINVAL. > > ----8<---- > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c > b/drivers/gpu/drm/msm/dsi/dsi_host.c > index e269df285136..f6fba07220e5 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > @@ -1696,6 +1696,7 @@ static int dsi_host_parse_lane_data(struct > msm_dsi_host *msm_host, > if (!prop) { > DRM_DEV_DEBUG(dev, > "failed to find data lane mapping, using default\n"); > + msm_host->num_data_lanes = 4; > return 0; > } I haven't tried. But I think it can fix the problem I described above. Would you like to send it as a separate patch? Or I can do it. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output 2021-10-29 23:24 ` Philip Chen @ 2021-10-29 23:35 ` Stephen Boyd [not found] ` <e91a6134-c2ce-6112-0818-ffd9483feeeb@quicinc.com> 1 sibling, 0 replies; 12+ messages in thread From: Stephen Boyd @ 2021-10-29 23:35 UTC (permalink / raw) To: Philip Chen Cc: LKML, dianders, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm Quoting Philip Chen (2021-10-29 16:24:58) > Hi Stephen, > > On Fri, Oct 29, 2021 at 4:16 PM Stephen Boyd <swboyd@chromium.org> wrote: > > > > Quoting Philip Chen (2021-10-29 15:27:41) > > > MSM DSI host driver actually parses "data-lanes" in DT and compare > > > it with the number of DSI lanes the bridge driver sets for > > > mipi_dsi_device. So we need to always specify "data-lanes" for the > > > DSI host output. As of now, "data-lanes" is added to ti-sn65dsi86 dts > > > fragment, but missing in parade-ps8640 dts fragment, which requires > > > a fixup. > > > > I don't see data-lanes required in the schema, and > > dsi_host_parse_lane_data() seems happy to continue without it. I do see > > that num_data_lanes isn't set though. Does this patch fix it? > The problem I see is from dsi_host_attach(). > If there is no "data-lanes" in DT, num_data_lanes would be 0. > Then dsi_host_attach() would return -EINVAL. Ok, got it. > > > > > ----8<---- > > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c > > b/drivers/gpu/drm/msm/dsi/dsi_host.c > > index e269df285136..f6fba07220e5 100644 > > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > > @@ -1696,6 +1696,7 @@ static int dsi_host_parse_lane_data(struct > > msm_dsi_host *msm_host, > > if (!prop) { > > DRM_DEV_DEBUG(dev, > > "failed to find data lane mapping, using default\n"); > > + msm_host->num_data_lanes = 4; > > return 0; > > } > > I haven't tried. > But I think it can fix the problem I described above. > Would you like to send it as a separate patch? > Or I can do it. Sure feel free to send it as another patch. Or fix the schema to make data-lanes required. I think fixing the driver is probably better so that we don't have to set data-lanes when it's the default 4 lanes. At least I think 4 lanes is the default. ^ permalink raw reply [flat|nested] 12+ messages in thread
[parent not found: <e91a6134-c2ce-6112-0818-ffd9483feeeb@quicinc.com>]
[parent not found: <55f951c1-1713-ad55-4ca3-b83d4f3763f6@quicinc.com>]
* Re: [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output [not found] ` <55f951c1-1713-ad55-4ca3-b83d4f3763f6@quicinc.com> @ 2021-11-01 16:39 ` Philip Chen 0 siblings, 0 replies; 12+ messages in thread From: Philip Chen @ 2021-11-01 16:39 UTC (permalink / raw) To: Abhinav Kumar Cc: Stephen Boyd, LKML, dianders, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm Hi, On Sun, Oct 31, 2021 at 7:52 PM Abhinav Kumar <quic_abhinavk@quicinc.com> wrote: > > > On 10/31/2021 2:01 PM, Abhinav Kumar wrote: > > Hi Philip > > On 10/29/2021 4:24 PM, Philip Chen wrote: > > Hi Stephen, > > On Fri, Oct 29, 2021 at 4:16 PM Stephen Boyd <swboyd@chromium.org> wrote: > > Quoting Philip Chen (2021-10-29 15:27:41) > > MSM DSI host driver actually parses "data-lanes" in DT and compare > it with the number of DSI lanes the bridge driver sets for > mipi_dsi_device. So we need to always specify "data-lanes" for the > DSI host output. As of now, "data-lanes" is added to ti-sn65dsi86 dts > fragment, but missing in parade-ps8640 dts fragment, which requires > a fixup. > > I don't see data-lanes required in the schema, and > dsi_host_parse_lane_data() seems happy to continue without it. I do see > that num_data_lanes isn't set though. Does this patch fix it? > > The problem I see is from dsi_host_attach(). > If there is no "data-lanes" in DT, num_data_lanes would be 0. > Then dsi_host_attach() would return -EINVAL. > > Let me know if i am missing something here. the dsi_host_attach returns an error if > > dsi->lanes is > than msm_host->num_data_lanes. That shouldnt happen even if > > num_data_lanes will be 0 > > static int dsi_host_attach(struct mipi_dsi_host *host, > struct mipi_dsi_device *dsi) > { > struct msm_dsi_host *msm_host = to_msm_dsi_host(host); > int ret; > > if (dsi->lanes > msm_host->num_data_lanes) > return -EINVAL; > > Thanks > > Abhinav > > Please ignore this comment, I understood now. The fix you had posted to default to 4 lanes seems fine. > > Will ack that one. Thanks! For the other folks: the fix I posted for dsi_host is here: https://patchwork.kernel.org/project/linux-arm-msm/patch/20211030100812.1.I6cd9af36b723fed277d34539d3b2ba4ca233ad2d@changeid/ > > > ----8<---- > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c > b/drivers/gpu/drm/msm/dsi/dsi_host.c > index e269df285136..f6fba07220e5 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > @@ -1696,6 +1696,7 @@ static int dsi_host_parse_lane_data(struct > msm_dsi_host *msm_host, > if (!prop) { > DRM_DEV_DEBUG(dev, > "failed to find data lane mapping, using default\n"); > + msm_host->num_data_lanes = 4; > return 0; > } > > I haven't tried. > But I think it can fix the problem I described above. > Would you like to send it as a separate patch? > Or I can do it. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output 2021-10-29 22:27 ` [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output Philip Chen 2021-10-29 23:16 ` Stephen Boyd @ 2021-11-01 17:09 ` Doug Anderson 2021-11-01 18:09 ` Stephen Boyd 2 siblings, 0 replies; 12+ messages in thread From: Doug Anderson @ 2021-11-01 17:09 UTC (permalink / raw) To: Philip Chen Cc: LKML, Stephen Boyd, Andy Gross, Bjorn Andersson, Rob Herring, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, linux-arm-msm Hi, On Fri, Oct 29, 2021 at 3:27 PM Philip Chen <philipchen@chromium.org> wrote: > > MSM DSI host driver actually parses "data-lanes" in DT and compare > it with the number of DSI lanes the bridge driver sets for > mipi_dsi_device. So we need to always specify "data-lanes" for the > DSI host output. As of now, "data-lanes" is added to ti-sn65dsi86 dts > fragment, but missing in parade-ps8640 dts fragment, which requires > a fixup. > > Since we'll do 4-lane DSI regardless of which bridge chip is used, > instead of adding "data-lanes" to parade-ps8640 dts fragment, let's > just move "data-lanes" from the bridge dts to sc7180-trogdor.dtsi. > > Signed-off-by: Philip Chen <philipchen@chromium.org> > --- > > (no changes since v1) > > arch/arm64/boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 1 - > arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 4 ++++ > 2 files changed, 4 insertions(+), 1 deletion(-) I think it's fine to take this change even if we also decide to fix the driver as well. Reviewed-by: Douglas Anderson <dianders@chromium.org> ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output 2021-10-29 22:27 ` [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output Philip Chen 2021-10-29 23:16 ` Stephen Boyd 2021-11-01 17:09 ` Doug Anderson @ 2021-11-01 18:09 ` Stephen Boyd 2 siblings, 0 replies; 12+ messages in thread From: Stephen Boyd @ 2021-11-01 18:09 UTC (permalink / raw) To: LKML, Philip Chen Cc: dianders, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm Quoting Philip Chen (2021-10-29 15:27:41) > MSM DSI host driver actually parses "data-lanes" in DT and compare > it with the number of DSI lanes the bridge driver sets for > mipi_dsi_device. So we need to always specify "data-lanes" for the > DSI host output. As of now, "data-lanes" is added to ti-sn65dsi86 dts > fragment, but missing in parade-ps8640 dts fragment, which requires > a fixup. > > Since we'll do 4-lane DSI regardless of which bridge chip is used, > instead of adding "data-lanes" to parade-ps8640 dts fragment, let's > just move "data-lanes" from the bridge dts to sc7180-trogdor.dtsi. > > Signed-off-by: Philip Chen <philipchen@chromium.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3 3/4] arm64: dts: sc7180: Support Lazor/Limozeen rev9 2021-10-29 22:27 [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts Philip Chen 2021-10-29 22:27 ` [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output Philip Chen @ 2021-10-29 22:27 ` Philip Chen 2021-11-01 17:09 ` Doug Anderson 2021-10-29 22:27 ` [PATCH v3 4/4] arm64: dts: sc7180: Support Homestar rev4 Philip Chen 2021-11-20 23:55 ` [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts Bjorn Andersson 3 siblings, 1 reply; 12+ messages in thread From: Philip Chen @ 2021-10-29 22:27 UTC (permalink / raw) To: LKML Cc: swboyd, dianders, Philip Chen, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm Support Lazor/Limozeen rev9 board where Parade ps8640 is added as the second source edp bridge. To support different edp bridge chips in different board revisions, now we move the #incldue line of the edp bridge dts fragment (e.g. sc7180-trogdor-ti-sn65dsi86.dtsi) from "sc7180-trogdor-lazor.dtsi" to per-board-rev dts files. Since the edp bridge dts fragment overrides 'dsi0_out', which is defined in "sc7180.dtsi", move the #incldue line of "sc7180.dtsi" from "sc7180-trogdor-lazor.dtsi" to per-board-rev dts files too, before the #include line of the edp bridge dts fragment. Signed-off-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> --- Retroactively edit the v2 change log slightly (no changes since v2) Changes in v2: - Explain why "sc7180.dtsi" is moved out of "sc7180-trogdor-lazor.dtsi" in the commit message. - In limozeen (nots) r5 dts, replace "google,rev5-sku5" with "google,lazor-rev5-sku5" and sort it - In limozeen (nots) r9 dts, drop the support for "sku5". - In limozeen r4 dts, remove the redundant "google,lazor-rev6-sku4" and add "google,lazor-rev7-sku4". - Do not add panel compatible in -r9 dts files. - Move the #include line of gpio.h from sc7180.dtsi to the bridge dts fragments, and factor out this change to patch 1/3. arch/arm64/boot/dts/qcom/Makefile | 9 +++- .../sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- .../sc7180-trogdor-lazor-limozeen-nots-r5.dts | 31 +++++++++++++ ...sc7180-trogdor-lazor-limozeen-nots-r9.dts} | 8 ++-- .../qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 46 +++++++++++++++++++ ...s => sc7180-trogdor-lazor-limozeen-r9.dts} | 6 ++- .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 + .../dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 9 +++- .../dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 9 +++- .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 8 +++- .../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 22 +++++++++ .../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 30 ++++++++++++ .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 18 ++++++++ .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 -- 15 files changed, 188 insertions(+), 17 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen-nots.dts => sc7180-trogdor-lazor-limozeen-nots-r9.dts} (60%) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen.dts => sc7180-trogdor-lazor-limozeen-r9.dts} (82%) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 6b816eb33309..f637c4d3729f 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -64,9 +64,14 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-kb.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-kb.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-lte.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r4.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts index 6ebde0828550..850776c5323d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts @@ -5,7 +5,7 @@ * Copyright 2020 Google LLC. */ -#include "sc7180-trogdor-lazor-limozeen-nots.dts" +#include "sc7180-trogdor-lazor-limozeen-nots-r5.dts" / { model = "Google Lazor Limozeen without Touchscreen (rev4)"; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts new file mode 100644 index 000000000000..f360ff27226e --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor Limozeen board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Lazor Limozeen without Touchscreen (rev5 - rev8)"; + /* No sku5 post-rev5 */ + compatible = "google,lazor-rev5-sku5", "google,lazor-rev5-sku6", + "google,lazor-rev6-sku6", "google,lazor-rev7-sku6", + "google,lazor-rev8-sku6", "qcom,sc7180"; +}; + +/delete-node/&ap_ts; + +&panel { + compatible = "innolux,n116bca-ea1", "innolux,n116bge"; +}; + +&sdhc_2 { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts similarity index 60% rename from arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts rename to arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts index 0456c7e05d00..4e35aec6a1e5 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts @@ -2,17 +2,19 @@ /* * Google Lazor Limozeen board device tree source * - * Copyright 2020 Google LLC. + * Copyright 2021 Google LLC. */ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-parade-ps8640.dtsi" #include "sc7180-trogdor-lazor.dtsi" #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google Lazor Limozeen without Touchscreen"; - compatible = "google,lazor-sku6", "google,lazor-sku5", "qcom,sc7180"; + model = "Google Lazor Limozeen without Touchscreen (rev9+)"; + compatible = "google,lazor-sku6", "qcom,sc7180"; }; /delete-node/&ap_ts; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts new file mode 100644 index 000000000000..42b4bbcc76f4 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor Limozeen board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Lazor Limozeen (rev4 - rev8)"; + compatible = "google,lazor-rev4-sku4", "google,lazor-rev5-sku4", + "google,lazor-rev6-sku4", "google,lazor-rev7-sku4", + "google,lazor-rev8-sku4", "qcom,sc7180"; +}; + +/delete-node/&ap_ts; + +&ap_ts_pen_1v8 { + ap_ts: touchscreen@10 { + compatible = "elan,ekth3500"; + reg = <0x10>; + pinctrl-names = "default"; + pinctrl-0 = <&ts_int_l>, <&ts_reset_l>; + + interrupt-parent = <&tlmm>; + interrupts = <9 IRQ_TYPE_LEVEL_LOW>; + + vcc33-supply = <&pp3300_ts>; + + reset-gpios = <&tlmm 8 GPIO_ACTIVE_LOW>; + }; +}; + +&panel { + compatible = "auo,b116xa01"; +}; + +&sdhc_2 { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts similarity index 82% rename from arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts rename to arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts index e6ad6dae4e60..dc47842bc662 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts @@ -2,16 +2,18 @@ /* * Google Lazor Limozeen board device tree source * - * Copyright 2020 Google LLC. + * Copyright 2021 Google LLC. */ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-parade-ps8640.dtsi" #include "sc7180-trogdor-lazor.dtsi" #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google Lazor Limozeen"; + model = "Google Lazor Limozeen (rev9+)"; compatible = "google,lazor-sku4", "qcom,sc7180"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts index 30e3e769d2b4..b142006478ea 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r0.dts @@ -7,6 +7,8 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-lazor.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts index c2ef06367baf..59740799fa3a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts @@ -7,6 +7,8 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-lazor.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts index dcb41afdc82a..18ef9da71998 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts @@ -7,12 +7,17 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-lazor.dtsi" #include "sc7180-lite.dtsi" / { - model = "Google Lazor (rev3+) with KB Backlight"; - compatible = "google,lazor-sku2", "qcom,sc7180"; + model = "Google Lazor (rev3 - 8) with KB Backlight"; + compatible = "google,lazor-rev3-sku2", "google,lazor-rev4-sku2", + "google,lazor-rev5-sku2", "google,lazor-rev6-sku2", + "google,lazor-rev7-sku2", "google,lazor-rev8-sku2", + "qcom,sc7180"; }; &keyboard_backlight { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts index be44900602d7..c5c9feff41b8 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts @@ -7,12 +7,17 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-lazor.dtsi" #include "sc7180-trogdor-lte-sku.dtsi" / { - model = "Google Lazor (rev3+) with LTE"; - compatible = "google,lazor-sku0", "qcom,sc7180"; + model = "Google Lazor (rev3 - 8) with LTE"; + compatible = "google,lazor-rev3-sku0", "google,lazor-rev4-sku0", + "google,lazor-rev5-sku0", "google,lazor-rev6-sku0", + "google,lazor-rev7-sku0", "google,lazor-rev8-sku0", + "qcom,sc7180"; }; &ap_sar_sensor { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts index b474df47cd70..7adcedbf080d 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r3.dts @@ -7,10 +7,14 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-lazor.dtsi" #include "sc7180-lite.dtsi" / { - model = "Google Lazor (rev3+)"; - compatible = "google,lazor", "qcom,sc7180"; + model = "Google Lazor (rev3 - 8)"; + compatible = "google,lazor-rev3", "google,lazor-rev4", + "google,lazor-rev5", "google,lazor-rev6", "google,lazor-rev7", + "google,lazor-rev8", "qcom,sc7180"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts new file mode 100644 index 000000000000..7f5c015e1ecb --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor board device tree source + * + * Copyright 2020 Google LLC. + */ + +/dts-v1/; + +#include "sc7180.dtsi" +#include "sc7180-trogdor-parade-ps8640.dtsi" +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-lite.dtsi" + +/ { + model = "Google Lazor (rev9+) with KB Backlight"; + compatible = "google,lazor-sku2", "qcom,sc7180"; +}; + +&keyboard_backlight { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts new file mode 100644 index 000000000000..344b57c035d0 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180.dtsi" +#include "sc7180-trogdor-parade-ps8640.dtsi" +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-trogdor-lte-sku.dtsi" + +/ { + model = "Google Lazor (rev9+) with LTE"; + compatible = "google,lazor-sku0", "qcom,sc7180"; +}; + +&ap_sar_sensor { + status = "okay"; +}; + +&ap_sar_sensor_i2c { + status = "okay"; +}; + +&keyboard_backlight { + status = "okay"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts new file mode 100644 index 000000000000..83f6a4eb5ae5 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts @@ -0,0 +1,18 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Lazor board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180.dtsi" +#include "sc7180-trogdor-parade-ps8640.dtsi" +#include "sc7180-trogdor-lazor.dtsi" +#include "sc7180-lite.dtsi" + +/ { + model = "Google Lazor (rev9+)"; + compatible = "google,lazor", "qcom,sc7180"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi index 8b79fbb75756..69666f92176a 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi @@ -5,13 +5,10 @@ * Copyright 2020 Google LLC. */ -#include "sc7180.dtsi" - ap_ec_spi: &spi6 {}; ap_h1_spi: &spi0 {}; #include "sc7180-trogdor.dtsi" -#include "sc7180-trogdor-ti-sn65dsi86.dtsi" &ap_sar_sensor { semtech,cs0-ground; -- 2.33.1.1089.g2158813163f-goog ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3 3/4] arm64: dts: sc7180: Support Lazor/Limozeen rev9 2021-10-29 22:27 ` [PATCH v3 3/4] arm64: dts: sc7180: Support Lazor/Limozeen rev9 Philip Chen @ 2021-11-01 17:09 ` Doug Anderson 0 siblings, 0 replies; 12+ messages in thread From: Doug Anderson @ 2021-11-01 17:09 UTC (permalink / raw) To: Philip Chen Cc: LKML, Stephen Boyd, Andy Gross, Bjorn Andersson, Rob Herring, open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS, linux-arm-msm Hi, On Fri, Oct 29, 2021 at 3:27 PM Philip Chen <philipchen@chromium.org> wrote: > > Support Lazor/Limozeen rev9 board where Parade ps8640 is added as the > second source edp bridge. > > To support different edp bridge chips in different board revisions, > now we move the #incldue line of the edp bridge dts fragment (e.g. > sc7180-trogdor-ti-sn65dsi86.dtsi) from "sc7180-trogdor-lazor.dtsi" to > per-board-rev dts files. > > Since the edp bridge dts fragment overrides 'dsi0_out', which is > defined in "sc7180.dtsi", move the #incldue line of "sc7180.dtsi" from > "sc7180-trogdor-lazor.dtsi" to per-board-rev dts files too, before > the #include line of the edp bridge dts fragment. > > Signed-off-by: Philip Chen <philipchen@chromium.org> > Reviewed-by: Stephen Boyd <swboyd@chromium.org> > --- > Retroactively edit the v2 change log slightly > > (no changes since v2) > > Changes in v2: > - Explain why "sc7180.dtsi" is moved out of "sc7180-trogdor-lazor.dtsi" > in the commit message. > - In limozeen (nots) r5 dts, replace "google,rev5-sku5" with > "google,lazor-rev5-sku5" and sort it > - In limozeen (nots) r9 dts, drop the support for "sku5". > - In limozeen r4 dts, remove the redundant "google,lazor-rev6-sku4" and > add "google,lazor-rev7-sku4". > - Do not add panel compatible in -r9 dts files. > - Move the #include line of gpio.h from sc7180.dtsi to the bridge dts > fragments, and factor out this change to patch 1/3. > > arch/arm64/boot/dts/qcom/Makefile | 9 +++- > .../sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- > .../sc7180-trogdor-lazor-limozeen-nots-r5.dts | 31 +++++++++++++ > ...sc7180-trogdor-lazor-limozeen-nots-r9.dts} | 8 ++-- > .../qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 46 +++++++++++++++++++ > ...s => sc7180-trogdor-lazor-limozeen-r9.dts} | 6 ++- > .../boot/dts/qcom/sc7180-trogdor-lazor-r0.dts | 2 + > .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 2 + > .../dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 9 +++- > .../dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 9 +++- > .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 8 +++- > .../dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 22 +++++++++ > .../dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 30 ++++++++++++ > .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 18 ++++++++ > .../boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 -- > 15 files changed, 188 insertions(+), 17 deletions(-) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts > rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen-nots.dts => sc7180-trogdor-lazor-limozeen-nots-r9.dts} (60%) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts > rename arch/arm64/boot/dts/qcom/{sc7180-trogdor-lazor-limozeen.dts => sc7180-trogdor-lazor-limozeen-r9.dts} (82%) > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts > create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r9.dts Reviewed-by: Douglas Anderson <dianders@chromium.org> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v3 4/4] arm64: dts: sc7180: Support Homestar rev4 2021-10-29 22:27 [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts Philip Chen 2021-10-29 22:27 ` [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output Philip Chen 2021-10-29 22:27 ` [PATCH v3 3/4] arm64: dts: sc7180: Support Lazor/Limozeen rev9 Philip Chen @ 2021-10-29 22:27 ` Philip Chen 2021-11-20 23:55 ` [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts Bjorn Andersson 3 siblings, 0 replies; 12+ messages in thread From: Philip Chen @ 2021-10-29 22:27 UTC (permalink / raw) To: LKML Cc: swboyd, dianders, Philip Chen, Andy Gross, Bjorn Andersson, Rob Herring, devicetree, linux-arm-msm Support Homestar rev4 board where Parade ps8640 is added as the second source edp bridge. Support different edp bridge chips in different board revisions, now we move the #incldue line of the edp bridge dts fragment (e.g. sc7180-trogdor-ti-sn65dsi86.dtsi) from "sc7180-trogdor-homestar.dtsi" to per-board-rev dts files. Since the edp bridge dts fragment overrides 'dsi0_out', which is defined in "sc7180.dtsi", move the #incldue line of "sc7180.dtsi" from "sc7180-trogdor-homestar.dtsi" to per-board-rev dts files too, before the #include line of the edp bridge dts fragment. Signed-off-by: Philip Chen <philipchen@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> Reviewed-by: Stephen Boyd <swboyd@chromium.org> --- (no changes since v2) Changes in v2: - Explain why "sc7180.dtsi" is moved out of "sc7180-trogdor-homestar.dtsi" in the commit message. arch/arm64/boot/dts/qcom/Makefile | 1 + .../dts/qcom/sc7180-trogdor-homestar-r2.dts | 2 ++ .../dts/qcom/sc7180-trogdor-homestar-r3.dts | 6 ++++-- .../dts/qcom/sc7180-trogdor-homestar-r4.dts | 17 +++++++++++++++++ .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 3 --- 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index f637c4d3729f..ba99aba1d51a 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -57,6 +57,7 @@ dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3-lte.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r2.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r3.dtb +dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r4.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r0.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1.dtb dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-kb.dtb diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts index db6c2da67cea..70032983fb65 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r2.dts @@ -7,6 +7,8 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-homestar.dtsi" / { diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts index 3fd8aa5bb7a6..e92e2e9e48ed 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r3.dts @@ -7,9 +7,11 @@ /dts-v1/; +#include "sc7180.dtsi" +#include "sc7180-trogdor-ti-sn65dsi86.dtsi" #include "sc7180-trogdor-homestar.dtsi" / { - model = "Google Homestar (rev3+)"; - compatible = "google,homestar", "qcom,sc7180"; + model = "Google Homestar (rev3)"; + compatible = "google,homestar-rev3", "qcom,sc7180"; }; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts new file mode 100644 index 000000000000..fb27106bbb4a --- /dev/null +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar-r4.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Google Homestar board device tree source + * + * Copyright 2021 Google LLC. + */ + +/dts-v1/; + +#include "sc7180.dtsi" +#include "sc7180-trogdor-parade-ps8640.dtsi" +#include "sc7180-trogdor-homestar.dtsi" + +/ { + model = "Google Homestar (rev4+)"; + compatible = "google,homestar", "qcom,sc7180"; +}; diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi index 4ab890b2a1d4..f32369af1351 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-homestar.dtsi @@ -5,13 +5,10 @@ * Copyright 2021 Google LLC. */ -#include "sc7180.dtsi" - ap_ec_spi: &spi6 {}; ap_h1_spi: &spi0 {}; #include "sc7180-trogdor.dtsi" -#include "sc7180-trogdor-ti-sn65dsi86.dtsi" / { /* BOARD-SPECIFIC TOP LEVEL NODES */ -- 2.33.1.1089.g2158813163f-goog ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts 2021-10-29 22:27 [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts Philip Chen ` (2 preceding siblings ...) 2021-10-29 22:27 ` [PATCH v3 4/4] arm64: dts: sc7180: Support Homestar rev4 Philip Chen @ 2021-11-20 23:55 ` Bjorn Andersson 3 siblings, 0 replies; 12+ messages in thread From: Bjorn Andersson @ 2021-11-20 23:55 UTC (permalink / raw) To: LKML, Philip Chen Cc: linux-arm-msm, devicetree, Rob Herring, dianders, Andy Gross, swboyd On Fri, 29 Oct 2021 15:27:40 -0700, Philip Chen wrote: > The edp bridge dts fragment files use the macros defined in > 'dt-bindings/gpio/gpio.h'. > > To help us more flexibly order the #include lines of dts files in a > board-revision-specific dts file, let's include the gpio header in the > bridge dts fragment files themselves. > > [...] Applied, thanks! [1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts commit: 963070f762137cff817d33c102309ab0a345eb32 [2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output commit: 0417a86b200b4da1dff73e9f4bd7743346e5565b [3/4] arm64: dts: sc7180: Support Lazor/Limozeen rev9 commit: 7624b41b3379e664f074137001fc2e44bc1f5eaf [4/4] arm64: dts: sc7180: Support Homestar rev4 commit: 3922ccaed4ac9dab5087fc5f20d319cc55765afa Best regards, -- Bjorn Andersson <bjorn.andersson@linaro.org> ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-11-20 23:56 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-29 22:27 [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts Philip Chen 2021-10-29 22:27 ` [PATCH v3 2/4] arm64: dts: sc7180: Specify "data-lanes" for DSI host output Philip Chen 2021-10-29 23:16 ` Stephen Boyd 2021-10-29 23:24 ` Philip Chen 2021-10-29 23:35 ` Stephen Boyd [not found] ` <e91a6134-c2ce-6112-0818-ffd9483feeeb@quicinc.com> [not found] ` <55f951c1-1713-ad55-4ca3-b83d4f3763f6@quicinc.com> 2021-11-01 16:39 ` Philip Chen 2021-11-01 17:09 ` Doug Anderson 2021-11-01 18:09 ` Stephen Boyd 2021-10-29 22:27 ` [PATCH v3 3/4] arm64: dts: sc7180: Support Lazor/Limozeen rev9 Philip Chen 2021-11-01 17:09 ` Doug Anderson 2021-10-29 22:27 ` [PATCH v3 4/4] arm64: dts: sc7180: Support Homestar rev4 Philip Chen 2021-11-20 23:55 ` [PATCH v3 1/4] arm64: dts: sc7180: Include gpio.h in edp bridge dts Bjorn Andersson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).