linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>
To: linux-sh@vger.kernel.org
Subject: [PATCH 1/2 v2] ARM: shmobile: lager: add SDHI0/2 support
Date: Wed, 12 Feb 2014 06:25:04 +0000	[thread overview]
Message-ID: <87wqh097bb.wl%kuninori.morimoto.gx@gmail.com> (raw)
In-Reply-To: <878uwqo2df.wl%kuninori.morimoto.gx@renesas.com>

From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

SDHI0 (CN8) needs JP/SW settings

Acked-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
v1 -> v2

 - add Acked-by: Magnus Damm <damm@opensource.se>

 arch/arm/mach-shmobile/board-lager.c |   64 ++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 3175748..90d7e81 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -26,8 +26,10 @@
 #include <linux/irq.h>
 #include <linux/kernel.h>
 #include <linux/leds.h>
+#include <linux/mfd/tmio.h>
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_data/camera-rcar.h>
 #include <linux/platform_data/gpio-rcar.h>
@@ -68,6 +70,19 @@
  * # amixer set "LINEOUT Mixer DACL" on
  */
 
+/*
+ * SDHI0 (CN8)
+ *
+ * JP3:  pin1
+ * SW20: pin1
+
+ * GP5_24:	1:  VDD  3.3V (defult)
+ *		0:  VDD  0.0V
+ * GP5_29:	1:  VccQ 3.3V (defult)
+ *		0:  VccQ 1.8V
+ *
+ */
+
 /* DU */
 static struct rcar_du_encoder_data lager_du_encoders[] = {
 	{
@@ -595,6 +610,34 @@ static void __init lager_add_rsnd_device(void)
 	platform_device_register_full(&cardinfo);
 }
 
+/* SDHI0 */
+static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
+	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+			  MMC_CAP_POWER_OFF_CARD,
+	.tmio_caps2	= MMC_CAP2_NO_MULTI_READ,
+	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT |
+			  TMIO_MMC_WRPROTECT_DISABLE,
+};
+
+static struct resource sdhi0_resources[] __initdata = {
+	DEFINE_RES_MEM(0xee100000, 0x200),
+	DEFINE_RES_IRQ(gic_spi(165)),
+};
+
+/* SDHI2 */
+static struct sh_mobile_sdhi_info sdhi2_info __initdata = {
+	.tmio_caps	= MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+			  MMC_CAP_POWER_OFF_CARD,
+	.tmio_caps2	= MMC_CAP2_NO_MULTI_READ,
+	.tmio_flags	= TMIO_MMC_HAS_IDLE_WAIT |
+			  TMIO_MMC_WRPROTECT_DISABLE,
+};
+
+static struct resource sdhi2_resources[] __initdata = {
+	DEFINE_RES_MEM(0xee140000, 0x100),
+	DEFINE_RES_IRQ(gic_spi(167)),
+};
+
 static const struct pinctrl_map lager_pinctrl_map[] = {
 	/* DU (CN10: ARGB0, CN13: LVDS) */
 	PIN_MAP_MUX_GROUP_DEFAULT("rcar-du-r8a7790", "pfc-r8a7790",
@@ -612,6 +655,20 @@ static const struct pinctrl_map lager_pinctrl_map[] = {
 	/* SCIF1 (CN20: DEBUG SERIAL1) */
 	PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7790",
 				  "scif1_data", "scif1"),
+	/* SDHI0 */
+	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7790",
+				  "sdhi0_data4", "sdhi0"),
+	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7790",
+				  "sdhi0_ctrl", "sdhi0"),
+	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7790",
+				  "sdhi0_cd", "sdhi0"),
+	/* SDHI2 */
+	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7790",
+				  "sdhi2_data4", "sdhi2"),
+	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7790",
+				  "sdhi2_ctrl", "sdhi2"),
+	PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.2", "pfc-r8a7790",
+				  "sdhi2_cd", "sdhi2"),
 	/* SSI (CN17: sound) */
 	PIN_MAP_MUX_GROUP_DEFAULT("rcar_sound", "pfc-r8a7790",
 				  "ssi0129_ctrl", "ssi"),
@@ -716,6 +773,13 @@ static void __init lager_add_standard_devices(void)
 	lager_register_usbhs();
 
 	lager_add_rsnd_device();
