* [GIT PULL] Renesas ARM-based SoC: Boards for 3.7
@ 2012-09-06 2:04 Simon Horman
2012-09-06 2:04 ` [PATCH 1/3] ARM: shmobile: marzen: add SDHI0 support Simon Horman
` (4 more replies)
0 siblings, 5 replies; 12+ messages in thread
From: Simon Horman @ 2012-09-06 2:04 UTC (permalink / raw)
To: linux-arm-kernel
Hi Olof, Hi Arnd,
please consider the following board enhancement from
Phil Edworthy and Morimoto-san for inclusion in 3.7.
----------------------------------------------------------------
The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d:
Linux 3.6-rc4 (2012-09-01 10:39:58 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards
for you to fetch changes up to eb8ca943bae2b84c3fc14dfd7a908cb334465fef:
ARM: shmobile: marzen: enable thermal sensor (2012-09-06 10:24:17 +0900)
----------------------------------------------------------------
Kuninori Morimoto (2):
ARM: shmobile: marzen: fixup regulator id for smsc911x
ARM: shmobile: marzen: enable thermal sensor
Phil Edworthy (1):
ARM: shmobile: marzen: add SDHI0 support
arch/arm/configs/marzen_defconfig | 2 +
arch/arm/mach-shmobile/board-marzen.c | 68 ++++++++++++++++++++++++++++++++-
2 files changed, 69 insertions(+), 1 deletion(-)
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH 1/3] ARM: shmobile: marzen: add SDHI0 support 2012-09-06 2:04 [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Simon Horman @ 2012-09-06 2:04 ` Simon Horman 2012-09-06 2:04 ` [PATCH 2/3] ARM: shmobile: marzen: fixup regulator id for smsc911x Simon Horman ` (3 subsequent siblings) 4 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2012-09-06 2:04 UTC (permalink / raw) To: linux-arm-kernel From: Phil Edworthy <phil.edworthy@renesas.com> [horms@verge.net.au: moved defconfig portion into a separate patch] [horms@verge.net.au: added "ARM: shmobile:" to title] Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Tested-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/mach-shmobile/board-marzen.c | 52 ++++++++++++++++++++++++++++++++- 1 file changed, 51 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 3a528cf..dec3ffc 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -30,6 +30,8 @@ #include <linux/regulator/fixed.h> #include <linux/regulator/machine.h> #include <linux/smsc911x.h> +#include <linux/mmc/sh_mobile_sdhi.h> +#include <linux/mfd/tmio.h> #include <mach/hardware.h> #include <mach/r8a7779.h> #include <mach/common.h> @@ -39,6 +41,12 @@ #include <asm/hardware/gic.h> #include <asm/traps.h> +/* Fixed 3.3V regulator to be used by SDHI0 */ +static struct regulator_consumer_supply fixed3v3_power_consumers[] = { + REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"), + REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"), +}; + /* Dummy supplies, where voltage doesn't matter */ static struct regulator_consumer_supply dummy_supplies[] = { REGULATOR_SUPPLY("vddvario", "smsc911x"), @@ -75,13 +83,45 @@ static struct platform_device eth_device = { .num_resources = ARRAY_SIZE(smsc911x_resources), }; +static struct resource sdhi0_resources[] = { + [0] = { + .name = "sdhi0", + .start = 0xffe4c000, + .end = 0xffe4c0ff, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = gic_spi(104), + .flags = IORESOURCE_IRQ, + }, +}; + +static struct sh_mobile_sdhi_info sdhi0_platform_data = { + .tmio_flags = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT, + .tmio_caps = MMC_CAP_SD_HIGHSPEED, +}; + +static struct platform_device sdhi0_device = { + .name = "sh_mobile_sdhi", + .num_resources = ARRAY_SIZE(sdhi0_resources), + .resource = sdhi0_resources, + .id = 0, + .dev = { + .platform_data = &sdhi0_platform_data, + } +}; + static struct platform_device *marzen_devices[] __initdata = { ð_device, + &sdhi0_device, }; static void __init marzen_init(void) { - regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies)); + regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, + ARRAY_SIZE(fixed3v3_power_consumers), 3300000); + regulator_register_fixed(0, dummy_supplies, + ARRAY_SIZE(dummy_supplies)); r8a7779_pinmux_init(); @@ -97,6 +137,16 @@ static void __init marzen_init(void) gpio_request(GPIO_FN_EX_CS0, NULL); /* nCS */ gpio_request(GPIO_FN_IRQ1_B, NULL); /* IRQ + PME */ + /* SD0 (CN20) */ + gpio_request(GPIO_FN_SD0_CLK, NULL); + gpio_request(GPIO_FN_SD0_CMD, NULL); + gpio_request(GPIO_FN_SD0_DAT0, NULL); + gpio_request(GPIO_FN_SD0_DAT1, NULL); + gpio_request(GPIO_FN_SD0_DAT2, NULL); + gpio_request(GPIO_FN_SD0_DAT3, NULL); + gpio_request(GPIO_FN_SD0_CD, NULL); + gpio_request(GPIO_FN_SD0_WP, NULL); + r8a7779_add_standard_devices(); platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices)); } -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 2/3] ARM: shmobile: marzen: fixup regulator id for smsc911x 2012-09-06 2:04 [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Simon Horman 2012-09-06 2:04 ` [PATCH 1/3] ARM: shmobile: marzen: add SDHI0 support Simon Horman @ 2012-09-06 2:04 ` Simon Horman 2012-09-06 2:04 ` [PATCH 3/3] ARM: shmobile: marzen: enable thermal sensor Simon Horman ` (2 subsequent siblings) 4 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2012-09-06 2:04 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> regulator id = 0 is used for sh_mobile_sdhi. smsc911x's regulator can use id = 1 Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/mach-shmobile/board-marzen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index dec3ffc..cbf9f25 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -120,7 +120,7 @@ static void __init marzen_init(void) { regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers, ARRAY_SIZE(fixed3v3_power_consumers), 3300000); - regulator_register_fixed(0, dummy_supplies, + regulator_register_fixed(1, dummy_supplies, ARRAY_SIZE(dummy_supplies)); r8a7779_pinmux_init(); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH 3/3] ARM: shmobile: marzen: enable thermal sensor 2012-09-06 2:04 [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Simon Horman 2012-09-06 2:04 ` [PATCH 1/3] ARM: shmobile: marzen: add SDHI0 support Simon Horman 2012-09-06 2:04 ` [PATCH 2/3] ARM: shmobile: marzen: fixup regulator id for smsc911x Simon Horman @ 2012-09-06 2:04 ` Simon Horman 2012-09-12 6:23 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Olof Johansson 2012-09-13 6:17 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Simon Horman 4 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2012-09-06 2:04 UTC (permalink / raw) To: linux-arm-kernel From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Marzen board can measure its thermal by this patch. cat /sys/class/thermal/thermal_zoneX/temp Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/configs/marzen_defconfig | 2 ++ arch/arm/mach-shmobile/board-marzen.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 864f9a5..f513ace 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -68,6 +68,8 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_GPIO_SYSFS=y # CONFIG_HWMON is not set +CONFIG_THERMAL=y +CONFIG_RCAR_THERMAL=y CONFIG_SSB=y # CONFIG_HID_SUPPORT is not set # CONFIG_USB_SUPPORT is not set diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index cbf9f25..2e884b6 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -111,9 +111,25 @@ static struct platform_device sdhi0_device = { } }; +/* Thermal */ +static struct resource thermal_resources[] = { + [0] = { + .start = 0xFFC48000, + .end = 0xFFC48038 - 1, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device thermal_device = { + .name = "rcar_thermal", + .resource = thermal_resources, + .num_resources = ARRAY_SIZE(thermal_resources), +}; + static struct platform_device *marzen_devices[] __initdata = { ð_device, &sdhi0_device, + &thermal_device, }; static void __init marzen_init(void) -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 2012-09-06 2:04 [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Simon Horman ` (2 preceding siblings ...) 2012-09-06 2:04 ` [PATCH 3/3] ARM: shmobile: marzen: enable thermal sensor Simon Horman @ 2012-09-12 6:23 ` Olof Johansson 2012-09-13 6:17 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Simon Horman 4 siblings, 0 replies; 12+ messages in thread From: Olof Johansson @ 2012-09-12 6:23 UTC (permalink / raw) To: linux-arm-kernel On Wed, Sep 5, 2012 at 7:04 PM, Simon Horman <horms@verge.net.au> wrote: > Hi Olof, Hi Arnd, > > please consider the following board enhancement from > Phil Edworthy and Morimoto-san for inclusion in 3.7. > > ---------------------------------------------------------------- > The following changes since commit 4cbe5a555fa58a79b6ecbb6c531b8bab0650778d: > > Linux 3.6-rc4 (2012-09-01 10:39:58 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards Thanks, pulled! -Olof ^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 2012-09-06 2:04 [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Simon Horman ` (3 preceding siblings ...) 2012-09-12 6:23 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Olof Johansson @ 2012-09-13 6:17 ` Simon Horman 2012-09-13 6:17 ` [PATCH] ARM: shmobile: armadillo800eva: Add support RTC Simon Horman 2012-09-16 23:40 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Olof Johansson 4 siblings, 2 replies; 12+ messages in thread From: Simon Horman @ 2012-09-13 6:17 UTC (permalink / raw) To: linux-arm-kernel Hi Olof, Hi Arnd, please consider the following board enhancement from Iwamatsu-san for inclusion in 3.7. ---------------------------------------------------------------- The following changes since commit eb8ca943bae2b84c3fc14dfd7a908cb334465fef: ARM: shmobile: marzen: enable thermal sensor (2012-09-06 10:24:17 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards for you to fetch changes up to b22f6bb030ee0c98839fe2445571c57c9f89594e: ARM: shmobile: armadillo800eva: Add support RTC (2012-09-13 15:02:25 +0900) ---------------------------------------------------------------- Nobuhiro Iwamatsu (1): ARM: shmobile: armadillo800eva: Add support RTC arch/arm/configs/armadillo800eva_defconfig | 3 +++ arch/arm/mach-shmobile/board-armadillo800eva.c | 25 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] ARM: shmobile: armadillo800eva: Add support RTC 2012-09-13 6:17 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Simon Horman @ 2012-09-13 6:17 ` Simon Horman 2012-09-16 23:40 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Olof Johansson 1 sibling, 0 replies; 12+ messages in thread From: Simon Horman @ 2012-09-13 6:17 UTC (permalink / raw) To: linux-arm-kernel From: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> The armadillo800eva has S35390A which is RTC. This is controlled using I2C of GPIO. This commit supports RTC of armadillo800eva. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/configs/armadillo800eva_defconfig | 3 +++ arch/arm/mach-shmobile/board-armadillo800eva.c | 25 ++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index 7d87184..05f523d 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -85,6 +85,7 @@ CONFIG_SERIAL_SH_SCI_NR_UARTS=8 CONFIG_SERIAL_SH_SCI_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y +CONFIG_I2C_GPIO=y CONFIG_I2C_SH_MOBILE=y # CONFIG_HWMON is not set CONFIG_MEDIA_SUPPORT=y @@ -120,6 +121,8 @@ CONFIG_USB_ETH=m CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_MMC_SH_MMCIF=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_S35390A=y CONFIG_DMADEVICES=y CONFIG_SH_DMAE=y CONFIG_UIO=y diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index cf10f92..81dfb88 100644 --- 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> @@ -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 */ 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 */ @@ -903,6 +926,7 @@ static struct platform_device *eva_devices[] __initdata = { &fsi_device, &fsi_hdmi_device, &fsi_wm8978_device, + &i2c_gpio_device, }; static void __init eva_clock_init(void) @@ -1173,6 +1197,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(); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 2012-09-13 6:17 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Simon Horman 2012-09-13 6:17 ` [PATCH] ARM: shmobile: armadillo800eva: Add support RTC Simon Horman @ 2012-09-16 23:40 ` Olof Johansson 2012-09-18 0:45 ` Simon Horman 1 sibling, 1 reply; 12+ messages in thread From: Olof Johansson @ 2012-09-16 23:40 UTC (permalink / raw) To: linux-arm-kernel On Thu, Sep 13, 2012 at 03:17:50PM +0900, Simon Horman wrote: > Hi Olof, Hi Arnd, > > please consider the following board enhancement from > Iwamatsu-san for inclusion in 3.7. > > ---------------------------------------------------------------- > The following changes since commit eb8ca943bae2b84c3fc14dfd7a908cb334465fef: > > ARM: shmobile: marzen: enable thermal sensor (2012-09-06 10:24:17 +0900) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards Thanks, I did this as a re-pull of the old branch, so it's still there as renesas/boards with this new patch at the top of the branch. -Olof ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 2012-09-16 23:40 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Olof Johansson @ 2012-09-18 0:45 ` Simon Horman 0 siblings, 0 replies; 12+ messages in thread From: Simon Horman @ 2012-09-18 0:45 UTC (permalink / raw) To: linux-arm-kernel On Sun, Sep 16, 2012 at 04:40:44PM -0700, Olof Johansson wrote: > On Thu, Sep 13, 2012 at 03:17:50PM +0900, Simon Horman wrote: > > Hi Olof, Hi Arnd, > > > > please consider the following board enhancement from > > Iwamatsu-san for inclusion in 3.7. > > > > ---------------------------------------------------------------- > > The following changes since commit eb8ca943bae2b84c3fc14dfd7a908cb334465fef: > > > > ARM: shmobile: marzen: enable thermal sensor (2012-09-06 10:24:17 +0900) > > > > are available in the git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git boards > > Thanks, I did this as a re-pull of the old branch, so it's still there as > renesas/boards with this new patch at the top of the branch. Thanks. ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH] ARM: shmobile: armadillo800eva: fixup: sound card detection order @ 2012-08-09 6:03 Kuninori Morimoto 2012-09-13 3:10 ` [PATCH] ARM: shmobile: armadillo800eva: Add support RTC Nobuhiro Iwamatsu 0 siblings, 1 reply; 12+ messages in thread From: Kuninori Morimoto @ 2012-08-09 6:03 UTC (permalink / raw) To: linux-sh Since armadillo800eva has 2 sound cards, and had reversed deferred probe order issue, it was purposely registered in reverse order. But it was solved by 1d29cfa57471a5e4b8a7c2a7433eeba170d3ad92 (driver core: fixup reversed deferred probe order) armadillo800eva board is expecting that FSI-WM8978 is the 1st, and FSI-HDMI is the 2nd sound card. This patch fixes it up Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> --- arch/arm/mach-shmobile/board-armadillo800eva.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index cf10f92..ecd8136 100644 --- a/arch/arm/mach-shmobile/board-armadillo800eva.c +++ b/arch/arm/mach-shmobile/board-armadillo800eva.c @@ -901,8 +901,8 @@ static struct platform_device *eva_devices[] __initdata = { &camera_device, &ceu0_device, &fsi_device, - &fsi_hdmi_device, &fsi_wm8978_device, + &fsi_hdmi_device, }; static void __init eva_clock_init(void) -- 1.7.5.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* [PATCH] ARM: shmobile: armadillo800eva: Add support RTC 2012-08-09 6:03 [PATCH] ARM: shmobile: armadillo800eva: fixup: sound card detection order Kuninori Morimoto @ 2012-09-13 3:10 ` Nobuhiro Iwamatsu 2012-09-13 4:06 ` Simon Horman 0 siblings, 1 reply; 12+ messages in thread From: Nobuhiro Iwamatsu @ 2012-09-13 3:10 UTC (permalink / raw) To: linux-arm-kernel The armadillo800eva has S35390A which is RTC. This is controlled using I2C of GPIO. This commit supports RTC of armadillo800eva. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> --- arch/arm/mach-shmobile/board-armadillo800eva.c | 25 ++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c index cf10f92..81dfb88 100644 --- 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> @@ -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 */ 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 */ @@ -903,6 +926,7 @@ static struct platform_device *eva_devices[] __initdata = { &fsi_device, &fsi_hdmi_device, &fsi_wm8978_device, + &i2c_gpio_device, }; static void __init eva_clock_init(void) @@ -1173,6 +1197,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(); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH] ARM: shmobile: armadillo800eva: Add support RTC 2012-09-13 3:10 ` [PATCH] ARM: shmobile: armadillo800eva: Add support RTC Nobuhiro Iwamatsu @ 2012-09-13 4:06 ` Simon Horman 2012-09-13 5:11 ` Nobuhiro Iwamatsu 0 siblings, 1 reply; 12+ messages in thread From: Simon Horman @ 2012-09-13 4:06 UTC (permalink / raw) To: linux-arm-kernel On Thu, Sep 13, 2012 at 12:10:41PM +0900, Nobuhiro Iwamatsu wrote: > The armadillo800eva has S35390A which is RTC. This is controlled > using I2C of GPIO. > This commit supports RTC of armadillo800eva. > > Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Hi Iwamatsu-san, could you please either update this patch or provide a follow-up patch to update the defconfig so the S35390A is enabled? "make savedefconfig" may be useful for this. ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH] ARM: shmobile: armadillo800eva: Add support RTC 2012-09-13 4:06 ` Simon Horman @ 2012-09-13 5:11 ` Nobuhiro Iwamatsu 0 siblings, 0 replies; 12+ messages in thread From: Nobuhiro Iwamatsu @ 2012-09-13 5:11 UTC (permalink / raw) To: linux-arm-kernel Hi, On Thu, Sep 13, 2012 at 1:06 PM, Simon Horman <horms@verge.net.au> wrote: > On Thu, Sep 13, 2012 at 12:10:41PM +0900, Nobuhiro Iwamatsu wrote: >> The armadillo800eva has S35390A which is RTC. This is controlled >> using I2C of GPIO. >> This commit supports RTC of armadillo800eva. >> >> Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> > > Hi Iwamatsu-san, > > could you please either update this patch or provide a follow-up > patch to update the defconfig so the S35390A is enabled? > > "make savedefconfig" may be useful for this. OK, I will resend with updated defconfig. -- Nobuhiro Iwamatsu ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-09-18 0:45 UTC | newest] Thread overview: 12+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-09-06 2:04 [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Simon Horman 2012-09-06 2:04 ` [PATCH 1/3] ARM: shmobile: marzen: add SDHI0 support Simon Horman 2012-09-06 2:04 ` [PATCH 2/3] ARM: shmobile: marzen: fixup regulator id for smsc911x Simon Horman 2012-09-06 2:04 ` [PATCH 3/3] ARM: shmobile: marzen: enable thermal sensor Simon Horman 2012-09-12 6:23 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 Olof Johansson 2012-09-13 6:17 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Simon Horman 2012-09-13 6:17 ` [PATCH] ARM: shmobile: armadillo800eva: Add support RTC Simon Horman 2012-09-16 23:40 ` [GIT PULL] Renesas ARM-based SoC: Boards for 3.7 #2 Olof Johansson 2012-09-18 0:45 ` Simon Horman -- strict thread matches above, loose matches on Subject: below -- 2012-08-09 6:03 [PATCH] ARM: shmobile: armadillo800eva: fixup: sound card detection order Kuninori Morimoto 2012-09-13 3:10 ` [PATCH] ARM: shmobile: armadillo800eva: Add support RTC Nobuhiro Iwamatsu 2012-09-13 4:06 ` Simon Horman 2012-09-13 5:11 ` Nobuhiro Iwamatsu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).