diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-11-20 08:02:54 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-07-21 21:12:36 -0400 |
commit | 3f59007e8efc29bb6cce08329bf010bcd9b19101 (patch) | |
tree | 6a3bc7d12df420b39ef752a9fd89f142b38f7b92 /arch/arm/mach-shmobile/board-kzm9g-reference.c | |
parent | 871e4b3e9e437b48287c635c5e66ba80b5cd365a (diff) |
ARM: shmobile: sh73a0: Add pin control device to device tree
Add a pfc node to the sh73a0 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>
Diffstat (limited to 'arch/arm/mach-shmobile/board-kzm9g-reference.c')
-rw-r--r-- | arch/arm/mach-shmobile/board-kzm9g-reference.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c index 44055fe8a45c..6ff6ca2740a3 100644 --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c | |||
@@ -40,35 +40,35 @@ static unsigned long pin_pullup_conf[] = { | |||
40 | }; | 40 | }; |
41 | 41 | ||
42 | static const struct pinctrl_map kzm_pinctrl_map[] = { | 42 | static const struct pinctrl_map kzm_pinctrl_map[] = { |
43 | PIN_MAP_MUX_GROUP_DEFAULT("e6826000.i2c", "pfc-sh73a0", | 43 | PIN_MAP_MUX_GROUP_DEFAULT("e6826000.i2c", "e6050000.pfc", |
44 | "i2c3_1", "i2c3"), | 44 | "i2c3_1", "i2c3"), |
45 | /* MMCIF */ | 45 | /* MMCIF */ |
46 | PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0", | 46 | PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "e6050000.pfc", |
47 | "mmc0_data8_0", "mmc0"), | 47 | "mmc0_data8_0", "mmc0"), |
48 | PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0", | 48 | PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "e6050000.pfc", |
49 | "mmc0_ctrl_0", "mmc0"), | 49 | "mmc0_ctrl_0", "mmc0"), |
50 | PIN_MAP_CONFIGS_PIN_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0", | 50 | PIN_MAP_CONFIGS_PIN_DEFAULT("e6bd0000.mmcif", "e6050000.pfc", |
51 | "PORT279", pin_pullup_conf), | 51 | "PORT279", pin_pullup_conf), |
52 | PIN_MAP_CONFIGS_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0", | 52 | PIN_MAP_CONFIGS_GROUP_DEFAULT("e6bd0000.mmcif", "e6050000.pfc", |
53 | "mmc0_data8_0", pin_pullup_conf), | 53 | "mmc0_data8_0", pin_pullup_conf), |
54 | /* SCIFA4 */ | 54 | /* SCIFA4 */ |
55 | PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0", | 55 | PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc", |
56 | "scifa4_data", "scifa4"), | 56 | "scifa4_data", "scifa4"), |
57 | PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0", | 57 | PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "e6050000.pfc", |
58 | "scifa4_ctrl", "scifa4"), | 58 | "scifa4_ctrl", "scifa4"), |
59 | /* SDHI0 */ | 59 | /* SDHI0 */ |
60 | PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0", | 60 | PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "e6050000.pfc", |
61 | "sdhi0_data4", "sdhi0"), | 61 | "sdhi0_data4", "sdhi0"), |
62 | PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0", | 62 | PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "e6050000.pfc", |
63 | "sdhi0_ctrl", "sdhi0"), | 63 | "sdhi0_ctrl", "sdhi0"), |
64 | PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0", | 64 | PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "e6050000.pfc", |
65 | "sdhi0_cd", "sdhi0"), | 65 | "sdhi0_cd", "sdhi0"), |
66 | PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0", | 66 | PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "e6050000.pfc", |
67 | "sdhi0_wp", "sdhi0"), | 67 | "sdhi0_wp", "sdhi0"), |
68 | /* SDHI2 */ | 68 | /* SDHI2 */ |
69 | PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0", | 69 | PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "e6050000.pfc", |
70 | "sdhi2_data4", "sdhi2"), | 70 | "sdhi2_data4", "sdhi2"), |
71 | PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0", | 71 | PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "e6050000.pfc", |
72 | "sdhi2_ctrl", "sdhi2"), | 72 | "sdhi2_ctrl", "sdhi2"), |
73 | }; | 73 | }; |
74 | 74 | ||
@@ -76,7 +76,6 @@ static void __init kzm_init(void) | |||
76 | { | 76 | { |
77 | sh73a0_add_standard_devices_dt(); | 77 | sh73a0_add_standard_devices_dt(); |
78 | pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map)); | 78 | pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map)); |
79 | sh73a0_pinmux_init(); | ||
80 | 79 | ||
81 | /* enable SD */ | 80 | /* enable SD */ |
82 | gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */ | 81 | gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */ |