system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-23 19:57:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards

Browse source 
* 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: armadillo800eva: Add support RTC
This commit is contained in:
Olof Johansson 2012-09-16 16:36:37 -07:00
parent 3b164b7b52 b22f6bb030
commit fd5812e0a5
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/configs/armadillo800eva_defconfig
View file

@ -85,6 +85,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=8
CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_SH_SCI_CONSOLE=y
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I2C_GPIO=y
CONFIG_I2C_SH_MOBILE=y CONFIG_I2C_SH_MOBILE=y
# CONFIG_HWMON is not set # CONFIG_HWMON is not set
CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_SUPPORT=y
@ -120,6 +121,8 @@ CONFIG_USB_ETH=m
CONFIG_MMC=y CONFIG_MMC=y
CONFIG_MMC_SDHI=y CONFIG_MMC_SDHI=y
CONFIG_MMC_SH_MMCIF=y CONFIG_MMC_SH_MMCIF=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_S35390A=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_SH_DMAE=y CONFIG_SH_DMAE=y
CONFIG_UIO=y CONFIG_UIO=y

25
arch/arm/mach-shmobile/board-armadillo800eva.c
View file

@ -37,6 +37,7 @@
#include <linux/mmc/host.h> #include <linux/mmc/host.h>
#include <linux/mmc/sh_mmcif.h> #include <linux/mmc/sh_mmcif.h>
#include <linux/mmc/sh_mobile_sdhi.h> #include <linux/mmc/sh_mobile_sdhi.h>
#include <linux/i2c-gpio.h>
#include <mach/common.h> #include <mach/common.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/r8a7740.h> #include <mach/r8a7740.h>
@ -876,6 +877,21 @@ static struct platform_device fsi_hdmi_device = {
}, },
}; };
/* RTC: RTC connects i2c-gpio. */
static struct i2c_gpio_platform_data i2c_gpio_data = {
.sda_pin = GPIO_PORT208,
.scl_pin = GPIO_PORT91,
.udelay = 5, /* 100 kHz */
};
static struct platform_device i2c_gpio_device = {
.name = "i2c-gpio",
.id = 2,
.dev = {
.platform_data = &i2c_gpio_data,
},
};
/* I2C */ /* I2C */
static struct i2c_board_info i2c0_devices[] = { static struct i2c_board_info i2c0_devices[] = {
{ {
@ -887,6 +903,13 @@ static struct i2c_board_info i2c0_devices[] = {
}, },
}; };
static struct i2c_board_info i2c2_devices[] = {
{
I2C_BOARD_INFO("s35390a", 0x30),
.type = "s35390a",
},
};
/* /*
* board devices * board devices
*/ */
@ -903,6 +926,7 @@ static struct platform_device *eva_devices[] __initdata = {
&fsi_device, &fsi_device,
&fsi_hdmi_device, &fsi_hdmi_device,
&fsi_wm8978_device, &fsi_wm8978_device,
&i2c_gpio_device,
}; };
static void __init eva_clock_init(void) static void __init eva_clock_init(void)
@ -1173,6 +1197,7 @@ static void __init eva_init(void)
#endif #endif
i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices)); i2c_register_board_info(0, i2c0_devices, ARRAY_SIZE(i2c0_devices));
i2c_register_board_info(2, i2c2_devices, ARRAY_SIZE(i2c2_devices));
r8a7740_add_standard_devices(); r8a7740_add_standard_devices();