diff options
| author | Tom Rini <trini@konsulko.com> | 2025-05-02 08:38:27 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-05-02 08:38:27 -0600 |
| commit | 4ca87fd18c1b718be423755939a6e5b1688869f5 (patch) | |
| tree | 4e233038a1826a39b6ef4c50262943881bdf5527 /drivers | |
| parent | ad60d979289650659cc6e158228d2049636215b0 (diff) | |
| parent | 2803a466a96153ab01c5789321e48397b6bae9c7 (diff) | |
Merge patch series "Qualcomm: cleanup OF_LIVE fixup and fix RB1/2"
Caleb Connolly <caleb.connolly@linaro.org> says:
Introduce a new event to signal that the live tree has been built,
allowing boards to perform fixups on the tree before devices are bound.
Crucially this allows for devices to be enabled or disabled, but also
allows for properties that are parsed during the bind stage to be
modified (such as dr_mode for dwc3).
With this in place, mach-snapdragon is switched over to use the event
and some hacky U-Boot specific DT overrides (which had to be undone
prior to booting an image) are removed in favour of fixing up the
livetree (which is not passed on to further boot stages).
Finally, some minor fixes are made for the QCM2290 RB1 board, the sdcard
is enabled and it now uses USB host mode in U-Boot like it's bigger
sibling the RB2.
Link: https://lore.kernel.org/r/20250411-livetree-fixup-v2-0-1236823377bb@linaro.org
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/clk/qcom/clock-qcm2290.c | 2 | ||||
| -rw-r--r-- | drivers/pinctrl/qcom/pinctrl-qcm2290.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/qcom/clock-qcm2290.c b/drivers/clk/qcom/clock-qcm2290.c index 1326b770c3e..fad104fb91a 100644 --- a/drivers/clk/qcom/clock-qcm2290.c +++ b/drivers/clk/qcom/clock-qcm2290.c @@ -88,7 +88,7 @@ static ulong qcm2290_set_rate(struct clk *clk, ulong rate) struct msm_clk_priv *priv = dev_get_priv(clk->dev); const struct freq_tbl *freq; - debug("%s: clk %s rate %lu\n", __func__, clk->dev->name, rate); + debug("%s: clk %s rate %lu\n", __func__, qcm2290_clks[clk->id].name, rate); switch (clk->id) { case GCC_QUPV3_WRAP0_S4_CLK: /*UART2*/ diff --git a/drivers/pinctrl/qcom/pinctrl-qcm2290.c b/drivers/pinctrl/qcom/pinctrl-qcm2290.c index 0c2222ce663..84f76b63b93 100644 --- a/drivers/pinctrl/qcom/pinctrl-qcm2290.c +++ b/drivers/pinctrl/qcom/pinctrl-qcm2290.c @@ -45,7 +45,7 @@ static int qcm2290_get_function_mux(__maybe_unused unsigned int pin, unsigned in struct msm_pinctrl_data qcm2290_data = { .pin_data = { - .pin_count = 133, + .pin_count = 134, .special_pins_start = 127, }, .functions_count = ARRAY_SIZE(msm_pinctrl_functions), |