mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2025-03-09 00:17:31 +00:00
core/linux-cubox(+headless) update kernel
This commit is contained in:
parent
419a603ed4
commit
121890a654
10 changed files with 7 additions and 455 deletions
|
@ -1,110 +0,0 @@
|
|||
#
|
||||
# Configuration for Cubox - /usr/share/alsa/cards/Kirkwood_SPDIF.conf
|
||||
#
|
||||
|
||||
<confdir:pcm/front.conf>
|
||||
|
||||
Kirkwood_SPDIF.pcm.front.0 {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
type softvol
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
control {
|
||||
name "PCM Playback Volume"
|
||||
card $CARD
|
||||
}
|
||||
}
|
||||
|
||||
Kirkwood_SPDIF.pcm.default {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
type asym
|
||||
playback.pcm {
|
||||
type plug
|
||||
slave.pcm {
|
||||
type softvol
|
||||
slave.pcm {
|
||||
@func concat
|
||||
strings [ "dmix:" $CARD ]
|
||||
}
|
||||
control {
|
||||
name = "PCM Playback Volume"
|
||||
card $CARD
|
||||
}
|
||||
}
|
||||
}
|
||||
capture.pcm {
|
||||
type plug
|
||||
slave.pcm {
|
||||
@func concat
|
||||
strings [ "dnsoop:" $CARD ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
<confdir:pcm/iec958.conf>
|
||||
|
||||
Kirkwood_SPDIF.pcm.iec958.0 {
|
||||
@args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD { type string }
|
||||
@args.AES0 { type integer }
|
||||
@args.AES1 { type integer }
|
||||
@args.AES2 { type integer }
|
||||
@args.AES3 { type integer }
|
||||
type hooks
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
hooks.0 {
|
||||
type ctl_elems
|
||||
hook_args [
|
||||
{
|
||||
interface PCM
|
||||
name "IEC958 Playback Default"
|
||||
lock true
|
||||
preserve true
|
||||
optional true
|
||||
value [ 0x06 0x82 0x00 0x01 ]
|
||||
# value [ $AES0 $AES1 $AES2 $AES3 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
<confdir:pcm/hdmi.conf>
|
||||
|
||||
Kirkwood_SPDIF.pcm.hdmi.0 {
|
||||
@args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD { type string }
|
||||
@args.AES0 { type integer }
|
||||
@args.AES1 { type integer }
|
||||
@args.AES2 { type integer }
|
||||
@args.AES3 { type integer }
|
||||
type hooks
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
hooks.0 {
|
||||
type ctl_elems
|
||||
hook_args [
|
||||
{
|
||||
interface PCM
|
||||
name "IEC958 Playback Default"
|
||||
lock true
|
||||
preserve true
|
||||
optional true
|
||||
value [ 0x06 0x82 0x00 0x01 ]
|
||||
# value [ $AES0 $AES1 $AES2 $AES3 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
|
@ -8,7 +8,7 @@ pkgname=('linux-cubox-headless')
|
|||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.5
|
||||
pkgver=${_basekernel}.7
|
||||
pkgrel=7
|
||||
pkgrel=8
|
||||
cryptover=1.5
|
||||
arch=('arm')
|
||||
url="http://www.kernel.org/"
|
||||
|
@ -17,18 +17,10 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git' 'python2')
|
|||
options=('!strip')
|
||||
source=('config'
|
||||
'change-default-console-loglevel.patch'
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
|
||||
'dovefb_patch1'.patch
|
||||
'dovefb_patch2'.patch
|
||||
"kirkwood-spdif-name.patch"
|
||||
"Kirkwood_SPDIF.conf")
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
|
||||
md5sums=('05dde562a417c40ec002451168c9f171'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'3a4b8d23c1708283e29477931d63ffb8'
|
||||
'f1a0a82c5a957c45d3a118e4f7c2a80e'
|
||||
'778d87956820ce7bffe8bb1a45416d2e'
|
||||
'9757a7460741b5284cadd0b12a2d7df6'
|
||||
'a746383e6ce46bcecb662acb3ac21b3f')
|
||||
'3a4b8d23c1708283e29477931d63ffb8')
|
||||
|
||||
__gitroot="git://github.com/vDorst/linux.git"
|
||||
__gitname="linux"
|
||||
|
@ -53,13 +45,6 @@ build() {
|
|||
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
||||
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
|
||||
|
||||
#video patches
|
||||
patch -Np1 -i "${srcdir}/dovefb_patch1.patch"
|
||||
patch -Np1 -i "${srcdir}/dovefb_patch2.patch"
|
||||
|
||||
# Changed kirkwood spdif name to SPDIF instead of S/PDIF.
|
||||
patch -Np1 -i "${srcdir}/kirkwood-spdif-name.patch"
|
||||
|
||||
cat "${srcdir}/config" > ./.config
|
||||
|
||||
# set extraversion to pkgrel
|
||||
|
|
|
@ -1,54 +0,0 @@
|
|||
From: Jean-Francois Moine <moinejf@free.fr>
|
||||
Date: Thu Nov 15 18:14:43 CET 2012
|
||||
|
||||
Stop the dovefb irq's after video display
|
||||
|
||||
This patch is to be applied to René van Dorst's linux kernel
|
||||
|
||||
git://github.com/vDorst/linux.git
|
||||
|
||||
branch
|
||||
CuBox-v3.5.7-Patched
|
||||
|
||||
diff --git a/drivers/video/dovefb/dovefb_ovly.c b/drivers/video/dovefb/dovefb_ovly.c
|
||||
index 68cfdd2..d640ac7 100644
|
||||
--- a/drivers/video/dovefb/dovefb_ovly.c
|
||||
+++ b/drivers/video/dovefb/dovefb_ovly.c
|
||||
@@ -322,7 +322,7 @@ static int dovefb_ovly_ioctl(struct fb_info *fi, unsigned int cmd,
|
||||
{
|
||||
void __user *argp = (void __user *)arg;
|
||||
struct dovefb_layer_info *dfli = fi->par;
|
||||
- u32 x;
|
||||
+ u32 x, irq_ena;
|
||||
int vmode = 0;
|
||||
int gfx_on = 1;
|
||||
int vid_on = 1;
|
||||
@@ -528,19 +528,19 @@ static int dovefb_ovly_ioctl(struct fb_info *fi, unsigned int cmd,
|
||||
case DOVEFB_IOCTL_SWITCH_VID_OVLY:
|
||||
if (copy_from_user(&vid_on, argp, sizeof(int)))
|
||||
return -EFAULT;
|
||||
+ x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
||||
+ irq_ena = readl(dfli->reg_base + SPU_IRQ_ENA);
|
||||
if (0 == vid_on) {
|
||||
- x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0) &
|
||||
- ~CFG_DMA_ENA_MASK;
|
||||
- writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
||||
+ x &= ~CFG_DMA_ENA_MASK;
|
||||
+ irq_ena &= ~(DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK);
|
||||
} else {
|
||||
- x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0) |
|
||||
- CFG_DMA_ENA(0x1);
|
||||
- writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
||||
+ x |= CFG_DMA_ENA(0x1);
|
||||
+
|
||||
/* Enable VID & VSync. */
|
||||
- x = readl(dfli->reg_base + SPU_IRQ_ENA) |
|
||||
- DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK;
|
||||
- writel(x, dfli->reg_base + SPU_IRQ_ENA);
|
||||
+ irq_ena |= DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK;
|
||||
}
|
||||
+ writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
||||
+ writel(irq_ena, dfli->reg_base + SPU_IRQ_ENA);
|
||||
break;
|
||||
case DOVEFB_IOCTL_SWITCH_GRA_OVLY:
|
||||
if (copy_from_user(&gfx_on, argp, sizeof(int)))
|
|
@ -1,14 +0,0 @@
|
|||
diff -upr linux-a/drivers/video/dovefb/dovefb_ovly.c linux-b/drivers/video/dovefb/dovefb_ovly.c
|
||||
--- linux-a/drivers/video/dovefb/dovefb_ovly.c 2012-11-16 05:47:41.682464311 -0600
|
||||
+++ linux-b/drivers/video/dovefb/dovefb_ovly.c 2012-11-16 05:41:41.217634544 -0600
|
||||
@@ -284,7 +284,9 @@ static int check_surface(struct fb_info
|
||||
(dfli->surface.viewPortInfo.srcWidth != new_info->srcWidth ||
|
||||
dfli->surface.viewPortInfo.srcHeight != new_info->srcHeight ||
|
||||
dfli->surface.viewPortInfo.zoomXSize != new_info->zoomXSize ||
|
||||
- dfli->surface.viewPortInfo.zoomYSize != new_info->zoomYSize)) {
|
||||
+ dfli->surface.viewPortInfo.zoomYSize != new_info->zoomYSize ||
|
||||
+ dfli->surface.viewPortInfo.ycPitch != new_info->ycPitch ||
|
||||
+ dfli->surface.viewPortInfo.uvPitch != new_info->uvPitch)) {
|
||||
var->xres = new_info->srcWidth;
|
||||
var->yres = new_info->srcHeight;
|
||||
var->xres_virtual = new_info->srcWidth;
|
|
@ -1,31 +0,0 @@
|
|||
--- a/sound/soc/kirkwood/kirkwood-spdif.c.orig 2012-11-25 12:55:11.314023286 +0200
|
||||
+++ b/sound/soc/kirkwood/kirkwood-spdif.c 2012-11-25 12:55:37.494024113 +0200
|
||||
@@ -72,8 +72,8 @@
|
||||
|
||||
static struct snd_soc_dai_link kirkwood_spdif_dai0[] = {
|
||||
{
|
||||
- .name = "S/PDIF0",
|
||||
- .stream_name = "S/PDIF0 PCM Playback",
|
||||
+ .name = "SPDIF0",
|
||||
+ .stream_name = "SPDIF0 PCM Playback",
|
||||
.platform_name = "kirkwood-pcm-audio.0",
|
||||
.cpu_dai_name = "kirkwood-i2s.0",
|
||||
.codec_dai_name = "dit-hifi",
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
static struct snd_soc_dai_link kirkwood_spdif_dai1[] = {
|
||||
{
|
||||
- .name = "S/PDIF1",
|
||||
+ .name = "SPDIF1",
|
||||
.stream_name = "IEC958 Playback",
|
||||
.platform_name = "kirkwood-pcm-audio.1",
|
||||
.cpu_dai_name = "kirkwood-i2s.1",
|
||||
@@ -135,7 +135,7 @@
|
||||
goto kirkwood_spdif_err_card_alloc;
|
||||
}
|
||||
|
||||
- card->name = "Kirkwood S/PDIF";
|
||||
+ card->name = "Kirkwood SPDIF";
|
||||
card->owner = THIS_MODULE;
|
||||
if (pdev->id == 0)
|
||||
card->dai_link = kirkwood_spdif_dai0;
|
|
@ -1,110 +0,0 @@
|
|||
#
|
||||
# Configuration for Cubox - /usr/share/alsa/cards/Kirkwood_SPDIF.conf
|
||||
#
|
||||
|
||||
<confdir:pcm/front.conf>
|
||||
|
||||
Kirkwood_SPDIF.pcm.front.0 {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
type softvol
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
control {
|
||||
name "PCM Playback Volume"
|
||||
card $CARD
|
||||
}
|
||||
}
|
||||
|
||||
Kirkwood_SPDIF.pcm.default {
|
||||
@args [ CARD ]
|
||||
@args.CARD {
|
||||
type string
|
||||
}
|
||||
type asym
|
||||
playback.pcm {
|
||||
type plug
|
||||
slave.pcm {
|
||||
type softvol
|
||||
slave.pcm {
|
||||
@func concat
|
||||
strings [ "dmix:" $CARD ]
|
||||
}
|
||||
control {
|
||||
name = "PCM Playback Volume"
|
||||
card $CARD
|
||||
}
|
||||
}
|
||||
}
|
||||
capture.pcm {
|
||||
type plug
|
||||
slave.pcm {
|
||||
@func concat
|
||||
strings [ "dnsoop:" $CARD ]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
<confdir:pcm/iec958.conf>
|
||||
|
||||
Kirkwood_SPDIF.pcm.iec958.0 {
|
||||
@args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD { type string }
|
||||
@args.AES0 { type integer }
|
||||
@args.AES1 { type integer }
|
||||
@args.AES2 { type integer }
|
||||
@args.AES3 { type integer }
|
||||
type hooks
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
hooks.0 {
|
||||
type ctl_elems
|
||||
hook_args [
|
||||
{
|
||||
interface PCM
|
||||
name "IEC958 Playback Default"
|
||||
lock true
|
||||
preserve true
|
||||
optional true
|
||||
value [ 0x06 0x82 0x00 0x01 ]
|
||||
# value [ $AES0 $AES1 $AES2 $AES3 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
<confdir:pcm/hdmi.conf>
|
||||
|
||||
Kirkwood_SPDIF.pcm.hdmi.0 {
|
||||
@args [ CARD AES0 AES1 AES2 AES3 ]
|
||||
@args.CARD { type string }
|
||||
@args.AES0 { type integer }
|
||||
@args.AES1 { type integer }
|
||||
@args.AES2 { type integer }
|
||||
@args.AES3 { type integer }
|
||||
type hooks
|
||||
slave.pcm {
|
||||
type hw
|
||||
card $CARD
|
||||
}
|
||||
hooks.0 {
|
||||
type ctl_elems
|
||||
hook_args [
|
||||
{
|
||||
interface PCM
|
||||
name "IEC958 Playback Default"
|
||||
lock true
|
||||
preserve true
|
||||
optional true
|
||||
value [ 0x06 0x82 0x00 0x01 ]
|
||||
# value [ $AES0 $AES1 $AES2 $AES3 ]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
|
@ -8,7 +8,7 @@ pkgname=('linux-cubox' 'linux-headers-cubox')
|
|||
_kernelname=${pkgname#linux}
|
||||
_basekernel=3.5
|
||||
pkgver=${_basekernel}.7
|
||||
pkgrel=7
|
||||
pkgrel=8
|
||||
cryptover=1.5
|
||||
arch=('arm')
|
||||
url="http://www.kernel.org/"
|
||||
|
@ -17,18 +17,10 @@ makedepends=('xmlto' 'docbook-xsl' 'uboot-mkimage' 'git' 'python2')
|
|||
options=('!strip')
|
||||
source=('config'
|
||||
'change-default-console-loglevel.patch'
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz"
|
||||
'dovefb_patch1'.patch
|
||||
'dovefb_patch2'.patch
|
||||
"kirkwood-spdif-name.patch"
|
||||
"Kirkwood_SPDIF.conf")
|
||||
md5sums=('8e36d8bd727aee9405460816085d350d'
|
||||
"http://download.gna.org/cryptodev-linux/cryptodev-linux-${cryptover}.tar.gz")
|
||||
md5sums=('e9f5000a295fabedbee858d506e771b5'
|
||||
'9d3c56a4b999c8bfbd4018089a62f662'
|
||||
'3a4b8d23c1708283e29477931d63ffb8'
|
||||
'f1a0a82c5a957c45d3a118e4f7c2a80e'
|
||||
'778d87956820ce7bffe8bb1a45416d2e'
|
||||
'9757a7460741b5284cadd0b12a2d7df6'
|
||||
'a746383e6ce46bcecb662acb3ac21b3f')
|
||||
'3a4b8d23c1708283e29477931d63ffb8')
|
||||
|
||||
__gitroot="git://github.com/vDorst/linux.git"
|
||||
__gitname="linux"
|
||||
|
@ -53,13 +45,6 @@ build() {
|
|||
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
|
||||
patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
|
||||
|
||||
#video patches
|
||||
patch -Np1 -i "${srcdir}/dovefb_patch1.patch"
|
||||
patch -Np1 -i "${srcdir}/dovefb_patch2.patch"
|
||||
|
||||
# Changed kirkwood spdif name to SPDIF instead of S/PDIF.
|
||||
patch -Np1 -i "${srcdir}/kirkwood-spdif-name.patch"
|
||||
|
||||
cat "${srcdir}/config" > ./.config
|
||||
|
||||
# set extraversion to pkgrel
|
||||
|
|
|
@ -1,54 +0,0 @@
|
|||
From: Jean-Francois Moine <moinejf@free.fr>
|
||||
Date: Thu Nov 15 18:14:43 CET 2012
|
||||
|
||||
Stop the dovefb irq's after video display
|
||||
|
||||
This patch is to be applied to René van Dorst's linux kernel
|
||||
|
||||
git://github.com/vDorst/linux.git
|
||||
|
||||
branch
|
||||
CuBox-v3.5.7-Patched
|
||||
|
||||
diff --git a/drivers/video/dovefb/dovefb_ovly.c b/drivers/video/dovefb/dovefb_ovly.c
|
||||
index 68cfdd2..d640ac7 100644
|
||||
--- a/drivers/video/dovefb/dovefb_ovly.c
|
||||
+++ b/drivers/video/dovefb/dovefb_ovly.c
|
||||
@@ -322,7 +322,7 @@ static int dovefb_ovly_ioctl(struct fb_info *fi, unsigned int cmd,
|
||||
{
|
||||
void __user *argp = (void __user *)arg;
|
||||
struct dovefb_layer_info *dfli = fi->par;
|
||||
- u32 x;
|
||||
+ u32 x, irq_ena;
|
||||
int vmode = 0;
|
||||
int gfx_on = 1;
|
||||
int vid_on = 1;
|
||||
@@ -528,19 +528,19 @@ static int dovefb_ovly_ioctl(struct fb_info *fi, unsigned int cmd,
|
||||
case DOVEFB_IOCTL_SWITCH_VID_OVLY:
|
||||
if (copy_from_user(&vid_on, argp, sizeof(int)))
|
||||
return -EFAULT;
|
||||
+ x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
||||
+ irq_ena = readl(dfli->reg_base + SPU_IRQ_ENA);
|
||||
if (0 == vid_on) {
|
||||
- x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0) &
|
||||
- ~CFG_DMA_ENA_MASK;
|
||||
- writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
||||
+ x &= ~CFG_DMA_ENA_MASK;
|
||||
+ irq_ena &= ~(DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK);
|
||||
} else {
|
||||
- x = readl(dfli->reg_base + LCD_SPU_DMA_CTRL0) |
|
||||
- CFG_DMA_ENA(0x1);
|
||||
- writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
||||
+ x |= CFG_DMA_ENA(0x1);
|
||||
+
|
||||
/* Enable VID & VSync. */
|
||||
- x = readl(dfli->reg_base + SPU_IRQ_ENA) |
|
||||
- DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK;
|
||||
- writel(x, dfli->reg_base + SPU_IRQ_ENA);
|
||||
+ irq_ena |= DOVEFB_VID_INT_MASK | DOVEFB_VSYNC_INT_MASK;
|
||||
}
|
||||
+ writel(x, dfli->reg_base + LCD_SPU_DMA_CTRL0);
|
||||
+ writel(irq_ena, dfli->reg_base + SPU_IRQ_ENA);
|
||||
break;
|
||||
case DOVEFB_IOCTL_SWITCH_GRA_OVLY:
|
||||
if (copy_from_user(&gfx_on, argp, sizeof(int)))
|
|
@ -1,14 +0,0 @@
|
|||
diff -upr linux-a/drivers/video/dovefb/dovefb_ovly.c linux-b/drivers/video/dovefb/dovefb_ovly.c
|
||||
--- linux-a/drivers/video/dovefb/dovefb_ovly.c 2012-11-16 05:47:41.682464311 -0600
|
||||
+++ linux-b/drivers/video/dovefb/dovefb_ovly.c 2012-11-16 05:41:41.217634544 -0600
|
||||
@@ -284,7 +284,9 @@ static int check_surface(struct fb_info
|
||||
(dfli->surface.viewPortInfo.srcWidth != new_info->srcWidth ||
|
||||
dfli->surface.viewPortInfo.srcHeight != new_info->srcHeight ||
|
||||
dfli->surface.viewPortInfo.zoomXSize != new_info->zoomXSize ||
|
||||
- dfli->surface.viewPortInfo.zoomYSize != new_info->zoomYSize)) {
|
||||
+ dfli->surface.viewPortInfo.zoomYSize != new_info->zoomYSize ||
|
||||
+ dfli->surface.viewPortInfo.ycPitch != new_info->ycPitch ||
|
||||
+ dfli->surface.viewPortInfo.uvPitch != new_info->uvPitch)) {
|
||||
var->xres = new_info->srcWidth;
|
||||
var->yres = new_info->srcHeight;
|
||||
var->xres_virtual = new_info->srcWidth;
|
|
@ -1,31 +0,0 @@
|
|||
--- a/sound/soc/kirkwood/kirkwood-spdif.c.orig 2012-11-25 12:55:11.314023286 +0200
|
||||
+++ b/sound/soc/kirkwood/kirkwood-spdif.c 2012-11-25 12:55:37.494024113 +0200
|
||||
@@ -72,8 +72,8 @@
|
||||
|
||||
static struct snd_soc_dai_link kirkwood_spdif_dai0[] = {
|
||||
{
|
||||
- .name = "S/PDIF0",
|
||||
- .stream_name = "S/PDIF0 PCM Playback",
|
||||
+ .name = "SPDIF0",
|
||||
+ .stream_name = "SPDIF0 PCM Playback",
|
||||
.platform_name = "kirkwood-pcm-audio.0",
|
||||
.cpu_dai_name = "kirkwood-i2s.0",
|
||||
.codec_dai_name = "dit-hifi",
|
||||
@@ -84,7 +84,7 @@
|
||||
|
||||
static struct snd_soc_dai_link kirkwood_spdif_dai1[] = {
|
||||
{
|
||||
- .name = "S/PDIF1",
|
||||
+ .name = "SPDIF1",
|
||||
.stream_name = "IEC958 Playback",
|
||||
.platform_name = "kirkwood-pcm-audio.1",
|
||||
.cpu_dai_name = "kirkwood-i2s.1",
|
||||
@@ -135,7 +135,7 @@
|
||||
goto kirkwood_spdif_err_card_alloc;
|
||||
}
|
||||
|
||||
- card->name = "Kirkwood S/PDIF";
|
||||
+ card->name = "Kirkwood SPDIF";
|
||||
card->owner = THIS_MODULE;
|
||||
if (pdev->id == 0)
|
||||
card->dai_link = kirkwood_spdif_dai0;
|
Loading…
Reference in a new issue