ucm: Change directory name to bcm2835 from bcm2837

Actually, RPI3's audio device name is "bcm2835".

Please See: audio-hal-bcm2837/tizen-audio-internal.h
platform/kernel/linux-rpi3/sound/arm/

The SoC:BCM2837 is the Broadcom chip used in the Raspberry-Pi 3.
However, the kernel's audio driver has been developed since the days of
bcm2835. And the name "bcm2835" continues to be used until now. So
Raspberry-pi 3 is bcm2837, but the audio device name is bcm2835. For the
same reason, not only audio, but other kernel drivers are also named
"bcm2835".

The alsa-ucm directory is of the form
"/usr/share/alsa/ucm/<card name>/<card name>.conf".
In "audio-hal-bcm2837", the snd_use_case_mgr_open() function is used,
and the parameter of this function is the "card name".
And Raspberry-Pi 3's the "card name" is "bcm2835".

Change-Id: Ie5c1e2502c28ffc72fe27346694274defec90ee5
Signed-off-by: Hackseung Lee <lhs@dignsys.com>

diff --git a/bcm2835/bcm2835.conf b/bcm2835/bcm2835.conf
new file mode 100644 (file)
index 0000000..f8ab3a8
--- /dev/null
+++ b/bcm2835/bcm2835.conf
@@ -0,0 +1,23 @@
+SectionUseCase."Inactive" {
+  File "inactive"
+  Comment "reset audio path"
+}
+
+SectionUseCase."HiFi" {
+  File "hifi"
+  Comment "Hifi audio path"
+}
+
+SectionUseCase."HDMI" {
+  File "hdmi"
+  Comment "HDMI audio path"
+}
+
+
+ValueDefaults {
+  PlaybackCTL "hw:1"
+  CaptureCTL "hw:1"
+}
+
+SectionDefaults {
+}

diff --git a/bcm2835/hdmi b/bcm2835/hdmi
new file mode 100644 (file)
index 0000000..8d825c5
--- /dev/null
+++ b/bcm2835/hdmi
@@ -0,0 +1,25 @@
+SectionVerb {
+  EnableSequence [
+  ]
+  DisableSequence [
+  ]
+
+  Value {
+    TQ "Music"
+    PlaybackCTL "hw:1"
+  }
+}
+
+SectionDevice."HDMI" {
+  Comment "HDMI AUDIO"
+
+  EnableSequence [
+  ]
+
+  DisableSequence [
+  ]
+
+  Value {
+    PlaybackPCM "hw:1,1"
+  }
+}

diff --git a/bcm2835/hifi b/bcm2835/hifi
new file mode 100644 (file)
index 0000000..0764735
--- /dev/null
+++ b/bcm2835/hifi
@@ -0,0 +1,25 @@
+SectionVerb {
+  EnableSequence [
+  ]
+  DisableSequence [
+  ]
+
+  Value {
+    TQ "Music"
+    PlaybackCTL "hw:1"
+  }
+}
+
+SectionDevice."Speaker" {
+  Comment "3.5mm Speaker"
+
+  EnableSequence [
+  ]
+
+  DisableSequence [
+  ]
+
+  Value {
+    PlaybackPCM "hw:1,0"
+  }
+}

diff --git a/bcm2835/inactive b/bcm2835/inactive
new file mode 100644 (file)
index 0000000..17e9a80
--- /dev/null
+++ b/bcm2835/inactive
@@ -0,0 +1,42 @@
+SectionVerb {
+  EnableSequence [
+  ]
+  DisableSequence [
+  ]
+
+  Value {
+    TQ "Music"
+    PlaybackCTL "hw:1"
+    CaptureCTL "hw:1"
+  }
+}
+
+SectionDevice."All" {
+  Comment "reset all"
+
+  EnableSequence [
+  ]
+
+  DisableSequence [
+  ]
+}
+
+SectionDevice."Playback" {
+  Comment "reset playback"
+
+  EnableSequence [
+  ]
+
+  DisableSequence [
+  ]
+}
+
+SectionDevice."Capture" {
+  Comment "reset capture"
+
+  EnableSequence [
+  ]
+
+  DisableSequence [
+  ]
+}

