Commit af8a2fe1 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

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: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent f2390880

arch/arm/mach-shmobile/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ config MACH_AP4EVB 
	depends on ARCH_SH7372

	select ARCH_REQUIRE_GPIOLIB

	select SH_LCD_MIPI_DSI

	select SND_SOC_AK4642 if SND_SIMPLE_CARD



choice

	prompt "AP4EVB LCD panel selection"
@@ -82,6 +83,7 @@ config MACH_MACKEREL 
	bool "mackerel board"

	depends on ARCH_SH7372

	select ARCH_REQUIRE_GPIOLIB

	select SND_SOC_AK4642 if SND_SIMPLE_CARD



config MACH_KOTA2

	bool "KOTA2 board"

arch/arm/mach-shmobile/board-ap4evb.c

+12 −3
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <media/soc_camera.h>



#include <sound/sh_fsi.h>

#include <sound/simple_card.h>



#include <video/sh_mobile_hdmi.h>

#include <video/sh_mobile_lcdc.h>
@@ -785,17 +786,25 @@ static struct platform_device fsi_device = { 
	},

};



static struct fsi_ak4642_info fsi2_ak4643_info = {

static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = {

	.fmt		= SND_SOC_DAIFMT_LEFT_J,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.sysclk		= 11289600,

};



static struct asoc_simple_card_info fsi2_ak4643_info = {

	.name		= "AK4643",

	.card		= "FSI2A-AK4643",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0013",

	.platform	= "sh_fsi2",

	.id		= FSI_PORT_A,

	.codec_dai	= "ak4642-hifi",

	.init		= &fsi2_ak4643_init_info,

};



static struct platform_device fsi_ak4643_device = {

	.name	= "fsi-ak4642-audio",

	.name	= "asoc-simple-card",

	.dev	= {

		.platform_data	= &fsi2_ak4643_info,

	},

arch/arm/mach-shmobile/board-mackerel.c

+12 −3
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#include <media/soc_camera.h>

#include <media/soc_camera_platform.h>

#include <sound/sh_fsi.h>

#include <sound/simple_card.h>



#include <mach/common.h>

#include <mach/irqs.h>
@@ -941,17 +942,25 @@ static struct platform_device fsi_device = { 
	},

};



static struct fsi_ak4642_info fsi2_ak4643_info = {

static struct asoc_simple_dai_init_info fsi2_ak4643_init_info = {

	.fmt		= SND_SOC_DAIFMT_LEFT_J,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.sysclk		= 11289600,

};



static struct asoc_simple_card_info fsi2_ak4643_info = {

	.name		= "AK4643",

	.card		= "FSI2A-AK4643",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0013",

	.platform	= "sh_fsi2",

	.id		= FSI_PORT_A,

	.codec_dai	= "ak4642-hifi",

	.init		= &fsi2_ak4643_init_info,

};



static struct platform_device fsi_ak4643_device = {

	.name	= "fsi-ak4642-audio",

	.name	= "asoc-simple-card",

	.dev	= {

		.platform_data	= &fsi2_ak4643_info,

	},

arch/sh/boards/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ config SH_7724_SOLUTION_ENGINE 
	select SOLUTION_ENGINE

	depends on CPU_SUBTYPE_SH7724

	select ARCH_REQUIRE_GPIOLIB

	select SND_SOC_AK4642 if SND_SIMPLE_CARD

	help

	  Select 7724 SolutionEngine if configuring for a Hitachi SH7724

	  evaluation board.

arch/sh/boards/mach-se/7724/setup.c

+12 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <video/sh_mobile_lcdc.h>

#include <media/sh_mobile_ceu.h>

#include <sound/sh_fsi.h>

#include <sound/simple_card.h>

#include <asm/io.h>

#include <asm/heartbeat.h>

#include <asm/clock.h>
@@ -304,17 +305,25 @@ static struct platform_device fsi_device = { 
	},

};



static struct fsi_ak4642_info fsi_ak4642_info = {

static struct asoc_simple_dai_init_info fsi2_ak4642_init_info = {

	.fmt		= SND_SOC_DAIFMT_LEFT_J,

	.codec_daifmt	= SND_SOC_DAIFMT_CBM_CFM,

	.cpu_daifmt	= SND_SOC_DAIFMT_CBS_CFS,

	.sysclk		= 11289600,

};



static struct asoc_simple_card_info fsi_ak4642_info = {

	.name		= "AK4642",

	.card		= "FSIA-AK4642",

	.cpu_dai	= "fsia-dai",

	.codec		= "ak4642-codec.0-0012",

	.platform	= "sh_fsi.0",

	.id		= FSI_PORT_A,

	.codec_dai	= "ak4642-hifi",

	.init		= &fsi2_ak4642_init_info,

};



static struct platform_device fsi_ak4642_device = {

	.name	= "fsi-ak4642-audio",

	.name	= "asoc-simple-card",

	.dev	= {

		.platform_data	= &fsi_ak4642_info,

	},

CRA Git | Maintained and supported by SUSTech CRA and CCSE