Changeset 28683
- Timestamp:
- 2011-10-30T19:46:45+01:00 (6 years ago)
- Location:
- trunk/target/linux/omap24xx/patches-3.1
- Files:
-
- 2 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/target/linux/omap24xx/patches-3.1/300-cbus-platform.patch
r28676 r28683 1 1 Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2 2 =================================================================== 3 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:29.505056863 +02004 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:47.357044479 +02005 @@ -15,8 +15,1 0@@3 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:31:54.096705150 +0100 4 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:34:46.537525210 +0100 5 @@ -15,8 +15,11 @@ 6 6 #include <linux/delay.h> 7 7 #include <linux/gpio.h> … … 11 11 #include <linux/stddef.h> 12 12 +#include <linux/platform_device.h> 13 +#include <linux/platform_data/cbus.h> 13 14 #include <linux/i2c.h> 14 15 #include <linux/spi/spi.h> 15 16 #include <linux/usb/musb.h> 16 @@ -33,6 +35,7 @@ 17 #include <plat/onenand.h> 18 #include <plat/mmc.h> 19 #include <plat/serial.h> 20 +#include <plat/cbus.h> 21 22 #include "mux.h" 23 24 @@ -193,6 +196,114 @@ static struct omap_onenand_platform_data 17 @@ -193,6 +196,110 @@ static struct omap_onenand_platform_data 25 18 }; 26 19 #endif … … 50 43 + 51 44 +static struct cbus_retu_platform_data n8x0_retu_data = { 52 + .irq_base = CBUS_RETU_IRQ_BASE,53 + .irq_end = CBUS_RETU_IRQ_END,54 45 + .devid = CBUS_RETU_DEVICE_ID, 55 46 +}; … … 62 53 + .dev = { 63 54 + .platform_data = &n8x0_retu_data, 55 + .parent = &n8x0_cbus_device.dev, 64 56 + }, 65 57 +}; … … 77 69 + .resource = tahvo_resource, 78 70 + .num_resources = ARRAY_SIZE(tahvo_resource), 79 +}; 80 + 81 +static struct platform_device tahvo_usb_device = { 82 + .name = "tahvo-usb", 83 + .id = -1, 71 + .dev = { 72 + .parent = &n8x0_cbus_device.dev, 73 + }, 84 74 +}; 85 75 + … … 125 115 + tahvo_resource[0].start = gpio_to_irq(111); 126 116 + platform_device_register(&tahvo_device); 127 + platform_device_register(&tahvo_usb_device);128 117 +} 129 118 + … … 137 126 (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)) 138 127 139 @@ -679,6 +7 90,8 @@ static inline void board_serial_init(voi128 @@ -679,6 +786,8 @@ static inline void board_serial_init(voi 140 129 static void __init n8x0_init_machine(void) 141 130 { … … 146 135 spi_register_board_info(n800_spi_board_info, 147 136 ARRAY_SIZE(n800_spi_board_info)); 148 Index: linux-3.1/ arch/arm/plat-omap/include/plat/irqs.h137 Index: linux-3.1/include/linux/platform_data/cbus.h 149 138 =================================================================== 150 --- linux-3.1.orig/arch/arm/plat-omap/include/plat/irqs.h 2011-10-30 00:48:29.517056855 +0200 151 +++ linux-3.1/arch/arm/plat-omap/include/plat/irqs.h 2011-10-30 00:48:47.357044479 +0200 152 @@ -428,8 +428,16 @@ 153 #define OMAP_GPMC_NR_IRQS 8 154 #define OMAP_GPMC_IRQ_END (OMAP_GPMC_IRQ_BASE + OMAP_GPMC_NR_IRQS) 155 156 +/* CBUS */ 157 +#define CBUS_RETU_IRQ_BASE OMAP_GPMC_IRQ_END 158 +#ifdef CONFIG_CBUS_RETU 159 +#define CBUS_RETU_NR_IRQS 16 160 +#else 161 +#define CBUS_RETU_NR_IRQS 0 162 +#endif 163 +#define CBUS_RETU_IRQ_END (CBUS_RETU_IRQ_BASE + CBUS_RETU_NR_IRQS) 164 165 -#define NR_IRQS OMAP_GPMC_IRQ_END 166 +#define NR_IRQS CBUS_RETU_IRQ_END 167 168 #define OMAP_IRQ_BIT(irq) (1 << ((irq) % 32)) 169 139 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 140 +++ linux-3.1/include/linux/platform_data/cbus.h 2011-10-30 19:31:55.452679772 +0100 141 @@ -0,0 +1,38 @@ 142 +/* 143 + * cbus.h - CBUS platform_data definition 144 + * 145 + * Copyright (C) 2004 - 2009 Nokia Corporation 146 + * 147 + * Written by Felipe Balbi <felipe.balbi@nokia.com> 148 + * 149 + * This file is subject to the terms and conditions of the GNU General 150 + * Public License. See the file "COPYING" in the main directory of this 151 + * archive for more details. 152 + * 153 + * This program is distributed in the hope that it will be useful, 154 + * but WITHOUT ANY WARRANTY; without even the implied warranty of 155 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 156 + * GNU General Public License for more details. 157 + * 158 + * You should have received a copy of the GNU General Public License 159 + * along with this program; if not, write to the Free Software 160 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 161 + */ 162 + 163 +#ifndef __INCLUDE_LINUX_CBUS_H 164 +#define __INCLUDE_LINUX_CBUS_H 165 + 166 +#define CBUS_RETU_DEVICE_ID 0x01 167 +#define CBUS_TAHVO_DEVICE_ID 0x02 168 + 169 +struct cbus_host_platform_data { 170 + int dat_gpio; 171 + int clk_gpio; 172 + int sel_gpio; 173 +}; 174 + 175 +struct cbus_retu_platform_data { 176 + int devid; 177 +}; 178 + 179 +#endif /* __INCLUDE_LINUX_CBUS_H */ -
trunk/target/linux/omap24xx/patches-3.1/310-n810-lcd.patch
r28676 r28683 1 1 Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2 2 =================================================================== 3 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:47.357044479 +02004 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:48.205044041 +02005 @@ -2 3,6 +23,7 @@3 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:31:22.825292085 +0100 4 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:31:25.817235793 +0100 5 @@ -24,6 +24,7 @@ 6 6 #include <linux/spi/spi.h> 7 7 #include <linux/usb/musb.h> … … 108 108 109 109 #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ 110 @@ -7 93,6 +871,7 @@ static void __init n8x0_init_machine(voi110 @@ -789,6 +867,7 @@ static void __init n8x0_init_machine(voi 111 111 n8x0_cbus_init(); 112 112 … … 116 116 ARRAY_SIZE(n800_spi_board_info)); 117 117 omap_register_i2c_bus(1, 400, n8x0_i2c_board_info_1, 118 @@ - 802,6 +881,8 @@ static void __init n8x0_init_machine(voi118 @@ -798,6 +877,8 @@ static void __init n8x0_init_machine(voi 119 119 i2c_register_board_info(2, n810_i2c_board_info_2, 120 120 ARRAY_SIZE(n810_i2c_board_info_2)); … … 128 128 =================================================================== 129 129 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 130 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-30 00:48:48.205044041 +0200131 @@ -0,0 +1, 140@@130 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0-lcd.c 2011-10-30 19:31:25.817235793 +0100 131 @@ -0,0 +1,229 @@ 132 132 +/* 133 133 + * linux/arch/arm/mach-omap2/board-n8x0.c … … 151 151 +#include <plat/blizzard.h> 152 152 + 153 +#include "../../../drivers/cbus/tahvo.h" 154 + 155 + 156 +struct tahvo_pwm_device { 157 + struct device *dev; 158 + int tahvo_7bit_backlight; 159 +}; 160 + 161 +static struct tahvo_pwm_device *tahvo_pwm; 162 + 163 +static unsigned int tahvo_pwm_get_backlight_level(struct tahvo_pwm_device *pd) 164 +{ 165 + unsigned int mask; 166 + 167 + if (pd->tahvo_7bit_backlight) 168 + mask = 0x7f; 169 + else 170 + mask = 0x0f; 171 + return tahvo_read_reg(pd->dev, TAHVO_REG_LEDPWMR) & mask; 172 +} 173 + 174 +static unsigned int tahvo_pwm_get_max_backlight_level(struct tahvo_pwm_device *pd) 175 +{ 176 + if (pd->tahvo_7bit_backlight) 177 + return 0x7f; 178 + return 0x0f; 179 +} 180 + 181 +static void tahvo_pwm_set_backlight_level(struct tahvo_pwm_device *pd, unsigned int level) 182 +{ 183 + unsigned int max_level; 184 + 185 + max_level = tahvo_pwm_get_max_backlight_level(pd); 186 + if (level > max_level) 187 + level = max_level; 188 + tahvo_write_reg(pd->dev, TAHVO_REG_LEDPWMR, level); 189 +} 190 + 191 +static int __init n8x0_tahvo_pwm_probe(struct platform_device *pdev) 192 +{ 193 + struct tahvo_pwm_device *pd; 194 + unsigned int rev, id; 195 + 196 + pd = kzalloc(sizeof(*pd), GFP_KERNEL); 197 + if (WARN_ON(!pd)) 198 + return -ENOMEM; 199 + pd->dev = &pdev->dev; 200 + 201 + rev = tahvo_read_reg(pd->dev, TAHVO_REG_ASICR); 202 + id = (rev >> 8) & 0xff; 203 + if (id == 0x03) { 204 + if ((rev & 0xff) >= 0x50) 205 + pd->tahvo_7bit_backlight = 1; 206 + } else if (id == 0x0b) 207 + pd->tahvo_7bit_backlight = 1; 208 + 209 + dev_set_drvdata(pd->dev, pd); 210 + tahvo_pwm = pd; 211 +} 212 + 213 +static struct platform_driver n8x0_tahvo_pwm_driver = { 214 + .driver = { 215 + .name = "tahvo-pwm", 216 + }, 217 +}; 218 + 219 +static int __init n8x0_tahvo_pwm_init(void) 220 +{ 221 + return platform_driver_probe(&n8x0_tahvo_pwm_driver, n8x0_tahvo_pwm_probe); 222 +} 223 +fs_initcall(n8x0_tahvo_pwm_init); 224 + 225 +static int n8x0_get_backlight_level(struct mipid_platform_data *pdata) 226 +{ 227 + return tahvo_pwm_get_backlight_level(tahvo_pwm); 228 +} 229 + 230 +static int n8x0_get_max_backlight_level(struct mipid_platform_data *pdata) 231 +{ 232 + return tahvo_pwm_get_max_backlight_level(tahvo_pwm); 233 +} 234 + 235 +static void n8x0_set_backlight_level(struct mipid_platform_data *pdata, int level) 236 +{ 237 + tahvo_pwm_set_backlight_level(tahvo_pwm, level); 238 +} 153 239 + 154 240 +#define N8X0_BLIZZARD_POWERDOWN_GPIO 15 … … 167 253 +struct mipid_platform_data n8x0_mipid_platform_data = { 168 254 + .shutdown = mipid_shutdown, 255 + .get_bklight_level = n8x0_get_backlight_level, 256 + .set_bklight_level = n8x0_set_backlight_level, 257 + .get_bklight_max = n8x0_get_max_backlight_level, 169 258 +}; 170 259 + … … 230 319 +{ 231 320 + /* Vcore to 1.475V */ 232 + //FIXME tahvo_set_clear_reg_bits(0x07, 0, 0xf);321 + tahvo_set_clear_reg_bits(tahvo_pwm->dev, 0x07, 0, 0xf); 233 322 + msleep(10); 234 323 + … … 243 332 + 244 333 + /* Vcore to 1.005V */ 245 + //FIXME tahvo_set_clear_reg_bits(0x07, 0xf, 0);334 + tahvo_set_clear_reg_bits(tahvo_pwm->dev, 0x07, 0xf, 0); 246 335 +} 247 336 + … … 272 361 Index: linux-3.1/arch/arm/mach-omap2/Makefile 273 362 =================================================================== 274 --- linux-3.1.orig/arch/arm/mach-omap2/Makefile 2011-10-30 00:48:29.461056893 +0200275 +++ linux-3.1/arch/arm/mach-omap2/Makefile 2011-10-30 00:48:48.205044041 +0200363 --- linux-3.1.orig/arch/arm/mach-omap2/Makefile 2011-10-30 19:14:57.705562343 +0100 364 +++ linux-3.1/arch/arm/mach-omap2/Makefile 2011-10-30 19:31:25.817235793 +0100 276 365 @@ -209,6 +209,7 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += boar 277 366 hsmmc.o \ … … 284 373 Index: linux-3.1/arch/arm/mach-omap2/omap_hwmod_2420_data.c 285 374 =================================================================== 286 --- linux-3.1.orig/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-10-30 00:48:29.441056907 +0200287 +++ linux-3.1/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-10-30 00:48:48.205044041 +0200375 --- linux-3.1.orig/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-10-30 19:14:57.689562700 +0100 376 +++ linux-3.1/arch/arm/mach-omap2/omap_hwmod_2420_data.c 2011-10-30 19:31:25.817235793 +0100 288 377 @@ -1181,6 +1181,7 @@ static struct omap_hwmod_ocp_if *omap242 289 378 -
trunk/target/linux/omap24xx/patches-3.1/320-nokia-various.patch
r28676 r28683 1 1 Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2 2 =================================================================== 3 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:48.205044041 +02004 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:49.837042881 +02005 @@ -2 4,6 +24,8 @@3 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:31:56.000000000 +0100 4 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:22.288178756 +0100 5 @@ -25,6 +25,8 @@ 6 6 #include <linux/usb/musb.h> 7 7 #include <sound/tlv320aic3x.h> … … 13 13 #include <asm/mach-types.h> 14 14 @@ -37,6 +39,7 @@ 15 #include <plat/onenand.h> 15 16 #include <plat/mmc.h> 16 17 #include <plat/serial.h> 17 #include <plat/cbus.h>18 18 +#include <plat/gpio-switch.h> 19 19 … … 173 173 #define TUSB6010_SYNC_CS 4 174 174 #define TUSB6010_GPIO_INT 58 175 @@ -79 9,6 +948,11 @@ static struct aic3x_pdata n810_aic33_dat175 @@ -795,6 +944,11 @@ static struct aic3x_pdata n810_aic33_dat 176 176 }; 177 177 … … 185 185 I2C_BOARD_INFO("tlv320aic3x", 0x18), 186 186 .platform_data = &n810_aic33_data, 187 @@ -86 8,7 +1022,9 @@ static inline void board_serial_init(voi187 @@ -864,7 +1018,9 @@ static inline void board_serial_init(voi 188 188 static void __init n8x0_init_machine(void) 189 189 { … … 195 195 /* FIXME: add n810 spi devices */ 196 196 tsc2005_set_config(); 197 Index: linux-3.1/arch/arm/plat-omap/include/plat/cbus.h198 ===================================================================199 --- /dev/null 1970-01-01 00:00:00.000000000 +0000200 +++ linux-3.1/arch/arm/plat-omap/include/plat/cbus.h 2011-10-30 00:48:49.837042881 +0200201 @@ -0,0 +1,40 @@202 +/*203 + * cbus.h - CBUS platform_data definition204 + *205 + * Copyright (C) 2004 - 2009 Nokia Corporation206 + *207 + * Written by Felipe Balbi <felipe.balbi@nokia.com>208 + *209 + * This file is subject to the terms and conditions of the GNU General210 + * Public License. See the file "COPYING" in the main directory of this211 + * archive for more details.212 + *213 + * This program is distributed in the hope that it will be useful,214 + * but WITHOUT ANY WARRANTY; without even the implied warranty of215 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the216 + * GNU General Public License for more details.217 + *218 + * You should have received a copy of the GNU General Public License219 + * along with this program; if not, write to the Free Software220 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA221 + */222 +223 +#ifndef __PLAT_CBUS_H224 +#define __PLAT_CBUS_H225 +226 +#define CBUS_RETU_DEVICE_ID 0x01227 +#define CBUS_TAHVO_DEVICE_ID 0x02228 +229 +struct cbus_host_platform_data {230 + int dat_gpio;231 + int clk_gpio;232 + int sel_gpio;233 +};234 +235 +struct cbus_retu_platform_data {236 + int irq_base;237 + int irq_end;238 + int devid;239 +};240 +241 +#endif /* __PLAT_CBUS_H */ -
trunk/target/linux/omap24xx/patches-3.1/330-n800-tsc2301-platform.patch
r28676 r28683 11 11 Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c 12 12 =================================================================== 13 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:49.837042881 +020014 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:50.813042079 +020015 @@ -2 6,6 +26,7 @@13 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:22.288178756 +0100 14 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:26.840094004 +0100 15 @@ -27,6 +27,7 @@ 16 16 #include <linux/spi/tsc2005.h> 17 17 #include <linux/input.h> … … 183 183 184 184 #if defined(CONFIG_MTD_ONENAND_OMAP2) || \ 185 @@ -102 7,9 +1144,17 @@ static void __init n8x0_init_machine(voi185 @@ -1023,9 +1140,17 @@ static void __init n8x0_init_machine(voi 186 186 n8x0_bt_init(); 187 187 … … 204 204 ARRAY_SIZE(n8x0_i2c_board_info_1)); 205 205 omap_register_i2c_bus(2, 400, NULL, 0); 206 @@ -103 9,6 +1164,8 @@ static void __init n8x0_init_machine(voi206 @@ -1035,6 +1160,8 @@ static void __init n8x0_init_machine(voi 207 207 board_serial_init(); 208 208 n8x0_mipid_init(); -
trunk/target/linux/omap24xx/patches-3.1/597-cbus-tahvo-usb-platform.patch
r28676 r28683 1 1 Index: linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2 2 =================================================================== 3 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:51.565042059 +02004 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 00:48:54.637039450 +02003 --- linux-3.1.orig/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:29.896037143 +0100 4 +++ linux-3.1/arch/arm/mach-omap2/board-n8x0.c 2011-10-30 19:32:32.839982394 +0100 5 5 @@ -41,6 +41,7 @@ 6 #include <plat/mmc.h> 6 7 #include <plat/serial.h> 7 #include <plat/cbus.h>8 8 #include <plat/gpio-switch.h> 9 9 +#include <plat/usb.h> -
trunk/target/linux/omap24xx/patches-3.1/900-n810-battery-management.patch
r28676 r28683 1 1 Index: linux-3.1/drivers/cbus/Kconfig 2 2 =================================================================== 3 --- linux-3.1.orig/drivers/cbus/Kconfig 2011-10-30 00:48:42.989047642 +02004 +++ linux-3.1/drivers/cbus/Kconfig 2011-10-30 00:48:58.765036552 +02003 --- linux-3.1.orig/drivers/cbus/Kconfig 2011-10-30 19:14:57.000000000 +0100 4 +++ linux-3.1/drivers/cbus/Kconfig 2011-10-30 19:32:58.263510754 +0100 5 5 @@ -83,4 +83,12 @@ config CBUS_RETU_HEADSET 6 6 … … 18 18 Index: linux-3.1/drivers/cbus/Makefile 19 19 =================================================================== 20 --- linux-3.1.orig/drivers/cbus/Makefile 2011-10-30 00:48:42.989047642 +020021 +++ linux-3.1/drivers/cbus/Makefile 2011-10-30 00:48:58.765036552 +020020 --- linux-3.1.orig/drivers/cbus/Makefile 2011-10-30 19:14:57.000000000 +0100 21 +++ linux-3.1/drivers/cbus/Makefile 2011-10-30 19:32:58.263510754 +0100 22 22 @@ -11,3 +11,6 @@ obj-$(CONFIG_CBUS_RETU_POWERBUTTON) += r 23 23 obj-$(CONFIG_CBUS_RETU_RTC) += retu-rtc.o … … 30 30 =================================================================== 31 31 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 32 +++ linux-3.1/drivers/cbus/n810bm_main.c 2011-10-30 00:48:58.765036552 +020032 +++ linux-3.1/drivers/cbus/n810bm_main.c 2011-10-30 19:32:58.263510754 +0100 33 33 @@ -0,0 +1,1586 @@ 34 34 +/* … … 1621 1621 =================================================================== 1622 1622 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1623 +++ linux-3.1/drivers/cbus/lipocharge.c 2011-10-30 00:48:58.765036552 +02001623 +++ linux-3.1/drivers/cbus/lipocharge.c 2011-10-30 19:32:58.263510754 +0100 1624 1624 @@ -0,0 +1,183 @@ 1625 1625 +/* … … 1809 1809 =================================================================== 1810 1810 --- /dev/null 1970-01-01 00:00:00.000000000 +0000 1811 +++ linux-3.1/drivers/cbus/lipocharge.h 2011-10-30 00:48:58.765036552 +02001811 +++ linux-3.1/drivers/cbus/lipocharge.h 2011-10-30 19:32:58.263510754 +0100 1812 1812 @@ -0,0 +1,60 @@ 1813 1813 +#ifndef LIPOCHARGE_H_ … … 1873 1873 Index: linux-3.1/drivers/cbus/cbus.c 1874 1874 =================================================================== 1875 --- linux-3.1.orig/drivers/cbus/cbus.c 2011-10-30 00:48:46.413045272 +02001876 +++ linux-3.1/drivers/cbus/cbus.c 2011-10-30 00:48:58.765036552 +02001875 --- linux-3.1.orig/drivers/cbus/cbus.c 2011-10-30 19:31:35.000000000 +0100 1876 +++ linux-3.1/drivers/cbus/cbus.c 2011-10-30 19:33:12.107254808 +0100 1877 1877 @@ -34,6 +34,7 @@ 1878 1878 #include <linux/gpio.h> 1879 1879 #include <linux/platform_device.h> 1880 #include < plat/cbus.h>1880 #include <linux/platform_data/cbus.h> 1881 1881 +#include <linux/reboot.h> 1882 1882 … … 1899 1899 Index: linux-3.1/drivers/cbus/cbus.h 1900 1900 =================================================================== 1901 --- linux-3.1.orig/drivers/cbus/cbus.h 2011-10-30 00:48:42.989047642 +02001902 +++ linux-3.1/drivers/cbus/cbus.h 2011-10-30 00:48:58.765036552 +02001901 --- linux-3.1.orig/drivers/cbus/cbus.h 2011-10-30 19:14:57.000000000 +0100 1902 +++ linux-3.1/drivers/cbus/cbus.h 2011-10-30 19:32:58.263510754 +0100 1903 1903 @@ -27,4 +27,6 @@ extern int cbus_read_reg(struct device * 1904 1904 extern int cbus_write_reg(struct device *, unsigned dev, unsigned reg, … … 1910 1910 Index: linux-3.1/drivers/cbus/retu.c 1911 1911 =================================================================== 1912 --- linux-3.1.orig/drivers/cbus/retu.c 2011-10-30 00:48:46.413045272 +02001913 +++ linux-3.1/drivers/cbus/retu.c 2011-10-30 00:48:58.765036552 +02001912 --- linux-3.1.orig/drivers/cbus/retu.c 2011-10-30 19:31:35.000000000 +0100 1913 +++ linux-3.1/drivers/cbus/retu.c 2011-10-30 19:32:58.263510754 +0100 1914 1914 @@ -417,6 +417,11 @@ static int retu_allocate_children(struct 1915 1915 if (!child) … … 1926 1926 Index: linux-3.1/drivers/cbus/tahvo.c 1927 1927 =================================================================== 1928 --- linux-3.1.orig/drivers/cbus/tahvo.c 2011-10-30 00:48:46.413045272 +02001929 +++ linux-3.1/drivers/cbus/tahvo.c 2011-10-30 00:48:58.765036552 +02001928 --- linux-3.1.orig/drivers/cbus/tahvo.c 2011-10-30 19:31:35.000000000 +0100 1929 +++ linux-3.1/drivers/cbus/tahvo.c 2011-10-30 19:32:58.263510754 +0100 1930 1930 @@ -129,6 +129,7 @@ void tahvo_set_clear_reg_bits(struct dev 1931 1931 __tahvo_write_reg(tahvo, reg, w);
Note: See TracChangeset
for help on using the changeset viewer.