From 1980190a5a96fba4d36be8f8037ba9925c263b57 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Wed, 4 Aug 2010 13:33:55 +0000 Subject: Drop 2.6.32 patches SVN-Revision: 22485 --- .../xburst/files-2.6.32/include/linux/jz4740-adc.h | 25 -------- .../xburst/files-2.6.32/include/linux/jz4740_fb.h | 58 ----------------- .../files-2.6.32/include/linux/mmc/jz4740_mmc.h | 15 ----- .../files-2.6.32/include/linux/mtd/jz4740_nand.h | 34 ---------- .../include/linux/power/gpio-charger.h | 28 --------- .../include/linux/power/jz4740-battery.h | 24 ------- .../files-2.6.32/include/video/metronomefb.h | 73 ---------------------- 7 files changed, 257 deletions(-) delete mode 100644 target/linux/xburst/files-2.6.32/include/linux/jz4740-adc.h delete mode 100644 target/linux/xburst/files-2.6.32/include/linux/jz4740_fb.h delete mode 100644 target/linux/xburst/files-2.6.32/include/linux/mmc/jz4740_mmc.h delete mode 100644 target/linux/xburst/files-2.6.32/include/linux/mtd/jz4740_nand.h delete mode 100644 target/linux/xburst/files-2.6.32/include/linux/power/gpio-charger.h delete mode 100644 target/linux/xburst/files-2.6.32/include/linux/power/jz4740-battery.h delete mode 100644 target/linux/xburst/files-2.6.32/include/video/metronomefb.h (limited to 'target/linux/xburst/files-2.6.32/include') diff --git a/target/linux/xburst/files-2.6.32/include/linux/jz4740-adc.h b/target/linux/xburst/files-2.6.32/include/linux/jz4740-adc.h deleted file mode 100644 index 59cfe634f7..0000000000 --- a/target/linux/xburst/files-2.6.32/include/linux/jz4740-adc.h +++ /dev/null @@ -1,25 +0,0 @@ - -#ifndef __LINUX_JZ4740_ADC -#define __LINUX_JZ4740_ADC - -#include - -enum jz_adc_battery_scale { - JZ_ADC_BATTERY_SCALE_2V5, /* Mesures voltages up to 2.5V */ - JZ_ADC_BATTERY_SCALE_7V5, /* Mesures voltages up to 7.5V */ -}; - -/* - * jz4740_adc_read_battery_voltage - Read battery voltage from the ADC PBAT pin - * @dev: Pointer to a jz4740-adc device - * @scale: Whether to use 2.5V or 7.5V scale - * - * Returns: Battery voltage in mircovolts - * - * Context: Process -*/ -long jz4740_adc_read_battery_voltage(struct device *dev, - enum jz_adc_battery_scale scale); - - -#endif diff --git a/target/linux/xburst/files-2.6.32/include/linux/jz4740_fb.h b/target/linux/xburst/files-2.6.32/include/linux/jz4740_fb.h deleted file mode 100644 index ab4c963e1c..0000000000 --- a/target/linux/xburst/files-2.6.32/include/linux/jz4740_fb.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2009, Lars-Peter Clausen - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef __LINUX_JZ4740_FB_H -#define __LINUX_JZ4740_FB_H - -#include - -enum jz4740_fb_lcd_type { - JZ_LCD_TYPE_GENERIC_16_BIT = 0, - JZ_LCD_TYPE_GENERIC_18_BIT = 0 | (1 << 4), - JZ_LCD_TYPE_SPECIAL_TFT_1 = 1, - JZ_LCD_TYPE_SPECIAL_TFT_2 = 2, - JZ_LCD_TYPE_SPECIAL_TFT_3 = 3, - JZ_LCD_TYPE_NON_INTERLACED_CCIR656 = 5, - JZ_LCD_TYPE_INTERLACED_CCIR656 = 7, - JZ_LCD_TYPE_SINGLE_COLOR_STN = 8, - JZ_LCD_TYPE_SINGLE_MONOCHROME_STN = 9, - JZ_LCD_TYPE_DUAL_COLOR_STN = 10, - JZ_LCD_TYPE_DUAL_MONOCHROME_STN = 11, - JZ_LCD_TYPE_8BIT_SERIAL = 12, -}; - -/* -* width: width of the lcd display in mm -* height: height of the lcd display in mm -* num_modes: size of modes -* modes: list of valid video modes -* bpp: bits per pixel for the lcd -* lcd_type: lcd type -*/ - -struct jz4740_fb_platform_data { - unsigned int width; - unsigned int height; - - size_t num_modes; - struct fb_videomode *modes; - - unsigned int bpp; - enum jz4740_fb_lcd_type lcd_type; - - unsigned pixclk_falling_edge:1; - unsigned date_enable_active_low:1; -}; - -#endif diff --git a/target/linux/xburst/files-2.6.32/include/linux/mmc/jz4740_mmc.h b/target/linux/xburst/files-2.6.32/include/linux/mmc/jz4740_mmc.h deleted file mode 100644 index 8543f432b4..0000000000 --- a/target/linux/xburst/files-2.6.32/include/linux/mmc/jz4740_mmc.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef __LINUX_MMC_JZ4740_MMC -#define __LINUX_MMC_JZ4740_MMC - -struct jz4740_mmc_platform_data { - int gpio_power; - int gpio_card_detect; - int gpio_read_only; - unsigned card_detect_active_low:1; - unsigned read_only_active_low:1; - unsigned power_active_low:1; - - unsigned data_1bit:1; -}; - -#endif diff --git a/target/linux/xburst/files-2.6.32/include/linux/mtd/jz4740_nand.h b/target/linux/xburst/files-2.6.32/include/linux/mtd/jz4740_nand.h deleted file mode 100644 index d8cfabe0ed..0000000000 --- a/target/linux/xburst/files-2.6.32/include/linux/mtd/jz4740_nand.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2009, Lars-Peter Clausen - * JZ4720/JZ4740 SoC NAND controller driver - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef __JZ_NAND_H__ -#define __JZ_NAND_H__ - -#include -#include - -struct jz_nand_platform_data { - int num_partitions; - struct mtd_partition *partitions; - - struct nand_ecclayout *ecc_layout; - - unsigned int busy_gpio; - - void (*ident_callback)(struct platform_device *, struct nand_chip *, - struct mtd_partition **, int *num_partitions); -}; - -#endif diff --git a/target/linux/xburst/files-2.6.32/include/linux/power/gpio-charger.h b/target/linux/xburst/files-2.6.32/include/linux/power/gpio-charger.h deleted file mode 100644 index 95cdfc352f..0000000000 --- a/target/linux/xburst/files-2.6.32/include/linux/power/gpio-charger.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Copyright (C) 2010, Lars-Peter Clausen - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef __LINUX_POWER_GPIO_CHARGER_H__ -#define __LINUX_POWER_GPIO_CHARGER_H__ - -struct gpio_charger_platform_data { - const char *name; - enum power_supply_type type; - int gpio; - int gpio_active_low; - - char **batteries; - size_t num_batteries; -}; - -#endif diff --git a/target/linux/xburst/files-2.6.32/include/linux/power/jz4740-battery.h b/target/linux/xburst/files-2.6.32/include/linux/power/jz4740-battery.h deleted file mode 100644 index 19c9610c72..0000000000 --- a/target/linux/xburst/files-2.6.32/include/linux/power/jz4740-battery.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (C) 2009, Jiejing Zhang - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef __JZ4740_BATTERY_H -#define __JZ4740_BATTERY_H - -struct jz_battery_platform_data { - struct power_supply_info info; - int gpio_charge; /* GPIO port of Charger state */ - int gpio_charge_active_low; -}; - -#endif diff --git a/target/linux/xburst/files-2.6.32/include/video/metronomefb.h b/target/linux/xburst/files-2.6.32/include/video/metronomefb.h deleted file mode 100644 index ea446ae85c..0000000000 --- a/target/linux/xburst/files-2.6.32/include/video/metronomefb.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * metronomefb.h - definitions for the metronome framebuffer driver - * - * Copyright (C) 2008 by Jaya Kumar - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of this archive for - * more details. - * - */ - -#ifndef _LINUX_METRONOMEFB_H_ -#define _LINUX_METRONOMEFB_H_ - -/* command structure used by metronome controller */ -struct metromem_cmd { - u16 opcode; - u16 args[((64-2)/2)]; - u16 csum; -} __attribute__((packed)); - -struct epd_frame; - -/* struct used by metronome. board specific stuff comes from *board */ -struct metronomefb_par { - struct metromem_cmd *metromem_cmd; - unsigned char *metromem_wfm; - unsigned char *metromem_img; - u16 *metromem_img_csum; - u16 *csum_table; - dma_addr_t metromem_dma; - const struct firmware *firmware; - struct fb_info *info; - struct metronome_board *board; - struct platform_device *pdev; - wait_queue_head_t waitq; - u8 frame_count; - int extra_size; - int current_wf_mode; - int current_wf_temp; - unsigned int manual_refresh_threshold; - unsigned int partial_autorefresh_interval; - const struct epd_frame *epd_frame; - u32 *fxbuckets; - u32 *fybuckets; - - unsigned int partial_updates_count; - unsigned is_first_update:1; - - struct mutex lock; -}; - -#define METRONOME_POWER_OFF 0 -#define METRONOME_POWER_ON 1 - -/* board specific routines and data */ -struct metronome_board { - struct module *owner; /* the platform device */ - void (*power_ctl)(struct metronomefb_par *, int); - void (*set_rst)(struct metronomefb_par *, int); - void (*set_stdby)(struct metronomefb_par *, int); - int (*get_err)(struct metronomefb_par *); - int (*get_rdy)(struct metronomefb_par *); - void (*cleanup)(struct metronomefb_par *); - int (*met_wait_event)(struct metronomefb_par *); - int (*met_wait_event_intr)(struct metronomefb_par *); - int (*setup_irq)(struct fb_info *); - int (*setup_fb)(struct metronomefb_par *); - int (*setup_io)(struct metronomefb_par *); - int (*get_panel_type)(void); -}; - -#endif -- cgit v1.2.3