Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <arnd@arndb.de>

+1 -19
+1 -1
arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
··· 98 98 }; 99 99 100 100 &codec_analog { 101 - hpvcc-supply = <&reg_eldo1>; 101 + cpvdd-supply = <&reg_eldo1>; 102 102 status = "okay"; 103 103 }; 104 104
-18
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
··· 154 154 }; 155 155 }; 156 156 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 - 175 157 timer { 176 158 compatible = "arm,armv8-timer"; 177 159 allwinner,erratum-unknown1;