debian: Bump to 1.2.5.1-1+linaro1debian/1.2.5.1-1+linaro1debian/master

Changes,

- Remove RB3, RB5 and Yoga patches now in upstream.
- Add patches for change apq* plughw to hw.

Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>

4 files changed, 155 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 8fc1ea7..bf8d069 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+alsa-ucm-conf (1.2.5.1-1+linaro1) unstable; urgency=medium
+
+  * Remove RB3, RB5 and Yoga patches now in upstream.
+  * Add patch for change apq* plughw to hw.
+
+ -- Anibal Limon <anibal.limon@linaro.org>  Tue, 14 Dec 2021 11:28:16 -0600
+
 alsa-ucm-conf (1.2.5.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/0001-ucm2-Qualcomm-apq8016-sbc-Change-plughw-to-hw-to-acc.patch b/debian/patches/0001-ucm2-Qualcomm-apq8016-sbc-Change-plughw-to-hw-to-acc.patch
new file mode 100644
index 0000000..21b271b
--- /dev/null
+++ b/debian/patches/0001-ucm2-Qualcomm-apq8016-sbc-Change-plughw-to-hw-to-acc.patch
@@ -0,0 +1,95 @@
+From 65dba3cf755385d531bed9a2cd903a3869005d30 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org>
+Date: Tue, 14 Dec 2021 11:29:35 -0600
+Subject: [PATCH] ucm2/Qualcomm/apq8016-sbc: Change plughw to hw to access card
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
+---
+ ucm2/Qualcomm/apq8016-sbc/HDMI.conf |  2 +-
+ ucm2/Qualcomm/apq8016-sbc/HiFi.conf | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/ucm2/Qualcomm/apq8016-sbc/HDMI.conf b/ucm2/Qualcomm/apq8016-sbc/HDMI.conf
+index 3335422..e2316fc 100644
+--- a/ucm2/Qualcomm/apq8016-sbc/HDMI.conf
++++ b/ucm2/Qualcomm/apq8016-sbc/HDMI.conf
+@@ -12,6 +12,6 @@ SectionDevice."HDMI" {
+ 	Comment "HDMI Digital Stereo Output"
+ 	Value {
+ 		PlaybackPriority 200
+-		PlaybackPCM "plughw:${CardId}"
++		PlaybackPCM "hw:${CardId}"
+ 	}
+ }
+diff --git a/ucm2/Qualcomm/apq8016-sbc/HiFi.conf b/ucm2/Qualcomm/apq8016-sbc/HiFi.conf
+index 62ddc8e..a9c8b10 100644
+--- a/ucm2/Qualcomm/apq8016-sbc/HiFi.conf
++++ b/ucm2/Qualcomm/apq8016-sbc/HiFi.conf
+@@ -23,7 +23,7 @@ SectionDevice."Speaker" {
+ 
+ 	Value {
+ 		PlaybackPriority 200
+-		PlaybackPCM "plughw:${CardId},1"
++		PlaybackPCM "hw:${CardId},1"
+ 	}
+ }
+ 
+@@ -58,7 +58,7 @@ SectionDevice."Headphones" {
+ 
+ 	Value {
+ 		PlaybackPriority 300
+-		PlaybackPCM "plughw:${CardId},1"
++		PlaybackPCM "hw:${CardId},1"
+ 	}
+ }
+ 
+@@ -72,7 +72,7 @@ SectionDevice."Earpiece" {
+ 
+ 	Value {
+ 		PlaybackPriority 100
+-		PlaybackPCM "plughw:${CardId},1"
++		PlaybackPCM "hw:${CardId},1"
+ 	}
+ }
+ 
+@@ -94,7 +94,7 @@ SectionDevice."Handset" {
+ 
+ 	Value {
+ 		CapturePriority 400
+-		CapturePCM "plughw:${CardId},2"
++		CapturePCM "hw:${CardId},2"
+ 	}
+ }
+ 
+@@ -114,7 +114,7 @@ SectionDevice."Mic1" {
+ 
+ 	Value {
+ 		CapturePriority 300
+-		CapturePCM "plughw:${CardId},2"
++		CapturePCM "hw:${CardId},2"
+ 	}
+ }
+ 
+@@ -136,7 +136,7 @@ SectionDevice."Mic2" {
+ 
+ 	Value {
+ 		CapturePriority 200
+-		CapturePCM "plughw:${CardId},2"
++		CapturePCM "hw:${CardId},2"
+ 	}
+ }
+ 
+@@ -154,6 +154,6 @@ SectionDevice."Mic3" {
+ 
+ 	Value {
+ 		CapturePriority 100
+-		CapturePCM "plughw:${CardId},2"
++		CapturePCM "hw:${CardId},2"
+ 	}
+ }
+-- 
+2.34.1
+
diff --git a/debian/patches/0001-ucm2-Qualcomm-apq8096-Change-plughw-to-hw-to-access-.patch b/debian/patches/0001-ucm2-Qualcomm-apq8096-Change-plughw-to-hw-to-access-.patch
new file mode 100644
index 0000000..410bfdf
--- /dev/null
+++ b/debian/patches/0001-ucm2-Qualcomm-apq8096-Change-plughw-to-hw-to-access-.patch
@@ -0,0 +1,51 @@
+From 5a0a0147958009185dd9de9f2efa57ca77732708 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linaro.org>
+Date: Tue, 14 Dec 2021 11:35:45 -0600
+Subject: [PATCH] ucm2/Qualcomm/apq8096: Change plughw to hw to access card
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
+---
+ ucm2/Qualcomm/apq8096/HDMI.conf | 2 +-
+ ucm2/Qualcomm/apq8096/HiFi.conf | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/ucm2/Qualcomm/apq8096/HDMI.conf b/ucm2/Qualcomm/apq8096/HDMI.conf
+index 5bdf07e..e9967e0 100644
+--- a/ucm2/Qualcomm/apq8096/HDMI.conf
++++ b/ucm2/Qualcomm/apq8096/HDMI.conf
+@@ -28,6 +28,6 @@ SectionDevice."HDMI" {
+ 
+ 	Value {
+ 		PlaybackPriority 200
+-		PlaybackPCM "plughw:${CardId}"
++		PlaybackPCM "hw:${CardId}"
+ 	}
+ }
+diff --git a/ucm2/Qualcomm/apq8096/HiFi.conf b/ucm2/Qualcomm/apq8096/HiFi.conf
+index 89280d7..c60062e 100644
+--- a/ucm2/Qualcomm/apq8096/HiFi.conf
++++ b/ucm2/Qualcomm/apq8096/HiFi.conf
+@@ -68,7 +68,7 @@ SectionDevice."Headphones" {
+ 
+ 	Value {
+ 		PlaybackPriority 100
+-		PlaybackPCM "plughw:${CardId},1"
++		PlaybackPCM "hw:${CardId},1"
+ 	}
+ }
+ 
+@@ -94,7 +94,7 @@ SectionDevice."Headset" {
+ 
+ 	Value {
+ 		CapturePriority 100
+-		CapturePCM "plughw:${CardId},2"
++		CapturePCM "hw:${CardId},2"
+ 		CaptureChannels 1
+ 	}
+ }
+-- 
+2.34.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..e964743
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-ucm2-Qualcomm-apq8016-sbc-Change-plughw-to-hw-to-acc.patch
+0001-ucm2-Qualcomm-apq8096-Change-plughw-to-hw-to-access-.patch