Hi,
On Mon, Aug 24, 2020 at 5:32 PM Rob Clark <robdclark@xxxxxxxxx> wrote:
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts
> new file mode 100644
> index 000000000000..2b37113f1e3a
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts
> @@ -0,0 +1,18 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Lazor board device tree source
> + *
> + * Copyright 2020 Google LLC.
> + */
> +
> +#include "sc7180-trogdor-lazor-r1.dts"
> +#include "sc7180-trogdor-lte-sku.dtsi"
> +
> +/ {
> + model = "Google Lazor (rev1, rev3+) with LTE";
Since we're not handling the currently-being-debugged eMMC problem by
hacking the -rev2 dts, above model should probably just say:
"Google Lazor (rev1+) with LTE";
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
> new file mode 100644
> index 000000000000..c2a8f7d5b336
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r1.dts
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Lazor board device tree source
> + *
> + * Copyright 2020 Google LLC.
> + */
> +
> +/dts-v1/;
> +
> +#include "sc7180-trogdor-lazor.dtsi"
> +
> +/ {
> + model = "Google Lazor (rev1, rev3+)";
"Google Lazor (rev1+)";
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
> new file mode 100644
> index 000000000000..1b8bc5a1e625
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts
> +&sdhc_1 {
> + /*
> + * HACK: due to b/155826689 we are temporarily overriding the
> + * compatible string which will cause us to restore the DLL config
> + * at runtime resume.
> + */
> + compatible = "qcom,sdm845-sdhci", "qcom,sdhci-msm-v5";
> +
> + /* HACK: this emmc is also causing us s2r problems, so further hack. */
> + max-frequency = <100000000>;
> + /delete-property/mmc-ddr-1_8v;
> + /delete-property/mmc-hs400-1_8v;
> + /delete-property/mmc-hs400-enhanced-strobe;
> +};
I'd be inclined to leave the "sdhc_1" hacks out. Qualcomm's gotta fix
this without hacks. It means that trogdor boards won't work quite
work right until they do but it needs to be fixed in a saner way.
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> new file mode 100644
> index 000000000000..b04987ab6c22
> --- /dev/null
> +++ b/arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi
> @@ -0,0 +1,1364 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Google Trogdor device tree source (common between revisions)
> + *
> + * Copyright 2019 Google LLC.
> + */
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/input/input.h>
> +#include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> +
> +/* PMICs depend on spmi_bus label and so must come after SoC */
> +#include "pm6150.dtsi"
> +#include "pm6150l.dtsi"
> +
> +/*
> + * Reserved memory changes
> + *
> + * Delete all unused memory nodes and define the peripheral memory regions
> + * required by the board dts.
> + *
Get rid of extra blank line?
> + */
> +
> +/delete-node/ &hyp_mem;
> +/delete-node/ &xbl_mem;
> +/delete-node/ &aop_mem;
> +/delete-node/ &sec_apps_mem;
> +/delete-node/ &tz_mem;
> +
> +/* Increase the size from 2MB to 8MB */
> +&rmtfs_mem {
> + reg = <0x0 0x84400000 0x0 0x800000>;
> +};
> +
> +/ {
> +
Get rid of extra blank line?
> + /* BOARD-SPECIFIC TOP LEVEL NODES */
> +
> + backlight: backlight {
> + compatible = "pwm-backlight";
> +
> + /* The panels don't seem to like anything below ~ 5% */
> + brightness-levels = <
> + 196 256 324 400 484 576 676 784 900 1024 1156 1296
> + 1444 1600 1764 1936 2116 2304 2500 2704 2916 3136
> + 3364 3600 3844 4096
> + >;
> + num-interpolated-steps = <64>;
> + default-brightness-level = <951>;
I suspect that this isn't quite right because locally we have the
series from <https://lore.kernel.org/r/20200721042522.2403410-1-amstan@xxxxxxxxxxxx>.
>From looking at <https://crrev.com/c/2291209> I think you just gotta
drop these properties.
> +&wifi {
> + status = "okay";
> + vdd-0.8-cx-mx-supply = <&vdd_cx_wlan>;
> + vdd-1.8-xo-supply = <&pp1800_l1c>;
> + vdd-1.3-rfa-supply = <&pp1300_l2c>;
> +
> + /*
> + * TODO: Put ch1 supply in its rightful place, rather than in ch0's
> + * spot. Channel 0 is held open by bluetooth for now.
> + */
> + vdd-3.3-ch0-supply = <&pp3300_l11c>;
I'd be tempted to just do this correctly for upstream. Seems like the
ath10k patch is ready to go anyway?
