| From 89da1f26fca254c66b79499c6f40aab8edab274b Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Thu, 9 May 2013 15:05:57 +0200 |
| Subject: ARM: shmobile: r8a7779: Add pin control device to device tree |
| |
| Add a pfc node to the r8a7779 device tree and remove manual pinmux |
| initialization from the corresponding board files. |
| |
| Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 3ab03d01a989e4d77ed6ba0bc8c2efd9211df7c8) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/r8a7779.dtsi | 5 +++++ |
| arch/arm/mach-shmobile/board-marzen-reference.c | 17 ++++++++--------- |
| 2 files changed, 13 insertions(+), 9 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi |
| index 7f146c6b..9dfc4384 100644 |
| --- a/arch/arm/boot/dts/r8a7779.dtsi |
| +++ b/arch/arm/boot/dts/r8a7779.dtsi |
| @@ -101,6 +101,11 @@ |
| interrupts = <0 81 0x4>; |
| }; |
| |
| + pfc: pfc@fffc0000 { |
| + compatible = "renesas,pfc-r8a7779"; |
| + reg = <0xfffc0000 0x23c>; |
| + }; |
| + |
| thermal@ffc48000 { |
| compatible = "renesas,rcar-thermal"; |
| reg = <0xffc48000 0x38>; |
| diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c |
| index 480d882e..94804f3c 100644 |
| --- a/arch/arm/mach-shmobile/board-marzen-reference.c |
| +++ b/arch/arm/mach-shmobile/board-marzen-reference.c |
| @@ -28,24 +28,24 @@ |
| |
| static const struct pinctrl_map marzen_pinctrl_map[] = { |
| /* SCIF2 (CN18: DEBUG0) */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779", |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "fffc0000.pfc", |
| "scif2_data_c", "scif2"), |
| /* SCIF4 (CN19: DEBUG1) */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-r8a7779", |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "fffc0000.pfc", |
| "scif4_data", "scif4"), |
| /* SDHI0 */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779", |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc", |
| "sdhi0_data4", "sdhi0"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779", |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc", |
| "sdhi0_ctrl", "sdhi0"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779", |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc", |
| "sdhi0_cd", "sdhi0"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779", |
| + PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "fffc0000.pfc", |
| "sdhi0_wp", "sdhi0"), |
| /* SMSC */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779", |
| + PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "fffc0000.pfc", |
| "intc_irq1_b", "intc"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779", |
| + PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "fffc0000.pfc", |
| "lbsc_ex_cs0", "lbsc"), |
| }; |
| |
| @@ -53,7 +53,6 @@ static void __init marzen_init(void) |
| { |
| pinctrl_register_mappings(marzen_pinctrl_map, |
| ARRAY_SIZE(marzen_pinctrl_map)); |
| - r8a7779_pinmux_init(); |
| |
| r8a7779_add_standard_devices_dt(); |
| } |
| -- |
| 1.8.4.3.gca3854a |
| |
