| From c0159f812437f5eec1f4743ca954c58a12a928b0 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 9 May 2013 17:41:59 +0200 |
| Subject: ARM: shmobile: armadillo-reference: Move pinctrl mappings to device |
| tree |
| |
| Replace the pinctrl mappings in board code by device tree mappings. |
| For devices that are still instantiated from board code reference the |
| mappings as the default pin controller state to apply them at boot time. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 5d244563da5326d66ca839b06dbc6f632d2f24df) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts | 10 ++++++++++ |
| arch/arm/mach-shmobile/board-armadillo800eva-reference.c | 9 --------- |
| 2 files changed, 10 insertions(+), 9 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| index 09ea22c2..4a7ae32d 100644 |
| --- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts |
| @@ -43,3 +43,13 @@ |
| interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */ |
| }; |
| }; |
| + |
| +&pfc { |
| + pinctrl-0 = <&scifa1_pins>; |
| + pinctrl-names = "default"; |
| + |
| + scifa1_pins: scifa1 { |
| + renesas,groups = "scifa1_data"; |
| + renesas,function = "scifa1"; |
| + }; |
| +}; |
| diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c |
| index f25b6aab..4ddd2999 100644 |
| --- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c |
| +++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c |
| @@ -24,7 +24,6 @@ |
| #include <linux/kernel.h> |
| #include <linux/gpio.h> |
| #include <linux/io.h> |
| -#include <linux/pinctrl/machine.h> |
| #include <mach/common.h> |
| #include <mach/r8a7740.h> |
| #include <asm/mach/arch.h> |
| @@ -119,12 +118,6 @@ |
| * usbhsf_power_ctrl() |
| */ |
| |
| -static const struct pinctrl_map eva_pinctrl_map[] = { |
| - /* SCIFA1 */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "e6050000.pfc", |
| - "scifa1_data", "scifa1"), |
| -}; |
| - |
| static void __init eva_clock_init(void) |
| { |
| struct clk *system = clk_get(NULL, "system_clk"); |
| @@ -169,8 +162,6 @@ static void __init eva_init(void) |
| r8a7740_clock_init(MD_CK0 | MD_CK2); |
| eva_clock_init(); |
| |
| - pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map)); |
| - |
| r8a7740_meram_workaround(); |
| |
| #ifdef CONFIG_CACHE_L2X0 |
| -- |
| 1.8.4.3.gca3854a |
| |
