Skip to content

Commit 2c5a33f

Browse files
rockpis devicetree: remove unused nodes
Signed-off-by: Stephen <[email protected]>
1 parent ea65ae4 commit 2c5a33f

File tree

2 files changed

+1
-86
lines changed

2 files changed

+1
-86
lines changed

arch/arm64/boot/dts/rockchip/overlays-rockpis/hw_intfc.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
# Set "on" to enable the optional hardware interfaces while set "off" to disable.
55

6+
intfc:i2c0=off
67
intfc:i2c1=off
78
intfc:i2c2=off
89
intfc:i2c3=off
9-
intfc:i2c4=off
1010

1111
intfc:pwm1=off
1212
intfc:pwm2=off

arch/arm64/boot/dts/rockchip/rockpi-s-linux.dts

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,6 @@
1313
model = "Radxa ROCK Pi S";
1414
compatible = "radxa,rockpis-rk3308", "rockchip,rk3308";
1515

16-
adc-keys1 {
17-
compatible = "adc-keys";
18-
io-channels = <&saradc 1>;
19-
io-channel-names = "buttons";
20-
poll-interval = <100>;
21-
keyup-threshold-microvolt = <1800000>;
22-
23-
play-key {
24-
linux,code = <KEY_PLAY>;
25-
label = "play";
26-
press-threshold-microvolt = <625000>;
27-
};
28-
};
29-
30-
rotary {
31-
compatible = "rotary-encoder";
32-
pinctrl-names = "default";
33-
pinctrl-0 = <&rotary_gpio>;
34-
gpios = <&gpio2 RK_PB3 GPIO_ACTIVE_LOW>,
35-
<&gpio2 RK_PB4 GPIO_ACTIVE_LOW>;
36-
linux,axis = <0>; /* REL_X */
37-
rotary-encoder,relative-axis;
38-
};
39-
4016
sdio_pwrseq: sdio-pwrseq {
4117
compatible = "mmc-pwrseq-simple";
4218
pinctrl-names = "default";
@@ -51,36 +27,6 @@
5127
reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
5228
};
5329

54-
sound {
55-
status = "disabled";
56-
compatible = "simple-audio-card";
57-
simple-audio-card,format = "i2s";
58-
simple-audio-card,mclk-fs = <256>;
59-
simple-audio-card,name = "i2s_8ch_0";
60-
61-
simple-audio-card,dai-link@0 {
62-
format = "i2s";
63-
cpu {
64-
sound-dai = <&i2s_8ch_0>;
65-
};
66-
67-
codec {
68-
sound-dai = <&dummy_codec>;
69-
};
70-
};
71-
72-
simple-audio-card,dai-link@1 {
73-
format = "i2s";
74-
cpu {
75-
sound-dai = <&i2s_8ch_0>;
76-
};
77-
78-
codec {
79-
sound-dai = <&tas5711>;
80-
};
81-
};
82-
};
83-
8430
dummy_codec: dummy-codec {
8531
compatible = "rockchip,dummy-codec";
8632
#sound-dai-cells = <0>;
@@ -132,7 +78,6 @@
13278
regulator-name = "vccio_sd";
13379
regulator-min-microvolt = <1800000>;
13480
regulator-max-microvolt = <3300000>;
135-
gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;
13681
states = <1800000 0x0
13782
3300000 0x1>;
13883
};
@@ -300,25 +245,6 @@
300245
vccio5-supply = <&vcc_io>;
301246
};
302247

303-
&i2c1 {
304-
status = "okay";
305-
clock-frequency = <400000>;
306-
// i2c-scl-rising-time-ns = <300>;
307-
// i2c-scl-falling-time-ns = <15>;
308-
309-
tas5711: tas5711@1b {
310-
#sound-dai-cells = <0>;
311-
compatible = "ti,tas5711";
312-
reg = <0x1b>;
313-
clocks = <&cru SCLK_I2S0_8CH_TX_OUT>;
314-
clock-names = "mclk";
315-
pinctrl-names = "default";
316-
pinctrl-0 = <&i2s_8ch_0_mclk>;
317-
pdn-gpios = <&gpio0 RK_PA5 GPIO_ACTIVE_LOW>;
318-
reset-gpios = <&gpio0 RK_PC4 GPIO_ACTIVE_LOW>;
319-
};
320-
};
321-
322248
&i2s_8ch_0 {
323249
status = "okay";
324250
assigned-clocks = <&cru SCLK_I2S0_8CH_RX>;
@@ -377,11 +303,6 @@
377303
status = "okay";
378304
};
379305

380-
&saradc {
381-
status = "okay";
382-
vref-supply = <&vcc_1v8>;
383-
};
384-
385306
&sdio {
386307
max-frequency = <110000000>;
387308
bus-width = <4>;
@@ -395,12 +316,6 @@
395316
status = "okay";
396317
};
397318

398-
&tsadc {
399-
rockchip,hw-tshut-mode = <0>; /* tshut mode 0:CRU 1:GPIO */
400-
rockchip,hw-tshut-polarity = <1>; /* tshut polarity 0:LOW 1:HIGH */
401-
status = "okay";
402-
};
403-
404319
&u2phy {
405320
status = "okay";
406321

0 commit comments

Comments
 (0)