aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin
diff options
context:
space:
mode:
authorBarry Song <barry.song@analog.com>2009-08-06 17:03:02 -0400
committerMike Frysinger <vapier@gentoo.org>2009-09-16 22:10:18 -0400
commit8312440e05ea74feabc648ad8f36c823af4ddd8e (patch)
tree7dfa04633db89aa1ee247a2f4830b2eb920c78d3 /arch/blackfin
parentbd411b15cc4b3f31f67d15e1afffbd1ec650d5b8 (diff)
Blackfin: bf537-stamp: update ad1836 resources
Update the ad1836 resources for the new ASoC driver. Signed-off-by: Barry Song <barry.song@analog.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin')
-rw-r--r--arch/blackfin/mach-bf537/boards/stamp.c22
1 files changed, 17 insertions, 5 deletions
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 9b67006ec849..d438ca40bc12 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -532,8 +532,8 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = {
532}; 532};
533#endif 533#endif
534 534
535#if defined(CONFIG_SND_BLACKFIN_AD1836) \ 535#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
536 || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) 536 || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
537static struct bfin5xx_spi_chip ad1836_spi_chip_info = { 537static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
538 .enable_dma = 0, 538 .enable_dma = 0,
539 .bits_per_word = 16, 539 .bits_per_word = 16,
@@ -883,14 +883,15 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
883 }, 883 },
884#endif 884#endif
885 885
886#if defined(CONFIG_SND_BLACKFIN_AD1836) \ 886#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
887 || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE) 887 || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
888 { 888 {
889 .modalias = "ad1836-spi", 889 .modalias = "ad1836-spi",
890 .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */ 890 .max_speed_hz = 3125000, /* max spi clock (SCK) speed in HZ */
891 .bus_num = 0, 891 .bus_num = 0,
892 .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT, 892 .chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */
893 .controller_data = &ad1836_spi_chip_info, 893 .controller_data = &ad1836_spi_chip_info,
894 .mode = SPI_MODE_3,
894 }, 895 },
895#endif 896#endif
896 897
@@ -1628,6 +1629,13 @@ static struct platform_device bfin_dpmc = {
1628 }, 1629 },
1629}; 1630};
1630 1631
1632#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
1633static struct platform_device bfin_tdm = {
1634 .name = "bfin-tdm",
1635 /* TODO: add platform data here */
1636};
1637#endif
1638
1631static struct platform_device *stamp_devices[] __initdata = { 1639static struct platform_device *stamp_devices[] __initdata = {
1632 1640
1633 &bfin_dpmc, 1641 &bfin_dpmc,
@@ -1733,6 +1741,10 @@ static struct platform_device *stamp_devices[] __initdata = {
1733#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE) 1741#if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
1734 &stamp_flash_device, 1742 &stamp_flash_device,
1735#endif 1743#endif
1744
1745#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
1746 &bfin_tdm,
1747#endif
1736}; 1748};
1737 1749
1738static int __init stamp_init(void) 1750static int __init stamp_init(void)