From: Sasha Levin <sashal@kernel.org>
Date: Mon, 9 Dec 2019 20:27:52 +0000 (-0500)
Subject: fixes for 4.19
X-Git-Tag: v5.4.3~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62b448b2afa5720c72b3451dd105f93cdb07d291;p=thirdparty%2Fkernel%2Fstable-queue.git

fixes for 4.19

Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/queue-4.19/arm64-dts-allwinner-a64-enable-sound-on-pinebook.patch b/queue-4.19/arm64-dts-allwinner-a64-enable-sound-on-pinebook.patch
deleted file mode 100644
index 7292f192ef3..00000000000
--- a/queue-4.19/arm64-dts-allwinner-a64-enable-sound-on-pinebook.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From 4e3b4ee3bd4f6b5ef25c970c17cdce956aaba70d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 22 Nov 2018 18:23:25 +0800
-Subject: arm64: dts: allwinner: a64: enable sound on Pinebook
-
-From: Vasily Khoruzhick <anarsoul@gmail.com>
-
-[ Upstream commit 6de8e717848f1b07b05f1b512dd6b8552677d958 ]
-
-The Pinebook has a headphone jack tied to the HP headphone output of
-the SoC, and internal speakers connected to the LINEOUT of the SoC,
-through a standalone amplifier.
-
-This commit enables I2S, digital and analog parts of audio codec on
-Pinebook, along with a device node for the external amplifier.
-
-Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
-[wens@csie.org: dropped headphone_amp; added headphone amp regulator supply;
-		fixed speaker_amp node name and sound-name-prefix name]
-Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>
-Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
-Signed-off-by: Chen-Yu Tsai <wens@csie.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- .../dts/allwinner/sun50i-a64-pinebook.dts     | 49 +++++++++++++++++++
- 1 file changed, 49 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
-index 897e60cbe38d1..b71ac80f6dc77 100644
---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
-+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
-@@ -64,6 +64,32 @@
- 		compatible = "mmc-pwrseq-simple";
- 		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
- 	};
-+
-+	speaker_amp: audio-amplifier {
-+		compatible = "simple-audio-amplifier";
-+		/*
-+		 * TODO This is actually a fixed regulator controlled by
-+		 * the GPIO line on the PMIC. This should be corrected
-+		 * once GPIO support is added for this PMIC.
-+		 */
-+		VCC-supply = <&reg_ldo_io0>;
-+		enable-gpios = <&pio 7 7 GPIO_ACTIVE_HIGH>; /* PH7 */
-+		sound-name-prefix = "Speaker Amp";
-+	};
-+
-+};
-+
-+&codec {
-+	status = "okay";
-+};
-+
-+&codec_analog {
-+	hpvcc-supply = <&reg_eldo1>;
-+	status = "okay";
-+};
-+
-+&dai {
-+	status = "okay";
- };
- 
- &ehci0 {
-@@ -268,6 +294,29 @@
- 	vcc-hdmi-supply = <&reg_dldo1>;
- };
- 
-+&sound {
-+	status = "okay";
-+	simple-audio-card,aux-devs = <&codec_analog>, <&speaker_amp>;
-+	simple-audio-card,widgets = "Microphone", "Internal Microphone Left",
-+				    "Microphone", "Internal Microphone Right",
-+				    "Headphone", "Headphone Jack",
-+				    "Speaker", "Internal Speaker";
-+	simple-audio-card,routing =
-+			"Left DAC", "AIF1 Slot 0 Left",
-+			"Right DAC", "AIF1 Slot 0 Right",
-+			"Speaker Amp INL", "LINEOUT",
-+			"Speaker Amp INR", "LINEOUT",
-+			"Internal Speaker", "Speaker Amp OUTL",
-+			"Internal Speaker", "Speaker Amp OUTR",
-+			"Headphone Jack", "HP",
-+			"AIF1 Slot 0 Left ADC", "Left ADC",
-+			"AIF1 Slot 0 Right ADC", "Right ADC",
-+			"Internal Microphone Left", "MBIAS",
-+			"MIC1", "Internal Microphone Left",
-+			"Internal Microphone Right", "HBIAS",
-+			"MIC2", "Internal Microphone Right";
-+};
-+
- &uart0 {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&uart0_pins_a>;
--- 
-2.20.1
-
diff --git a/queue-4.19/series b/queue-4.19/series
index 6e6551d9ffe..870b9db5607 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -88,7 +88,6 @@ media-coda-fix-memory-corruption-in-case-more-than-3.patch
 media-pulse8-cec-return-0-when-invalidating-the-logi.patch
 media-cec-report-vendor-id-after-initialization.patch
 iwlwifi-fix-cfg-structs-for-22000-with-different-rf-.patch
-arm64-dts-allwinner-a64-enable-sound-on-pinebook.patch
 ravb-clean-up-duplex-handling.patch
 net-ipv6-re-do-dad-when-interface-has-iff_noarp-flag.patch
 dmaengine-coh901318-fix-a-double-lock-bug.patch