Skip to content

spacewar: 6.17 rebase #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fekz115 wants to merge 12 commits into
base: sc7280-6.17.y
Choose a base branch
from
Open

spacewar: 6.17 rebase #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
fa80890
HACK dpu pkt_per_line hack
lweiss-fairphone Sep 28, 2023
5d3a98a
WIP: media: i2c: Add dw9800 vcm driver
N1kroks Jan 22, 2025
b701489
media: i2c: dw9800: Add one more delay
JIaxyga Mar 6, 2025
8d7bbe0
sm7325-nothing-spacewar: Configure actuator for UW camera
JIaxyga Mar 6, 2025
b44c840
media: i2c: ak7375: Add support for ak7377
JIaxyga Mar 10, 2025
fa026f1
sm7325-nothing-spacewar: Configure actuator for wide camera
JIaxyga Mar 10, 2025
72b057c
HACK(?) ASoC: codecs: wcd938x: Wait longer for swr probe
lweiss-fairphone Nov 24, 2023
10d0363
WIP: arm64: dts: qcom: sm7325: Add sound
JIaxyga Aug 19, 2024
1ec60b5
WIP: arm64: dts: qcom: sm7325-nothing-spacewar: Add WCD
JIaxyga Aug 19, 2024
a645189
arm64: dts: qcom: sm7325-nothing-spacewar: Add touchscreen support
fekz115 Jan 11, 2024
ff259d3
WIP: fixup! drivers: input: touchscreen: Import FT touchcscreen drive…
JIaxyga Jan 20, 2025
f3420f7
arm64: configs: create separate nothing-spacewar defconfig
fekz115 Oct 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
193 changes: 178 additions & 15 deletions arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts
View file
Open in desktop
Copy link
Member

@z3ntu z3ntu Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you update the commit message for touchscreen commit to be fixup! $your_original_commit so it gets auto-squashed in the next rebase?

Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
#size-cells = <2>;
ranges;

bootargs = "clk_ignore_unused pd_ignore_unused";
Copy link
Member

@z3ntu z3ntu Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?

stdout-path = "serial0:115200n8";

framebuffer0: framebuffer@e1000000 {
Expand Down Expand Up @@ -380,6 +381,34 @@
regulator-always-on;
vin-supply = <&vph_pwr>;
};

wcd9385: audio-codec {
compatible = "qcom,wcd9385-codec";
pinctrl-names = "default", "sleep";
pinctrl-0 = <&wcd_reset_n>;
pinctrl-1 = <&wcd_reset_n_sleep>;

reset-gpios = <&tlmm 83 GPIO_ACTIVE_LOW>;

qcom,rx-device = <&wcd_rx>;
qcom,tx-device = <&wcd_tx>;

vdd-rxtx-supply = <&vdd_txrx>;
vdd-io-supply = <&vdd_px_wcd9385>;
vdd-buck-supply = <&vdd_buck>;
vdd-mic-bias-supply = <&vdd_mic_bias>;

qcom,micbias1-microvolt = <2750000>;
qcom,micbias2-microvolt = <2700000>;
qcom,micbias3-microvolt = <2750000>;
qcom,micbias4-microvolt = <2750000>;

qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000
500000 500000 500000>;
qcom,mbhc-headset-vthreshold-microvolt = <1700000>;
qcom,mbhc-headphone-vthreshold-microvolt = <50000>;
#sound-dai-cells = <1>;
};
};

&apps_rsc {
Expand Down Expand Up @@ -910,7 +939,13 @@
};

