History

Merge tag 'v4.3-rc1' into MTD -next development

Brian Norris committed 11 years ago

Commit db66e322 parents f9f3ce8 6ff33f310364 files · +569128 −257571Browse files

Showing the changes to include/linux/platform_data (16 of 10364 files). Show all

Unified · Split

16 files
  1. include/linux/platform_data/atmel.h +0 −12
  2. include/linux/platform_data/atmel_mxt_ts.h +31 −0
  3. include/linux/platform_data/clk-ux500.h +3 −9
  4. include/linux/platform_data/gpio-em.h +0 −11
  5. include/linux/platform_data/i2c-mux-reg.h +44 −0
  6. include/linux/platform_data/itco_wdt.h +19 −0
  7. include/linux/platform_data/leds-kirkwood-ns2.h +14 −0
  8. include/linux/platform_data/lp855x.h +0 −2
  9. include/linux/platform_data/macb.h +11 −3
  10. include/linux/platform_data/mmc-esdhc-imx.h +1 −1
  11. include/linux/platform_data/pixcir_i2c_ts.h +63 −0
  12. include/linux/platform_data/spi-davinci.h +1 −0
  13. include/linux/platform_data/spi-mt65xx.h +20 −0
  14. include/linux/platform_data/st_nci.h +0 −29
  15. include/linux/platform_data/video-ep93xx.h +0 −8
  16. include/linux/platform_data/zforce_ts.h +0 −3
