Merge branch 'for-2.6.36' into for-2.6.37
Fairly simple conflicts, the most serious ones are the i.MX ones which I suspect now need another rename. Conflicts: arch/arm/mach-mx2/clock_imx27.c arch/arm/mach-mx2/devices.c arch/arm/mach-omap2/board-rx51-peripherals.c arch/arm/mach-omap2/board-zoom2.c sound/soc/fsl/mpc5200_dma.c sound/soc/fsl/mpc5200_dma.h sound/soc/fsl/mpc8610_hpcd.c sound/soc/pxa/spitz.c
This commit is contained in:
Mark Brown
commit
e4862f2f6f
9371 changed files with 597301 additions and 771571 deletions
|
|
@ -78,6 +78,40 @@
|
|||
|
||||
#define ADP5588_KEYMAPSIZE 80
|
||||
|
||||
#define GPI_PIN_ROW0 97
|
||||
#define GPI_PIN_ROW1 98
|
||||
#define GPI_PIN_ROW2 99
|
||||
#define GPI_PIN_ROW3 100
|
||||
#define GPI_PIN_ROW4 101
|
||||
#define GPI_PIN_ROW5 102
|
||||
#define GPI_PIN_ROW6 103
|
||||
#define GPI_PIN_ROW7 104
|
||||
#define GPI_PIN_COL0 105
|
||||
#define GPI_PIN_COL1 106
|
||||
#define GPI_PIN_COL2 107
|
||||
#define GPI_PIN_COL3 108
|
||||
#define GPI_PIN_COL4 109
|
||||
#define GPI_PIN_COL5 110
|
||||
#define GPI_PIN_COL6 111
|
||||
#define GPI_PIN_COL7 112
|
||||
#define GPI_PIN_COL8 113
|
||||
#define GPI_PIN_COL9 114
|
||||
|
||||
#define GPI_PIN_ROW_BASE GPI_PIN_ROW0
|
||||
#define GPI_PIN_ROW_END GPI_PIN_ROW7
|
||||
#define GPI_PIN_COL_BASE GPI_PIN_COL0
|
||||
#define GPI_PIN_COL_END GPI_PIN_COL9
|
||||
|
||||
#define GPI_PIN_BASE GPI_PIN_ROW_BASE
|
||||
#define GPI_PIN_END GPI_PIN_COL_END
|
||||
|
||||
#define ADP5588_GPIMAPSIZE_MAX (GPI_PIN_END - GPI_PIN_BASE + 1)
|
||||
|
||||
struct adp5588_gpi_map {
|
||||
unsigned short pin;
|
||||
unsigned short sw_evt;
|
||||
};
|
||||
|
||||
struct adp5588_kpad_platform_data {
|
||||
int rows; /* Number of rows */
|
||||
int cols; /* Number of columns */
|
||||
|
|
@ -87,6 +121,9 @@ struct adp5588_kpad_platform_data {
|
|||
unsigned en_keylock:1; /* Enable Key Lock feature */
|
||||
unsigned short unlock_key1; /* Unlock Key 1 */
|
||||
unsigned short unlock_key2; /* Unlock Key 2 */
|
||||
const struct adp5588_gpi_map *gpimap;
|
||||
unsigned short gpimapsize;
|
||||
const struct adp5588_gpio_platform_data *gpio_data;
|
||||
};
|
||||
|
||||
struct adp5588_gpio_platform_data {
|
||||
|
|
|
|||
21
include/linux/i2c/ltc4245.h
Normal file
21
include/linux/i2c/ltc4245.h
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
/*
|
||||
* Platform Data for LTC4245 hardware monitor chip
|
||||
*
|
||||
* Copyright (c) 2010 Ira W. Snyder <iws@ovro.caltech.edu>
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef LINUX_LTC4245_H
|
||||
#define LINUX_LTC4245_H
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
struct ltc4245_platform_data {
|
||||
bool use_extra_gpios;
|
||||
};
|
||||
|
||||
#endif /* LINUX_LTC4245_H */
|
||||
34
include/linux/i2c/mcs.h
Normal file
34
include/linux/i2c/mcs.h
Normal file
|
|
@ -0,0 +1,34 @@
|
|||
/*
|
||||
* Copyright (C) 2009 - 2010 Samsung Electronics Co.Ltd
|
||||
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
|
||||
* Author: HeungJun Kim <riverful.kim@samsung.com>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_MCS_H
|
||||
#define __LINUX_MCS_H
|
||||
|
||||
#define MCS_KEY_MAP(v, c) ((((v) & 0xff) << 16) | ((c) & 0xffff))
|
||||
#define MCS_KEY_VAL(v) (((v) >> 16) & 0xff)
|
||||
#define MCS_KEY_CODE(v) ((v) & 0xffff)
|
||||
|
||||
struct mcs_platform_data {
|
||||
void (*cfg_pin)(void);
|
||||
|
||||
/* touchscreen */
|
||||
unsigned int x_size;
|
||||
unsigned int y_size;
|
||||
|
||||
/* touchkey */
|
||||
const u32 *keymap;
|
||||
unsigned int keymap_size;
|
||||
unsigned int key_maxval;
|
||||
bool no_autorepeat;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_MCS_H */
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
/*
|
||||
* mcs5000_ts.h
|
||||
*
|
||||
* Copyright (C) 2009 Samsung Electronics Co.Ltd
|
||||
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_MCS5000_TS_H
|
||||
#define __LINUX_MCS5000_TS_H
|
||||
|
||||
/* platform data for the MELFAS MCS-5000 touchscreen driver */
|
||||
struct mcs5000_ts_platform_data {
|
||||
void (*cfg_pin)(void);
|
||||
int x_size;
|
||||
int y_size;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_MCS5000_TS_H */
|
||||
47
include/linux/i2c/pca954x.h
Normal file
47
include/linux/i2c/pca954x.h
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
/*
|
||||
*
|
||||
* pca954x.h - I2C multiplexer/switch support
|
||||
*
|
||||
* Copyright (c) 2008-2009 Rodolfo Giometti <giometti@linux.it>
|
||||
* Copyright (c) 2008-2009 Eurotech S.p.A. <info@eurotech.it>
|
||||
* Michael Lawnick <michael.lawnick.ext@nsn.com>
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* 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_I2C_PCA954X_H
|
||||
#define _LINUX_I2C_PCA954X_H
|
||||
|
||||
/* Platform data for the PCA954x I2C multiplexers */
|
||||
|
||||
/* Per channel initialisation data:
|
||||
* @adap_id: bus number for the adapter. 0 = don't care
|
||||
* @deselect_on_exit: set this entry to 1, if your H/W needs deselection
|
||||
* of this channel after transaction.
|
||||
*
|
||||
*/
|
||||
struct pca954x_platform_mode {
|
||||
int adap_id;
|
||||
unsigned int deselect_on_exit:1;
|
||||
};
|
||||
|
||||
/* Per mux/switch data, used with i2c_register_board_info */
|
||||
struct pca954x_platform_data {
|
||||
struct pca954x_platform_mode *modes;
|
||||
int num_modes;
|
||||
};
|
||||
|
||||
#endif /* _LINUX_I2C_PCA954X_H */
|
||||
38
include/linux/i2c/qt602240_ts.h
Normal file
38
include/linux/i2c/qt602240_ts.h
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
/*
|
||||
* AT42QT602240/ATMXT224 Touchscreen driver
|
||||
*
|
||||
* Copyright (C) 2010 Samsung Electronics Co.Ltd
|
||||
* Author: Joonyoung Shim <jy0922.shim@samsung.com>
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef __LINUX_QT602240_TS_H
|
||||
#define __LINUX_QT602240_TS_H
|
||||
|
||||
/* Orient */
|
||||
#define QT602240_NORMAL 0x0
|
||||
#define QT602240_DIAGONAL 0x1
|
||||
#define QT602240_HORIZONTAL_FLIP 0x2
|
||||
#define QT602240_ROTATED_90_COUNTER 0x3
|
||||
#define QT602240_VERTICAL_FLIP 0x4
|
||||
#define QT602240_ROTATED_90 0x5
|
||||
#define QT602240_ROTATED_180 0x6
|
||||
#define QT602240_DIAGONAL_COUNTER 0x7
|
||||
|
||||
/* The platform data for the AT42QT602240/ATMXT224 touchscreen driver */
|
||||
struct qt602240_platform_data {
|
||||
unsigned int x_line;
|
||||
unsigned int y_line;
|
||||
unsigned int x_size;
|
||||
unsigned int y_size;
|
||||
unsigned int blen;
|
||||
unsigned int threshold;
|
||||
unsigned int voltage;
|
||||
unsigned char orient;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_QT602240_TS_H */
|
||||
78
include/linux/i2c/sx150x.h
Normal file
78
include/linux/i2c/sx150x.h
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
/*
|
||||
* Driver for the Semtech SX150x I2C GPIO Expanders
|
||||
*
|
||||
* Copyright (c) 2010, Code Aurora Forum. All rights reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 and
|
||||
* only version 2 as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* 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., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||
* 02110-1301, USA.
|
||||
*/
|
||||
#ifndef __LINUX_I2C_SX150X_H
|
||||
#define __LINUX_I2C_SX150X_H
|
||||
|
||||
/**
|
||||
* struct sx150x_platform_data - config data for SX150x driver
|
||||
* @gpio_base: The index number of the first GPIO assigned to this
|
||||
* GPIO expander. The expander will create a block of
|
||||
* consecutively numbered gpios beginning at the given base,
|
||||
* with the size of the block depending on the model of the
|
||||
* expander chip.
|
||||
* @oscio_is_gpo: If set to true, the driver will configure OSCIO as a GPO
|
||||
* instead of as an oscillator, increasing the size of the
|
||||
* GP(I)O pool created by this expander by one. The
|
||||
* output-only GPO pin will be added at the end of the block.
|
||||
* @io_pullup_ena: A bit-mask which enables or disables the pull-up resistor
|
||||
* for each IO line in the expander. Setting the bit at
|
||||
* position n will enable the pull-up for the IO at
|
||||
* the corresponding offset. For chips with fewer than
|
||||
* 16 IO pins, high-end bits are ignored.
|
||||
* @io_pulldn_ena: A bit-mask which enables-or disables the pull-down
|
||||
* resistor for each IO line in the expander. Setting the
|
||||
* bit at position n will enable the pull-down for the IO at
|
||||
* the corresponding offset. For chips with fewer than
|
||||
* 16 IO pins, high-end bits are ignored.
|
||||
* @io_open_drain_ena: A bit-mask which enables-or disables open-drain
|
||||
* operation for each IO line in the expander. Setting the
|
||||
* bit at position n enables open-drain operation for
|
||||
* the IO at the corresponding offset. Clearing the bit
|
||||
* enables regular push-pull operation for that IO.
|
||||
* For chips with fewer than 16 IO pins, high-end bits
|
||||
* are ignored.
|
||||
* @io_polarity: A bit-mask which enables polarity inversion for each IO line
|
||||
* in the expander. Setting the bit at position n inverts
|
||||
* the polarity of that IO line, while clearing it results
|
||||
* in normal polarity. For chips with fewer than 16 IO pins,
|
||||
* high-end bits are ignored.
|
||||
* @irq_summary: The 'summary IRQ' line to which the GPIO expander's INT line
|
||||
* is connected, via which it reports interrupt events
|
||||
* across all GPIO lines. This must be a real,
|
||||
* pre-existing IRQ line.
|
||||
* Setting this value < 0 disables the irq_chip functionality
|
||||
* of the driver.
|
||||
* @irq_base: The first 'virtual IRQ' line at which our block of GPIO-based
|
||||
* IRQ lines will appear. Similarly to gpio_base, the expander
|
||||
* will create a block of irqs beginning at this number.
|
||||
* This value is ignored if irq_summary is < 0.
|
||||
*/
|
||||
struct sx150x_platform_data {
|
||||
unsigned gpio_base;
|
||||
bool oscio_is_gpo;
|
||||
u16 io_pullup_ena;
|
||||
u16 io_pulldn_ena;
|
||||
u16 io_open_drain_ena;
|
||||
u16 io_polarity;
|
||||
int irq_summary;
|
||||
unsigned irq_base;
|
||||
};
|
||||
|
||||
#endif /* __LINUX_I2C_SX150X_H */
|
||||
Loading…
Add table
Add a link
Reference in a new issue