Update to 6.0.2.pf2-1

- New upstream release based on 6.0.2
- Sync kernel config with Arch and Arch32
- Store patches in git

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

1 files changed, 0 insertions, 72 deletions

diff --git a/asus_zenith_ii_map.patch b/asus_zenith_ii_map.patch
deleted file mode 100644
index 97a673fdd081..000000000000
--- a/asus_zenith_ii_map.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/sound/usb/card.c b/sound/usb/card.c
-index d731ca62d599..39a4cdb28499 100644
---- a/sound/usb/card.c
-+++ b/sound/usb/card.c
-@@ -380,6 +380,14 @@ static const struct usb_audio_device_name usb_audio_names[] = {
- 
- 	DEVICE_NAME(0x046d, 0x0990, "Logitech, Inc.", "QuickCam Pro 9000"),
- 
-+	/* ASUS ROG Zenith II: this machine has also two devices, one for
-+	 * the front headphone and another for the rest
-+	 */
-+	PROFILE_NAME(0x0b05, 0x1915, "ASUS", "Zenith II Front Headphone",
-+		     "Zenith-II-Front-Headphone"),
-+	PROFILE_NAME(0x0b05, 0x1916, "ASUS", "Zenith II Main Audio",
-+		     "Zenith-II-Main-Audio"),
-+
- 	/* ASUS ROG Strix */
- 	PROFILE_NAME(0x0b05, 0x1917,
- 		     "Realtek", "ALC1220-VB-DT", "Realtek-ALC1220-VB-Desktop"),
-diff --git a/sound/usb/mixer_maps.c b/sound/usb/mixer_maps.c
-index a7212f16660e..0ce0f702ce3d 100644
---- a/sound/usb/mixer_maps.c
-+++ b/sound/usb/mixer_maps.c
-@@ -360,13 +360,28 @@ static const struct usbmix_name_map corsair_virtuoso_map[] = {
- 	{ 0 }
- };
- 
--/* Some mobos shipped with a dummy HD-audio show the invalid GET_MIN/GET_MAX
-- * response for Input Gain Pad (id=19, control=12) and the connector status
-- * for SPDIF terminal (id=18).  Skip them.
-- */
--static const struct usbmix_name_map asus_rog_map[] = {
--	{ 18, NULL }, /* OT, connector control */
--	{ 19, NULL, 12 }, /* FU, Input Gain Pad */
-+/* ASUS ROG Zenith II with Realtek ALC1220-VB */
-+static const struct usbmix_name_map asus_zenith_ii_map[] = {
-+	{ 19, NULL, 12 }, /* FU, Input Gain Pad - broken response, disabled */
-+	{ 16, "Speaker" },		/* OT */
-+	{ 22, "Speaker Playback" },	/* FU */
-+	{ 7, "Line" },			/* IT */
-+	{ 19, "Line Capture" },		/* FU */
-+	{ 8, "Mic" },			/* IT */
-+	{ 20, "Mic Capture" },		/* FU */
-+	{ 9, "Front Mic" },		/* IT */
-+	{ 21, "Front Mic Capture" },	/* FU */
-+	{ 17, "IEC958" },		/* OT */
-+	{ 23, "IEC958 Playback" },	/* FU */
-+	{}
-+};
-+
-+static const struct usbmix_connector_map asus_zenith_ii_connector_map[] = {
-+	{ 10, 16 },	/* (Back) Speaker */
-+	{ 11, 17 },	/* SPDIF */
-+	{ 13, 7 },	/* Line */
-+	{ 14, 8 },	/* Mic */
-+	{ 15, 9 },	/* Front Mic */
- 	{}
- };
- 
-@@ -555,9 +570,10 @@ static const struct usbmix_ctl_map usbmix_ctl_maps[] = {
- 		.map = trx40_mobo_map,
- 		.connector_map = trx40_mobo_connector_map,
- 	},
--	{	/* ASUS ROG Zenith II */
-+	{	/* ASUS ROG Zenith II (main audio) */
- 		.id = USB_ID(0x0b05, 0x1916),
--		.map = asus_rog_map,
-+		.map = asus_zenith_ii_map,
-+		.connector_map = asus_zenith_ii_connector_map,
- 	},
- 	{	/* ASUS ROG Strix */
- 		.id = USB_ID(0x0b05, 0x1917),