diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2012-04-09 00:18:28 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-13 06:29:26 -0400 |
commit | af8a2fe12fae1b59178dc96e396e5665bcbea7da (patch) | |
tree | fd8d1e36ff014148a16a34c501806d464c5cc0e8 /arch/arm/mach-shmobile | |
parent | f2390880ec0264a0ed26b32c23bc23435b4297da (diff) |
ASoC: sh: fsi: use simple-card instead of fsi-ak4642
This patch uses simple-card driver instead of fsi-ak4642 on each board.
To select AK4642 driver, each boards select it on Kconfig.
This patch removes fsi-ak4642 driver which is no longer needed
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'arch/arm/mach-shmobile')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-ap4evb.c | 15 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 15 |
3 files changed, 26 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 34560cab45d9..2cda0c2af230 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
@@ -58,6 +58,7 @@ config MACH_AP4EVB | |||
58 | depends on ARCH_SH7372 | 58 | depends on ARCH_SH7372 |
59 | select ARCH_REQUIRE_GPIOLIB | 59 | select ARCH_REQUIRE_GPIOLIB |
60 | select SH_LCD_MIPI_DSI | 60 | select SH_LCD_MIPI_DSI |
61 | select SND_SOC_AK4642 if SND_SIMPLE_CARD | ||
61 | 62 | ||
62 | choice | 63 | choice |
63 | prompt "AP4EVB LCD panel selection" | 64 | prompt "AP4EVB LCD panel selection" |
@@ -82,6 +83,7 @@ config MACH_MACKEREL | |||
82 | bool "mackerel board" | 83 | bool "mackerel board" |
83 | depends on ARCH_SH7372 | 84 | depends on ARCH_SH7372 |
84 | select ARCH_REQUIRE_GPIOLIB | 85 | select ARCH_REQUIRE_GPIOLIB |
86 | select SND_SOC_AK4642 if SND_SIMPLE_CARD | ||
85 | 87 | ||
86 | config MACH_KOTA2 | 88 | config MACH_KOTA2 |
87 | bool "KOTA2 board" | 89 | bool "KOTA2 board" |
diff --git a/arch/arm/mach-shmobile/board-ap4evb.c b/arch/arm/mach-shmobile/board-ap4evb.c index b56dde2732bb..b39751244daa 100644 --- a/arch/arm/mach-shmobile/board-ap4evb.c +++ b/arch/arm/mach-shmobile/board-ap4evb.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <media/soc_camera.h> | 50 | #include <media/soc_camera.h> |
51 | 51 | ||
52 | #include <sound/sh_fsi.h> | 52 | #include <sound/sh_fsi.h> |
53 | #include <sound/simple_card.h> | ||
53 | 54 | ||
54 | #include <video/sh_mobile_hdmi.h> | 55 | #include <video/sh_mobile_hdmi.h> |
55 | #include <video/sh_mobile_lcdc.h> | 56 | #include <video/sh_mobile_lcdc.h> |
@@ -785,17 +786,25 @@ static struct platform_device fsi_device = { | |||
785 | }, | 786 | }, |
786 | }; | 787 | }; |
787 | 788 | ||
788 | static struct fsi_ak4642_info fsi2_ak4643_info = { | 789 | static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = { |
790 | .fmt = SND_SOC_DAIFMT_LEFT_J, | ||
791 | .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, | ||
792 | .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS, | ||
793 | .sysclk = 11289600, | ||
794 | }; | ||
795 | |||
796 | static struct asoc_simple_card_info fsi2_ak4643_info = { | ||
789 | .name = "AK4643", | 797 | .name = "AK4643", |
790 | .card = "FSI2A-AK4643", | 798 | .card = "FSI2A-AK4643", |
791 | .cpu_dai = "fsia-dai", | 799 | .cpu_dai = "fsia-dai", |
792 | .codec = "ak4642-codec.0-0013", | 800 | .codec = "ak4642-codec.0-0013", |
793 | .platform = "sh_fsi2", | 801 | .platform = "sh_fsi2", |
794 | .id = FSI_PORT_A, | 802 | .codec_dai = "ak4642-hifi", |
803 | .init = &fsi2_ak4643_init_info, | ||
795 | }; | 804 | }; |
796 | 805 | ||
797 | static struct platform_device fsi_ak4643_device = { | 806 | static struct platform_device fsi_ak4643_device = { |
798 | .name = "fsi-ak4642-audio", | 807 | .name = "asoc-simple-card", |
799 | .dev = { | 808 | .dev = { |
800 | .platform_data = &fsi2_ak4643_info, | 809 | .platform_data = &fsi2_ak4643_info, |
801 | }, | 810 | }, |
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index f49e28abe0ab..4a461384d27c 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c | |||
@@ -53,6 +53,7 @@ | |||
53 | #include <media/soc_camera.h> | 53 | #include <media/soc_camera.h> |
54 | #include <media/soc_camera_platform.h> | 54 | #include <media/soc_camera_platform.h> |
55 | #include <sound/sh_fsi.h> | 55 | #include <sound/sh_fsi.h> |
56 | #include <sound/simple_card.h> | ||
56 | 57 | ||
57 | #include <mach/common.h> | 58 | #include <mach/common.h> |
58 | #include <mach/irqs.h> | 59 | #include <mach/irqs.h> |
@@ -941,17 +942,25 @@ static struct platform_device fsi_device = { | |||
941 | }, | 942 | }, |
942 | }; | 943 | }; |
943 | 944 | ||
944 | static struct fsi_ak4642_info fsi2_ak4643_info = { | 945 | static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = { |
946 | .fmt = SND_SOC_DAIFMT_LEFT_J, | ||
947 | .codec_daifmt = SND_SOC_DAIFMT_CBM_CFM, | ||
948 | .cpu_daifmt = SND_SOC_DAIFMT_CBS_CFS, | ||
949 | .sysclk = 11289600, | ||
950 | }; | ||
951 | |||
952 | static struct asoc_simple_card_info fsi2_ak4643_info = { | ||
945 | .name = "AK4643", | 953 | .name = "AK4643", |
946 | .card = "FSI2A-AK4643", | 954 | .card = "FSI2A-AK4643", |
947 | .cpu_dai = "fsia-dai", | 955 | .cpu_dai = "fsia-dai", |
948 | .codec = "ak4642-codec.0-0013", | 956 | .codec = "ak4642-codec.0-0013", |
949 | .platform = "sh_fsi2", | 957 | .platform = "sh_fsi2", |
950 | .id = FSI_PORT_A, | 958 | .codec_dai = "ak4642-hifi", |
959 | .init = &fsi2_ak4643_init_info, | ||
951 | }; | 960 | }; |
952 | 961 | ||
953 | static struct platform_device fsi_ak4643_device = { | 962 | static struct platform_device fsi_ak4643_device = { |
954 | .name = "fsi-ak4642-audio", | 963 | .name = "asoc-simple-card", |
955 | .dev = { | 964 | .dev = { |
956 | .platform_data = &fsi2_ak4643_info, | 965 | .platform_data = &fsi2_ak4643_info, |
957 | }, | 966 | }, |