diff options
author | Andrew Lunn <andrew@lunn.ch> | 2011-05-15 07:32:52 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-05-16 15:25:54 -0400 |
commit | b2f427a1088a9ad4f86855f4df1fc059bebb441f (patch) | |
tree | 61508b83eabb956e6ab1255110689485151872b3 /arch/arm/plat-orion | |
parent | 44350061905b2a502579d3827eacaf8efa393aad (diff) |
ARM: orion: Refactor the MPP code common in the orion platform
mv78xx0 and kirkwood use identical mpp code.
It should also be possible to rewrite the orion5x mpp to use this
platform code.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/plat-orion')
-rw-r--r-- | arch/arm/plat-orion/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/plat-orion/include/plat/mpp.h | 34 | ||||
-rw-r--r-- | arch/arm/plat-orion/mpp.c | 81 |
3 files changed, 116 insertions, 1 deletions
diff --git a/arch/arm/plat-orion/Makefile b/arch/arm/plat-orion/Makefile index 0f048c58b4c..95a5fc53b6d 100644 --- a/arch/arm/plat-orion/Makefile +++ b/arch/arm/plat-orion/Makefile | |||
@@ -2,7 +2,7 @@ | |||
2 | # Makefile for the linux kernel. | 2 | # Makefile for the linux kernel. |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := irq.o pcie.o time.o common.o | 5 | obj-y := irq.o pcie.o time.o common.o mpp.o |
6 | obj-m := | 6 | obj-m := |
7 | obj-n := | 7 | obj-n := |
8 | obj- := | 8 | obj- := |
diff --git a/arch/arm/plat-orion/include/plat/mpp.h b/arch/arm/plat-orion/include/plat/mpp.h new file mode 100644 index 00000000000..723adce99f4 --- /dev/null +++ b/arch/arm/plat-orion/include/plat/mpp.h | |||
@@ -0,0 +1,34 @@ | |||
1 | /* | ||
2 | * arch/arm/plat-orion/include/plat/mpp.h | ||
3 | * | ||
4 | * Marvell Orion SoC MPP handling. | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | #ifndef __PLAT_MPP_H | ||
12 | #define __PLAT_MPP_H | ||
13 | |||
14 | #define MPP_NUM(x) ((x) & 0xff) | ||
15 | #define MPP_SEL(x) (((x) >> 8) & 0xf) | ||
16 | |||
17 | /* This is the generic MPP macro, without any variant information. | ||
18 | Each machine architecture is expected to extend this with further | ||
19 | bit fields indicating which MPP configurations are valid for a | ||
20 | specific variant. */ | ||
21 | |||
22 | #define GENERIC_MPP(_num, _sel, _in, _out) ( \ | ||
23 | /* MPP number */ ((_num) & 0xff) | \ | ||
24 | /* MPP select value */ (((_sel) & 0xf) << 8) | \ | ||
25 | /* may be input signal */ ((!!(_in)) << 12) | \ | ||
26 | /* may be output signal */ ((!!(_out)) << 13)) | ||
27 | |||
28 | #define MPP_INPUT_MASK GENERIC_MPP(0, 0x0, 1, 0) | ||
29 | #define MPP_OUTPUT_MASK GENERIC_MPP(0, 0x0, 0, 1) | ||
30 | |||
31 | void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask, | ||
32 | unsigned int mpp_max, unsigned int dev_bus); | ||
33 | |||
34 | #endif | ||
diff --git a/arch/arm/plat-orion/mpp.c b/arch/arm/plat-orion/mpp.c new file mode 100644 index 00000000000..248c02205b6 --- /dev/null +++ b/arch/arm/plat-orion/mpp.c | |||
@@ -0,0 +1,81 @@ | |||
1 | /* | ||
2 | * arch/arm/plat-orion/mpp.c | ||
3 | * | ||
4 | * MPP functions for Marvell orion SoCs | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | #include <linux/kernel.h> | ||
12 | #include <linux/init.h> | ||
13 | #include <linux/mbus.h> | ||
14 | #include <linux/io.h> | ||
15 | #include <linux/gpio.h> | ||
16 | #include <mach/hardware.h> | ||
17 | #include <plat/mpp.h> | ||
18 | |||
19 | /* Address of the ith MPP control register */ | ||
20 | static __init unsigned long mpp_ctrl_addr(unsigned int i, | ||
21 | unsigned long dev_bus) | ||
22 | { | ||
23 | return dev_bus + (i) * 4; | ||
24 | } | ||
25 | |||
26 | |||
27 | void __init orion_mpp_conf(unsigned int *mpp_list, unsigned int variant_mask, | ||
28 | unsigned int mpp_max, unsigned int dev_bus) | ||
29 | { | ||
30 | unsigned int mpp_nr_regs = (1 + mpp_max/8); | ||
31 | u32 mpp_ctrl[mpp_nr_regs]; | ||
32 | int i; | ||
33 | |||
34 | if (!variant_mask) | ||
35 | return; | ||
36 | |||
37 | printk(KERN_DEBUG "initial MPP regs:"); | ||
38 | for (i = 0; i < mpp_nr_regs; i++) { | ||
39 | mpp_ctrl[i] = readl(mpp_ctrl_addr(i, dev_bus)); | ||
40 | printk(" %08x", mpp_ctrl[i]); | ||
41 | } | ||
42 | printk("\n"); | ||
43 | |||
44 | for ( ; *mpp_list; mpp_list++) { | ||
45 | unsigned int num = MPP_NUM(*mpp_list); | ||
46 | unsigned int sel = MPP_SEL(*mpp_list); | ||
47 | int shift, gpio_mode; | ||
48 | |||
49 | if (num > mpp_max) { | ||
50 | printk(KERN_ERR "orion_mpp_conf: invalid MPP " | ||
51 | "number (%u)\n", num); | ||
52 | continue; | ||
53 | } | ||
54 | if (!(*mpp_list & variant_mask)) { | ||
55 | printk(KERN_WARNING | ||
56 | "orion_mpp_conf: requested MPP%u config " | ||
57 | "unavailable on this hardware\n", num); | ||
58 | continue; | ||
59 | } | ||
60 | |||
61 | shift = (num & 7) << 2; | ||
62 | mpp_ctrl[num / 8] &= ~(0xf << shift); | ||
63 | mpp_ctrl[num / 8] |= sel << shift; | ||
64 | |||
65 | gpio_mode = 0; | ||
66 | if (*mpp_list & MPP_INPUT_MASK) | ||
67 | gpio_mode |= GPIO_INPUT_OK; | ||
68 | if (*mpp_list & MPP_OUTPUT_MASK) | ||
69 | gpio_mode |= GPIO_OUTPUT_OK; | ||
70 | if (sel != 0) | ||
71 | gpio_mode = 0; | ||
72 | orion_gpio_set_valid(num, gpio_mode); | ||
73 | } | ||
74 | |||
75 | printk(KERN_DEBUG " final MPP regs:"); | ||
76 | for (i = 0; i < mpp_nr_regs; i++) { | ||
77 | writel(mpp_ctrl[i], mpp_ctrl_addr(i, dev_bus)); | ||
78 | printk(" %08x", mpp_ctrl[i]); | ||
79 | } | ||
80 | printk("\n"); | ||
81 | } | ||