lkml.org 
[lkml]   [2023]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v7 4/4] arm64: dts: qcom: sc8280xp-x13s: Add bluetooth
    On Tue, Mar 21, 2023 at 08:14:42PM -0500, Steev Klimaszewski wrote:
    > The Lenovo Thinkpad X13s has a WCN6855 Bluetooth controller on uart2,
    > add this.
    >
    > Signed-off-by: Steev Klimaszewski <steev@kali.org>

    Reviewed-by: Bjorn Andersson <andersson@kernel.org>

    Regards,
    Bjorn

    > ---
    > Changes since v6:
    > * Remove allowed-modes as they aren't needed
    > * Remove regulator-allow-set-load
    > * Set regulator-always-on because the wifi chip also uses the regulator
    > * cts pin uses bias-bus-hold
    > * Alphabetize uart2 pins
    >
    > Changes since v5:
    > * Update patch subject
    > * Specify initial mode (via guess) for vreg_s1c
    > * Drop uart17 definition
    > * Rename bt_en to bt_default because configuring more than one pin
    > * Correct (maybe) bias configurations
    > * Correct cts gpio
    > * Split rts-tx into two nodes
    > * Drop incorrect link in the commit message
    >
    > Changes since v4:
    > * Address Konrad's review comments.
    >
    > Changes since v3:
    > * Add vreg_s1c
    > * Add regulators and not dead code
    > * Fix commit message changelog
    >
    > Changes since v2:
    > * Remove dead code and add TODO comment
    > * Make dtbs_check happy with the pin definitions
    > .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 78 +++++++++++++++++++
    > 1 file changed, 78 insertions(+)
    >
    > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
    > index 92d365519546..05e66505e5cc 100644
    > --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
    > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
    > @@ -24,6 +24,7 @@ / {
    > aliases {
    > i2c4 = &i2c4;
    > i2c21 = &i2c21;
    > + serial1 = &uart2;
    > };
    >
    > wcd938x: audio-codec {
    > @@ -431,6 +432,14 @@ regulators-1 {
    > qcom,pmic-id = "c";
    > vdd-bob-supply = <&vreg_vph_pwr>;
    >
    > + vreg_s1c: smps1 {
    > + regulator-name = "vreg_s1c";
    > + regulator-min-microvolt = <1880000>;
    > + regulator-max-microvolt = <1900000>;
    > + regulator-initial-mode = <RPMH_REGULATOR_MODE_HPM>;
    > + regulator-always-on;
    > + };
    > +
    > vreg_l1c: ldo1 {
    > regulator-name = "vreg_l1c";
    > regulator-min-microvolt = <1800000>;
    > @@ -918,6 +927,32 @@ &qup0 {
    > status = "okay";
    > };
    >
    > +&uart2 {
    > + pinctrl-0 = <&uart2_default>;
    > + pinctrl-names = "default";
    > +
    > + status = "okay";
    > +
    > + bluetooth {
    > + compatible = "qcom,wcn6855-bt";
    > +
    > + vddio-supply = <&vreg_s10b>;
    > + vddbtcxmx-supply = <&vreg_s12b>;
    > + vddrfacmn-supply = <&vreg_s12b>;
    > + vddrfa0p8-supply = <&vreg_s12b>;
    > + vddrfa1p2-supply = <&vreg_s11b>;
    > + vddrfa1p7-supply = <&vreg_s1c>;
    > +
    > + max-speed = <3200000>;
    > +
    > + enable-gpios = <&tlmm 133 GPIO_ACTIVE_HIGH>;
    > + swctrl-gpios = <&tlmm 132 GPIO_ACTIVE_HIGH>;
    > +
    > + pinctrl-0 = <&bt_default>;
    > + pinctrl-names = "default";
    > + };
    > +};
    > +
    > &qup1 {
    > status = "okay";
    > };
    > @@ -1192,6 +1227,21 @@ hastings_reg_en: hastings-reg-en-state {
    > &tlmm {
    > gpio-reserved-ranges = <70 2>, <74 6>, <83 4>, <125 2>, <128 2>, <154 7>;
    >
    > + bt_default: bt-default-state {
    > + hstp-sw-ctrl-pins {
    > + pins = "gpio132";
    > + function = "gpio";
    > + bias-pull-down;
    > + };
    > +
    > + hstp-bt-en-pins {
    > + pins = "gpio133";
    > + function = "gpio";
    > + drive-strength = <16>;
    > + bias-disable;
    > + };
    > + };
    > +
    > edp_reg_en: edp-reg-en-state {
    > pins = "gpio25";
    > function = "gpio";
    > @@ -1213,6 +1263,34 @@ i2c4_default: i2c4-default-state {
    > bias-disable;
    > };
    >
    > + uart2_default: uart2-default-state {
    > + cts-pins {
    > + pins = "gpio121";
    > + function = "qup2";
    > + bias-bus-hold;
    > + };
    > +
    > + rts-pins {
    > + pins = "gpio122";
    > + function = "qup2";
    > + drive-strength = <2>;
    > + bias-disable;
    > + };
    > +
    > + rx-pins {
    > + pins = "gpio124";
    > + function = "qup2";
    > + bias-pull-up;
    > + };
    > +
    > + tx-pins {
    > + pins = "gpio123";
    > + function = "qup2";
    > + drive-strength = <2>;
    > + bias-disable;
    > + };
    > + };
    > +
    > i2c21_default: i2c21-default-state {
    > pins = "gpio81", "gpio82";
    > function = "qup21";
    > --
    > 2.39.2
    >

    \
     
     \ /
      Last update: 2023-03-27 01:11    [W:7.626 / U:0.244 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site