[PATCH v3 0/3] SHIFT 6MQ SD-card support, improved responsivness of touchscreen, and codec

[PATCH v3 0/3] SHIFT 6MQ SD-card support, improved responsivness of touchscreen, and codec

[David Heidelberg via B4 Relay]

I've tested that SD card and touchscreen works well, the codec does too,
but for complete enablement needs soundcard support which isn't fully
finished.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
Changes in v3:
- sdcard property sorting (Konrad)
- Link to v2: https://lore.kernel.org/r/20260401-axolotl-misc-p1-v2-0-f3af384bbb50@ixit.cz

Changes in v2:
- Changed bias-pull-up to bias-disable for SD card detection, since the
  mechanism doesn't work, we can just save few uA. (Casey)
- Link to v1: https://lore.kernel.org/r/20260320-axolotl-misc-p1-v1-0-89c9b5ecb26e@ixit.cz

---
Alexander Martinz (1):
      arm64: dts: qcom: sdm845-shift-axolotl: Enable TFA9890 codec

Casey Connolly (2):
      arm64: dts: qcom: sdm845-shift-axolotl: Enable sdcard
      arm64: dts: qcom: sdm845-shift-axolotl: Set higher touchscreen i2c clock

 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 59 +++++++++++++++++++++++
 1 file changed, 59 insertions(+)
---
base-commit: bd0f139e5fc11182777b81cefc3893ea508544ec
change-id: 20260320-axolotl-misc-p1-601d480c25df

Best regards,
-- 
David Heidelberg <david@ixit.cz>

[PATCH v3 1/3] arm64: dts: qcom: sdm845-shift-axolotl: Enable sdcard

[David Heidelberg via B4 Relay]

From: Casey Connolly <casey.connolly@linaro.org>

The SHIFT6mq features an sdcard slot, add it.

Signed-off-by: Casey Connolly <casey.connolly@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Co-developed-by: David Heidelberg <david@ixit.cz>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 44 +++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index 740eb22550724..b05f04a621e5b 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -600,6 +600,24 @@ &qupv3_id_1 {
 	status = "okay";
 };
 