&cci1_i2c0 {
/* actuator (For Ultra Wide sensor) @ 0xc */
camu_dw9800w: actuator@c {
compatible = "dongwoon,dw9800w",
"dongwoon,dw9800";
reg = <0x0c>;

vdd-supply = <&vreg_camu_vaf_1p8>;
};

camera@2d {
compatible = "samsung,s5kjn1";
Expand All @@ -930,6 +965,8 @@
orientation = <1>; /* Rear facing */
rotation = <90>;

lens-focus = <&camu_dw9800w>;

port {
camera_s5kjn1_ep: endpoint {
data-lanes = <1 2 3 4>;
Expand All @@ -950,7 +987,14 @@
};

&cci1_i2c1 {
/* actuator (For Wide sensor) @ 0xc */
camw_ak7377: actuator@c {
compatible = "asahi-kasei,ak7377";
reg = <0x0c>;

vin-supply = <&vreg_cam_vio_1p8>;
vdd-supply = <&vreg_camw_vaf_1p8>;
};

/* C-PHY sony,imx766 (Wide) @ 0x10 */

camw_gt24p128e: eeprom@50 {
Expand Down Expand Up @@ -1076,6 +1120,20 @@
/delete-property/ power-domains;
};

&lpass_rx_macro {
status = "okay";
};

&lpass_tx_macro {
status = "okay";
};

&lpass_va_macro {
qcom,dmic-sample-rate = <4800000>;
vdd-micb-supply = <&vdd_mic_bias>;
status = "okay";
};

&mdss {
status = "okay";
};
Expand Down Expand Up @@ -1317,12 +1375,28 @@
reg = <PRIMARY_MI2S_RX>;
qcom,sd-lines = <1>;
};

dai@113 {
reg = <RX_CODEC_DMA_RX_0>;
};

dai@120 {
reg = <TX_CODEC_DMA_TX_3>;
};
};

&q6asmdai {
dai@0 {
reg = <MSM_FRONTEND_DAI_MULTIMEDIA1>;
};

dai@1 {
reg = <1>;
};

dai@2 {
reg = <2>;
};
};

&qfprom {
Expand Down Expand Up @@ -1379,6 +1453,20 @@
pinctrl-names = "default",
"sleep";

audio-routing = "IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"AMIC1", "MIC BIAS1",
"AMIC2", "MIC BIAS2",
"AMIC3", "MIC BIAS1", // Unused?
"AMIC4", "MIC BIAS3",
"AMIC5", "MIC BIAS4",
/*"TX SWR_ADC0", "ADC1_OUTPUT", // txmacro < v9.2
"TX SWR_ADC1", "ADC2_OUTPUT";*/
"TX SWR_INPUT0", "ADC1_OUTPUT", // txmacro >= v9.2
"TX SWR_INPUT1", "ADC2_OUTPUT",
"TX SWR_INPUT4", "ADC3_OUTPUT",
"TX SWR_INPUT5", "ADC4_OUTPUT";
Copy link
Member

@z3ntu z3ntu Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you clean up this list?


mm1-dai-link {
link-name = "MultiMedia1";

Expand All @@ -1387,28 +1475,76 @@
};
};

mm2-dai-link {
link-name = "MultiMedia2";

cpu {
sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>;
};
};

mm3-dai-link {
link-name = "MultiMedia3";

cpu {
sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>;
};
};

i2s-dai-link {
link-name = "I2S Playback";

cpu {
sound-dai = <&q6afedai PRIMARY_MI2S_RX>;
};

codec {
sound-dai = <&tfa9873_l 0>, <&tfa9873_r 0>;
};

platform {
sound-dai = <&q6routing>;
};
Copy link
Member

@z3ntu z3ntu Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

alphabetically: codec < cpu < platform

};

wcd-playback-dai-link {
link-name = "WCD Playback";

cpu {
sound-dai = <&q6afedai RX_CODEC_DMA_RX_0>;
};

codec {
sound-dai = <&tfa9873_l 0>, <&tfa9873_r 0>;
sound-dai = <&wcd9385 0>, <&swr0 0>, <&lpass_rx_macro 0>;
};

platform {
sound-dai = <&q6routing>;
};
};

wcd-capture-dai-link {
link-name = "WCD Capture";

cpu {
sound-dai = <&q6afedai TX_CODEC_DMA_TX_3>;
};

codec {
sound-dai = <&wcd9385 1>, <&swr1 0>, <&lpass_tx_macro 0>;
};

platform {
sound-dai = <&q6routing>;
};
Copy link
Member

@z3ntu z3ntu Oct 16, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does microphone work by now? Last I heard it's broken

};
};

&spi13 {
status = "okay";

focaltech@0 {
compatible = "focaltech,fts_ts";
touchscreen@0 {
compatible = "focaltech,ft3680";
reg = <0x0>;

spi-max-frequency = <6000000>;
Expand All @@ -1419,24 +1555,38 @@
focaltech,irq-gpio = <&tlmm 81 0x2008>;
focaltech,display-coords = <0 0 1080 2400>;
focaltech,max-touch-number = <10>;
focaltech,ic-type = <0x3658d488>;

vdd-supply = <&vdd_ts>;
iovdd-supply = <&vreg_l8c_1p8>;

firmware-name =
"qcom/sm7325/nothing/spacewar/focaltech_ts_novatek.bin";

pinctrl-names = "default";
pinctrl-0 = <&ts_int_n>,
<&ts_reset_n>;
};
};

&swr0 {
status = "okay";

wcd_rx: codec@0,4 {
compatible = "sdw20217010d00";
reg = <0 4>;

qcom,rx-port-mapping = <1 2 3 4 5>;
};
};

&swr1 {
status = "okay";

wcd_tx: codec@0,3 {
compatible = "sdw20217010d00";
reg = <0 3>;

focaltech,trusted-touch-mode = "vm_mode";
focaltech,touch-environment = "pvm";
focaltech,trusted-touch-spi-irq = <601>;
focaltech,trusted-touch-io-bases = <0xf134000 0xf135000
0xf136000 0xf137000
0xf169000 0xf151000
0xa94000 0x00a10000>;
focaltech,trusted-touch-io-sizes = <0x1000 0x1000 0x1000 0x1000
0x1000 0x1000 0x1000 0x4000>;
qcom,tx-port-mapping = <1 2 3 4>;
};
};

Expand Down Expand Up @@ -1524,6 +1674,19 @@
bias-pull-down;
};

wcd_reset_n: wcd-reset-n-state {
pins = "gpio83";
function = "gpio";
drive-strength = <8>;
};

wcd_reset_n_sleep: wcd-reset-n-sleep-state {
pins = "gpio83";
function = "gpio";
drive-strength = <8>;
bias-disable;
};

hst_bt_en: hst-bt-en-state {
pins = "gpio85";
function = "gpio";
Expand Down
Loading