redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

Merge remote-tracking branch 'asoc/topic/fsi' into asoc-next

hifive-unleashed-5.1
Mark Brown 2013-02-11 11:06:35 +00:00
parent 1b4327dced e43fc6af25
commit d0c65252c4
7 changed files with 122 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Documentation/devicetree/bindings/sound/renesas,fsi.txt 100644
View File

@ -0,0 +1,26 @@
Renesas FSI
Required properties:
- compatible : "renesas,sh_fsi2" or "renesas,sh_fsi"
- reg : Should contain the register physical address and length
- interrupts : Should contain FSI interrupt
- fsia,spdif-connection : FSI is connected by S/PDFI
- fsia,stream-mode-support : FSI supports 16bit stream mode.
- fsia,use-internal-clock : FSI uses internal clock when master mode.
- fsib,spdif-connection : same as fsia
- fsib,stream-mode-support : same as fsia
- fsib,use-internal-clock : same as fsia
Example:
sh_fsi2: sh_fsi2@0xec230000 {
compatible = "renesas,sh_fsi2";
reg = <0xec230000 0x400>;
interrupts = <0 146 0x4>;
fsia,spdif-connection;
fsia,stream-mode-support;
fsia,use-internal-clock;
};

11
arch/arm/mach-shmobile/board-ap4evb.c
View File

