* [PATCH] ARM: shmobile: Add pinctrl_register_mappings() for Koelsch
@ 2013-11-20 7:41 Magnus Damm
2013-11-21 4:05 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Magnus Damm @ 2013-11-20 7:41 UTC (permalink / raw)
To: linux-kernel; +Cc: Magnus Damm, horms, linux-sh
From: Magnus Damm <damm@opensource.se>
Add code to setup the r8a7791 PFC for the Koelsch board.
At this point serial consoles are added, and in the near
future other platform-device-only devices will be added
here like for instance the r8a7791 DU.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/board-koelsch.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
--- 0014/arch/arm/mach-shmobile/board-koelsch.c
+++ work/arch/arm/mach-shmobile/board-koelsch.c 2013-11-20 16:18:28.000000000 +0900
@@ -24,6 +24,7 @@
#include <linux/input.h>
#include <linux/kernel.h>
#include <linux/leds.h>
+#include <linux/pinctrl/machine.h>
#include <linux/platform_data/gpio-rcar.h>
#include <linux/platform_device.h>
#include <mach/common.h>
@@ -78,9 +79,20 @@ static const struct gpio_keys_platform_d
.nbuttons = ARRAY_SIZE(gpio_buttons),
};
+static const struct pinctrl_map koelsch_pinctrl_map[] = {
+ /* SCIF0 (CN19: DEBUG SERIAL0) */
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7791",
+ "scif0_data_d", "scif0"),
+ /* SCIF1 (CN20: DEBUG SERIAL1) */
+ PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7791",
+ "scif1_data_d", "scif1"),
+};
+
static void __init koelsch_add_standard_devices(void)
{
r8a7791_clock_init();
+ pinctrl_register_mappings(koelsch_pinctrl_map,
+ ARRAY_SIZE(koelsch_pinctrl_map));
r8a7791_pinmux_init();
r8a7791_add_standard_devices();
platform_device_register_data(&platform_bus, "leds-gpio", -1,
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: shmobile: Add pinctrl_register_mappings() for Koelsch
2013-11-20 7:41 [PATCH] ARM: shmobile: Add pinctrl_register_mappings() for Koelsch Magnus Damm
@ 2013-11-21 4:05 ` Simon Horman
2013-11-21 8:38 ` Simon Horman
0 siblings, 1 reply; 3+ messages in thread
From: Simon Horman @ 2013-11-21 4:05 UTC (permalink / raw)
To: Magnus Damm; +Cc: linux-kernel, linux-sh
On Wed, Nov 20, 2013 at 04:41:48PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
>
> Add code to setup the r8a7791 PFC for the Koelsch board.
>
> At this point serial consoles are added, and in the near
> future other platform-device-only devices will be added
> here like for instance the r8a7791 DU.
>
> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
>
> arch/arm/mach-shmobile/board-koelsch.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
Thanks, I will queue this up.
Assuming all goes will I plan to push this and other updates
today or tomorrow.
>
> --- 0014/arch/arm/mach-shmobile/board-koelsch.c
> +++ work/arch/arm/mach-shmobile/board-koelsch.c 2013-11-20 16:18:28.000000000 +0900
> @@ -24,6 +24,7 @@
> #include <linux/input.h>
> #include <linux/kernel.h>
> #include <linux/leds.h>
> +#include <linux/pinctrl/machine.h>
> #include <linux/platform_data/gpio-rcar.h>
> #include <linux/platform_device.h>
> #include <mach/common.h>
> @@ -78,9 +79,20 @@ static const struct gpio_keys_platform_d
> .nbuttons = ARRAY_SIZE(gpio_buttons),
> };
>
> +static const struct pinctrl_map koelsch_pinctrl_map[] = {
> + /* SCIF0 (CN19: DEBUG SERIAL0) */
> + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7791",
> + "scif0_data_d", "scif0"),
> + /* SCIF1 (CN20: DEBUG SERIAL1) */
> + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7791",
> + "scif1_data_d", "scif1"),
> +};
> +
> static void __init koelsch_add_standard_devices(void)
> {
> r8a7791_clock_init();
> + pinctrl_register_mappings(koelsch_pinctrl_map,
> + ARRAY_SIZE(koelsch_pinctrl_map));
> r8a7791_pinmux_init();
> r8a7791_add_standard_devices();
> platform_device_register_data(&platform_bus, "leds-gpio", -1,
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: shmobile: Add pinctrl_register_mappings() for Koelsch
2013-11-21 4:05 ` Simon Horman
@ 2013-11-21 8:38 ` Simon Horman
0 siblings, 0 replies; 3+ messages in thread
From: Simon Horman @ 2013-11-21 8:38 UTC (permalink / raw)
To: Magnus Damm; +Cc: linux-kernel, linux-sh
On Thu, Nov 21, 2013 at 01:05:57PM +0900, Simon Horman wrote:
> On Wed, Nov 20, 2013 at 04:41:48PM +0900, Magnus Damm wrote:
> > From: Magnus Damm <damm@opensource.se>
> >
> > Add code to setup the r8a7791 PFC for the Koelsch board.
> >
> > At this point serial consoles are added, and in the near
> > future other platform-device-only devices will be added
> > here like for instance the r8a7791 DU.
> >
> > Signed-off-by: Magnus Damm <damm@opensource.se>
> > ---
> >
> > arch/arm/mach-shmobile/board-koelsch.c | 12 ++++++++++++
> > 1 file changed, 12 insertions(+)
>
> Thanks, I will queue this up.
> Assuming all goes will I plan to push this and other updates
> today or tomorrow.
Unfortunately with this patch applied I am no longer
able to boot my Koelsch board using the koelsch defconfig.
Am I missing something?
I am dropping this patch for now.
>
> >
> > --- 0014/arch/arm/mach-shmobile/board-koelsch.c
> > +++ work/arch/arm/mach-shmobile/board-koelsch.c 2013-11-20 16:18:28.000000000 +0900
> > @@ -24,6 +24,7 @@
> > #include <linux/input.h>
> > #include <linux/kernel.h>
> > #include <linux/leds.h>
> > +#include <linux/pinctrl/machine.h>
> > #include <linux/platform_data/gpio-rcar.h>
> > #include <linux/platform_device.h>
> > #include <mach/common.h>
> > @@ -78,9 +79,20 @@ static const struct gpio_keys_platform_d
> > .nbuttons = ARRAY_SIZE(gpio_buttons),
> > };
> >
> > +static const struct pinctrl_map koelsch_pinctrl_map[] = {
> > + /* SCIF0 (CN19: DEBUG SERIAL0) */
> > + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7791",
> > + "scif0_data_d", "scif0"),
> > + /* SCIF1 (CN20: DEBUG SERIAL1) */
> > + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7791",
> > + "scif1_data_d", "scif1"),
> > +};
> > +
> > static void __init koelsch_add_standard_devices(void)
> > {
> > r8a7791_clock_init();
> > + pinctrl_register_mappings(koelsch_pinctrl_map,
> > + ARRAY_SIZE(koelsch_pinctrl_map));
> > r8a7791_pinmux_init();
> > r8a7791_add_standard_devices();
> > platform_device_register_data(&platform_bus, "leds-gpio", -1,
> >
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-21 8:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-11-20 7:41 [PATCH] ARM: shmobile: Add pinctrl_register_mappings() for Koelsch Magnus Damm
2013-11-21 4:05 ` Simon Horman
2013-11-21 8:38 ` Simon Horman
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).