Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f5e8779a authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'renesas-kzm9g' into renesas-board 

* renesas-kzm9g:
  ARM: shmobile: kzm9g: Support Real Time Clock
  ARM: shmobile: kzm9g: enable FSI-AK4648
  ARM: shmobile: sh73a0: add FSI clock
parents 3760e794 080e0d13

arch/arm/configs/kzm9g_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ CONFIG_MMC_SH_MMCIF=y 
CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_RS5C372=y

CONFIG_DMADEVICES=y

CONFIG_SH_DMAE=y

CONFIG_ASYNC_TX_DMA=y

arch/arm/mach-shmobile/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -122,6 +122,7 @@ config MACH_KZM9G 
	depends on ARCH_SH73A0

	select ARCH_REQUIRE_GPIOLIB

	select USE_OF

	select SND_SOC_AK4642 if SND_SIMPLE_CARD



comment "SH-Mobile System Configuration"

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

+82 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#include <linux/smsc911x.h>

#include <linux/usb/r8a66597.h>

#include <linux/videodev2.h>

#include <sound/sh_fsi.h>

#include <sound/simple_card.h>

#include <mach/irqs.h>

#include <mach/sh73a0.h>

#include <mach/common.h>
@@ -54,6 +56,14 @@ 
#define GPIO_PCF8575_PORT15	(GPIO_NR + 13)

#define GPIO_PCF8575_PORT16	(GPIO_NR + 14)



/*

 * FSI-AK4648

 *

 * this command is required when playback.

 *

 * # amixer set "LINEOUT Mixer DACL" on

 */



/* SMSC 9221 */

static struct resource smsc9221_resources[] = {

	[0] = {
@@ -267,11 +277,73 @@ static struct platform_device gpio_keys_device = { 
	},

};



/* FSI-AK4648 */

static struct sh_fsi_platform_info fsi_info = {

	.port_a = {

	},

};



static struct resource fsi_resources[] = {

	[0] = {

		.name	= "FSI",

		.start	= 0xEC230000,

		.end	= 0xEC230400 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start  = gic_spi(146),

		.flags  = IORESOURCE_IRQ,

	},

};



static struct platform_device fsi_device = {

	.name		= "sh_fsi2",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(fsi_resources),

	.resource	= fsi_resources,

	.dev	= {

		.platform_data	= &fsi_info,

	},

};



static struct asoc_simple_dai_init_info fsi2_ak4648_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_ak4648_info = {

	.name		= "AK4648",

	.card		= "FSI2A-AK4648",

	.cpu_dai	= "fsia-dai",

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

	.platform	= "sh_fsi2",

	.codec_dai	= "ak4642-hifi",

	.init		= &fsi2_ak4648_init_info,

};



static struct platform_device fsi_ak4648_device = {

	.name	= "asoc-simple-card",

	.dev	= {

		.platform_data	= &fsi2_ak4648_info,

	},

};



/* I2C */

static struct pcf857x_platform_data pcf8575_pdata = {

	.gpio_base	= GPIO_PCF8575_BASE,

};



static struct i2c_board_info i2c0_devices[] = {

	{

		I2C_BOARD_INFO("ak4648", 0x12),

	},

	{

		I2C_BOARD_INFO("r2025sd", 0x32),

	}

};



static struct i2c_board_info i2c1_devices[] = {

	{

		I2C_BOARD_INFO("st1232-ts", 0x55),
@@ -293,6 +365,8 @@ static struct platform_device *kzm_devices[] __initdata = { 
	&mmc_device,

	&sdhi0_device,

	&gpio_keys_device,

	&fsi_device,

	&fsi_ak4648_device,

};



/*
@@ -431,11 +505,19 @@ static void __init kzm_init(void) 
	gpio_request(GPIO_FN_PORT27_I2C_SCL3, NULL);

	gpio_request(GPIO_FN_PORT28_I2C_SDA3, NULL);



	/* enable FSI2 port A (ak4648) */

	gpio_request(GPIO_FN_FSIACK,	NULL);

	gpio_request(GPIO_FN_FSIAILR,	NULL);

	gpio_request(GPIO_FN_FSIAIBT,	NULL);

	gpio_request(GPIO_FN_FSIAISLD,	NULL);

	gpio_request(GPIO_FN_FSIAOSLD,	NULL);



#ifdef CONFIG_CACHE_L2X0

	/* Early BRESP enable, Shared attribute override enable, 64K*8way */

	l2x0_init(IOMEM(0xf0100000), 0x40460000, 0x82000fff);

#endif



	i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));

	i2c_register_board_info(1, i2c1_devices, ARRAY_SIZE(i2c1_devices));

	i2c_register_board_info(3, i2c3_devices, ARRAY_SIZE(i2c3_devices));

arch/arm/mach-shmobile/clock-sh73a0.c

+3 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ enum { MSTP001, 
	MSTP129, MSTP128, MSTP127, MSTP126, MSTP125, MSTP118, MSTP116, MSTP100,

	MSTP219, MSTP218,

	MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,

	MSTP331, MSTP329, MSTP325, MSTP323,

	MSTP331, MSTP329, MSTP328, MSTP325, MSTP323,

	MSTP314, MSTP313, MSTP312, MSTP311,

	MSTP303, MSTP302, MSTP301, MSTP300,

	MSTP411, MSTP410, MSTP403,
@@ -507,6 +507,7 @@ static struct clk mstp_clks[MSTP_NR] = { 
	[MSTP200] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR2, 0, 0), /* SCIFA4 */

	[MSTP331] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 31, 0), /* SCIFA6 */

	[MSTP329] = MSTP(&r_clk, SMSTPCR3, 29, 0), /* CMT10 */

	[MSTP328] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 28, 0), /*FSI*/

	[MSTP325] = MSTP(&div6_clks[DIV6_SUB], SMSTPCR3, 25, 0), /* IrDA */

	[MSTP323] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 23, 0), /* IIC1 */

	[MSTP314] = MSTP(&div6_clks[DIV6_SDHI0], SMSTPCR3, 14, 0), /* SDHI0 */
@@ -562,6 +563,7 @@ static struct clk_lookup lookups[] = { 
	CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP200]), /* SCIFA4 */

	CLKDEV_DEV_ID("sh-sci.6", &mstp_clks[MSTP331]), /* SCIFA6 */

	CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]), /* CMT10 */

	CLKDEV_DEV_ID("sh_fsi2", &mstp_clks[MSTP328]), /* FSI */

	CLKDEV_DEV_ID("sh_irda.0", &mstp_clks[MSTP325]), /* IrDA */

	CLKDEV_DEV_ID("i2c-sh_mobile.1", &mstp_clks[MSTP323]), /* I2C1 */

	CLKDEV_DEV_ID("sh_mobile_sdhi.0", &mstp_clks[MSTP314]), /* SDHI0 */