+&sdhc_2 {
+	pinctrl-0 = <&sdc2_default_state &sdc2_card_det_n>;
+	pinctrl-names = "default";
+
+	vmmc-supply = <&vreg_l21a_2p95>;
+	vqmmc-supply = <&vreg_l13a_2p95>;
+
+	bus-width = <4>;
+	/*
+	 * Card detection is broken, but because the battery must be removed
+	 * to insert the card, we use this rather than the broken-cd property
+	 * which would just waste CPU cycles polling.
+	 */
+	non-removable;
+
+	status = "okay";
+};
+
 &slpi_pas {
 	firmware-name = "qcom/sdm845/SHIFT/axolotl/slpi.mbn";
 
@@ -609,6 +627,32 @@ &slpi_pas {
 &tlmm {
 	gpio-reserved-ranges = <0 4>, <81 4>;
 
+	sdc2_default_state: sdc2-default-state {
+		clk-pins {
+			pins = "sdc2_clk";
+			drive-strength = <16>;
+			bias-disable;
+		};
+
+		cmd-pins {
+			pins = "sdc2_cmd";
+			drive-strength = <10>;
+			bias-pull-up;
+		};
+
+		data-pins {
+			pins = "sdc2_data";
+			drive-strength = <10>;
+			bias-pull-up;
+		};
+	};
+
+	sdc2_card_det_n: sd-card-det-n-state {
+		pins = "gpio126";
+		function = "gpio";
+		bias-disable;
+	};
+
 	sde_dsi_active: sde-dsi-active-state {
 		pins = "gpio6", "gpio11";
 		function = "gpio";

-- 
2.53.0

Re: [PATCH v3 1/3] arm64: dts: qcom: sdm845-shift-axolotl: Enable sdcard

[Vladimir Zapolskiy]

On 4/2/26 12:54, David Heidelberg via B4 Relay wrote:
> From: Casey Connolly <casey.connolly@linaro.org>
> 
> The SHIFT6mq features an sdcard slot, add it.
> 
> Signed-off-by: Casey Connolly <casey.connolly@linaro.org>
> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
> Co-developed-by: David Heidelberg <david@ixit.cz>
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---
>   arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 44 +++++++++++++++++++++++
>   1 file changed, 44 insertions(+)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> index 740eb22550724..b05f04a621e5b 100644
> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
> @@ -600,6 +600,24 @@ &qupv3_id_1 {
>   	status = "okay";
>   };
>   
> +&sdhc_2 {
> +	pinctrl-0 = <&sdc2_default_state &sdc2_card_det_n>;

If card detection is broken and disabled, then likely card detection
GPIO can be omitted, no?

> +	pinctrl-names = "default";
> +
> +	vmmc-supply = <&vreg_l21a_2p95>;
> +	vqmmc-supply = <&vreg_l13a_2p95>;
> +
> +	bus-width = <4>;
> +	/*
> +	 * Card detection is broken, but because the battery must be removed
> +	 * to insert the card, we use this rather than the broken-cd property
> +	 * which would just waste CPU cycles polling.
> +	 */
> +	non-removable;
> +
> +	status = "okay";
> +};
> +
>   &slpi_pas {
>   	firmware-name = "qcom/sdm845/SHIFT/axolotl/slpi.mbn";
>   
> @@ -609,6 +627,32 @@ &slpi_pas {
>   &tlmm {
>   	gpio-reserved-ranges = <0 4>, <81 4>;
>   
> +	sdc2_default_state: sdc2-default-state {
> +		clk-pins {
> +			pins = "sdc2_clk";
> +			drive-strength = <16>;
> +			bias-disable;
> +		};
> +
> +		cmd-pins {
> +			pins = "sdc2_cmd";
> +			drive-strength = <10>;
> +			bias-pull-up;
> +		};
> +
> +		data-pins {
> +			pins = "sdc2_data";
> +			drive-strength = <10>;
> +			bias-pull-up;
> +		};
> +	};
> +
> +	sdc2_card_det_n: sd-card-det-n-state {
> +		pins = "gpio126";
> +		function = "gpio";
> +		bias-disable;
> +	};
> +
>   	sde_dsi_active: sde-dsi-active-state {
>   		pins = "gpio6", "gpio11";
>   		function = "gpio";
> 

-- 
Best wishes,
Vladimir

Re: [PATCH v3 1/3] arm64: dts: qcom: sdm845-shift-axolotl: Enable sdcard

[David Heidelberg]

On 02/04/2026 13:16, Vladimir Zapolskiy wrote:
> On 4/2/26 12:54, David Heidelberg via B4 Relay wrote:
>> From: Casey Connolly <casey.connolly@linaro.org>
>>
>> The SHIFT6mq features an sdcard slot, add it.
>>
>> Signed-off-by: Casey Connolly <casey.connolly@linaro.org>
>> Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
>> Co-developed-by: David Heidelberg <david@ixit.cz>
>> Signed-off-by: David Heidelberg <david@ixit.cz>
>> ---
>>   arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 44 +++++++++++++++++++++++
>>   1 file changed, 44 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/ 
>> boot/dts/qcom/sdm845-shift-axolotl.dts
>> index 740eb22550724..b05f04a621e5b 100644
>> --- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
>> +++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
>> @@ -600,6 +600,24 @@ &qupv3_id_1 {
>>       status = "okay";
>>   };
>> +&sdhc_2 {
>> +    pinctrl-0 = <&sdc2_default_state &sdc2_card_det_n>;
> 
> If card detection is broken and disabled, then likely card detection
> GPIO can be omitted, no?

Could be, but current use, since it's broken, is to minimize power consumption 
which we do by setting this GPIO with bias-disable and still documenting it's 
presence.

David

> 
>> +    pinctrl-names = "default";
>> +
>> +    vmmc-supply = <&vreg_l21a_2p95>;
>> +    vqmmc-supply = <&vreg_l13a_2p95>;
>> +
>> +    bus-width = <4>;
>> +    /*
>> +     * Card detection is broken, but because the battery must be removed
>> +     * to insert the card, we use this rather than the broken-cd property
>> +     * which would just waste CPU cycles polling.
>> +     */
>> +    non-removable;
>> +
>> +    status = "okay";
>> +};
>> +
>>   &slpi_pas {
>>       firmware-name = "qcom/sdm845/SHIFT/axolotl/slpi.mbn";
>> @@ -609,6 +627,32 @@ &slpi_pas {
>>   &tlmm {
>>       gpio-reserved-ranges = <0 4>, <81 4>;
>> +    sdc2_default_state: sdc2-default-state {
>> +        clk-pins {
>> +            pins = "sdc2_clk";
>> +            drive-strength = <16>;
>> +            bias-disable;
>> +        };
>> +
>> +        cmd-pins {
>> +            pins = "sdc2_cmd";
>> +            drive-strength = <10>;
>> +            bias-pull-up;
>> +        };
>> +
>> +        data-pins {
>> +            pins = "sdc2_data";
>> +            drive-strength = <10>;
>> +            bias-pull-up;
>> +        };
>> +    };
>> +
>> +    sdc2_card_det_n: sd-card-det-n-state {
>> +        pins = "gpio126";
>> +        function = "gpio";
>> +        bias-disable;
>> +    };
>> +
>>       sde_dsi_active: sde-dsi-active-state {
>>           pins = "gpio6", "gpio11";
>>           function = "gpio";
>>
> 

-- 
David Heidelberg

[PATCH v3 2/3] arm64: dts: qcom: sdm845-shift-axolotl: Set higher touchscreen i2c clock

[David Heidelberg via B4 Relay]

From: Casey Connolly <casey.connolly@linaro.org>

Sets a higher rate than the default for good responsiveness of
touchscreen.

Signed-off-by: Casey Connolly <casey.connolly@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index b05f04a621e5b..f26079398e07b 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -432,6 +432,8 @@ &gpu_zap_shader {
 };
 
 &i2c5 {
+	clock-frequency = <400000>;
+
 	status = "okay";
 
 	touchscreen@38 {

-- 
2.53.0

[PATCH v3 3/3] arm64: dts: qcom: sdm845-shift-axolotl: Enable TFA9890 codec

[David Heidelberg via B4 Relay]

From: Alexander Martinz <amartinz@shiftphones.com>

Audio amplifier TFA9890 is present on the board.

Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
index f26079398e07b..7d81198bc499c 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
+++ b/arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts
@@ -459,6 +459,19 @@ &i2c10 {
 	/* SMB1355@0x0C */
 };
 
+&i2c11 {
+	clock-frequency = <400000>;
+
+	status = "okay";
+
+	audio-codec@34 {
+		compatible = "nxp,tfa9890";
+		reg = <0x34>;
+		vddd-supply = <&vreg_s4a_1p8>;
+		#sound-dai-cells = <0>;
+	};
+};
+
 &ipa {
 	qcom,gsi-loader = "self";
 	memory-region = <&ipa_fw_mem>;

-- 
2.53.0

Re: [PATCH v3 0/3] SHIFT 6MQ SD-card support, improved responsivness of touchscreen, and codec

[Bjorn Andersson]

On Thu, 02 Apr 2026 11:54:05 +0200, David Heidelberg wrote:
> I've tested that SD card and touchscreen works well, the codec does too,
> but for complete enablement needs soundcard support which isn't fully
> finished.
> 
> 

Applied, thanks!

[1/3] arm64: dts: qcom: sdm845-shift-axolotl: Enable sdcard
      commit: 338b4158e877f116d404262098bbdcd1eaf6fd88
[2/3] arm64: dts: qcom: sdm845-shift-axolotl: Set higher touchscreen i2c clock
      commit: 8a53d5aa0d1179ac14aa7da58351848c2e709dcc
[3/3] arm64: dts: qcom: sdm845-shift-axolotl: Enable TFA9890 codec
      commit: 2b676b5a13d28eb038b4e54dae8e161a7be58d96

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>