| Message ID | 20241203-x1e80100-disable-smb2360-v1-1-80942b7f73da@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: qcom: x1e80100-pmics: Enable all SMB2360 separately | expand |
On 12/4/2024 12:27 AM, Stephan Gerhold wrote: > At the moment, x1e80100-pmics.dtsi enables two of the SMB2360 PMICs by > default and only leaves the third disabled. This was introduced in commit One correction: it’s not only the third PMIC that is disabled. Both the third (smb2360_2) and fourth (smb2360_3) are disabled. This information is verified from link[1]: [1]https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/tree/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi > a237b8da413c ("arm64: dts: qcom: x1e80100: Disable SMB2360_2 by default"). > This is inconsistent and confusing. Some laptops will even need SMB2360_1 > disabled by default if they just have a single USB-C port. > > Make this consistent by keeping all SMB2360 disabled in x1e80100-pmics.dtsi > and enable them separately for all boards where needed. That way it is > always clear which ones are available and avoids accidentally trying to > read/write from missing chips when some of the PMICs are not present. > > Signed-off-by: Stephan Gerhold <stephan.gerhold@linaro.org> > --- > arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 8 ++++++++ > arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 8 ++++++++ > arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 8 ++++++++ > arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 8 ++++++++ > arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 8 ++++++++ > arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 8 ++++++++ > arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 8 ++++++++ > arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 4 ++++ > arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 8 ++++++++ > 9 files changed, 68 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts > index c9db6298d528ed505bae08e91bf4da02faef7d76..c3ec0bb2c42dfed9f5e9f56f18874b4ae6c0632c 100644 > --- a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts > +++ b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts > @@ -1062,11 +1062,19 @@ &remoteproc_cdsp { > status = "okay"; > }; > > +&smb2360_0 { > + status = "okay"; > +}; > + > &smb2360_0_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l2b_3p0>; > }; > > +&smb2360_1 { > + status = "okay"; > +}; > + > &smb2360_1_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l14b_3p0>; > diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts > index 975550139e1024420ed335a2a46e4d54df7ee423..4097d2677285757ce67eef76d8d17669c7130001 100644 > --- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts > +++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts > @@ -635,11 +635,19 @@ &remoteproc_cdsp { > status = "okay"; > }; > > +&smb2360_0 { > + status = "okay"; > +}; > + > &smb2360_0_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l2b_3p0>; > }; > > +&smb2360_1 { > + status = "okay"; > +}; > + > &smb2360_1_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l14b_3p0>; > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts > index f25991b887de3fca0092c5f81c881c5d8bd71aac..10f140ed08f47f2cd96e953d4ad3c75f3aad002a 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts > @@ -501,11 +501,19 @@ &remoteproc_cdsp { > status = "okay"; > }; > > +&smb2360_0 { > + status = "okay"; > +}; > + > &smb2360_0_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l2b_3p0>; > }; > > +&smb2360_1 { > + status = "okay"; > +}; > + > &smb2360_1_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l14b_3p0>; > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts > index 39f9d9cdc10d8e79824b72288e2529536144fa9e..81c519e690f325f2d4d36c4a99061649da65ec87 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts > @@ -932,11 +932,19 @@ &remoteproc_cdsp { > status = "okay"; > }; > > +&smb2360_0 { > + status = "okay"; > +}; > + > &smb2360_0_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l2b_3p0>; > }; > > +&smb2360_1 { > + status = "okay"; > +}; > + > &smb2360_1_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l14b_3p0>; > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts > index b112092fbb9fd955adca1ae8a76294c776fa2d1e..288e818961670be0d25b696730e7186a8d61b56e 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts > @@ -905,11 +905,19 @@ &remoteproc_cdsp { > status = "okay"; > }; > > +&smb2360_0 { > + status = "okay"; > +}; > + > &smb2360_0_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l2b_3p0>; > }; > > +&smb2360_1 { > + status = "okay"; > +}; > + > &smb2360_1_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l14b_3p0>; > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts > index ca5a808f2c7df66a861a933df407fd4bdaea3fe1..3d7e0230dc0381a2c2a3b0c5b766f5b854777937 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts > @@ -717,11 +717,19 @@ &remoteproc_cdsp { > status = "okay"; > }; > > +&smb2360_0 { > + status = "okay"; > +}; > + > &smb2360_0_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l2b_3p0>; > }; > > +&smb2360_1 { > + status = "okay"; > +}; > + > &smb2360_1_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l14b_3p0>; > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi > index 6835fdeef3aec10206e8b2839d23e4f3494afe1e..6941945b2f9a7e7b11598705fa22d3a6f2cc01c7 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi > +++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi > @@ -718,11 +718,19 @@ &remoteproc_cdsp { > status = "okay"; > }; > > +&smb2360_0 { > + status = "okay"; > +}; > + > &smb2360_0_eusb2_repeater { > vdd18-supply = <&vreg_l3d>; > vdd3-supply = <&vreg_l2b>; > }; > > +&smb2360_1 { > + status = "okay"; > +}; > + > &smb2360_1_eusb2_repeater { > vdd18-supply = <&vreg_l3d>; > vdd3-supply = <&vreg_l14b>; > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi > index 5b54ee79f048e3208cbcd6f91e0cec073420fe63..d7a2a2b8fc6c30bdb10df81eac7d92306998838f 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi > +++ b/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi > @@ -491,6 +491,8 @@ smb2360_0: pmic@7 { > #address-cells = <1>; > #size-cells = <0>; > > + status = "disabled"; > + > smb2360_0_eusb2_repeater: phy@fd00 { > compatible = "qcom,smb2360-eusb2-repeater"; > reg = <0xfd00>; > @@ -504,6 +506,8 @@ smb2360_1: pmic@a { > #address-cells = <1>; > #size-cells = <0>; > > + status = "disabled"; > + > smb2360_1_eusb2_repeater: phy@fd00 { > compatible = "qcom,smb2360-eusb2-repeater"; > reg = <0xfd00>; > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts > index 5ef030c60abe2998d093ee60a6754a90cd5aaf72..ffd28fd8059895ec345f4ee8fe6a2c37e7989747 100644 > --- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts > +++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts > @@ -731,11 +731,19 @@ &remoteproc_cdsp { > status = "okay"; > }; > > +&smb2360_0 { > + status = "okay"; > +}; > + > &smb2360_0_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l2b_3p0>; > }; > > +&smb2360_1 { > + status = "okay"; > +}; > + > &smb2360_1_eusb2_repeater { > vdd18-supply = <&vreg_l3d_1p8>; > vdd3-supply = <&vreg_l14b_3p0>; > > --- > base-commit: 12b080aaf4275c579c91106ed926044b4d5df0af > change-id: 20241129-x1e80100-disable-smb2360-20cec1656411 > > Best regards,
diff --git a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts index c9db6298d528ed505bae08e91bf4da02faef7d76..c3ec0bb2c42dfed9f5e9f56f18874b4ae6c0632c 100644 --- a/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts +++ b/arch/arm64/boot/dts/qcom/x1e001de-devkit.dts @@ -1062,11 +1062,19 @@ &remoteproc_cdsp { status = "okay"; }; +&smb2360_0 { + status = "okay"; +}; + &smb2360_0_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l2b_3p0>; }; +&smb2360_1 { + status = "okay"; +}; + &smb2360_1_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l14b_3p0>; diff --git a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts index 975550139e1024420ed335a2a46e4d54df7ee423..4097d2677285757ce67eef76d8d17669c7130001 100644 --- a/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts +++ b/arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts @@ -635,11 +635,19 @@ &remoteproc_cdsp { status = "okay"; }; +&smb2360_0 { + status = "okay"; +}; + &smb2360_0_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l2b_3p0>; }; +&smb2360_1 { + status = "okay"; +}; + &smb2360_1_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l14b_3p0>; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts index f25991b887de3fca0092c5f81c881c5d8bd71aac..10f140ed08f47f2cd96e953d4ad3c75f3aad002a 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts @@ -501,11 +501,19 @@ &remoteproc_cdsp { status = "okay"; }; +&smb2360_0 { + status = "okay"; +}; + &smb2360_0_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l2b_3p0>; }; +&smb2360_1 { + status = "okay"; +}; + &smb2360_1_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l14b_3p0>; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts index 39f9d9cdc10d8e79824b72288e2529536144fa9e..81c519e690f325f2d4d36c4a99061649da65ec87 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-crd.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-crd.dts @@ -932,11 +932,19 @@ &remoteproc_cdsp { status = "okay"; }; +&smb2360_0 { + status = "okay"; +}; + &smb2360_0_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l2b_3p0>; }; +&smb2360_1 { + status = "okay"; +}; + &smb2360_1_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l14b_3p0>; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts index b112092fbb9fd955adca1ae8a76294c776fa2d1e..288e818961670be0d25b696730e7186a8d61b56e 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts @@ -905,11 +905,19 @@ &remoteproc_cdsp { status = "okay"; }; +&smb2360_0 { + status = "okay"; +}; + &smb2360_0_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l2b_3p0>; }; +&smb2360_1 { + status = "okay"; +}; + &smb2360_1_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l14b_3p0>; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts index ca5a808f2c7df66a861a933df407fd4bdaea3fe1..3d7e0230dc0381a2c2a3b0c5b766f5b854777937 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts @@ -717,11 +717,19 @@ &remoteproc_cdsp { status = "okay"; }; +&smb2360_0 { + status = "okay"; +}; + &smb2360_0_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l2b_3p0>; }; +&smb2360_1 { + status = "okay"; +}; + &smb2360_1_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l14b_3p0>; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi index 6835fdeef3aec10206e8b2839d23e4f3494afe1e..6941945b2f9a7e7b11598705fa22d3a6f2cc01c7 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi @@ -718,11 +718,19 @@ &remoteproc_cdsp { status = "okay"; }; +&smb2360_0 { + status = "okay"; +}; + &smb2360_0_eusb2_repeater { vdd18-supply = <&vreg_l3d>; vdd3-supply = <&vreg_l2b>; }; +&smb2360_1 { + status = "okay"; +}; + &smb2360_1_eusb2_repeater { vdd18-supply = <&vreg_l3d>; vdd3-supply = <&vreg_l14b>; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi b/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi index 5b54ee79f048e3208cbcd6f91e0cec073420fe63..d7a2a2b8fc6c30bdb10df81eac7d92306998838f 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi @@ -491,6 +491,8 @@ smb2360_0: pmic@7 { #address-cells = <1>; #size-cells = <0>; + status = "disabled"; + smb2360_0_eusb2_repeater: phy@fd00 { compatible = "qcom,smb2360-eusb2-repeater"; reg = <0xfd00>; @@ -504,6 +506,8 @@ smb2360_1: pmic@a { #address-cells = <1>; #size-cells = <0>; + status = "disabled"; + smb2360_1_eusb2_repeater: phy@fd00 { compatible = "qcom,smb2360-eusb2-repeater"; reg = <0xfd00>; diff --git a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts index 5ef030c60abe2998d093ee60a6754a90cd5aaf72..ffd28fd8059895ec345f4ee8fe6a2c37e7989747 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts +++ b/arch/arm64/boot/dts/qcom/x1e80100-qcp.dts @@ -731,11 +731,19 @@ &remoteproc_cdsp { status = "okay"; }; +&smb2360_0 { + status = "okay"; +}; + &smb2360_0_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l2b_3p0>; }; +&smb2360_1 { + status = "okay"; +}; + &smb2360_1_eusb2_repeater { vdd18-supply = <&vreg_l3d_1p8>; vdd3-supply = <&vreg_l14b_3p0>;
At the moment, x1e80100-pmics.dtsi enables two of the SMB2360 PMICs by default and only leaves the third disabled. This was introduced in commit a237b8da413c ("arm64: dts: qcom: x1e80100: Disable SMB2360_2 by default"). This is inconsistent and confusing. Some laptops will even need SMB2360_1 disabled by default if they just have a single USB-C port. Make this consistent by keeping all SMB2360 disabled in x1e80100-pmics.dtsi and enable them separately for all boards where needed. That way it is always clear which ones are available and avoids accidentally trying to read/write from missing chips when some of the PMICs are not present. Signed-off-by: Stephan Gerhold <stephan.gerhold@linaro.org> --- arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 8 ++++++++ arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 8 ++++++++ arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 4 ++++ arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 8 ++++++++ 9 files changed, 68 insertions(+) --- base-commit: 12b080aaf4275c579c91106ed926044b4d5df0af change-id: 20241129-x1e80100-disable-smb2360-20cec1656411 Best regards,