From 6bc98cd302dad195ef16ebf3246ebfb0b2f50004 Mon Sep 17 00:00:00 2001
From: Svyatoslav Ryhel <clamor95@gmail.com>
Date: Mon, 19 Jul 2021 20:16:43 +0300
Subject: [PATCH] pegatron-chagall: use transfomer firmwares (MR 2371)

Signed-off-by: Svyatoslav Ryhel <clamor95@gmail.com>
---
 .../testing/device-pegatron-chagall/APKBUILD  | 25 ++++++------------
 .../ucm/tegra-hda.conf                        |  8 ------
 .../ucm/tegra-hda_HiFi.conf                   | 24 -----------------
 .../firmware-pegatron-chagall/APKBUILD        | 26 -------------------
 4 files changed, 8 insertions(+), 75 deletions(-)
 delete mode 100644 device/testing/device-pegatron-chagall/ucm/tegra-hda.conf
 delete mode 100644 device/testing/device-pegatron-chagall/ucm/tegra-hda_HiFi.conf
 delete mode 100644 device/testing/firmware-pegatron-chagall/APKBUILD

diff --git a/device/testing/device-pegatron-chagall/APKBUILD b/device/testing/device-pegatron-chagall/APKBUILD
index bcfe191ad..f3caf359d 100644
--- a/device/testing/device-pegatron-chagall/APKBUILD
+++ b/device/testing/device-pegatron-chagall/APKBUILD
@@ -2,20 +2,18 @@
 
 pkgname=device-pegatron-chagall
 pkgdesc="Pegatron Chagall"
-pkgver=1
-pkgrel=1
+pkgver=2
+pkgrel=0
 url="https://postmarketos.org"
 license="MIT"
 arch="armv7"
 options="!check !archcheck"
-depends="postmarketos-base linux-postmarketos-grate mkbootimg mesa-dri-gallium xf86-video-opentegra"
+depends="postmarketos-base linux-postmarketos-grate mkbootimg alsa-ucm-conf mesa-dri-gallium xf86-video-opentegra"
 makedepends="devicepkg-dev"
 subpackages="$pkgname-phosh
 	     $pkgname-nonfree-firmware:nonfree_firmware"
 source="deviceinfo
