diff options
Diffstat (limited to 'arch/sh/boards/renesas/r7780rp')
-rw-r--r-- | arch/sh/boards/renesas/r7780rp/Makefile | 4 | ||||
-rw-r--r-- | arch/sh/boards/renesas/r7780rp/io.c | 2 | ||||
-rw-r--r-- | arch/sh/boards/renesas/r7780rp/irq.c | 10 | ||||
-rw-r--r-- | arch/sh/boards/renesas/r7780rp/psw.c | 122 | ||||
-rw-r--r-- | arch/sh/boards/renesas/r7780rp/setup.c | 31 |
5 files changed, 162 insertions, 7 deletions
diff --git a/arch/sh/boards/renesas/r7780rp/Makefile b/arch/sh/boards/renesas/r7780rp/Makefile index f1776d027978..574b0316ed56 100644 --- a/arch/sh/boards/renesas/r7780rp/Makefile +++ b/arch/sh/boards/renesas/r7780rp/Makefile | |||
@@ -3,4 +3,6 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := setup.o io.o irq.o | 5 | obj-y := setup.o io.o irq.o |
6 | obj-$(CONFIG_HEARTBEAT) += led.o | 6 | |
7 | obj-$(CONFIG_HEARTBEAT) += led.o | ||
8 | obj-$(CONFIG_PUSH_SWITCH) += psw.o | ||
diff --git a/arch/sh/boards/renesas/r7780rp/io.c b/arch/sh/boards/renesas/r7780rp/io.c index db92d6e6ae99..311ccccba718 100644 --- a/arch/sh/boards/renesas/r7780rp/io.c +++ b/arch/sh/boards/renesas/r7780rp/io.c | |||
@@ -11,7 +11,7 @@ | |||
11 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/types.h> | 13 | #include <linux/types.h> |
14 | #include <asm/r7780rp/r7780rp.h> | 14 | #include <asm/r7780rp.h> |
15 | #include <asm/addrspace.h> | 15 | #include <asm/addrspace.h> |
16 | #include <asm/io.h> | 16 | #include <asm/io.h> |
17 | 17 | ||
diff --git a/arch/sh/boards/renesas/r7780rp/irq.c b/arch/sh/boards/renesas/r7780rp/irq.c index b544772cbc72..cc381e197783 100644 --- a/arch/sh/boards/renesas/r7780rp/irq.c +++ b/arch/sh/boards/renesas/r7780rp/irq.c | |||
@@ -10,7 +10,9 @@ | |||
10 | */ | 10 | */ |
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/irq.h> | 12 | #include <linux/irq.h> |
13 | #include <asm/io.h> | 13 | #include <linux/interrupt.h> |
14 | #include <linux/io.h> | ||
15 | #include <asm/r7780rp.h> | ||
14 | 16 | ||
15 | #ifdef CONFIG_SH_R7780MP | 17 | #ifdef CONFIG_SH_R7780MP |
16 | static int mask_pos[] = {12, 11, 9, 14, 15, 8, 13, 6, 5, 4, 3, 2, 0, 0, 1, 0}; | 18 | static int mask_pos[] = {12, 11, 9, 14, 15, 8, 13, 6, 5, 4, 3, 2, 0, 0, 1, 0}; |
@@ -32,7 +34,7 @@ static void disable_r7780rp_irq(unsigned int irq) | |||
32 | } | 34 | } |
33 | 35 | ||
34 | static struct irq_chip r7780rp_irq_chip __read_mostly = { | 36 | static struct irq_chip r7780rp_irq_chip __read_mostly = { |
35 | .name = "r7780rp", | 37 | .name = "R7780RP", |
36 | .mask = disable_r7780rp_irq, | 38 | .mask = disable_r7780rp_irq, |
37 | .unmask = enable_r7780rp_irq, | 39 | .unmask = enable_r7780rp_irq, |
38 | .mask_ack = disable_r7780rp_irq, | 40 | .mask_ack = disable_r7780rp_irq, |
@@ -47,8 +49,8 @@ void __init init_r7780rp_IRQ(void) | |||
47 | 49 | ||
48 | for (i = 0; i < 15; i++) { | 50 | for (i = 0; i < 15; i++) { |
49 | disable_irq_nosync(i); | 51 | disable_irq_nosync(i); |
50 | set_irq_chip_and_handler(i, &r7780rp_irq_chip, | 52 | set_irq_chip_and_handler_name(i, &r7780rp_irq_chip, |
51 | handle_level_irq); | 53 | handle_level_irq, "level"); |
52 | enable_r7780rp_irq(i); | 54 | enable_r7780rp_irq(i); |
53 | } | 55 | } |
54 | } | 56 | } |
diff --git a/arch/sh/boards/renesas/r7780rp/psw.c b/arch/sh/boards/renesas/r7780rp/psw.c new file mode 100644 index 000000000000..c844dfa5d58d --- /dev/null +++ b/arch/sh/boards/renesas/r7780rp/psw.c | |||
@@ -0,0 +1,122 @@ | |||
1 | /* | ||
2 | * arch/sh/boards/renesas/r7780rp/psw.c | ||
3 | * | ||
4 | * push switch support for RDBRP-1/RDBREVRP-1 debug boards. | ||
5 | * | ||
6 | * Copyright (C) 2006 Paul Mundt | ||
7 | * | ||
8 | * This file is subject to the terms and conditions of the GNU General Public | ||
9 | * License. See the file "COPYING" in the main directory of this archive | ||
10 | * for more details. | ||
11 | */ | ||
12 | #include <linux/io.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/interrupt.h> | ||
15 | #include <linux/platform_device.h> | ||
16 | #include <asm/mach/r7780rp.h> | ||
17 | #include <asm/push-switch.h> | ||
18 | |||
19 | static irqreturn_t psw_irq_handler(int irq, void *arg) | ||
20 | { | ||
21 | struct platform_device *pdev = arg; | ||
22 | struct push_switch *psw = platform_get_drvdata(pdev); | ||
23 | struct push_switch_platform_info *psw_info = pdev->dev.platform_data; | ||
24 | unsigned int l, mask; | ||
25 | int ret = 0; | ||
26 | |||
27 | l = ctrl_inw(PA_DBSW); | ||
28 | |||
29 | /* Nothing to do if there's no state change */ | ||
30 | if (psw->state) { | ||
31 | ret = 1; | ||
32 | goto out; | ||
33 | } | ||
34 | |||
35 | mask = l & 0x70; | ||
36 | /* Figure out who raised it */ | ||
37 | if (mask & (1 << psw_info->bit)) { | ||
38 | psw->state = !!(mask & (1 << psw_info->bit)); | ||
39 | if (psw->state) /* debounce */ | ||
40 | mod_timer(&psw->debounce, jiffies + 50); | ||
41 | |||
42 | ret = 1; | ||
43 | } | ||
44 | |||
45 | out: | ||
46 | /* Clear the switch IRQs */ | ||
47 | l |= (0x7 << 12); | ||
48 | ctrl_outw(l, PA_DBSW); | ||
49 | |||
50 | return IRQ_RETVAL(ret); | ||
51 | } | ||
52 | |||
53 | static struct resource psw_resources[] = { | ||
54 | [0] = { | ||
55 | .start = IRQ_PSW, | ||
56 | .flags = IORESOURCE_IRQ, | ||
57 | }, | ||
58 | }; | ||
59 | |||
60 | static struct push_switch_platform_info s2_platform_data = { | ||
61 | .name = "s2", | ||
62 | .bit = 6, | ||
63 | .irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | | ||
64 | IRQF_SHARED, | ||
65 | .irq_handler = psw_irq_handler, | ||
66 | }; | ||
67 | |||
68 | static struct platform_device s2_switch_device = { | ||
69 | .name = "push-switch", | ||
70 | .id = 0, | ||
71 | .num_resources = ARRAY_SIZE(psw_resources), | ||
72 | .resource = psw_resources, | ||
73 | .dev = { | ||
74 | .platform_data = &s2_platform_data, | ||
75 | }, | ||
76 | }; | ||
77 | |||
78 | static struct push_switch_platform_info s3_platform_data = { | ||
79 | .name = "s3", | ||
80 | .bit = 5, | ||
81 | .irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | | ||
82 | IRQF_SHARED, | ||
83 | .irq_handler = psw_irq_handler, | ||
84 | }; | ||
85 | |||
86 | static struct platform_device s3_switch_device = { | ||
87 | .name = "push-switch", | ||
88 | .id = 1, | ||
89 | .num_resources = ARRAY_SIZE(psw_resources), | ||
90 | .resource = psw_resources, | ||
91 | .dev = { | ||
92 | .platform_data = &s3_platform_data, | ||
93 | }, | ||
94 | }; | ||
95 | |||
96 | static struct push_switch_platform_info s4_platform_data = { | ||
97 | .name = "s4", | ||
98 | .bit = 4, | ||
99 | .irq_flags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | | ||
100 | IRQF_SHARED, | ||
101 | .irq_handler = psw_irq_handler, | ||
102 | }; | ||
103 | |||
104 | static struct platform_device s4_switch_device = { | ||
105 | .name = "push-switch", | ||
106 | .id = 2, | ||
107 | .num_resources = ARRAY_SIZE(psw_resources), | ||
108 | .resource = psw_resources, | ||
109 | .dev = { | ||
110 | .platform_data = &s4_platform_data, | ||
111 | }, | ||
112 | }; | ||
113 | |||
114 | static struct platform_device *psw_devices[] = { | ||
115 | &s2_switch_device, &s3_switch_device, &s4_switch_device, | ||
116 | }; | ||
117 | |||
118 | static int __init psw_init(void) | ||
119 | { | ||
120 | return platform_add_devices(psw_devices, ARRAY_SIZE(psw_devices)); | ||
121 | } | ||
122 | module_init(psw_init); | ||
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c index b941aa0aa34e..9f89c8de9db9 100644 --- a/arch/sh/boards/renesas/r7780rp/setup.c +++ b/arch/sh/boards/renesas/r7780rp/setup.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
15 | #include <asm/machvec.h> | 15 | #include <asm/machvec.h> |
16 | #include <asm/r7780rp/r7780rp.h> | 16 | #include <asm/r7780rp.h> |
17 | #include <asm/clock.h> | 17 | #include <asm/clock.h> |
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | 19 | ||
@@ -44,8 +44,37 @@ static struct platform_device m66596_usb_host_device = { | |||
44 | .resource = m66596_usb_host_resources, | 44 | .resource = m66596_usb_host_resources, |
45 | }; | 45 | }; |
46 | 46 | ||
47 | static struct resource cf_ide_resources[] = { | ||
48 | [0] = { | ||
49 | .start = 0x1f0, | ||
50 | .end = 0x1f0 + 8, | ||
51 | .flags = IORESOURCE_IO, | ||
52 | }, | ||
53 | [1] = { | ||
54 | .start = 0x1f0 + 0x206, | ||
55 | .end = 0x1f0 + 8 + 0x206 + 8, | ||
56 | .flags = IORESOURCE_IO, | ||
57 | }, | ||
58 | [2] = { | ||
59 | #ifdef CONFIG_SH_R7780MP | ||
60 | .start = 1, | ||
61 | #else | ||
62 | .start = 4, | ||
63 | #endif | ||
64 | .flags = IORESOURCE_IRQ, | ||
65 | }, | ||
66 | }; | ||
67 | |||
68 | static struct platform_device cf_ide_device = { | ||
69 | .name = "pata_platform", | ||
70 | .id = -1, | ||
71 | .num_resources = ARRAY_SIZE(cf_ide_resources), | ||
72 | .resource = cf_ide_resources, | ||
73 | }; | ||
74 | |||
47 | static struct platform_device *r7780rp_devices[] __initdata = { | 75 | static struct platform_device *r7780rp_devices[] __initdata = { |
48 | &m66596_usb_host_device, | 76 | &m66596_usb_host_device, |
77 | &cf_ide_device, | ||
49 | }; | 78 | }; |
50 | 79 | ||
51 | static int __init r7780rp_devices_setup(void) | 80 | static int __init r7780rp_devices_setup(void) |