| Message ID | 20210128175225.3102958-6-dmitry.baryshkov@linaro.org (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Lorenzo Pieralisi |
| Headers | show |
| Series | Add support for Qualcomm QCA639x chips family | expand |
On 28/01/2021 22:15, Rob Herring wrote: > On Thu, Jan 28, 2021 at 11:52 AM Dmitry Baryshkov > <dmitry.baryshkov@linaro.org> wrote: >> >> From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> >> >> Add Bluetooth support on RB5 using the onboard QCA6391 WLAN+BT chipset. >> >> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> >> [DB: added qca6391 power domain, removed s2f regulator] >> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> >> --- >> arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 29 ++++++++++++++++++++++++ >> 1 file changed, 29 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts >> index b39a9729395f..c65c13994a86 100644 >> --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts >> +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts >> @@ -19,6 +19,7 @@ / { >> compatible = "qcom,qrb5165-rb5", "qcom,sm8250"; >> >> aliases { >> + hsuart0 = &uart6; > > Serial devices should be 'serialN'. Don't add custom aliases. Ack > >> serial0 = &uart12; >> sdhc2 = &sdhc_2; > > BTW, this should be dropped too. Ack > >> }; >> @@ -689,6 +690,26 @@ &pm8150_rtc { >> status = "okay"; >> }; >> >> +&qup_uart6_default { >> + ctsrx { >> + pins = "gpio16", "gpio19"; >> + drive-strength = <2>; >> + bias-disable; >> + }; >> + >> + rts { >> + pins = "gpio17"; >> + drive-strength = <2>; >> + bias-disable; >> + }; >> + >> + tx { >> + pins = "gpio18"; >> + drive-strength = <2>; >> + bias-pull-up; >> + }; >> +}; >> + >> &qupv3_id_0 { >> status = "okay"; >> }; >> @@ -1194,6 +1215,14 @@ wlan-en { >> }; >> }; >> >> +&uart6 { >> + status = "okay"; >> + bluetooth { >> + compatible = "qcom,qca6390-bt"; >> + power-domains = <&qca6391>; >> + }; >> +}; >> + >> &uart12 { >> status = "okay"; >> }; >> -- >> 2.29.2 >>
On Thu, Jan 28, 2021 at 01:15:22PM -0600, Rob Herring wrote: > On Thu, Jan 28, 2021 at 11:52 AM Dmitry Baryshkov > <dmitry.baryshkov@linaro.org> wrote: > > > > From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > > > Add Bluetooth support on RB5 using the onboard QCA6391 WLAN+BT chipset. > > > > Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > > [DB: added qca6391 power domain, removed s2f regulator] > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 29 ++++++++++++++++++++++++ > > 1 file changed, 29 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts > > index b39a9729395f..c65c13994a86 100644 > > --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts > > +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts > > @@ -19,6 +19,7 @@ / { > > compatible = "qcom,qrb5165-rb5", "qcom,sm8250"; > > > > aliases { > > + hsuart0 = &uart6; > > Serial devices should be 'serialN'. Don't add custom aliases. > Sorry, this is needed by the serial driver: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/drivers/tty/serial/qcom_geni_serial.c#n1364 Thanks, Mani > > serial0 = &uart12; > > sdhc2 = &sdhc_2; > > BTW, this should be dropped too. > > > }; > > @@ -689,6 +690,26 @@ &pm8150_rtc { > > status = "okay"; > > }; > > > > +&qup_uart6_default { > > + ctsrx { > > + pins = "gpio16", "gpio19"; > > + drive-strength = <2>; > > + bias-disable; > > + }; > > + > > + rts { > > + pins = "gpio17"; > > + drive-strength = <2>; > > + bias-disable; > > + }; > > + > > + tx { > > + pins = "gpio18"; > > + drive-strength = <2>; > > + bias-pull-up; > > + }; > > +}; > > + > > &qupv3_id_0 { > > status = "okay"; > > }; > > @@ -1194,6 +1215,14 @@ wlan-en { > > }; > > }; > > > > +&uart6 { > > + status = "okay"; > > + bluetooth { > > + compatible = "qcom,qca6390-bt"; > > + power-domains = <&qca6391>; > > + }; > > +}; > > + > > &uart12 { > > status = "okay"; > > }; > > -- > > 2.29.2 > >
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index b39a9729395f..c65c13994a86 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -19,6 +19,7 @@ / { compatible = "qcom,qrb5165-rb5", "qcom,sm8250"; aliases { + hsuart0 = &uart6; serial0 = &uart12; sdhc2 = &sdhc_2; }; @@ -689,6 +690,26 @@ &pm8150_rtc { status = "okay"; }; +&qup_uart6_default { + ctsrx { + pins = "gpio16", "gpio19"; + drive-strength = <2>; + bias-disable; + }; + + rts { + pins = "gpio17"; + drive-strength = <2>; + bias-disable; + }; + + tx { + pins = "gpio18"; + drive-strength = <2>; + bias-pull-up; + }; +}; + &qupv3_id_0 { status = "okay"; }; @@ -1194,6 +1215,14 @@ wlan-en { }; }; +&uart6 { + status = "okay"; + bluetooth { + compatible = "qcom,qca6390-bt"; + power-domains = <&qca6391>; + }; +}; + &uart12 { status = "okay"; };