Merge tag 'pm-for-3.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-shmobile / board-armadillo800eva.c

diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index da6117c326b9e0c80147050089f1d8a5f604c28a..2912eab3b967bddedb8a42e39747e9612f04d237 100644 (file)
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -37,6 +37,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/i2c-gpio.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r8a7740.h>
@@ -54,6 +55,8 @@
 #include <sound/sh_fsi.h>
 #include <sound/simple_card.h>
 
+#include "sh-gpio.h"
+
 /*
  * CON1                Camera Module
  * CON2                Extension Bus
@@ -135,7 +138,7 @@
  *     usbhsf_power_ctrl()
  */
 #define IRQ7           evt2irq(0x02e0)
-#define USBCR1         0xe605810a
+#define USBCR1         IOMEM(0xe605810a)
 #define USBH           0xC6700000
 #define USBH_USBCTR    0x10834
 
@@ -877,6 +880,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 */
 static struct i2c_board_info i2c0_devices[] = {
        {
@@ -888,6 +906,13 @@ static struct i2c_board_info i2c0_devices[] = {
        },
 };
 
+static struct i2c_board_info i2c2_devices[] = {
+       {
+               I2C_BOARD_INFO("s35390a", 0x30),
+               .type = "s35390a",
+       },
+};
+
 /*
  * board devices
  */
@@ -904,6 +929,7 @@ static struct platform_device *eva_devices[] __initdata = {
        &fsi_device,
        &fsi_wm8978_device,
        &fsi_hdmi_device,
+       &i2c_gpio_device,
 };
 
 static void __init eva_clock_init(void)
@@ -950,8 +976,8 @@ clock_error:
 /*
  * board init
  */
-#define GPIO_PORT7CR   0xe6050007
-#define GPIO_PORT8CR   0xe6050008
+#define GPIO_PORT7CR   IOMEM(0xe6050007)
+#define GPIO_PORT8CR   IOMEM(0xe6050008)
 static void __init eva_init(void)
 {
        struct platform_device *usb = NULL;
@@ -1174,6 +1200,7 @@ static void __init eva_init(void)
 #endif
 
        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();