| From e1e53987e8f32e8b1289e950be498934e1b99a88 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: kzm9g-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 ec028600f4a4bd1b272465caea3e2ff066e40377) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 51 ++++++++++++++++++++++++++ |
| arch/arm/mach-shmobile/board-kzm9g-reference.c | 40 -------------------- |
| 2 files changed, 51 insertions(+), 40 deletions(-) |
| |
| diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts |
| index b6f759e8..11ae9ade 100644 |
| --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts |
| +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts |
| @@ -145,19 +145,70 @@ |
| }; |
| }; |
| |
| +&i2c3 { |
| + pinctrl-0 = <&i2c3_pins>; |
| + pinctrl-names = "default"; |
| +}; |
| + |
| &mmcif { |
| + pinctrl-0 = <&mmcif_pins>; |
| + pinctrl-names = "default"; |
| + |
| bus-width = <8>; |
| vmmc-supply = <®_1p8v>; |
| status = "okay"; |
| }; |
| |
| +&pfc { |
| + pinctrl-0 = <&scifa4_pins>; |
| + pinctrl-names = "default"; |
| + |
| + i2c3_pins: i2c3 { |
| + renesas,groups = "i2c3_1"; |
| + renesas,function = "i2c3"; |
| + }; |
| + |
| + mmcif_pins: mmcif { |
| + mux { |
| + renesas,groups = "mmc0_data8_0", "mmc0_ctrl_0"; |
| + renesas,function = "mmc0"; |
| + }; |
| + cfg { |
| + renesas,groups = "mmc0_data8_0"; |
| + renesas,pins = "PORT279"; |
| + bias-pull-up; |
| + }; |
| + }; |
| + |
| + scifa4_pins: scifa4 { |
| + renesas,groups = "scifa4_data", "scifa4_ctrl"; |
| + renesas,function = "scifa4"; |
| + }; |
| + |
| + sdhi0_pins: sdhi0 { |
| + renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd", "sdhi0_wp"; |
| + renesas,function = "sdhi0"; |
| + }; |
| + |
| + sdhi2_pins: sdhi2 { |
| + renesas,groups = "sdhi2_data4", "sdhi2_ctrl"; |
| + renesas,function = "sdhi2"; |
| + }; |
| +}; |
| + |
| &sdhi0 { |
| + pinctrl-0 = <&sdhi0_pins>; |
| + pinctrl-names = "default"; |
| + |
| vmmc-supply = <®_3p3v>; |
| bus-width = <4>; |
| status = "okay"; |
| }; |
| |
| &sdhi2 { |
| + pinctrl-0 = <&sdhi2_pins>; |
| + pinctrl-names = "default"; |
| + |
| vmmc-supply = <®_3p3v>; |
| bus-width = <4>; |
| broken-cd; |
| diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c |
| index d7bbd29a..6a9f6a3a 100644 |
| --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c |
| +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c |
| @@ -26,55 +26,15 @@ |
| #include <linux/irq.h> |
| #include <linux/input.h> |
| #include <linux/of_platform.h> |
| -#include <linux/pinctrl/machine.h> |
| -#include <linux/pinctrl/pinconf-generic.h> |
| #include <mach/sh73a0.h> |
| #include <mach/common.h> |
| #include <asm/hardware/cache-l2x0.h> |
| #include <asm/mach-types.h> |
| #include <asm/mach/arch.h> |
| |
| -static unsigned long pin_pullup_conf[] = { |
| - PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_UP, 0), |
| -}; |
| - |
| -static const struct pinctrl_map kzm_pinctrl_map[] = { |
| - PIN_MAP_MUX_GROUP_DEFAULT("e6826000.i2c", "e6050000.pfc", |
| - "i2c3_1", "i2c3"), |
| - /* MMCIF */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "e6050000.pfc", |
| - "mmc0_data8_0", "mmc0"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "e6050000.pfc", |
| - "mmc0_ctrl_0", "mmc0"), |
| - PIN_MAP_CONFIGS_PIN_DEFAULT("e6bd0000.mmcif", "e6050000.pfc", |
| - "PORT279", pin_pullup_conf), |
| - PIN_MAP_CONFIGS_GROUP_DEFAULT("e6bd0000.mmcif", "e6050000.pfc", |
| - "mmc0_data8_0", pin_pullup_conf), |
| - /* SCIFA4 */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc", |
| - "scifa4_data", "scifa4"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc", |
| - "scifa4_ctrl", "scifa4"), |
| - /* SDHI0 */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "e6050000.pfc", |
| - "sdhi0_data4", "sdhi0"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "e6050000.pfc", |
| - "sdhi0_ctrl", "sdhi0"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "e6050000.pfc", |
| - "sdhi0_cd", "sdhi0"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "e6050000.pfc", |
| - "sdhi0_wp", "sdhi0"), |
| - /* SDHI2 */ |
| - PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "e6050000.pfc", |
| - "sdhi2_data4", "sdhi2"), |
| - PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "e6050000.pfc", |
| - "sdhi2_ctrl", "sdhi2"), |
| -}; |
| - |
| static void __init kzm_init(void) |
| { |
| sh73a0_add_standard_devices_dt(); |
| - pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map)); |
| |
| /* enable SD */ |
| gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */ |
| -- |
| 1.8.4.3.gca3854a |
| |