iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'sunxi-fixes-for-5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into arm/fixes

Browse Source 
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 <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2020-05-15 23:13:45 +02:00
parent 39572dd33b 29ee412bb7
commit 495e135643
2 changed files with 1 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
View File

@ -98,7 +98,7 @@
}; };
&codec_analog { &codec_analog {
hpvcc-supply = <&reg_eldo1>; cpvdd-supply = <&reg_eldo1>;
status = "okay"; status = "okay";
}; };

18
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
View File

@ -154,24 +154,6 @@
}; };
}; };
sound_spdif {
compatible = "simple-audio-card";
simple-audio-card,name = "On-board SPDIF";
simple-audio-card,cpu {
sound-dai = <&spdif>;
};
simple-audio-card,codec {
sound-dai = <&spdif_out>;
};
};
spdif_out: spdif-out {
#sound-dai-cells = <0>;
compatible = "linux,spdif-dit";
};
timer { timer {
compatible = "arm,armv8-timer"; compatible = "arm,armv8-timer";
allwinner,erratum-unknown1; allwinner,erratum-unknown1;