[ixp4xx] include/asm-arm/arch-ixp4xx/io.h must include linux/bitops.h on 2.6.24
[openwrt.git] / target / linux / ixp4xx / patches-2.6.24 / 020-ixp4xx_rtc_info.patch
1 From 88721db37ead2212a54c1392e2e65bae78d2604b Mon Sep 17 00:00:00 2001
2 From: Rod Whitby <rod@whitby.id.au>
3 Date: Tue, 29 Jan 2008 10:05:48 +1030
4 Subject: ixp4xx: Register nslu2 rtc i2c_board_info (Patch #4772)
5
6 Register the i2c board info related to the RTC chip on the nslu2 board
7 to allow it to be found automatically on boot.
8
9 Signed-off-by: Rod Whitby <rod@whitby.id.au>
10 Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
11
12 PATCH FOLLOWS
13 KernelVersion: 2.6.24-git5
14
15 diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
16 index 332a066..ebeb566 100644
17 --- a/arch/arm/mach-ixp4xx/nslu2-setup.c
18 +++ b/arch/arm/mach-ixp4xx/nslu2-setup.c
19 @@ -19,6 +19,7 @@
20  #include <linux/serial.h>
21  #include <linux/serial_8250.h>
22  #include <linux/leds.h>
23 +#include <linux/i2c.h>
24  #include <linux/i2c-gpio.h>
25  
26  #include <asm/mach-types.h>
27 @@ -49,6 +50,12 @@ static struct i2c_gpio_platform_data nslu2_i2c_gpio_data = {
28         .scl_pin                = NSLU2_SCL_PIN,
29  };
30  
31 +static struct i2c_board_info __initdata nslu2_i2c_board_info [] = {
32 +       {
33 +               I2C_BOARD_INFO("rtc-x1205", 0x6f),
34 +       },
35 +};
36 +
37  #ifdef CONFIG_LEDS_IXP4XX
38  static struct resource nslu2_led_resources[] = {
39         {
40 @@ -207,6 +214,9 @@ static void __init nslu2_init(void)
41  
42         pm_power_off = nslu2_power_off;
43  
44 +       i2c_register_board_info(0, nslu2_i2c_board_info,
45 +                               ARRAY_SIZE(nslu2_i2c_board_info));
46 +
47         /*
48          * This is only useful on a modified machine, but it is valuable
49          * to have it first in order to see debug messages, and so that
50 -- 
51 1.5.2.5
52
53 From d4ef1ee0daf96e42bf93421960eaded71e189712 Mon Sep 17 00:00:00 2001
54 From: Rod Whitby <rod@whitby.id.au>
55 Date: Tue, 29 Jan 2008 10:07:29 +1030
56 Subject: ixp4xx: Register nas100d rtc i2c_board_info (Patch #4773)
57
58 Register the i2c board info related to the RTC chip on the nas100d
59 board to allow it to be found automatically on boot.
60
61 Signed-off-by: Rod Whitby <rod@whitby.id.au>
62 Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
63
64 PATCH FOLLOWS
65 KernelVersion: 2.6.24-git5
66
67 diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
68 index b0884c2..09f75b9 100644
69 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c
70 +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
71 @@ -17,6 +17,7 @@
72  #include <linux/serial.h>
73  #include <linux/serial_8250.h>
74  #include <linux/leds.h>
75 +#include <linux/i2c.h>
76  #include <linux/i2c-gpio.h>
77  
78  #include <asm/mach-types.h>
79 @@ -41,6 +42,12 @@ static struct platform_device nas100d_flash = {
80         .resource               = &nas100d_flash_resource,
81  };
82  
83 +static struct i2c_board_info __initdata nas100d_i2c_board_info [] = {
84 +       {
85 +               I2C_BOARD_INFO("rtc-pcf8563", 0x51),
86 +       },
87 +};
88 +
89  #ifdef CONFIG_LEDS_IXP4XX
90  static struct resource nas100d_led_resources[] = {
91         {
92 @@ -181,6 +188,9 @@ static void __init nas100d_init(void)
93  
94         pm_power_off = nas100d_power_off;
95  
96 +       i2c_register_board_info(0, nas100d_i2c_board_info,
97 +                               ARRAY_SIZE(nas100d_i2c_board_info));
98 +
99         /*
100          * This is only useful on a modified machine, but it is valuable
101          * to have it first in order to see debug messages, and so that
102 -- 
103 1.5.2.5
104
105 From aa9d35dae397402f57f1baa8d53fed75d76aed8d Mon Sep 17 00:00:00 2001
106 From: Rod Whitby <rod@whitby.id.au>
107 Date: Tue, 29 Jan 2008 10:09:41 +1030
108 Subject: ixp4xx: Register dsmg600 rtc i2c_board_info (Patch #4774)
109
110 Register the i2c board info related to the RTC chip on the dsmg600
111 board to allow it to be found automatically on boot.
112
113 Signed-off-by: Rod Whitby <rod@whitby.id.au>
114 Signed-off-by: Alessandro Zummo <a.zummo@towertech.it>
115
116 PATCH FOLLOWS
117 KernelVersion: 2.6.24-git5
118
119 diff --git a/arch/arm/mach-ixp4xx/dsmg600-setup.c b/arch/arm/mach-ixp4xx/dsmg600-setup.c
120 index c473d40..a1c44ef 100644
121 --- a/arch/arm/mach-ixp4xx/dsmg600-setup.c
122 +++ b/arch/arm/mach-ixp4xx/dsmg600-setup.c
123 @@ -14,6 +14,7 @@
124  #include <linux/kernel.h>
125  #include <linux/serial.h>
126  #include <linux/serial_8250.h>
127 +#include <linux/i2c.h>
128  #include <linux/i2c-gpio.h>
129  
130  #include <asm/mach-types.h>
131 @@ -51,6 +52,12 @@ static struct platform_device dsmg600_i2c_gpio = {
132         },
133  };
134  
135 +static struct i2c_board_info __initdata dsmg600_i2c_board_info [] = {
136 +       {
137 +               I2C_BOARD_INFO("rtc-pcf8563", 0x51),
138 +       },
139 +};
140 +
141  #ifdef CONFIG_LEDS_CLASS
142  static struct resource dsmg600_led_resources[] = {
143         {
144 @@ -158,6 +165,9 @@ static void __init dsmg600_init(void)
145  
146         pm_power_off = dsmg600_power_off;
147  
148 +       i2c_register_board_info(0, dsmg600_i2c_board_info,
149 +                               ARRAY_SIZE(dsmg600_i2c_board_info));
150 +
151         /* The UART is required on the DSM-G600 (Redboot cannot use the
152          * NIC) -- do it here so that it does *not* get removed if
153          * platform_add_devices fails!
154 -- 
155 1.5.2.5
156