[PATCH 1/2] arm64: dts: qcom: sc8280xp: Add camera MCLK pinctrl

[PATCH 1/2] arm64: dts: qcom: sc8280xp: Add camera MCLK pinctrl

[Pengyu Luo]

Define pinctrl definitions to enable camera master clocks on sc8280xp.

Suggested-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
---
 arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 56 ++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
index a2bd6b10e475..0dbcd3069a3b 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
@@ -5484,6 +5484,62 @@ tlmm: pinctrl@f100000 {
 			gpio-ranges = <&tlmm 0 0 230>;
 			wakeup-parent = <&pdc>;
 
+			cam_mclk0_default: cam-mclk0-default-state {
+				pins = "gpio119";
+				function = "cam_mclk";
+				drive-strength = <6>;
+				bias-disable;
+			};
+
+			cam_mclk1_default: cam-mclk1-default-state {
+				pins = "gpio120";
+				function = "cam_mclk";
+				drive-strength = <6>;
+				bias-disable;
+			};
+
+			cam_mclk2_default: cam-mclk2-default-state {
+				pins = "gpio16";
+				function = "cam_mclk";
+				drive-strength = <6>;
+				bias-disable;
+			};
+
+			cam_mclk3_default: cam-mclk3-default-state {
+				pins = "gpio17";
+				function = "cam_mclk";
+				drive-strength = <6>;
+				bias-disable;
+			};
+
+			cam_mclk4_default: cam-mclk4-default-state {
+				pins = "gpio6";
+				function = "cam_mclk";
+				drive-strength = <6>;
+				bias-disable;
+			};
+
+			cam_mclk5_default: cam-mclk5-default-state {
+				pins = "gpio7";
+				function = "cam_mclk";
+				drive-strength = <6>;
+				bias-disable;
+			};
+
+			cam_mclk6_default: cam-mclk6-default-state {
+				pins = "gpio33";
+				function = "cam_mclk";
+				drive-strength = <6>;
+				bias-disable;
+			};
+
+			cam_mclk7_default: cam-mclk7-default-state {
+				pins = "gpio34";
+				function = "cam_mclk";
+				drive-strength = <6>;
+				bias-disable;
+			};
+
 			cci0_default: cci0-default-state {
 				cci0_i2c0_default: cci0-i2c0-default-pins {
 					/* cci_i2c_sda0, cci_i2c_scl0 */
-- 
2.54.0

[PATCH 2/2] arm64: dts: qcom: sc8280xp-x13s: Use predefined MCLK pinctrl

[Pengyu Luo]

Now that the predefined MCLK pinctrl configuration is available in the
sc8280xp SoC DTSI, switch the ThinkPad X13s to use it. Drop the local,
duplicate MCLK pin definition from the camera pinctrl node.

Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
---
 .../boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts    | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

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 abd9c5a67b9f..5d652be69e44 100644
--- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
+++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
@@ -674,8 +674,9 @@ camera@10 {
 		reg = <0x10>;
 
 		reset-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
+
+		pinctrl-0 = <&cam_rgb_default>, <&cam_mclk3_default>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&cam_rgb_default>;
 
 		leds = <&privacy_led>;
 		led-names = "privacy";
@@ -1552,13 +1553,6 @@ cam_indicator_en: cam-indicator-en-state {
 	};
 
 	cam_rgb_default: cam-rgb-default-state {
-		mclk-pins {
-			pins = "gpio17";
-			function = "cam_mclk";
-			drive-strength = <16>;
-			bias-disable;
-		};
-
 		sc-rgb-xshut-n-pins {
 			pins = "gpio15";
 			function = "gpio";
-- 
2.54.0

Re: [PATCH 1/2] arm64: dts: qcom: sc8280xp: Add camera MCLK pinctrl

[Konrad Dybcio]

On 6/7/26 6:04 PM, Pengyu Luo wrote:
> Define pinctrl definitions to enable camera master clocks on sc8280xp.
> 
> Suggested-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
> Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
> ---
>  arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 56 ++++++++++++++++++++++++++
>  1 file changed, 56 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> index a2bd6b10e475..0dbcd3069a3b 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> @@ -5484,6 +5484,62 @@ tlmm: pinctrl@f100000 {
>  			gpio-ranges = <&tlmm 0 0 230>;
>  			wakeup-parent = <&pdc>;
>  
> +			cam_mclk0_default: cam-mclk0-default-state {
> +				pins = "gpio119";
> +				function = "cam_mclk";
> +				drive-strength = <6>;

Other platforms set this to 2 by default.

What's the value set on Windows when the camera is in use?

Konrad

Re: [PATCH 2/2] arm64: dts: qcom: sc8280xp-x13s: Use predefined MCLK pinctrl

[Konrad Dybcio]

On 6/7/26 6:04 PM, Pengyu Luo wrote:
> Now that the predefined MCLK pinctrl configuration is available in the
> sc8280xp SoC DTSI, switch the ThinkPad X13s to use it. Drop the local,
> duplicate MCLK pin definition from the camera pinctrl node.
> 
> Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
> ---
>  .../boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts    | 10 ++--------
>  1 file changed, 2 insertions(+), 8 deletions(-)
> 
> 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 abd9c5a67b9f..5d652be69e44 100644
> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts
> @@ -674,8 +674,9 @@ camera@10 {
>  		reg = <0x10>;
>  
>  		reset-gpios = <&tlmm 15 GPIO_ACTIVE_LOW>;
> +
> +		pinctrl-0 = <&cam_rgb_default>, <&cam_mclk3_default>;
>  		pinctrl-names = "default";
> -		pinctrl-0 = <&cam_rgb_default>;
>  
>  		leds = <&privacy_led>;
>  		led-names = "privacy";
> @@ -1552,13 +1553,6 @@ cam_indicator_en: cam-indicator-en-state {
>  	};
>  
>  	cam_rgb_default: cam-rgb-default-state {
> -		mclk-pins {
> -			pins = "gpio17";
> -			function = "cam_mclk";
> -			drive-strength = <16>;

This changes the value of drive-strength (which is probably way too
high, but it would be good to know what Lenovo set originally..)

Konrad

Re: [PATCH 1/2] arm64: dts: qcom: sc8280xp: Add camera MCLK pinctrl

[Pengyu Luo]

On Tue, Jun 9, 2026 at 8:17 PM Konrad Dybcio
<konrad.dybcio@oss.qualcomm.com> wrote:
>
> On 6/7/26 6:04 PM, Pengyu Luo wrote:
> > Define pinctrl definitions to enable camera master clocks on sc8280xp.
> >
> > Suggested-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
> > Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
> > ---
> >  arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 56 ++++++++++++++++++++++++++
> >  1 file changed, 56 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> > index a2bd6b10e475..0dbcd3069a3b 100644
> > --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
> > @@ -5484,6 +5484,62 @@ tlmm: pinctrl@f100000 {
> >                       gpio-ranges = <&tlmm 0 0 230>;
> >                       wakeup-parent = <&pdc>;
> >
> > +                     cam_mclk0_default: cam-mclk0-default-state {
> > +                             pins = "gpio119";
> > +                             function = "cam_mclk";
> > +                             drive-strength = <6>;
>
> Other platforms set this to 2 by default.
>
> What's the value set on Windows when the camera is in use?
>

It is 6mA.

Let us get ctl_reg first on Windows

lkd> !dd f111000 L8
# f111000 00000284 00000002 000000e2 00000000
# f111010 00000001 00000801 00000000 00000000

ctl_reg => 0x284

in msm_gpio_dbg_show_one()
...
drive = (ctl_reg >> g->drv_bit) & 7; // (0x284 >> 6) & 7 == 2
...
seq_printf(s, " %dmA", msm_regval_to_drive(drive)); // (drive + 1) * 2 == 6;
...

x13s should be the same as gaokun3 in this part.

--
Best wishes,
Pengyu

Re: [PATCH 1/2] arm64: dts: qcom: sc8280xp: Add camera MCLK pinctrl

[Konrad Dybcio]

On 6/11/26 7:29 AM, Pengyu Luo wrote:
> On Tue, Jun 9, 2026 at 8:17 PM Konrad Dybcio
> <konrad.dybcio@oss.qualcomm.com> wrote:
>>
>> On 6/7/26 6:04 PM, Pengyu Luo wrote:
>>> Define pinctrl definitions to enable camera master clocks on sc8280xp.
>>>
>>> Suggested-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
>>> Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
>>> ---
>>>  arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 56 ++++++++++++++++++++++++++
>>>  1 file changed, 56 insertions(+)
>>>
>>> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>> index a2bd6b10e475..0dbcd3069a3b 100644
>>> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>> @@ -5484,6 +5484,62 @@ tlmm: pinctrl@f100000 {
>>>                       gpio-ranges = <&tlmm 0 0 230>;
>>>                       wakeup-parent = <&pdc>;
>>>
>>> +                     cam_mclk0_default: cam-mclk0-default-state {
>>> +                             pins = "gpio119";
>>> +                             function = "cam_mclk";
>>> +                             drive-strength = <6>;
>>
>> Other platforms set this to 2 by default.
>>
>> What's the value set on Windows when the camera is in use?
>>
> 
> It is 6mA.
> 
> Let us get ctl_reg first on Windows
> 
> lkd> !dd f111000 L8
> # f111000 00000284 00000002 000000e2 00000000
> # f111010 00000001 00000801 00000000 00000000
> 
> ctl_reg => 0x284
> 
> in msm_gpio_dbg_show_one()
> ...
> drive = (ctl_reg >> g->drv_bit) & 7; // (0x284 >> 6) & 7 == 2
> ...
> seq_printf(s, " %dmA", msm_regval_to_drive(drive)); // (drive + 1) * 2 == 6;
> ...
> 
> x13s should be the same as gaokun3 in this part.

I confirmed as much and I'm willing to believe this is a default for
all 8280 devices

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

for the second patch, please mention in the commit message that the value
will now match windows and please add a fixes tag

Konrad

Re: [PATCH 1/2] arm64: dts: qcom: sc8280xp: Add camera MCLK pinctrl

[Vladimir Zapolskiy]

On 6/19/26 15:35, Konrad Dybcio wrote:
> On 6/11/26 7:29 AM, Pengyu Luo wrote:
>> On Tue, Jun 9, 2026 at 8:17 PM Konrad Dybcio
>> <konrad.dybcio@oss.qualcomm.com> wrote:
>>>
>>> On 6/7/26 6:04 PM, Pengyu Luo wrote:
>>>> Define pinctrl definitions to enable camera master clocks on sc8280xp.
>>>>
>>>> Suggested-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
>>>> Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
>>>> ---
>>>>   arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 56 ++++++++++++++++++++++++++
>>>>   1 file changed, 56 insertions(+)
>>>>
>>>> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>> index a2bd6b10e475..0dbcd3069a3b 100644
>>>> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>> @@ -5484,6 +5484,62 @@ tlmm: pinctrl@f100000 {
>>>>                        gpio-ranges = <&tlmm 0 0 230>;
>>>>                        wakeup-parent = <&pdc>;
>>>>
>>>> +                     cam_mclk0_default: cam-mclk0-default-state {
>>>> +                             pins = "gpio119";
>>>> +                             function = "cam_mclk";
>>>> +                             drive-strength = <6>;
>>>
>>> Other platforms set this to 2 by default.
>>>
>>> What's the value set on Windows when the camera is in use?
>>>
>>
>> It is 6mA.
>>
>> Let us get ctl_reg first on Windows
>>
>> lkd> !dd f111000 L8
>> # f111000 00000284 00000002 000000e2 00000000
>> # f111010 00000001 00000801 00000000 00000000
>>
>> ctl_reg => 0x284
>>
>> in msm_gpio_dbg_show_one()
>> ...
>> drive = (ctl_reg >> g->drv_bit) & 7; // (0x284 >> 6) & 7 == 2
>> ...
>> seq_printf(s, " %dmA", msm_regval_to_drive(drive)); // (drive + 1) * 2 == 6;
>> ...
>>
>> x13s should be the same as gaokun3 in this part.
> 
> I confirmed as much and I'm willing to believe this is a default for
> all 8280 devices
> 
> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> 
> for the second patch, please mention in the commit message that the value
> will now match windows and please add a fixes tag
> 

I believe the second change cannot be tagged as Fixes in sense that it
strictly depends on a not going to be backported non-fix commit, and thus
backporting of just 2/2 change as is will break the matter. Reordering of
the commits placing the fix commit as the first one should be fine though.

-- 
Best wishes,
Vladimir

Re: [PATCH 1/2] arm64: dts: qcom: sc8280xp: Add camera MCLK pinctrl

[Konrad Dybcio]

On 6/19/26 2:59 PM, Vladimir Zapolskiy wrote:
> On 6/19/26 15:35, Konrad Dybcio wrote:
>> On 6/11/26 7:29 AM, Pengyu Luo wrote:
>>> On Tue, Jun 9, 2026 at 8:17 PM Konrad Dybcio
>>> <konrad.dybcio@oss.qualcomm.com> wrote:
>>>>
>>>> On 6/7/26 6:04 PM, Pengyu Luo wrote:
>>>>> Define pinctrl definitions to enable camera master clocks on sc8280xp.
>>>>>
>>>>> Suggested-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
>>>>> Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
>>>>> ---
>>>>>   arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 56 ++++++++++++++++++++++++++
>>>>>   1 file changed, 56 insertions(+)
>>>>>
>>>>> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>>> index a2bd6b10e475..0dbcd3069a3b 100644
>>>>> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>>> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>>> @@ -5484,6 +5484,62 @@ tlmm: pinctrl@f100000 {
>>>>>                        gpio-ranges = <&tlmm 0 0 230>;
>>>>>                        wakeup-parent = <&pdc>;
>>>>>
>>>>> +                     cam_mclk0_default: cam-mclk0-default-state {
>>>>> +                             pins = "gpio119";
>>>>> +                             function = "cam_mclk";
>>>>> +                             drive-strength = <6>;
>>>>
>>>> Other platforms set this to 2 by default.
>>>>
>>>> What's the value set on Windows when the camera is in use?
>>>>
>>>
>>> It is 6mA.
>>>
>>> Let us get ctl_reg first on Windows
>>>
>>> lkd> !dd f111000 L8
>>> # f111000 00000284 00000002 000000e2 00000000
>>> # f111010 00000001 00000801 00000000 00000000
>>>
>>> ctl_reg => 0x284
>>>
>>> in msm_gpio_dbg_show_one()
>>> ...
>>> drive = (ctl_reg >> g->drv_bit) & 7; // (0x284 >> 6) & 7 == 2
>>> ...
>>> seq_printf(s, " %dmA", msm_regval_to_drive(drive)); // (drive + 1) * 2 == 6;
>>> ...
>>>
>>> x13s should be the same as gaokun3 in this part.
>>
>> I confirmed as much and I'm willing to believe this is a default for
>> all 8280 devices
>>
>> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>>
>> for the second patch, please mention in the commit message that the value
>> will now match windows and please add a fixes tag
>>
> 
> I believe the second change cannot be tagged as Fixes in sense that it
> strictly depends on a not going to be backported non-fix commit, and thus
> backporting of just 2/2 change as is will break the matter. Reordering of
> the commits placing the fix commit as the first one should be fine though.

The Fixes tag makes the patch eligible for backporting through AUTOSEL
but is itself not the same as "please backport"

Konrad

Re: [PATCH 1/2] arm64: dts: qcom: sc8280xp: Add camera MCLK pinctrl

[Vladimir Zapolskiy]

On 6/19/26 16:03, Konrad Dybcio wrote:
> On 6/19/26 2:59 PM, Vladimir Zapolskiy wrote:
>> On 6/19/26 15:35, Konrad Dybcio wrote:
>>> On 6/11/26 7:29 AM, Pengyu Luo wrote:
>>>> On Tue, Jun 9, 2026 at 8:17 PM Konrad Dybcio
>>>> <konrad.dybcio@oss.qualcomm.com> wrote:
>>>>>
>>>>> On 6/7/26 6:04 PM, Pengyu Luo wrote:
>>>>>> Define pinctrl definitions to enable camera master clocks on sc8280xp.
>>>>>>
>>>>>> Suggested-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
>>>>>> Signed-off-by: Pengyu Luo <mitltlatltl@gmail.com>
>>>>>> ---
>>>>>>    arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 56 ++++++++++++++++++++++++++
>>>>>>    1 file changed, 56 insertions(+)
>>>>>>
>>>>>> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>>>> index a2bd6b10e475..0dbcd3069a3b 100644
>>>>>> --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>>>> +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
>>>>>> @@ -5484,6 +5484,62 @@ tlmm: pinctrl@f100000 {
>>>>>>                         gpio-ranges = <&tlmm 0 0 230>;
>>>>>>                         wakeup-parent = <&pdc>;
>>>>>>
>>>>>> +                     cam_mclk0_default: cam-mclk0-default-state {
>>>>>> +                             pins = "gpio119";
>>>>>> +                             function = "cam_mclk";
>>>>>> +                             drive-strength = <6>;
>>>>>
>>>>> Other platforms set this to 2 by default.
>>>>>
>>>>> What's the value set on Windows when the camera is in use?
>>>>>
>>>>
>>>> It is 6mA.
>>>>
>>>> Let us get ctl_reg first on Windows
>>>>
>>>> lkd> !dd f111000 L8
>>>> # f111000 00000284 00000002 000000e2 00000000
>>>> # f111010 00000001 00000801 00000000 00000000
>>>>
>>>> ctl_reg => 0x284
>>>>
>>>> in msm_gpio_dbg_show_one()
>>>> ...
>>>> drive = (ctl_reg >> g->drv_bit) & 7; // (0x284 >> 6) & 7 == 2
>>>> ...
>>>> seq_printf(s, " %dmA", msm_regval_to_drive(drive)); // (drive + 1) * 2 == 6;
>>>> ...
>>>>
>>>> x13s should be the same as gaokun3 in this part.
>>>
>>> I confirmed as much and I'm willing to believe this is a default for
>>> all 8280 devices
>>>
>>> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>>>
>>> for the second patch, please mention in the commit message that the value
>>> will now match windows and please add a fixes tag
>>>
>>
>> I believe the second change cannot be tagged as Fixes in sense that it
>> strictly depends on a not going to be backported non-fix commit, and thus
>> backporting of just 2/2 change as is will break the matter. Reordering of
>> the commits placing the fix commit as the first one should be fine though.
> 
> The Fixes tag makes the patch eligible for backporting through AUTOSEL
> but is itself not the same as "please backport"
> 

That's correct, and due Documentation/process/stable-kernel-rules.rst it
would make sense to add Cc: <stable+noautosel@kernel.org> to the next
version of the change to help stable tree maintainers, since it is known
in advance that the unmodified and Fixes tagged 2/2 change shall not be
considered as a candidate change to the stable tree. Or is it excessive?

IMHO here it might be better to properly arrange the changes and backport
the fix.

-- 
Best wishes,
Vladimir