include/linux/platform_data/atmel.h+0−12
@@ -46,18 +46,6 @@ struct at91_cf_data { · 45 unmodified lines
46#define AT91_IDE_SWAP_A0_A2 0x0246#define AT91_IDE_SWAP_A0_A2 0x02
47};47};
48 48
49 /* USB Host */
50#define AT91_MAX_USBH_PORTS 3
51struct at91_usbh_data {
52 int vbus_pin[AT91_MAX_USBH_PORTS]; /* port power-control pin */
53 int overcurrent_pin[AT91_MAX_USBH_PORTS];
54 u8 ports; /* number of ports on root hub */
55 u8 overcurrent_supported;
56 u8 vbus_pin_active_low[AT91_MAX_USBH_PORTS];
57 u8 overcurrent_status[AT91_MAX_USBH_PORTS];
58 u8 overcurrent_changed[AT91_MAX_USBH_PORTS];
59};
60
61 /* NAND / SmartMedia */49 /* NAND / SmartMedia */
62struct atmel_nand_data {50struct atmel_nand_data {
63 int enable_pin; /* chip enable */51 int enable_pin; /* chip enable */
include/linux/platform_data/atmel_mxt_ts.h+31−0
@@ -0,0 +1,31 @@
1/*
2 * Atmel maXTouch Touchscreen driver
3 *
4 * Copyright (C) 2010 Samsung Electronics Co.Ltd
5 * Author: Joonyoung Shim <jy0922.shim@samsung.com>
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation; either version 2 of the License, or (at your
10 * option) any later version.
11 */
12
13#ifndef __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H
14#define __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H
15
16#include <linux/types.h>
17
18enum mxt_suspend_mode {
19 MXT_SUSPEND_DEEP_SLEEP = 0,
20 MXT_SUSPEND_T9_CTRL = 1,
21};
22
23/* The platform data for the Atmel maXTouch touchscreen driver */
24struct mxt_platform_data {
25 unsigned long irqflags;
26 u8 t19_num_keys;
27 const unsigned int *t19_keymap;
28 enum mxt_suspend_mode suspend_mode;
29};
30
31#endif /* __LINUX_PLATFORM_DATA_ATMEL_MXT_TS_H */
include/linux/platform_data/clk-ux500.h+3−9
@@ -10,14 +10,8 @@ · 9 unmodified lines
10#ifndef __CLK_UX500_H10#ifndef __CLK_UX500_H
11#define __CLK_UX500_H11#define __CLK_UX500_H
12 12
13void u8500_of_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,13void u8500_clk_init(void);
14 u32 clkrst5_base, u32 clkrst6_base);14void u9540_clk_init(void);
15 15void u8540_clk_init(void);
16void u8500_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
17 u32 clkrst5_base, u32 clkrst6_base);
18void u9540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
19 u32 clkrst5_base, u32 clkrst6_base);
20void u8540_clk_init(u32 clkrst1_base, u32 clkrst2_base, u32 clkrst3_base,
21 u32 clkrst5_base, u32 clkrst6_base);
22 16
23#endif /* __CLK_UX500_H */17#endif /* __CLK_UX500_H */
include/linux/platform_data/gpio-em.h+0−11
@@ -1,11 +0,0 @@
1#ifndef __GPIO_EM_H__
2#define __GPIO_EM_H__
3
4struct gpio_em_config {
5 unsigned int gpio_base;
6 unsigned int irq_base;
7 unsigned int number_of_pins;
8 const char *pctl_name;
9};
10
11#endif /* __GPIO_EM_H__ */
include/linux/platform_data/i2c-mux-reg.h+44−0
@@ -0,0 +1,44 @@
1/*
2 * I2C multiplexer using a single register
3 *
4 * Copyright 2015 Freescale Semiconductor
5 * York Sun <yorksun@freescale.com>
6 *
7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation; either version 2 of the License, or (at your
10 * option) any later version.
11 */
12
13#ifndef __LINUX_PLATFORM_DATA_I2C_MUX_REG_H
14#define __LINUX_PLATFORM_DATA_I2C_MUX_REG_H
15
16/**
17 * struct i2c_mux_reg_platform_data - Platform-dependent data for i2c-mux-reg
18 * @parent: Parent I2C bus adapter number
19 * @base_nr: Base I2C bus number to number adapters from or zero for dynamic
20 * @values: Array of value for each channel
21 * @n_values: Number of multiplexer channels
22 * @little_endian: Indicating if the register is in little endian
23 * @write_only: Reading the register is not allowed by hardware
24 * @classes: Optional I2C auto-detection classes
25 * @idle: Value to write to mux when idle
26 * @idle_in_use: indicate if idle value is in use
27 * @reg: Virtual address of the register to switch channel
28 * @reg_size: register size in bytes
29 */
30struct i2c_mux_reg_platform_data {
31 int parent;
32 int base_nr;
33 const unsigned int *values;
34 int n_values;
35 bool little_endian;
36 bool write_only;
37 const unsigned int *classes;
38 u32 idle;
39 bool idle_in_use;
40 void __iomem *reg;
41 resource_size_t reg_size;
42};
43
44#endif /* __LINUX_PLATFORM_DATA_I2C_MUX_REG_H */
include/linux/platform_data/itco_wdt.h+19−0
@@ -0,0 +1,19 @@
1/*
2 * Platform data for the Intel TCO Watchdog
3 */
4
5#ifndef _ITCO_WDT_H_
6#define _ITCO_WDT_H_
7
8/* Watchdog resources */
9#define ICH_RES_IO_TCO 0
10#define ICH_RES_IO_SMI 1
11#define ICH_RES_MEM_OFF 2
12#define ICH_RES_MEM_GCS_PMC 0
13
14struct itco_wdt_platform_data {
15 char name[32];
16 unsigned int version;
17};
18
19#endif /* _ITCO_WDT_H_ */
include/linux/platform_data/leds-kirkwood-ns2.h+14−0
@@ -9,11 +9,25 @@ · 8 unmodified lines
9#ifndef __LEDS_KIRKWOOD_NS2_H9#ifndef __LEDS_KIRKWOOD_NS2_H
10#define __LEDS_KIRKWOOD_NS2_H10#define __LEDS_KIRKWOOD_NS2_H
11 11
12enum ns2_led_modes {
13 NS_V2_LED_OFF,
14 NS_V2_LED_ON,
15 NS_V2_LED_SATA,
16};
17
18struct ns2_led_modval {
19 enum ns2_led_modes mode;
20 int cmd_level;
21 int slow_level;
22};
23
12struct ns2_led {24struct ns2_led {
13 const char *name;25 const char *name;
14 const char *default_trigger;26 const char *default_trigger;
15 unsigned cmd;27 unsigned cmd;
16 unsigned slow;28 unsigned slow;
29 int num_modes;
30 struct ns2_led_modval *modval;
17};31};
18 32
19struct ns2_led_platform_data {33struct ns2_led_platform_data {
include/linux/platform_data/lp855x.h+0−2
@@ -136,7 +136,6 @@ struct lp855x_rom_data { · 135 unmodified lines
136 Only valid when mode is PWM_BASED.136 Only valid when mode is PWM_BASED.
137 * @size_program : total size of lp855x_rom_data137 * @size_program : total size of lp855x_rom_data
138 * @rom_data : list of new eeprom/eprom registers138 * @rom_data : list of new eeprom/eprom registers
139 * @supply : regulator that supplies 3V input
140 */139 */
141struct lp855x_platform_data {140struct lp855x_platform_data {
142 const char *name;141 const char *name;
@@ -145,7 +144,6 @@ struct lp855x_platform_data { · 2 unmodified lines
145 unsigned int period_ns;144 unsigned int period_ns;
146 int size_program;145 int size_program;
147 struct lp855x_rom_data *rom_data;146 struct lp855x_rom_data *rom_data;
148 struct regulator *supply;
149};147};
150 148
151#endif149#endif
include/linux/platform_data/macb.h+11−3
@@ -8,11 +8,19 @@ · 7 unmodified lines
8#ifndef __MACB_PDATA_H__8#ifndef __MACB_PDATA_H__
9#define __MACB_PDATA_H__9#define __MACB_PDATA_H__
10 10
11/**
12 * struct macb_platform_data - platform data for MACB Ethernet
13 * @phy_mask: phy mask passed when register the MDIO bus
14 * within the driver
15 * @phy_irq_pin: PHY IRQ
16 * @is_rmii: using RMII interface?
17 * @rev_eth_addr: reverse Ethernet address byte order
18 */
11struct macb_platform_data {19struct macb_platform_data {
12 u32 phy_mask;20 u32 phy_mask;
13 int phy_irq_pin; /* PHY IRQ */21 int phy_irq_pin;
14 u8 is_rmii; /* using RMII interface? */22 u8 is_rmii;
15 u8 rev_eth_addr; /* reverse Ethernet address byte order */23 u8 rev_eth_addr;
16};24};
17 25
18#endif /* __MACB_PDATA_H__ */26#endif /* __MACB_PDATA_H__ */
include/linux/platform_data/mmc-esdhc-imx.h+1−1
@@ -43,8 +43,8 @@ struct esdhc_platform_data { · 42 unmodified lines
43 enum wp_types wp_type;43 enum wp_types wp_type;
44 enum cd_types cd_type;44 enum cd_types cd_type;
45 int max_bus_width;45 int max_bus_width;
46 unsigned int f_max;
47 bool support_vsel;46 bool support_vsel;
48 unsigned int delay_line;47 unsigned int delay_line;
48 unsigned int tuning_step; /* The delay cell steps in tuning procedure */
49};49};
50#endif /* __ASM_ARCH_IMX_ESDHC_H */50#endif /* __ASM_ARCH_IMX_ESDHC_H */
include/linux/platform_data/pixcir_i2c_ts.h+63−0
@@ -0,0 +1,63 @@
1#ifndef _PIXCIR_I2C_TS_H
2#define _PIXCIR_I2C_TS_H
3
4/*
5 * Register map
6 */
7#define PIXCIR_REG_POWER_MODE 51
8#define PIXCIR_REG_INT_MODE 52
9
10/*
11 * Power modes:
12 * active: max scan speed
13 * idle: lower scan speed with automatic transition to active on touch
14 * halt: datasheet says sleep but this is more like halt as the chip
15 * clocks are cut and it can only be brought out of this mode
16 * using the RESET pin.
17 */
18enum pixcir_power_mode {
19 PIXCIR_POWER_ACTIVE,
20 PIXCIR_POWER_IDLE,
21 PIXCIR_POWER_HALT,
22};
23
24#define PIXCIR_POWER_MODE_MASK 0x03
25#define PIXCIR_POWER_ALLOW_IDLE (1UL << 2)
26
27/*
28 * Interrupt modes:
29 * periodical: interrupt is asserted periodicaly
30 * diff coordinates: interrupt is asserted when coordinates change
31 * level on touch: interrupt level asserted during touch
32 * pulse on touch: interrupt pulse asserted druing touch
33 *
34 */
35enum pixcir_int_mode {
36 PIXCIR_INT_PERIODICAL,
37 PIXCIR_INT_DIFF_COORD,
38 PIXCIR_INT_LEVEL_TOUCH,
39 PIXCIR_INT_PULSE_TOUCH,
40};
41
42#define PIXCIR_INT_MODE_MASK 0x03
43#define PIXCIR_INT_ENABLE (1UL << 3)
44#define PIXCIR_INT_POL_HIGH (1UL << 2)
45
46/**
47 * struct pixcir_irc_chip_data - chip related data
48 * @max_fingers: Max number of fingers reported simultaneously by h/w
49 * @has_hw_ids: Hardware supports finger tracking IDs
50 *
51 */
52struct pixcir_i2c_chip_data {
53 u8 max_fingers;
54 bool has_hw_ids;
55};
56
57struct pixcir_ts_platform_data {
58 int x_max;
59 int y_max;
60 struct pixcir_i2c_chip_data chip;
61};
62
63#endif
include/linux/platform_data/spi-davinci.h+1−0
@@ -49,6 +49,7 @@ struct davinci_spi_platform_data { · 48 unmodified lines
49 u8 num_chipselect;49 u8 num_chipselect;
50 u8 intr_line;50 u8 intr_line;
51 u8 *chip_sel;51 u8 *chip_sel;
52 u8 prescaler_limit;
52 bool cshold_bug;53 bool cshold_bug;
53 enum dma_event_q dma_event_q;54 enum dma_event_q dma_event_q;
54};55};
include/linux/platform_data/spi-mt65xx.h+20−0
@@ -0,0 +1,20 @@
1/*
2 * MTK SPI bus driver definitions
3 *
4 * Copyright (c) 2015 MediaTek Inc.
5 * Author: Leilk Liu <leilk.liu@mediatek.com>
6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License version 2 as
9 * published by the Free Software Foundation.
10 */
11
12#ifndef ____LINUX_PLATFORM_DATA_SPI_MTK_H
13#define ____LINUX_PLATFORM_DATA_SPI_MTK_H
14
15/* Board specific platform_data */
16struct mtk_chip_config {
17 u32 tx_mlsb;
18 u32 rx_mlsb;
19};
20#endif
include/linux/platform_data/st_nci.h+0−29
@@ -1,29 +0,0 @@
1/*
2 * Driver include for ST NCI NFC chip family.
3 *
4 * Copyright (C) 2014-2015 STMicroelectronics SAS. All rights reserved.
5 *
6 * This program is free software; you can redistribute it and/or modify it
7 * under the terms and conditions of the GNU General Public License,
8 * version 2, as published by the Free Software Foundation.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program; if not, see <http://www.gnu.org/licenses/>.
17 */
18
19#ifndef _ST_NCI_H_
20#define _ST_NCI_H_
21
22#define ST_NCI_DRIVER_NAME "st_nci"
23
24struct st_nci_nfc_platform_data {
25 unsigned int gpio_reset;
26 unsigned int irq_polarity;
27};
28
29#endif /* _ST_NCI_H_ */
include/linux/platform_data/video-ep93xx.h+0−8
@@ -2,11 +2,8 @@ · 1 unmodified line
2#define __VIDEO_EP93XX_H2#define __VIDEO_EP93XX_H
3 3
4struct platform_device;4struct platform_device;
5struct fb_videomode;
6struct fb_info;5struct fb_info;
7 6
8#define EP93XXFB_USE_MODEDB 0
9
10/* VideoAttributes flags */7/* VideoAttributes flags */
11#define EP93XXFB_STATE_MACHINE_ENABLE (1 << 0)8#define EP93XXFB_STATE_MACHINE_ENABLE (1 << 0)
12#define EP93XXFB_PIXEL_CLOCK_ENABLE (1 << 1)9#define EP93XXFB_PIXEL_CLOCK_ENABLE (1 << 1)
@@ -38,12 +35,7 @@ struct fb_info; · 25 unmodified lines
38 EP93XXFB_PIXEL_DATA_ENABLE)35 EP93XXFB_PIXEL_DATA_ENABLE)
39 36
40struct ep93xxfb_mach_info {37struct ep93xxfb_mach_info {
41 unsigned int num_modes;
42 const struct fb_videomode *modes;
43 const struct fb_videomode *default_mode;
44 int bpp;
45 unsigned int flags;38 unsigned int flags;
46
47 int (*setup)(struct platform_device *pdev);39 int (*setup)(struct platform_device *pdev);
48 void (*teardown)(struct platform_device *pdev);40 void (*teardown)(struct platform_device *pdev);
49 void (*blank)(int blank_mode, struct fb_info *info);41 void (*blank)(int blank_mode, struct fb_info *info);
include/linux/platform_data/zforce_ts.h+0−3
@@ -16,9 +16,6 @@ · 15 unmodified lines
16#define _LINUX_INPUT_ZFORCE_TS_H16#define _LINUX_INPUT_ZFORCE_TS_H
17 17
18struct zforce_ts_platdata {18struct zforce_ts_platdata {
19 int gpio_int;
20 int gpio_rst;
21
22 unsigned int x_max;19 unsigned int x_max;
23 unsigned int y_max;20 unsigned int y_max;
24};21};

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t