diff options
Diffstat (limited to 'arch/arm/mach-nomadik')
-rw-r--r-- | arch/arm/mach-nomadik/cpu-8815.c | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 835161709c62..89e2c03db178 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c | |||
@@ -27,8 +27,6 @@ | |||
27 | #include <linux/dma-mapping.h> | 27 | #include <linux/dma-mapping.h> |
28 | #include <linux/irqchip.h> | 28 | #include <linux/irqchip.h> |
29 | #include <linux/platform_data/clk-nomadik.h> | 29 | #include <linux/platform_data/clk-nomadik.h> |
30 | #include <linux/platform_data/pinctrl-nomadik.h> | ||
31 | #include <linux/pinctrl/machine.h> | ||
32 | #include <linux/clocksource.h> | 30 | #include <linux/clocksource.h> |
33 | #include <linux/of_irq.h> | 31 | #include <linux/of_irq.h> |
34 | #include <linux/of_gpio.h> | 32 | #include <linux/of_gpio.h> |
@@ -91,52 +89,6 @@ | |||
91 | #define NOMADIK_L2CC_BASE 0x10210000 /* L2 Cache controller */ | 89 | #define NOMADIK_L2CC_BASE 0x10210000 /* L2 Cache controller */ |
92 | #define NOMADIK_UART1_VBASE 0xF01FB000 | 90 | #define NOMADIK_UART1_VBASE 0xF01FB000 |
93 | 91 | ||
94 | static unsigned long out_low[] = { PIN_OUTPUT_LOW }; | ||
95 | static unsigned long out_high[] = { PIN_OUTPUT_HIGH }; | ||
96 | static unsigned long in_nopull[] = { PIN_INPUT_NOPULL }; | ||
97 | static unsigned long in_pullup[] = { PIN_INPUT_PULLUP }; | ||
98 | |||
99 | static struct pinctrl_map __initdata nhk8815_pinmap[] = { | ||
100 | PIN_MAP_MUX_GROUP_DEFAULT("uart0", "pinctrl-stn8815", "u0_a_1", "u0"), | ||
101 | PIN_MAP_MUX_GROUP_DEFAULT("uart1", "pinctrl-stn8815", "u1_a_1", "u1"), | ||
102 | /* User LED on S8815 */ | ||
103 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO2_C5", out_high), | ||
104 | /* User button on S8815 */ | ||
105 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO3_A4", in_nopull), | ||
106 | /* Hog in MMC/SD card mux */ | ||
107 | PIN_MAP_MUX_GROUP_HOG_DEFAULT("pinctrl-stn8815", "mmcsd_a_1", "mmcsd"), | ||
108 | /* MCCLK */ | ||
109 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO8_B10", out_low), | ||
110 | /* MCCMD */ | ||
111 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO9_A10", in_pullup), | ||
112 | /* MCCMDDIR */ | ||
113 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO10_C11", out_high), | ||
114 | /* MCDAT3-0 */ | ||
115 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO11_B11", in_pullup), | ||
116 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO12_A11", in_pullup), | ||
117 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO13_C12", in_pullup), | ||
118 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO14_B12", in_pullup), | ||
119 | /* MCDAT0DIR */ | ||
120 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO15_A12", out_high), | ||
121 | /* MCDAT31DIR */ | ||
122 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO16_C13", out_high), | ||
123 | /* MCMSFBCLK */ | ||
124 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO24_C15", in_pullup), | ||
125 | /* CD input GPIO */ | ||
126 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO111_H21", in_nopull), | ||
127 | /* CD bias drive */ | ||
128 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO112_J21", out_low), | ||
129 | /* I2C0 */ | ||
130 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO62_D3", in_pullup), | ||
131 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO63_D2", in_pullup), | ||
132 | /* I2C1 */ | ||
133 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO53_L4", in_pullup), | ||
134 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO54_L3", in_pullup), | ||
135 | /* I2C2 */ | ||
136 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO73_C21", in_pullup), | ||
137 | PIN_MAP_CONFIGS_PIN_HOG_DEFAULT("pinctrl-stn8815", "GPIO74_C20", in_pullup), | ||
138 | }; | ||
139 | |||
140 | /* This is needed for LL-debug/earlyprintk/debug-macro.S */ | 92 | /* This is needed for LL-debug/earlyprintk/debug-macro.S */ |
141 | static struct map_desc cpu8815_io_desc[] __initdata = { | 93 | static struct map_desc cpu8815_io_desc[] __initdata = { |
142 | { | 94 | { |
@@ -284,8 +236,6 @@ device_initcall(cpu8815_mmcsd_init); | |||
284 | 236 | ||
285 | /* These are mostly to get the right device names for the clock lookups */ | 237 | /* These are mostly to get the right device names for the clock lookups */ |
286 | static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { | 238 | static struct of_dev_auxdata cpu8815_auxdata_lookup[] __initdata = { |
287 | OF_DEV_AUXDATA("stericsson,nmk-pinctrl-stn8815", 0, | ||
288 | "pinctrl-stn8815", NULL), | ||
289 | OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE, | 239 | OF_DEV_AUXDATA("stericsson,fsmc-nand", NOMADIK_FSMC_BASE, |
290 | NULL, &cpu8815_nand_data), | 240 | NULL, &cpu8815_nand_data), |
291 | OF_DEV_AUXDATA("arm,primecell", NOMADIK_SDI_BASE, | 241 | OF_DEV_AUXDATA("arm,primecell", NOMADIK_SDI_BASE, |
@@ -299,7 +249,6 @@ static void __init cpu8815_init_of(void) | |||
299 | /* At full speed latency must be >=2, so 0x249 in low bits */ | 249 | /* At full speed latency must be >=2, so 0x249 in low bits */ |
300 | l2x0_of_init(0x00730249, 0xfe000fff); | 250 | l2x0_of_init(0x00730249, 0xfe000fff); |
301 | #endif | 251 | #endif |
302 | pinctrl_register_mappings(nhk8815_pinmap, ARRAY_SIZE(nhk8815_pinmap)); | ||
303 | of_platform_populate(NULL, of_default_bus_match_table, | 252 | of_platform_populate(NULL, of_default_bus_match_table, |
304 | cpu8815_auxdata_lookup, NULL); | 253 | cpu8815_auxdata_lookup, NULL); |
305 | } | 254 | } |