| Message ID | Pine.LNX.4.64.1307231316170.19465@axis700.grange (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | 59b2bc34aaa5d4c85c5c868ea6da42c1d06ff27c |
| Headers | show |
On Tue, Jul 23, 2013 at 01:19:07PM +0200, Guennadi Liakhovetski wrote: > PFC pinctrl configuration can now be performed via DT. Update > ape6evm-reference to use this. > > Signed-off-by: Guennadi Liakhovetski <g.liakhovetski+renesas@gmail.com> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Thanks, I have queued this up for v3.12 in the dt2 branch. > --- > > v2: no change > > arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts | 10 ++++++++++ > arch/arm/mach-shmobile/board-ape6evm-reference.c | 9 --------- > 2 files changed, 10 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > index 6f4506e..bbd09d8 100644 > --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts > @@ -53,3 +53,13 @@ > >; > voltage-tolerance = <1>; /* 1% */ > }; > + > +&pfc { > + pinctrl-0 = <&scifa0_pins>; > + pinctrl-names = "default"; > + > + scifa0_pins: scifa0 { > + renesas,groups = "scifa0_data"; > + renesas,function = "scifa0"; > + }; > +}; > diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c > index 46b41de..52cc5fa 100644 > --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c > +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c > @@ -29,12 +29,6 @@ > #include <asm/mach-types.h> > #include <asm/mach/arch.h> > > -static const struct pinctrl_map ape6evm_pinctrl_map[] = { > - /* SCIFA0 console */ > - PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4", > - "scifa0_data", "scifa0"), > -}; > - > static void __init ape6evm_add_standard_devices(void) > { > > @@ -52,9 +46,6 @@ static void __init ape6evm_add_standard_devices(void) > clk_put(parent); > clk_put(mp); > > - pinctrl_register_mappings(ape6evm_pinctrl_map, > - ARRAY_SIZE(ape6evm_pinctrl_map)); > - r8a73a4_pinmux_init(); > r8a73a4_add_dt_devices(); > of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); > platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0); > -- > 1.7.2.5 > -- 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
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts index 6f4506e..bbd09d8 100644 --- a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts +++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts @@ -53,3 +53,13 @@ >; voltage-tolerance = <1>; /* 1% */ }; + +&pfc { + pinctrl-0 = <&scifa0_pins>; + pinctrl-names = "default"; + + scifa0_pins: scifa0 { + renesas,groups = "scifa0_data"; + renesas,function = "scifa0"; + }; +}; diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c index 46b41de..52cc5fa 100644 --- a/arch/arm/mach-shmobile/board-ape6evm-reference.c +++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c @@ -29,12 +29,6 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> -static const struct pinctrl_map ape6evm_pinctrl_map[] = { - /* SCIFA0 console */ - PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4", - "scifa0_data", "scifa0"), -}; - static void __init ape6evm_add_standard_devices(void) { @@ -52,9 +46,6 @@ static void __init ape6evm_add_standard_devices(void) clk_put(parent); clk_put(mp); - pinctrl_register_mappings(ape6evm_pinctrl_map, - ARRAY_SIZE(ape6evm_pinctrl_map)); - r8a73a4_pinmux_init(); r8a73a4_add_dt_devices(); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0);