diff --git a/bcm2837/bcm2837.conf b/bcm2837/bcm2837.conf
deleted file mode 100644 (file)
index f8ab3a8..0000000
--- a/bcm2837/bcm2837.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-SectionUseCase."Inactive" {
-  File "inactive"
-  Comment "reset audio path"
-}
-
-SectionUseCase."HiFi" {
-  File "hifi"
-  Comment "Hifi audio path"
-}
-
-SectionUseCase."HDMI" {
-  File "hdmi"
-  Comment "HDMI audio path"
-}
-
-
-ValueDefaults {
-  PlaybackCTL "hw:1"
-  CaptureCTL "hw:1"
-}
-
-SectionDefaults {
-}

diff --git a/bcm2837/hdmi b/bcm2837/hdmi
deleted file mode 100644 (file)
index 8d825c5..0000000
--- a/bcm2837/hdmi
+++ /dev/null
@@ -1,25 +0,0 @@
-SectionVerb {
-  EnableSequence [
-  ]
-  DisableSequence [
-  ]
-
-  Value {
-    TQ "Music"
-    PlaybackCTL "hw:1"
-  }
-}
-
-SectionDevice."HDMI" {
-  Comment "HDMI AUDIO"
-
-  EnableSequence [
-  ]
-
-  DisableSequence [
-  ]
-
-  Value {
-    PlaybackPCM "hw:1,1"
-  }
-}

diff --git a/bcm2837/hifi b/bcm2837/hifi
deleted file mode 100644 (file)
index 0764735..0000000
--- a/bcm2837/hifi
+++ /dev/null
@@ -1,25 +0,0 @@
-SectionVerb {
-  EnableSequence [
-  ]
-  DisableSequence [
-  ]
-
-  Value {
-    TQ "Music"
-    PlaybackCTL "hw:1"
-  }
-}
-
-SectionDevice."Speaker" {
-  Comment "3.5mm Speaker"
-
-  EnableSequence [
-  ]
-
-  DisableSequence [
-  ]
-
-  Value {
-    PlaybackPCM "hw:1,0"
-  }
-}

diff --git a/bcm2837/inactive b/bcm2837/inactive
deleted file mode 100644 (file)
index 17e9a80..0000000
--- a/bcm2837/inactive
+++ /dev/null
@@ -1,42 +0,0 @@
-SectionVerb {
-  EnableSequence [
-  ]
-  DisableSequence [
-  ]
-
-  Value {
-    TQ "Music"
-    PlaybackCTL "hw:1"
-    CaptureCTL "hw:1"
-  }
-}
-
-SectionDevice."All" {
-  Comment "reset all"
-
-  EnableSequence [
-  ]
-
-  DisableSequence [
-  ]
-}
-
-SectionDevice."Playback" {
-  Comment "reset playback"
-
-  EnableSequence [
-  ]
-
-  DisableSequence [
-  ]
-}
-
-SectionDevice."Capture" {
-  Comment "reset capture"
-
-  EnableSequence [
-  ]
-
-  DisableSequence [
-  ]
-}

diff --git a/packaging/alsa-ucm-data-rpi3.spec b/packaging/alsa-ucm-data-rpi3.spec
index 31d073dd3b26623bb75595ce8aa222b05834ab3b..afb0051eb6a26f3ab5210f05e43428ac2b8401df 100644 (file)
--- a/packaging/alsa-ucm-data-rpi3.spec
+++ b/packaging/alsa-ucm-data-rpi3.spec
@@ -17,11 +17,11 @@ ALSA UCM data for rpi3
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/alsa/ucm
-cp -a bcm2837 %{buildroot}/usr/share/alsa/ucm
+cp -a bcm2835 %{buildroot}/usr/share/alsa/ucm
 
 %post
 
 %files
 %manifest alsa-ucm-conf-rpi3.manifest
-/usr/share/alsa/ucm/bcm2837/*
+/usr/share/alsa/ucm/bcm2835/*
 %license LICENSE.Apache-2.0