Skip to content

Commit 495e135

Browse files
committed
Merge tag 'sunxi-fixes-for-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes
Two fixes for the Allwinner SoCs, one to remove some inexistant sound card on the A64, and one to fix the audio codec regulator on the pinetab. * tag 'sunxi-fixes-for-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: arm64: dts: allwinner: a64: Remove unused SPDIF sound card arm64: dts: allwinner: a64: pinetab: Fix cpvdd supply name Link: https://lore.kernel.org/r/f7a98a47-316d-4b1a-b5a5-0e1e330d5f52.lettre@localhost Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 39572dd + 29ee412 commit 495e135

File tree

2 files changed

+1
-19
lines changed

2 files changed

+1
-19
lines changed

arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
};
9999

100100
&codec_analog {
101-
hpvcc-supply = <&reg_eldo1>;
101+
cpvdd-supply = <&reg_eldo1>;
102102
status = "okay";
103103
};
104104

arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -154,24 +154,6 @@
154154
};
155155
};
156156

157-
sound_spdif {
158-
compatible = "simple-audio-card";
159-
simple-audio-card,name = "On-board SPDIF";
160-
161-
simple-audio-card,cpu {
162-
sound-dai = <&spdif>;
163-
};
164-
165-
simple-audio-card,codec {
166-
sound-dai = <&spdif_out>;
167-
};
168-
};
169-
170-
spdif_out: spdif-out {
171-
#sound-dai-cells = <0>;
172-
compatible = "linux,spdif-dit";
173-
};
174-
175157
timer {
176158
compatible = "arm,armv8-timer";
177159
allwinner,erratum-unknown1;

0 commit comments

Comments
 (0)