+
+	platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0,
+					  sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
+					  &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
+	platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 2,
+					  sdhi2_resources, ARRAY_SIZE(sdhi2_resources),
+					  &sdhi2_info, sizeof(struct sh_mobile_sdhi_info));
 }
 
 /*
-- 
1.7.9.5


  parent reply	other threads:[~2014-02-12  6:25 UTC|newest]

Thread overview: 58+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-14 10:16 [PATCH 0/16] SDHI support for r8a7790 Kuninori Morimoto
2013-11-14 10:18 ` [PATCH 0/16]: gpio-rcar fixup Kuninori Morimoto
2013-11-14 10:19   ` [PATCH 01/16] gpio: rcar: use postcore_init() Kuninori Morimoto
2013-11-14 13:42     ` Laurent Pinchart
2013-11-15  0:26       ` Kuninori Morimoto
2013-11-18 13:59         ` Laurent Pinchart
2013-11-19  9:57           ` Linus Walleij
2013-11-19 12:36             ` Laurent Pinchart
2013-11-21  2:02               ` Kuninori Morimoto
2013-11-14 10:21 ` [PATCH 0/16] mmc: bug fix patches Kuninori Morimoto
2013-11-14 10:23   ` [PATCH 03/17] mmc: tmio: Fix odd size access Kuninori Morimoto
2013-11-14 13:32     ` Laurent Pinchart
2013-11-14 10:24   ` [PATCH 04/17] mmc: tmio: Add error IRQ status clear Kuninori Morimoto
2013-11-14 13:34     ` Laurent Pinchart
2013-11-14 10:24   ` [PATCH 05/17] mmc: tmio: don't overwrite caps2 Kuninori Morimoto
2013-11-14 13:36     ` Laurent Pinchart
2013-11-14 10:26 ` [PATCH 0/16] ARM: shmobile: bug fix Kuninori Morimoto
2013-11-14 10:27   ` [PATCH 06/17] ARM: shmobile: marzen: remove SDHI0 WP pin setting from DTS Kuninori Morimoto
2013-11-14 13:38     ` Laurent Pinchart
2013-11-14 10:27   ` [PATCH 07/17] ARM: shmobile: marzen: remove SDHI0 WP pin setting Kuninori Morimoto
2013-11-14 13:38     ` Laurent Pinchart
2013-11-14 10:27   ` [PATCH 08/17] ARM: shmobile: sh73a0: fixup sdhi compatible name Kuninori Morimoto
2013-11-14 13:39     ` Laurent Pinchart
2013-11-14 10:29 ` [PATCH 0/16] mmc: SDHI: add new feature Kuninori Morimoto
2013-11-14 10:30   ` [PATCH 09/17] mmc: tmio: bus_shift become tmio_mmc_data member Kuninori Morimoto
2013-11-14 10:31   ` [PATCH 10/17] mmc: tmio: add new TMIO_MMC_HAVE_HIGH_REG flags Kuninori Morimoto
2013-11-14 10:31   ` [PATCH 11/17] mmc: SDHI: add SoC specific workaround via HW version Kuninori Morimoto
2013-11-14 14:03     ` Sergei Shtylyov
2013-11-15  0:16       ` Kuninori Morimoto
2013-11-14 10:31   ` [PATCH 12/17] mmc: SDHI: tidyup sh_mobile_sdhi_of_match position Kuninori Morimoto
2013-11-14 10:32   ` [PATCH 13/17] mmc: SDHI: updata sh_mobile_sdhi_of_data for r8a7778 Kuninori Morimoto
2013-11-14 10:32   ` [PATCH 14/17] mmc: SDHI: updata sh_mobile_sdhi_of_data for r8a7779 Kuninori Morimoto
2013-11-14 10:32   ` [PATCH 15/17] mmc: SDHI: updata sh_mobile_sdhi_of_data for r8a7790 Kuninori Morimoto
2013-11-14 10:34 ` [PATCH 0/16] ARM: shmobile: SDHI support " Kuninori Morimoto
2013-11-14 10:34   ` [PATCH 16/17] ARM: shmobile: lager: add SDHI0/2 support Kuninori Morimoto
2013-11-14 10:35   ` [PATCH 17/17] ARM: shmobile: lager: use gpio/fixed regulator for SDHI Kuninori Morimoto
2013-11-14 13:51     ` Laurent Pinchart
2013-11-15  0:42       ` Kuninori Morimoto
2013-11-14 13:46   ` [PATCH 0/16] ARM: shmobile: SDHI support for r8a7790 Laurent Pinchart
2013-11-15  0:43     ` Kuninori Morimoto
2013-11-15  1:53   ` Kuninori Morimoto
2013-11-15  1:55     ` [PATCH 1/2 v2] ARM: shmobile: lager: add gpio/fixed regulator for SDHI Kuninori Morimoto
2013-11-18 11:35       ` Laurent Pinchart
2013-11-19  5:14         ` Kuninori Morimoto
2013-11-19 12:45           ` Laurent Pinchart
2013-11-20  7:37             ` Kuninori Morimoto
2013-11-20 10:57               ` Laurent Pinchart
2013-11-21  1:53                 ` Kuninori Morimoto
2013-12-05  6:11       ` Kuninori Morimoto
2013-12-05  6:59       ` Simon Horman
2014-02-12  6:25       ` Kuninori Morimoto [this message]
2013-11-15  1:56     ` [PATCH 2/2 v2] ARM: shmobile: lager: add SDHI0/2 support Kuninori Morimoto
2013-11-18  7:21     ` [PATCH 0/16] ARM: shmobile: SDHI support for r8a7790 Simon Horman
2013-11-18  7:42       ` Kuninori Morimoto
2013-11-21  3:53         ` Simon Horman
2013-11-21  5:20           ` Kuninori Morimoto
2013-11-21  8:48             ` Simon Horman
2013-11-20  0:43 ` [PATCH 0/16] " Kuninori Morimoto

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87wqh097bb.wl%kuninori.morimoto.gx@gmail.com \
    --to=kuninori.morimoto.gx@gmail.com \
    --cc=linux-sh@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).