-	rootston.ini
-	ucm/tegra-hda.conf
-	ucm/tegra-hda_HiFi.conf"
+	rootston.ini"
 
 build() {
 	devicepkg_build $startdir $pkgname
@@ -23,12 +21,6 @@ build() {
 
 package() {
 	devicepkg_package $startdir $pkgname
-
-	# Alsa use case manager configuration (audio routing)
-	install -D -m644 "$srcdir"/tegra-hda.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/tegra-hda/tegra-hda.conf
-	install -D -m644 "$srcdir"/tegra-hda_HiFi.conf \
-		"$pkgdir"/usr/share/alsa/ucm2/tegra-hda/HiFi.conf
 }
 
 phosh() {
@@ -39,12 +31,11 @@ phosh() {
 
 nonfree_firmware() {
 	pkgdesc="Pegatron Chagall WiFi and Bluetooth firmware"
-	depends="firmware-pegatron-chagall linux-firmware-brcm"
+	depends="firmware-asus-transformer"
 	mkdir "$subpkgdir"
 }
 
-
-sha512sums="fbf38232f272bde3bf563e603dca78a6aa606a889acd52c27f6062df9dac4ab2516e4d684333244eb631cbb2874d2d7ff04553b7b0e5dbdc5e5d6fb88c3b95b1  deviceinfo
+sha512sums="
+fbf38232f272bde3bf563e603dca78a6aa606a889acd52c27f6062df9dac4ab2516e4d684333244eb631cbb2874d2d7ff04553b7b0e5dbdc5e5d6fb88c3b95b1  deviceinfo
 618284cdaccd09e60cb9a99afa337fcad7b3bd33f6422b9eae34175bc4516138d486cbb9f5735cafb325bc16cf362de16aeae7c77d334668c749afcfa557359b  rootston.ini
-5dead806f7568fad5f240957158864faab7a4dbbdae18b2a18110f64caa0254a001fbd5711789718cfde055528af57cebca11bbc4d7f55e12c9853f3d9e8534c  tegra-hda.conf
-17bac2dd664bb10e8a0308500c231c4394d1dfad47235b8e83e5b1187193d1c73c54e415f248f543a1281cfd946a67dc87794b580a6e24c65a6712d37190f833  tegra-hda_HiFi.conf"
+"
diff --git a/device/testing/device-pegatron-chagall/ucm/tegra-hda.conf b/device/testing/device-pegatron-chagall/ucm/tegra-hda.conf
deleted file mode 100644
index 83517fa0f..000000000
--- a/device/testing/device-pegatron-chagall/ucm/tegra-hda.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# UCM for Nvidia Tegra30 HDMI Audio
-
-Syntax 3
-
-SectionUseCase."HiFi" {
-	File "HiFi.conf"
-	Comment "Play HiFi quality Music"
-}
diff --git a/device/testing/device-pegatron-chagall/ucm/tegra-hda_HiFi.conf b/device/testing/device-pegatron-chagall/ucm/tegra-hda_HiFi.conf
deleted file mode 100644
index aa34b9f56..000000000
--- a/device/testing/device-pegatron-chagall/ucm/tegra-hda_HiFi.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-If.hdmi {
-	Condition {
-		Type ControlExists
-		Control "iface=CARD,name='HDMI/DP,pcm=3 Jack'"
-	}
-	True {
-		SectionDevice."HDMI1" {
-			Comment "HDMI / DisplayPort Output"
-
-			EnableSequence [
-				cset "name='IEC958 Playback Switch' on"
-			]
-
-			DisableSequence [
-				cset "name='IEC958 Playback Switch' off"
-			]
-
-			Value {
-				PlaybackPCM "hw:${CardId},3"
-				JackControl "HDMI/DP,pcm=3 Jack"
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/device/testing/firmware-pegatron-chagall/APKBUILD b/device/testing/firmware-pegatron-chagall/APKBUILD
deleted file mode 100644
index 711396556..000000000
--- a/device/testing/firmware-pegatron-chagall/APKBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Raffaele Tranquillini <raffaele.tranquillini@gmail.com>
-pkgname=firmware-pegatron-chagall
-pkgver=1
-pkgrel=0
-pkgdesc="Firmware for Pegatron Chagall"
-url="https://github.com/clamor95/linux-firmware"
-arch="armv7"
-license="custom:proprietary"
-options="!check !strip !archcheck !spdx"
-
-# Sources
-_commit="ce54d4301696fb26562216c37c9e86b64d7faa40"
-_url="https://github.com/clamor95/linux-firmware"
-source="$pkgname-bt-$_commit.tar.gz::$_url/archive/$_commit.tar.gz"
-
-package() {
-	# Bluetooth
-	cd "$srcdir/linux-firmware-$_commit/brcm/"
-	install -Dm644 BCM4330B1.hcd \
-		"$pkgdir"/lib/firmware/postmarketos/brcm/BCM4330B1.hcd
-	# Wi-Fi
-	install -Dm644 brcmfmac4330-sdio.pegatron,chagall.txt \
-		"$pkgdir"/lib/firmware/postmarketos/brcm/brcmfmac4330-sdio.pegatron,chagall.txt
-}
-
-sha512sums="cbbccdb1d83cb42829026c37cfb9e2bc62f6588357d8a2af47437cdb2147f886a8f3aa88ab59c333e48502e41dc3546d0b623bffe3f4a1be5465037c61d4f765  firmware-pegatron-chagall-bt-ce54d4301696fb26562216c37c9e86b64d7faa40.tar.gz"