@ -657,14 +657,8 @@ static struct platform_device lcdc_device = {
/* FSI */ /* FSI */
#define IRQ_FSI evt2irq(0x1840) #define IRQ_FSI evt2irq(0x1840)
static struct sh_fsi_platform_info fsi_info = { static struct sh_fsi_platform_info fsi_info = {
.port_a = {
.flags = SH_FSI_BRS_INV,
},
.port_b = { .port_b = {
.flags = SH_FSI_BRS_INV | .flags = SH_FSI_CLK_CPG |
SH_FSI_BRM_INV |
SH_FSI_LRS_INV |
SH_FSI_CLK_CPG |
SH_FSI_FMT_SPDIF, SH_FSI_FMT_SPDIF,
}, },
}; };
@ -816,7 +810,8 @@ static struct platform_device lcdc1_device = {
}; };
static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = { static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
.cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM, .cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM |
SND_SOC_DAIFMT_IB_NF,
}; };
static struct asoc_simple_card_info fsi2_hdmi_info = { static struct asoc_simple_card_info fsi2_hdmi_info = {

11
arch/arm/mach-shmobile/board-mackerel.c
View File

@ -503,7 +503,8 @@ static struct platform_device hdmi_lcdc_device = {
}; };
static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = { static struct asoc_simple_dai_init_info fsi2_hdmi_init_info = {
.cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM, .cpu_daifmt = SND_SOC_DAIFMT_CBM_CFM |
SND_SOC_DAIFMT_IB_NF,
}; };
static struct asoc_simple_card_info fsi2_hdmi_info = { static struct asoc_simple_card_info fsi2_hdmi_info = {
@ -858,16 +859,12 @@ static struct platform_device leds_device = {
#define IRQ_FSI evt2irq(0x1840) #define IRQ_FSI evt2irq(0x1840)
static struct sh_fsi_platform_info fsi_info = { static struct sh_fsi_platform_info fsi_info = {
.port_a = { .port_a = {
.flags = SH_FSI_BRS_INV,
.tx_id = SHDMA_SLAVE_FSIA_TX, .tx_id = SHDMA_SLAVE_FSIA_TX,
.rx_id = SHDMA_SLAVE_FSIA_RX, .rx_id = SHDMA_SLAVE_FSIA_RX,
}, },
.port_b = { .port_b = {
.flags = SH_FSI_BRS_INV | .flags = SH_FSI_CLK_CPG |
SH_FSI_BRM_INV | SH_FSI_FMT_SPDIF,
SH_FSI_LRS_INV |
SH_FSI_CLK_CPG |
SH_FSI_FMT_SPDIF,
} }
}; };

12
arch/sh/boards/mach-ecovec24/setup.c
View File

@ -887,12 +887,6 @@ static struct platform_device camera_devices[] = {
}; };
/* FSI */ /* FSI */
static struct sh_fsi_platform_info fsi_info = {
.port_b = {
.flags = SH_FSI_BRS_INV,
},
};
static struct resource fsi_resources[] = { static struct resource fsi_resources[] = {
[0] = { [0] = {
.name = "FSI", .name = "FSI",
@ -911,15 +905,13 @@ static struct platform_device fsi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(fsi_resources), .num_resources = ARRAY_SIZE(fsi_resources),
.resource = fsi_resources, .resource = fsi_resources,
.dev = {
.platform_data = &fsi_info,
},
}; };
static struct asoc_simple_dai_init_info fsi_da7210_init_info = { static struct asoc_simple_dai_init_info fsi_da7210_init_info = {
.fmt = SND_SOC_DAIFMT_I2S, .fmt = SND_SOC_DAIFMT_I2S,
.codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM,
.cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS, .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS |
SND_SOC_DAIFMT_IB_NF,
}; };
static struct asoc_simple_card_info fsi_da7210_info = { static struct asoc_simple_card_info fsi_da7210_info = {

12
arch/sh/boards/mach-se/7724/setup.c
View File

@ -279,12 +279,6 @@ static struct platform_device ceu1_device = {
/* FSI */ /* FSI */
/* change J20, J21, J22 pin to 1-2 connection to use slave mode */ /* change J20, J21, J22 pin to 1-2 connection to use slave mode */
static struct sh_fsi_platform_info fsi_info = {
.port_a = {
.flags = SH_FSI_BRS_INV,
},
};
static struct resource fsi_resources[] = { static struct resource fsi_resources[] = {
[0] = { [0] = {
.name = "FSI", .name = "FSI",
@ -303,15 +297,13 @@ static struct platform_device fsi_device = {
.id = 0, .id = 0,
.num_resources = ARRAY_SIZE(fsi_resources), .num_resources = ARRAY_SIZE(fsi_resources),
.resource = fsi_resources, .resource = fsi_resources,
.dev = {
.platform_data = &fsi_info,
},
}; };
static struct asoc_simple_dai_init_info fsi2_ak4642_init_info = { static struct asoc_simple_dai_init_info fsi2_ak4642_init_info = {
.fmt = SND_SOC_DAIFMT_LEFT_J, .fmt = SND_SOC_DAIFMT_LEFT_J,
.codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM,
.cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS, .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS |
SND_SOC_DAIFMT_IB_NF,
.sysclk = 11289600, .sysclk = 11289600,
}; };

70
include/sound/sh_fsi.h
View File

@ -11,82 +11,20 @@
* it under the terms of the GNU General Public License version 2 as * it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation. * published by the Free Software Foundation.
*/ */
#define FSI_PORT_A 0
#define FSI_PORT_B 1
#include <linux/clk.h> #include <linux/clk.h>
#include <sound/soc.h> #include <sound/soc.h>
/* /*
* flags format * flags
*
* 0x00000CBA
*
* A: inversion
* B: format mode
* C: chip specific
* D: clock selecter if master mode
*/ */
#define SH_FSI_FMT_SPDIF (1 << 0) /* spdif for HDMI */
/* A: clock inversion */ #define SH_FSI_ENABLE_STREAM_MODE (1 << 1) /* for 16bit data */
#define SH_FSI_INVERSION_MASK 0x0000000F #define SH_FSI_CLK_CPG (1 << 2) /* FSIxCK + FSI-DIV */
#define SH_FSI_LRM_INV (1 << 0)
#define SH_FSI_BRM_INV (1 << 1)
#define SH_FSI_LRS_INV (1 << 2)
#define SH_FSI_BRS_INV (1 << 3)
/* B: format mode */
#define SH_FSI_FMT_MASK 0x000000F0
#define SH_FSI_FMT_DAI (0 << 4)
#define SH_FSI_FMT_SPDIF (1 << 4)
/* C: chip specific */
#define SH_FSI_OPTION_MASK 0x00000F00
#define SH_FSI_ENABLE_STREAM_MODE (1 << 8) /* for 16bit data */
/* D: clock selecter if master mode */
#define SH_FSI_CLK_MASK 0x0000F000
#define SH_FSI_CLK_EXTERNAL (0 << 12)
#define SH_FSI_CLK_CPG (1 << 12) /* FSIxCK + FSI-DIV */
/*
* set_rate return value
*
* see ACKMD/BPFMD on
* ACK_MD (FSI2)
* CKG1 (FSI)
*
* err : return value < 0
* no change : return value == 0
* change xMD : return value > 0
*
* 0x-00000AB
*
* A: ACKMD value
* B: BPFMD value
*/
#define SH_FSI_ACKMD_MASK (0xF << 0)
#define SH_FSI_ACKMD_512 (1 << 0)
#define SH_FSI_ACKMD_256 (2 << 0)
#define SH_FSI_ACKMD_128 (3 << 0)
#define SH_FSI_ACKMD_64 (4 << 0)
#define SH_FSI_ACKMD_32 (5 << 0)
#define SH_FSI_BPFMD_MASK (0xF << 4)
#define SH_FSI_BPFMD_512 (1 << 4)
#define SH_FSI_BPFMD_256 (2 << 4)
#define SH_FSI_BPFMD_128 (3 << 4)
#define SH_FSI_BPFMD_64 (4 << 4)
#define SH_FSI_BPFMD_32 (5 << 4)
#define SH_FSI_BPFMD_16 (6 << 4)
struct sh_fsi_port_info { struct sh_fsi_port_info {
unsigned long flags; unsigned long flags;
int tx_id; int tx_id;
int rx_id; int rx_id;
int (*set_rate)(struct device *dev, int rate, int enable);
}; };
struct sh_fsi_platform_info { struct sh_fsi_platform_info {

242
sound/soc/sh/fsi.c
View File

@ -16,6 +16,8 @@
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/scatterlist.h> #include <linux/scatterlist.h>
#include <linux/sh_dma.h> #include <linux/sh_dma.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -131,8 +133,6 @@
#define FSI_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE) #define FSI_FMTS (SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S16_LE)
typedef int (*set_rate_func)(struct device *dev, int rate, int enable);
/* /*
* bus options * bus options
* *
@ -244,8 +244,7 @@ struct fsi_clk {
struct clk *ick; struct clk *ick;
struct clk *div; struct clk *div;
int (*set_rate)(struct device *dev, int (*set_rate)(struct device *dev,
struct fsi_priv *fsi, struct fsi_priv *fsi);
unsigned long rate);
unsigned long rate; unsigned long rate;
unsigned int count; unsigned int count;
@ -254,7 +253,6 @@ struct fsi_clk {
struct fsi_priv { struct fsi_priv {
void __iomem *base; void __iomem *base;
struct fsi_master *master; struct fsi_master *master;
struct sh_fsi_port_info *info;
struct fsi_stream playback; struct fsi_stream playback;
struct fsi_stream capture; struct fsi_stream capture;
@ -270,8 +268,6 @@ struct fsi_priv {
int enable_stream:1; int enable_stream:1;
int bit_clk_inv:1; int bit_clk_inv:1;
int lr_clk_inv:1; int lr_clk_inv:1;
long rate;
}; };
struct fsi_stream_handler { struct fsi_stream_handler {
@ -303,7 +299,7 @@ struct fsi_master {
int irq; int irq;
struct fsi_priv fsia; struct fsi_priv fsia;
struct fsi_priv fsib; struct fsi_priv fsib;
struct fsi_core *core; const struct fsi_core *core;
spinlock_t lock; spinlock_t lock;
}; };
@ -431,22 +427,6 @@ static struct fsi_priv *fsi_get_priv(struct snd_pcm_substream *substream)
return fsi_get_priv_frm_dai(fsi_get_dai(substream)); return fsi_get_priv_frm_dai(fsi_get_dai(substream));
} }
static set_rate_func fsi_get_info_set_rate(struct fsi_priv *fsi)
{
if (!fsi->info)
return NULL;
return fsi->info->set_rate;
}
static u32 fsi_get_info_flags(struct fsi_priv *fsi)
{
if (!fsi->info)
return 0;
return fsi->info->flags;
}
static u32 fsi_get_port_shift(struct fsi_priv *fsi, struct fsi_stream *io) static u32 fsi_get_port_shift(struct fsi_priv *fsi, struct fsi_stream *io)
{ {
int is_play = fsi_stream_is_play(fsi, io); int is_play = fsi_stream_is_play(fsi, io);
@ -757,8 +737,7 @@ static int fsi_clk_init(struct device *dev,
int ick, int ick,
int div, int div,
int (*set_rate)(struct device *dev, int (*set_rate)(struct device *dev,
struct fsi_priv *fsi, struct fsi_priv *fsi))
unsigned long rate))
{ {
struct fsi_clk *clock = &fsi->clock; struct fsi_clk *clock = &fsi->clock;
int is_porta = fsi_is_port_a(fsi); int is_porta = fsi_is_port_a(fsi);
@ -829,8 +808,7 @@ static int fsi_clk_is_valid(struct fsi_priv *fsi)
} }
static int fsi_clk_enable(struct device *dev, static int fsi_clk_enable(struct device *dev,
struct fsi_priv *fsi, struct fsi_priv *fsi)
unsigned long rate)
{ {
struct fsi_clk *clock = &fsi->clock; struct fsi_clk *clock = &fsi->clock;
int ret = -EINVAL; int ret = -EINVAL;
@ -839,7 +817,7 @@ static int fsi_clk_enable(struct device *dev,
return ret; return ret;
if (0 == clock->count) { if (0 == clock->count) {
ret = clock->set_rate(dev, fsi, rate); ret = clock->set_rate(dev, fsi);
if (ret < 0) { if (ret < 0) {
fsi_clk_invalid(fsi); fsi_clk_invalid(fsi);
return ret; return ret;
@ -946,11 +924,11 @@ static int fsi_clk_set_ackbpf(struct device *dev,
} }
static int fsi_clk_set_rate_external(struct device *dev, static int fsi_clk_set_rate_external(struct device *dev,
struct fsi_priv *fsi, struct fsi_priv *fsi)
unsigned long rate)
{ {
struct clk *xck = fsi->clock.xck; struct clk *xck = fsi->clock.xck;
struct clk *ick = fsi->clock.ick; struct clk *ick = fsi->clock.ick;
unsigned long rate = fsi->clock.rate;
unsigned long xrate; unsigned long xrate;
int ackmd, bpfmd; int ackmd, bpfmd;
int ret = 0; int ret = 0;
@ -978,11 +956,11 @@ static int fsi_clk_set_rate_external(struct device *dev,
} }
static int fsi_clk_set_rate_cpg(struct device *dev, static int fsi_clk_set_rate_cpg(struct device *dev,
struct fsi_priv *fsi, struct fsi_priv *fsi)
unsigned long rate)
{ {
struct clk *ick = fsi->clock.ick; struct clk *ick = fsi->clock.ick;
struct clk *div = fsi->clock.div; struct clk *div = fsi->clock.div;
unsigned long rate = fsi->clock.rate;
unsigned long target = 0; /* 12288000 or 11289600 */ unsigned long target = 0; /* 12288000 or 11289600 */
unsigned long actual, cout; unsigned long actual, cout;
unsigned long diff, min; unsigned long diff, min;
@ -1063,85 +1041,6 @@ static int fsi_clk_set_rate_cpg(struct device *dev,
return ret; return ret;
} }
static int fsi_set_master_clk(struct device *dev, struct fsi_priv *fsi,
long rate, int enable)
{
set_rate_func set_rate = fsi_get_info_set_rate(fsi);
int ret;
/*
* CAUTION
*
* set_rate will be deleted
*/
if (!set_rate) {
if (enable)
return fsi_clk_enable(dev, fsi, rate);
else
return fsi_clk_disable(dev, fsi);
}
ret = set_rate(dev, rate, enable);
if (ret < 0) /* error */
return ret;
if (!enable)
return 0;
if (ret > 0) {
u32 data = 0;
switch (ret & SH_FSI_ACKMD_MASK) {
default:
/* FALL THROUGH */
case SH_FSI_ACKMD_512:
data |= (0x0 << 12);
break;
case SH_FSI_ACKMD_256:
data |= (0x1 << 12);
break;
case SH_FSI_ACKMD_128:
data |= (0x2 << 12);
break;
case SH_FSI_ACKMD_64:
data |= (0x3 << 12);
break;
case SH_FSI_ACKMD_32:
data |= (0x4 << 12);
break;
}
switch (ret & SH_FSI_BPFMD_MASK) {
default:
/* FALL THROUGH */
case SH_FSI_BPFMD_32:
data |= (0x0 << 8);
break;
case SH_FSI_BPFMD_64:
data |= (0x1 << 8);
break;
case SH_FSI_BPFMD_128:
data |= (0x2 << 8);
break;
case SH_FSI_BPFMD_256:
data |= (0x3 << 8);
break;
case SH_FSI_BPFMD_512:
data |= (0x4 << 8);
break;
case SH_FSI_BPFMD_16:
data |= (0x7 << 8);
break;
}
fsi_reg_mask_set(fsi, CKG1, (ACKMD_MASK | BPFMD_MASK) , data);
udelay(10);
ret = 0;
}
return ret;
}
/* /*
* pio data transfer handler * pio data transfer handler
*/ */
@ -1637,7 +1536,6 @@ static int fsi_hw_startup(struct fsi_priv *fsi,
struct fsi_stream *io, struct fsi_stream *io,
struct device *dev) struct device *dev)
{ {
u32 flags = fsi_get_info_flags(fsi);
u32 data = 0; u32 data = 0;
/* clock setting */ /* clock setting */
@ -1654,19 +1552,6 @@ static int fsi_hw_startup(struct fsi_priv *fsi,
data |= (1 << 4); data |= (1 << 4);
if (fsi_is_clk_master(fsi)) if (fsi_is_clk_master(fsi))
data <<= 8; data <<= 8;
/* FIXME
*
* SH_FSI_xxx_INV style will be removed
*/
if (SH_FSI_LRM_INV & flags)
data |= 1 << 12;
if (SH_FSI_BRM_INV & flags)
data |= 1 << 8;
if (SH_FSI_LRS_INV & flags)
data |= 1 << 4;
if (SH_FSI_BRS_INV & flags)
data |= 1 << 0;
fsi_reg_write(fsi, CKG2, data); fsi_reg_write(fsi, CKG2, data);
/* spdif ? */ /* spdif ? */
@ -1698,7 +1583,7 @@ static int fsi_hw_startup(struct fsi_priv *fsi,
/* start master clock */ /* start master clock */
if (fsi_is_clk_master(fsi)) if (fsi_is_clk_master(fsi))
return fsi_set_master_clk(dev, fsi, fsi->rate, 1); return fsi_clk_enable(dev, fsi);
return 0; return 0;
} }
@ -1708,7 +1593,7 @@ static int fsi_hw_shutdown(struct fsi_priv *fsi,
{ {
/* stop master clock */ /* stop master clock */
if (fsi_is_clk_master(fsi)) if (fsi_is_clk_master(fsi))
return fsi_set_master_clk(dev, fsi, fsi->rate, 0); return fsi_clk_disable(dev, fsi);
return 0; return 0;
} }
@ -1719,7 +1604,6 @@ static int fsi_dai_startup(struct snd_pcm_substream *substream,
struct fsi_priv *fsi = fsi_get_priv(substream); struct fsi_priv *fsi = fsi_get_priv(substream);
fsi_clk_invalid(fsi); fsi_clk_invalid(fsi);
fsi->rate = 0;
return 0; return 0;
} }
@ -1730,7 +1614,6 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
struct fsi_priv *fsi = fsi_get_priv(substream); struct fsi_priv *fsi = fsi_get_priv(substream);
fsi_clk_invalid(fsi); fsi_clk_invalid(fsi);
fsi->rate = 0;
} }
static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd, static int fsi_dai_trigger(struct snd_pcm_substream *substream, int cmd,
@ -1795,7 +1678,6 @@ static int fsi_set_fmt_spdif(struct fsi_priv *fsi)
static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
{ {
struct fsi_priv *fsi = fsi_get_priv_frm_dai(dai); struct fsi_priv *fsi = fsi_get_priv_frm_dai(dai);
set_rate_func set_rate = fsi_get_info_set_rate(fsi);
int ret; int ret;
/* set master/slave audio interface */ /* set master/slave audio interface */
@ -1831,14 +1713,6 @@ static int fsi_dai_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
} }
if (fsi_is_clk_master(fsi)) { if (fsi_is_clk_master(fsi)) {
/*
* CAUTION
*
* set_rate will be deleted
*/
if (set_rate)
dev_warn(dai->dev, "set_rate will be removed soon\n");
if (fsi->clk_cpg) if (fsi->clk_cpg)
fsi_clk_init(dai->dev, fsi, 0, 1, 1, fsi_clk_init(dai->dev, fsi, 0, 1, 1,
fsi_clk_set_rate_cpg); fsi_clk_set_rate_cpg);
@ -1862,10 +1736,8 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
{ {
struct fsi_priv *fsi = fsi_get_priv(substream); struct fsi_priv *fsi = fsi_get_priv(substream);
if (fsi_is_clk_master(fsi)) { if (fsi_is_clk_master(fsi))
fsi->rate = params_rate(params); fsi_clk_valid(fsi, params_rate(params));
fsi_clk_valid(fsi, fsi->rate);
}
return 0; return 0;
} }
@ -2017,6 +1889,33 @@ static struct snd_soc_platform_driver fsi_soc_platform = {
/* /*
* platform function * platform function
*/ */
static void fsi_of_parse(char *name,
struct device_node *np,
struct sh_fsi_port_info *info,
struct device *dev)
{
int i;
char prop[128];
unsigned long flags = 0;
struct {
char *name;
unsigned int val;
} of_parse_property[] = {
{ "spdif-connection", SH_FSI_FMT_SPDIF },
{ "stream-mode-support", SH_FSI_ENABLE_STREAM_MODE },
{ "use-internal-clock", SH_FSI_CLK_CPG },
};
for (i = 0; i < ARRAY_SIZE(of_parse_property); i++) {
sprintf(prop, "%s,%s", name, of_parse_property[i].name);
if (of_get_property(np, prop, NULL))
flags |= of_parse_property[i].val;
}
info->flags = flags;
dev_dbg(dev, "%s flags : %lx\n", name, info->flags);
}
static void fsi_port_info_init(struct fsi_priv *fsi, static void fsi_port_info_init(struct fsi_priv *fsi,
struct sh_fsi_port_info *info) struct sh_fsi_port_info *info)
{ {
@ -2044,23 +1943,40 @@ static void fsi_handler_init(struct fsi_priv *fsi,
} }
} }
static struct of_device_id fsi_of_match[];
static int fsi_probe(struct platform_device *pdev) static int fsi_probe(struct platform_device *pdev)
{ {
struct fsi_master *master; struct fsi_master *master;
const struct platform_device_id *id_entry; struct device_node *np = pdev->dev.of_node;
struct sh_fsi_platform_info *info = pdev->dev.platform_data; struct sh_fsi_platform_info info;
struct sh_fsi_port_info nul_info, *pinfo; const struct fsi_core *core;
struct fsi_priv *fsi; struct fsi_priv *fsi;
struct resource *res; struct resource *res;
unsigned int irq; unsigned int irq;
int ret; int ret;
nul_info.flags = 0; memset(&info, 0, sizeof(info));
nul_info.tx_id = 0;
nul_info.rx_id = 0;
id_entry = pdev->id_entry; core = NULL;
if (!id_entry) { if (np) {
const struct of_device_id *of_id;
of_id = of_match_device(fsi_of_match, &pdev->dev);
if (of_id) {
core = of_id->data;
fsi_of_parse("fsia", np, &info.port_a, &pdev->dev);
fsi_of_parse("fsib", np, &info.port_b, &pdev->dev);
}
} else {
const struct platform_device_id *id_entry = pdev->id_entry;
if (id_entry)
core = (struct fsi_core *)id_entry->driver_data;
if (pdev->dev.platform_data)
memcpy(&info, pdev->dev.platform_data, sizeof(info));
}
if (!core) {
dev_err(&pdev->dev, "unknown fsi device\n"); dev_err(&pdev->dev, "unknown fsi device\n");
return -ENODEV; return -ENODEV;
} }
@ -2087,17 +2003,15 @@ static int fsi_probe(struct platform_device *pdev)
/* master setting */ /* master setting */
master->irq = irq; master->irq = irq;
master->core = (struct fsi_core *)id_entry->driver_data; master->core = core;
spin_lock_init(&master->lock); spin_lock_init(&master->lock);
/* FSI A setting */ /* FSI A setting */
pinfo = (info) ? &info->port_a : &nul_info;
fsi = &master->fsia; fsi = &master->fsia;
fsi->base = master->base; fsi->base = master->base;
fsi->master = master; fsi->master = master;
fsi->info = pinfo; fsi_port_info_init(fsi, &info.port_a);
fsi_port_info_init(fsi, pinfo); fsi_handler_init(fsi, &info.port_a);
fsi_handler_init(fsi, pinfo);
ret = fsi_stream_probe(fsi, &pdev->dev); ret = fsi_stream_probe(fsi, &pdev->dev);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "FSIA stream probe failed\n"); dev_err(&pdev->dev, "FSIA stream probe failed\n");
@ -2105,13 +2019,11 @@ static int fsi_probe(struct platform_device *pdev)
} }
/* FSI B setting */ /* FSI B setting */
pinfo = (info) ? &info->port_b : &nul_info;
fsi = &master->fsib; fsi = &master->fsib;
fsi->base = master->base + 0x40; fsi->base = master->base + 0x40;
fsi->master = master; fsi->master = master;
fsi->info = pinfo; fsi_port_info_init(fsi, &info.port_b);
fsi_port_info_init(fsi, pinfo); fsi_handler_init(fsi, &info.port_b);
fsi_handler_init(fsi, pinfo);
ret = fsi_stream_probe(fsi, &pdev->dev); ret = fsi_stream_probe(fsi, &pdev->dev);
if (ret < 0) { if (ret < 0) {
dev_err(&pdev->dev, "FSIB stream probe failed\n"); dev_err(&pdev->dev, "FSIB stream probe failed\n");
@ -2122,7 +2034,7 @@ static int fsi_probe(struct platform_device *pdev)
dev_set_drvdata(&pdev->dev, master); dev_set_drvdata(&pdev->dev, master);
ret = devm_request_irq(&pdev->dev, irq, &fsi_interrupt, 0, ret = devm_request_irq(&pdev->dev, irq, &fsi_interrupt, 0,
id_entry->name, master); dev_name(&pdev->dev), master);
if (ret) { if (ret) {
dev_err(&pdev->dev, "irq request err\n"); dev_err(&pdev->dev, "irq request err\n");
goto exit_fsib; goto exit_fsib;
@ -2248,6 +2160,13 @@ static struct fsi_core fsi2_core = {
.b_mclk = B_MST_CTLR, .b_mclk = B_MST_CTLR,
}; };
static struct of_device_id fsi_of_match[] = {
{ .compatible = "renesas,sh_fsi", .data = &fsi1_core},
{ .compatible = "renesas,sh_fsi2", .data = &fsi2_core},
{},
};
MODULE_DEVICE_TABLE(of, fsi_of_match);
static struct platform_device_id fsi_id_table[] = { static struct platform_device_id fsi_id_table[] = {
{ "sh_fsi", (kernel_ulong_t)&fsi1_core }, { "sh_fsi", (kernel_ulong_t)&fsi1_core },
{ "sh_fsi2", (kernel_ulong_t)&fsi2_core }, { "sh_fsi2", (kernel_ulong_t)&fsi2_core },
@ -2259,6 +2178,7 @@ static struct platform_driver fsi_driver = {
.driver = { .driver = {
.name = "fsi-pcm-audio", .name = "fsi-pcm-audio",
.pm = &fsi_pm_ops, .pm = &fsi_pm_ops,
.of_match_table = fsi_of_match,
}, },
.probe = fsi_probe, .probe = fsi_probe,
.remove = fsi_remove, .remove = fsi_remove,