From: Simon Horman <horms+renesas@verge.net.au>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/9] ARM: shmobile: kzm9g: reference: Populate platform devices from device tree
Date: Wed, 13 Feb 2013 03:29:18 +0000 [thread overview]
Message-ID: <1360726161-16072-7-git-send-email-horms+renesas@verge.net.au> (raw)
In-Reply-To: <1360726161-16072-1-git-send-email-horms+renesas@verge.net.au>
Call of_platform_populate() at machine initialization time to populate
platform devices. Remove the explicit pinmux initialization as the PFC
device will be instantiated from the device tree.
This change is for the kzm9g reference DT implementation and is in keeping
with a similar change for the default kzm9g implementation made by Laurent
Pinchart.
Reported-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 12 ++++++++++++
arch/arm/mach-shmobile/board-kzm9g-reference.c | 7 ++-----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 06f52f9..9901caf 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -35,6 +35,18 @@
};
};
+&i2c3 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c3_pins>;
+};
+
+&gpio {
+ i2c3_pins: pfc_i2c3_pins {
+ renesas,pins = "i2c3_1";
+ renesas,function = "i2c3";
+ };
+};
+
&mmcif {
vmmc-supply = <&fixedregulator1v8>;
vqmmc-supply = <&fixedregulator1v8>;
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index 7282048..625e337 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -34,11 +34,9 @@
#include <asm/mach/arch.h>
static const struct pinctrl_map kzm_pinctrl_map[] = {
- PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",
- "i2c3_1", "i2c3"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc",
"scifa4_data", "scifa4"),
- PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc",
"scifa4_ctrl", "scifa4"),
};
@@ -46,7 +44,6 @@ static void __init kzm_init(void)
{
sh73a0_add_standard_devices_dt();
pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map));
- sh73a0_pinmux_init();
/* enable MMCIF */
gpio_request(GPIO_FN_MMCCLK0, NULL);
--
1.7.10.4
next prev parent reply other threads:[~2013-02-13 3:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-13 3:29 [PATCH v2.1 0/9] SH pinctrl DT support Simon Horman
2013-02-13 3:29 ` [PATCH 1/9] sh-pfc: Add OF support Simon Horman
2013-02-15 19:37 ` Linus Walleij
2013-02-13 3:29 ` [PATCH 2/9] ARM: shmobile: r8a7740: Add pin control device in device tree Simon Horman
2013-02-13 3:29 ` [PATCH 3/9] ARM: shmobile: armadillo: Populate platform devices from " Simon Horman
2013-02-13 3:29 ` [PATCH 4/9] ARM: shmobile: sh73a0: Add pin control device in " Simon Horman
2013-02-13 3:29 ` [PATCH 5/9] ARM: shmobile: kzm9g: Populate platform devices from " Simon Horman
2013-02-13 3:29 ` Simon Horman [this message]
2013-02-13 3:29 ` [PATCH 7/9] ARM: shmobile: kzm9g: Add LED1-LED4 to the " Simon Horman
2013-02-13 3:29 ` [PATCH 8/9] ARM: shmobile: armadillo: Move pinctrl mappings to " Simon Horman
2013-02-13 3:29 ` [PATCH 9/9] ARM: shmobile: kzm9g: " Simon Horman
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=1360726161-16072-7-git-send-email-horms+renesas@verge.net.au \
--to=horms+renesas@verge.net.au \
--cc=linux-arm-kernel@lists.infradead.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).