Commit 495e1356 authored May 15, 2020 by Arnd Bergmann

Merge tag 'sunxi-fixes-for-5.7-1' of...

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>

parents 39572dd3 29ee412b

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -98,7 +98,7 @@
		};

		&codec_analog {
		hpvcc-supply = <&reg_eldo1>;
		cpvdd-supply = <&reg_eldo1>;
		status = "okay";
		};

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

+0 −18

Original line number	Diff line number	Diff line
		@@ -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 {
		compatible = "arm,armv8-timer";
		allwinner,erratum-unknown1;

Admin message