2019-11-19 01:22:41

by Bjorn Andersson

Subject: [PATCH v2] arm64: dts: qcom: msm8998-mtp: Add alias for blsp1_uart3

The msm_serial driver has a predefined set of uart ports defined, which
is allocated either by reading aliases or if no match is found a simple
counter, starting at index 0. But there's no logic in place to prevent
these two allocation mechanism from colliding. As a result either none
or all of the active msm_serial instances must be listed as aliases.

Define blsp1_uart3 as "serial1" to mitigate this problem.

Fixes: 4cffb9f2c700 ("arm64: dts: qcom: msm8998-mtp: Enable bluetooth")
Signed-off-by: Bjorn Andersson <[email protected]>
---

Changes since v1:
- Rewrote commit message

arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 1 +
1 file changed, 1 insertion(+)

diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
index 5f101a20a20a..e08fcb426bbf 100644
--- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
@@ -9,6 +9,7 @@
/ {
aliases {
serial0 = &blsp2_uart1;
+ serial1 = &blsp1_uart3;
};

chosen {
--
2.23.0

2019-11-19 15:40:39

by Jeffrey Hugo

Subject: Re: [PATCH v2] arm64: dts: qcom: msm8998-mtp: Add alias for blsp1_uart3

On Mon, Nov 18, 2019 at 6:18 PM Bjorn Andersson
<[email protected]> wrote:
>
> The msm_serial driver has a predefined set of uart ports defined, which
> is allocated either by reading aliases or if no match is found a simple
> counter, starting at index 0. But there's no logic in place to prevent
> these two allocation mechanism from colliding. As a result either none
> or all of the active msm_serial instances must be listed as aliases.
>
> Define blsp1_uart3 as "serial1" to mitigate this problem.
>
> Fixes: 4cffb9f2c700 ("arm64: dts: qcom: msm8998-mtp: Enable bluetooth")
> Signed-off-by: Bjorn Andersson <[email protected]>

Seems good to me.

Reviewed-by: Jeffrey Hugo <[email protected]>

> ---
>
> Changes since v1:
> - Rewrote commit message
>
> arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
> index 5f101a20a20a..e08fcb426bbf 100644
> --- a/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi
> @@ -9,6 +9,7 @@
> / {
> aliases {
> serial0 = &blsp2_uart1;
> + serial1 = &blsp1_uart3;
> };
>
> chosen {
> --
> 2.23.0
>