diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-19 17:59:07 -0400 |
| commit | 4e9816d012dbc28dc89559261c6ffbf8ffc440dd (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /include/linux/platform_data | |
| parent | da98f44f27d81d7fe9a41f69af4fe08c18d13b56 (diff) | |
| parent | 1795cd9b3a91d4b5473c97f491d63892442212ab (diff) | |
Merge tag 'v3.16-rc5' into next/fixes-non-critical
Linux 3.16-rc5
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/adau17x1.h | 109 | ||||
| -rw-r--r-- | include/linux/platform_data/at91_adc.h | 27 | ||||
| -rw-r--r-- | include/linux/platform_data/atmel.h | 8 | ||||
| -rw-r--r-- | include/linux/platform_data/edma.h | 28 | ||||
| -rw-r--r-- | include/linux/platform_data/elm.h | 3 | ||||
| -rw-r--r-- | include/linux/platform_data/intel-mid_wdt.h | 22 | ||||
| -rw-r--r-- | include/linux/platform_data/ipmmu-vmsa.h | 24 | ||||
| -rw-r--r-- | include/linux/platform_data/leds-pca9685.h | 35 | ||||
| -rw-r--r-- | include/linux/platform_data/max3421-hcd.h | 24 | ||||
| -rw-r--r-- | include/linux/platform_data/mipi-csis.h | 28 | ||||
| -rw-r--r-- | include/linux/platform_data/mtd-nand-omap2.h | 5 | ||||
| -rw-r--r-- | include/linux/platform_data/mtd-nand-pxa3xx.h | 3 | ||||
| -rw-r--r-- | include/linux/platform_data/omap4-keypad.h | 13 | ||||
| -rw-r--r-- | include/linux/platform_data/pwm-renesas-tpu.h | 16 | ||||
| -rw-r--r-- | include/linux/platform_data/shtc1.h | 23 | ||||
| -rw-r--r-- | include/linux/platform_data/st21nfca.h | 32 | ||||
| -rw-r--r-- | include/linux/platform_data/syscon.h | 8 |
17 files changed, 268 insertions, 140 deletions
diff --git a/include/linux/platform_data/adau17x1.h b/include/linux/platform_data/adau17x1.h new file mode 100644 index 000000000000..a81766cae230 --- /dev/null +++ b/include/linux/platform_data/adau17x1.h | |||
| @@ -0,0 +1,109 @@ | |||
| 1 | /* | ||
| 2 | * Driver for ADAU1761/ADAU1461/ADAU1761/ADAU1961/ADAU1781/ADAU1781 codecs | ||
| 3 | * | ||
| 4 | * Copyright 2011-2014 Analog Devices Inc. | ||
| 5 | * Author: Lars-Peter Clausen <lars@metafoo.de> | ||
| 6 | * | ||
| 7 | * Licensed under the GPL-2 or later. | ||
| 8 | */ | ||
| 9 | |||
| 10 | #ifndef __LINUX_PLATFORM_DATA_ADAU17X1_H__ | ||
| 11 | #define __LINUX_PLATFORM_DATA_ADAU17X1_H__ | ||
| 12 | |||
| 13 | /** | ||
| 14 | * enum adau17x1_micbias_voltage - Microphone bias voltage | ||
| 15 | * @ADAU17X1_MICBIAS_0_90_AVDD: 0.9 * AVDD | ||
| 16 | * @ADAU17X1_MICBIAS_0_65_AVDD: 0.65 * AVDD | ||
| 17 | */ | ||
| 18 | enum adau17x1_micbias_voltage { | ||
| 19 | ADAU17X1_MICBIAS_0_90_AVDD = 0, | ||
| 20 | ADAU17X1_MICBIAS_0_65_AVDD = 1, | ||
| 21 | }; | ||
| 22 | |||
| 23 | /** | ||
| 24 | * enum adau1761_digmic_jackdet_pin_mode - Configuration of the JACKDET/MICIN pin | ||
| 25 | * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE: Disable the pin | ||
| 26 | * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC: Configure the pin for usage as | ||
| 27 | * digital microphone input. | ||
| 28 | * @ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT: Configure the pin for jack | ||
| 29 | * insertion detection. | ||
| 30 | */ | ||
| 31 | enum adau1761_digmic_jackdet_pin_mode { | ||
| 32 | ADAU1761_DIGMIC_JACKDET_PIN_MODE_NONE, | ||
| 33 | ADAU1761_DIGMIC_JACKDET_PIN_MODE_DIGMIC, | ||
| 34 | ADAU1761_DIGMIC_JACKDET_PIN_MODE_JACKDETECT, | ||
| 35 | }; | ||
| 36 | |||
| 37 | /** | ||
| 38 | * adau1761_jackdetect_debounce_time - Jack insertion detection debounce time | ||
| 39 | * @ADAU1761_JACKDETECT_DEBOUNCE_5MS: 5 milliseconds | ||
| 40 | * @ADAU1761_JACKDETECT_DEBOUNCE_10MS: 10 milliseconds | ||
| 41 | * @ADAU1761_JACKDETECT_DEBOUNCE_20MS: 20 milliseconds | ||
| 42 | * @ADAU1761_JACKDETECT_DEBOUNCE_40MS: 40 milliseconds | ||
| 43 | */ | ||
| 44 | enum adau1761_jackdetect_debounce_time { | ||
| 45 | ADAU1761_JACKDETECT_DEBOUNCE_5MS = 0, | ||
| 46 | ADAU1761_JACKDETECT_DEBOUNCE_10MS = 1, | ||
| 47 | ADAU1761_JACKDETECT_DEBOUNCE_20MS = 2, | ||
| 48 | ADAU1761_JACKDETECT_DEBOUNCE_40MS = 3, | ||
| 49 | }; | ||
| 50 | |||
| 51 | /** | ||
| 52 | * enum adau1761_output_mode - Output mode configuration | ||
| 53 | * @ADAU1761_OUTPUT_MODE_HEADPHONE: Headphone output | ||
| 54 | * @ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS: Capless headphone output | ||
| 55 | * @ADAU1761_OUTPUT_MODE_LINE: Line output | ||
| 56 | */ | ||
| 57 | enum adau1761_output_mode { | ||
| 58 | ADAU1761_OUTPUT_MODE_HEADPHONE, | ||
| 59 | ADAU1761_OUTPUT_MODE_HEADPHONE_CAPLESS, | ||
| 60 | ADAU1761_OUTPUT_MODE_LINE, | ||
| 61 | }; | ||
| 62 | |||
| 63 | /** | ||
| 64 | * struct adau1761_platform_data - ADAU1761 Codec driver platform data | ||
| 65 | * @input_differential: If true the input pins will be configured in | ||
| 66 | * differential mode. | ||
| 67 | * @lineout_mode: Output mode for the LOUT/ROUT pins | ||
| 68 | * @headphone_mode: Output mode for the LHP/RHP pins | ||
| 69 | * @digmic_jackdetect_pin_mode: JACKDET/MICIN pin configuration | ||
| 70 | * @jackdetect_debounce_time: Jack insertion detection debounce time. | ||
| 71 | * Note: This value will only be used, if the JACKDET/MICIN pin is configured | ||
| 72 | * for jack insertion detection. | ||
| 73 | * @jackdetect_active_low: If true the jack insertion detection is active low. | ||
| 74 | * Othwise it will be active high. | ||
| 75 | * @micbias_voltage: Microphone voltage bias | ||
| 76 | */ | ||
| 77 | struct adau1761_platform_data { | ||
| 78 | bool input_differential; | ||
| 79 | enum adau1761_output_mode lineout_mode; | ||
| 80 | enum adau1761_output_mode headphone_mode; | ||
| 81 | |||
| 82 | enum adau1761_digmic_jackdet_pin_mode digmic_jackdetect_pin_mode; | ||
| 83 | |||
| 84 | enum adau1761_jackdetect_debounce_time jackdetect_debounce_time; | ||
| 85 | bool jackdetect_active_low; | ||
| 86 | |||
| 87 | enum adau17x1_micbias_voltage micbias_voltage; | ||
| 88 | }; | ||
| 89 | |||
| 90 | /** | ||
| 91 | * struct adau1781_platform_data - ADAU1781 Codec driver platform data | ||
| 92 | * @left_input_differential: If true configure the left input as | ||
| 93 | * differential input. | ||
| 94 | * @right_input_differential: If true configure the right input as differntial | ||
| 95 | * input. | ||
| 96 | * @use_dmic: If true configure the MIC pins as digital microphone pins instead | ||
| 97 | * of analog microphone pins. | ||
| 98 | * @micbias_voltage: Microphone voltage bias | ||
| 99 | */ | ||
| 100 | struct adau1781_platform_data { | ||
| 101 | bool left_input_differential; | ||
| 102 | bool right_input_differential; | ||
| 103 | |||
| 104 | bool use_dmic; | ||
| 105 | |||
| 106 | enum adau17x1_micbias_voltage micbias_voltage; | ||
| 107 | }; | ||
| 108 | |||
| 109 | #endif | ||
diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h index b3ca1e94e0c8..7819fc787731 100644 --- a/include/linux/platform_data/at91_adc.h +++ b/include/linux/platform_data/at91_adc.h | |||
| @@ -7,23 +7,10 @@ | |||
| 7 | #ifndef _AT91_ADC_H_ | 7 | #ifndef _AT91_ADC_H_ |
| 8 | #define _AT91_ADC_H_ | 8 | #define _AT91_ADC_H_ |
| 9 | 9 | ||
| 10 | /** | 10 | enum atmel_adc_ts_type { |
| 11 | * struct at91_adc_reg_desc - Various informations relative to registers | 11 | ATMEL_ADC_TOUCHSCREEN_NONE = 0, |
| 12 | * @channel_base: Base offset for the channel data registers | 12 | ATMEL_ADC_TOUCHSCREEN_4WIRE = 4, |
| 13 | * @drdy_mask: Mask of the DRDY field in the relevant registers | 13 | ATMEL_ADC_TOUCHSCREEN_5WIRE = 5, |
| 14 | (Interruptions registers mostly) | ||
| 15 | * @status_register: Offset of the Interrupt Status Register | ||
| 16 | * @trigger_register: Offset of the Trigger setup register | ||
| 17 | * @mr_prescal_mask: Mask of the PRESCAL field in the adc MR register | ||
| 18 | * @mr_startup_mask: Mask of the STARTUP field in the adc MR register | ||
| 19 | */ | ||
| 20 | struct at91_adc_reg_desc { | ||
| 21 | u8 channel_base; | ||
| 22 | u32 drdy_mask; | ||
| 23 | u8 status_register; | ||
| 24 | u8 trigger_register; | ||
| 25 | u32 mr_prescal_mask; | ||
| 26 | u32 mr_startup_mask; | ||
| 27 | }; | 14 | }; |
| 28 | 15 | ||
| 29 | /** | 16 | /** |
| @@ -42,23 +29,21 @@ struct at91_adc_trigger { | |||
| 42 | /** | 29 | /** |
| 43 | * struct at91_adc_data - platform data for ADC driver | 30 | * struct at91_adc_data - platform data for ADC driver |
| 44 | * @channels_used: channels in use on the board as a bitmask | 31 | * @channels_used: channels in use on the board as a bitmask |
| 45 | * @num_channels: global number of channels available on the board | ||
| 46 | * @registers: Registers definition on the board | ||
| 47 | * @startup_time: startup time of the ADC in microseconds | 32 | * @startup_time: startup time of the ADC in microseconds |
| 48 | * @trigger_list: Triggers available in the ADC | 33 | * @trigger_list: Triggers available in the ADC |
| 49 | * @trigger_number: Number of triggers available in the ADC | 34 | * @trigger_number: Number of triggers available in the ADC |
| 50 | * @use_external_triggers: does the board has external triggers availables | 35 | * @use_external_triggers: does the board has external triggers availables |
| 51 | * @vref: Reference voltage for the ADC in millivolts | 36 | * @vref: Reference voltage for the ADC in millivolts |
| 37 | * @touchscreen_type: If a touchscreen is connected, its type (4 or 5 wires) | ||
| 52 | */ | 38 | */ |
| 53 | struct at91_adc_data { | 39 | struct at91_adc_data { |
| 54 | unsigned long channels_used; | 40 | unsigned long channels_used; |
| 55 | u8 num_channels; | ||
| 56 | struct at91_adc_reg_desc *registers; | ||
| 57 | u8 startup_time; | 41 | u8 startup_time; |
| 58 | struct at91_adc_trigger *trigger_list; | 42 | struct at91_adc_trigger *trigger_list; |
| 59 | u8 trigger_number; | 43 | u8 trigger_number; |
| 60 | bool use_external_triggers; | 44 | bool use_external_triggers; |
| 61 | u16 vref; | 45 | u16 vref; |
| 46 | enum atmel_adc_ts_type touchscreen_type; | ||
| 62 | }; | 47 | }; |
| 63 | 48 | ||
| 64 | extern void __init at91_add_device_adc(struct at91_adc_data *data); | 49 | extern void __init at91_add_device_adc(struct at91_adc_data *data); |
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h index e26b0c14edea..4b452c6a2f7b 100644 --- a/include/linux/platform_data/atmel.h +++ b/include/linux/platform_data/atmel.h | |||
| @@ -84,14 +84,6 @@ struct atmel_uart_data { | |||
| 84 | short use_dma_rx; /* use receive DMA? */ | 84 | short use_dma_rx; /* use receive DMA? */ |
| 85 | void __iomem *regs; /* virt. base address, if any */ | 85 | void __iomem *regs; /* virt. base address, if any */ |
| 86 | struct serial_rs485 rs485; /* rs485 settings */ | 86 | struct serial_rs485 rs485; /* rs485 settings */ |
| 87 | int rts_gpio; /* optional RTS GPIO */ | ||
| 88 | }; | ||
| 89 | |||
| 90 | /* Touchscreen Controller */ | ||
| 91 | struct at91_tsadcc_data { | ||
| 92 | unsigned int adc_clock; | ||
| 93 | u8 pendet_debounce; | ||
| 94 | u8 ts_sample_hold_time; | ||
| 95 | }; | 87 | }; |
| 96 | 88 | ||
| 97 | /* CAN */ | 89 | /* CAN */ |
diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h index f50821cb64be..eb8d5627d080 100644 --- a/include/linux/platform_data/edma.h +++ b/include/linux/platform_data/edma.h | |||
| @@ -43,15 +43,15 @@ | |||
| 43 | 43 | ||
| 44 | /* PaRAM slots are laid out like this */ | 44 | /* PaRAM slots are laid out like this */ |
| 45 | struct edmacc_param { | 45 | struct edmacc_param { |
| 46 | unsigned int opt; | 46 | u32 opt; |
| 47 | unsigned int src; | 47 | u32 src; |
| 48 | unsigned int a_b_cnt; | 48 | u32 a_b_cnt; |
| 49 | unsigned int dst; | 49 | u32 dst; |
| 50 | unsigned int src_dst_bidx; | 50 | u32 src_dst_bidx; |
| 51 | unsigned int link_bcntrld; | 51 | u32 link_bcntrld; |
| 52 | unsigned int src_dst_cidx; | 52 | u32 src_dst_cidx; |
| 53 | unsigned int ccnt; | 53 | u32 ccnt; |
| 54 | }; | 54 | } __packed; |
| 55 | 55 | ||
| 56 | /* fields in edmacc_param.opt */ | 56 | /* fields in edmacc_param.opt */ |
| 57 | #define SAM BIT(0) | 57 | #define SAM BIT(0) |
| @@ -130,7 +130,7 @@ void edma_set_src(unsigned slot, dma_addr_t src_port, | |||
| 130 | enum address_mode mode, enum fifo_width); | 130 | enum address_mode mode, enum fifo_width); |
| 131 | void edma_set_dest(unsigned slot, dma_addr_t dest_port, | 131 | void edma_set_dest(unsigned slot, dma_addr_t dest_port, |
| 132 | enum address_mode mode, enum fifo_width); | 132 | enum address_mode mode, enum fifo_width); |
| 133 | void edma_get_position(unsigned slot, dma_addr_t *src, dma_addr_t *dst); | 133 | dma_addr_t edma_get_position(unsigned slot, bool dst); |
| 134 | void edma_set_src_index(unsigned slot, s16 src_bidx, s16 src_cidx); | 134 | void edma_set_src_index(unsigned slot, s16 src_bidx, s16 src_cidx); |
| 135 | void edma_set_dest_index(unsigned slot, s16 dest_bidx, s16 dest_cidx); | 135 | void edma_set_dest_index(unsigned slot, s16 dest_bidx, s16 dest_cidx); |
| 136 | void edma_set_transfer_params(unsigned slot, u16 acnt, u16 bcnt, u16 ccnt, | 136 | void edma_set_transfer_params(unsigned slot, u16 acnt, u16 bcnt, u16 ccnt, |
| @@ -158,13 +158,6 @@ struct edma_rsv_info { | |||
| 158 | 158 | ||
| 159 | /* platform_data for EDMA driver */ | 159 | /* platform_data for EDMA driver */ |
| 160 | struct edma_soc_info { | 160 | struct edma_soc_info { |
| 161 | |||
| 162 | /* how many dma resources of each type */ | ||
| 163 | unsigned n_channel; | ||
| 164 | unsigned n_region; | ||
| 165 | unsigned n_slot; | ||
| 166 | unsigned n_tc; | ||
| 167 | unsigned n_cc; | ||
| 168 | /* | 161 | /* |
| 169 | * Default queue is expected to be a low-priority queue. | 162 | * Default queue is expected to be a low-priority queue. |
| 170 | * This way, long transfers on the default queue started | 163 | * This way, long transfers on the default queue started |
| @@ -175,7 +168,6 @@ struct edma_soc_info { | |||
| 175 | /* Resource reservation for other cores */ | 168 | /* Resource reservation for other cores */ |
| 176 | struct edma_rsv_info *rsv; | 169 | struct edma_rsv_info *rsv; |
| 177 | 170 | ||
| 178 | s8 (*queue_tc_mapping)[2]; | ||
| 179 | s8 (*queue_priority_mapping)[2]; | 171 | s8 (*queue_priority_mapping)[2]; |
| 180 | const s16 (*xbar_chans)[2]; | 172 | const s16 (*xbar_chans)[2]; |
| 181 | }; | 173 | }; |
diff --git a/include/linux/platform_data/elm.h b/include/linux/platform_data/elm.h index 4edb40676b3f..780d1e97f620 100644 --- a/include/linux/platform_data/elm.h +++ b/include/linux/platform_data/elm.h | |||
| @@ -21,6 +21,7 @@ | |||
| 21 | enum bch_ecc { | 21 | enum bch_ecc { |
| 22 | BCH4_ECC = 0, | 22 | BCH4_ECC = 0, |
| 23 | BCH8_ECC, | 23 | BCH8_ECC, |
| 24 | BCH16_ECC, | ||
| 24 | }; | 25 | }; |
| 25 | 26 | ||
| 26 | /* ELM support 8 error syndrome process */ | 27 | /* ELM support 8 error syndrome process */ |
| @@ -38,7 +39,7 @@ struct elm_errorvec { | |||
| 38 | bool error_reported; | 39 | bool error_reported; |
| 39 | bool error_uncorrectable; | 40 | bool error_uncorrectable; |
| 40 | int error_count; | 41 | int error_count; |
| 41 | int error_loc[ERROR_VECTOR_MAX]; | 42 | int error_loc[16]; |
| 42 | }; | 43 | }; |
| 43 | 44 | ||
| 44 | void elm_decode_bch_error_page(struct device *dev, u8 *ecc_calc, | 45 | void elm_decode_bch_error_page(struct device *dev, u8 *ecc_calc, |
diff --git a/include/linux/platform_data/intel-mid_wdt.h b/include/linux/platform_data/intel-mid_wdt.h new file mode 100644 index 000000000000..b98253466ace --- /dev/null +++ b/include/linux/platform_data/intel-mid_wdt.h | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | /* | ||
| 2 | * intel-mid_wdt: generic Intel MID SCU watchdog driver | ||
| 3 | * | ||
| 4 | * Copyright (C) 2014 Intel Corporation. All rights reserved. | ||
| 5 | * Contact: David Cohen <david.a.cohen@linux.intel.com> | ||
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or | ||
| 8 | * modify it under the terms of version 2 of the GNU General | ||
| 9 | * Public License as published by the Free Software Foundation. | ||
| 10 | */ | ||
| 11 | |||
| 12 | #ifndef __INTEL_MID_WDT_H__ | ||
| 13 | #define __INTEL_MID_WDT_H__ | ||
| 14 | |||
| 15 | #include <linux/platform_device.h> | ||
| 16 | |||
| 17 | struct intel_mid_wdt_pdata { | ||
| 18 | int irq; | ||
| 19 | int (*probe)(struct platform_device *pdev); | ||
| 20 | }; | ||
| 21 | |||
| 22 | #endif /*__INTEL_MID_WDT_H__*/ | ||
diff --git a/include/linux/platform_data/ipmmu-vmsa.h b/include/linux/platform_data/ipmmu-vmsa.h new file mode 100644 index 000000000000..5275b3ac6d37 --- /dev/null +++ b/include/linux/platform_data/ipmmu-vmsa.h | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | /* | ||
| 2 | * IPMMU VMSA Platform Data | ||
| 3 | * | ||
| 4 | * Copyright (C) 2014 Renesas Electronics Corporation | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License as published by | ||
| 8 | * the Free Software Foundation; version 2 of the License. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __IPMMU_VMSA_H__ | ||
| 12 | #define __IPMMU_VMSA_H__ | ||
| 13 | |||
| 14 | struct ipmmu_vmsa_master { | ||
| 15 | const char *name; | ||
| 16 | unsigned int utlb; | ||
| 17 | }; | ||
| 18 | |||
| 19 | struct ipmmu_vmsa_platform_data { | ||
| 20 | const struct ipmmu_vmsa_master *masters; | ||
| 21 | unsigned int num_masters; | ||
| 22 | }; | ||
| 23 | |||
| 24 | #endif /* __IPMMU_VMSA_H__ */ | ||
diff --git a/include/linux/platform_data/leds-pca9685.h b/include/linux/platform_data/leds-pca9685.h deleted file mode 100644 index 778e9e4249cc..000000000000 --- a/include/linux/platform_data/leds-pca9685.h +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright 2013 Maximilian Güntner <maximilian.guentner@gmail.com> | ||
| 3 | * | ||
| 4 | * This file is subject to the terms and conditions of version 2 of | ||
| 5 | * the GNU General Public License. See the file COPYING in the main | ||
| 6 | * directory of this archive for more details. | ||
| 7 | * | ||
| 8 | * Based on leds-pca963x.h by Peter Meerwald <p.meerwald@bct-electronic.com> | ||
| 9 | * | ||
| 10 | * LED driver for the NXP PCA9685 PWM chip | ||
| 11 | * | ||
| 12 | */ | ||
| 13 | |||
| 14 | #ifndef __LINUX_PCA9685_H | ||
| 15 | #define __LINUX_PCA9685_H | ||
| 16 | |||
| 17 | #include <linux/leds.h> | ||
| 18 | |||
| 19 | enum pca9685_outdrv { | ||
| 20 | PCA9685_OPEN_DRAIN, | ||
| 21 | PCA9685_TOTEM_POLE, | ||
| 22 | }; | ||
| 23 | |||
| 24 | enum pca9685_inverted { | ||
| 25 | PCA9685_NOT_INVERTED, | ||
| 26 | PCA9685_INVERTED, | ||
| 27 | }; | ||
| 28 | |||
| 29 | struct pca9685_platform_data { | ||
| 30 | struct led_platform_data leds; | ||
| 31 | enum pca9685_outdrv outdrv; | ||
| 32 | enum pca9685_inverted inverted; | ||
| 33 | }; | ||
| 34 | |||
| 35 | #endif /* __LINUX_PCA9685_H */ | ||
diff --git a/include/linux/platform_data/max3421-hcd.h b/include/linux/platform_data/max3421-hcd.h new file mode 100644 index 000000000000..0303d1970084 --- /dev/null +++ b/include/linux/platform_data/max3421-hcd.h | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (c) 2014 eGauge Systems LLC | ||
| 3 | * Contributed by David Mosberger-Tang <davidm@egauge.net> | ||
| 4 | * | ||
| 5 | * Platform-data structure for MAX3421 USB HCD driver. | ||
| 6 | * | ||
| 7 | */ | ||
| 8 | #ifndef MAX3421_HCD_PLAT_H_INCLUDED | ||
| 9 | #define MAX3421_HCD_PLAT_H_INCLUDED | ||
| 10 | |||
| 11 | /* | ||
| 12 | * This structure defines the mapping of certain auxiliary functions to the | ||
| 13 | * MAX3421E GPIO pins. The chip has eight GP inputs and eight GP outputs. | ||
| 14 | * A value of 0 indicates that the pin is not used/wired to anything. | ||
| 15 | * | ||
| 16 | * At this point, the only control the max3421-hcd driver cares about is | ||
| 17 | * to control Vbus (5V to the peripheral). | ||
| 18 | */ | ||
| 19 | struct max3421_hcd_platform_data { | ||
| 20 | u8 vbus_gpout; /* pin controlling Vbus */ | ||
| 21 | u8 vbus_active_level; /* level that turns on power */ | ||
| 22 | }; | ||
| 23 | |||
| 24 | #endif /* MAX3421_HCD_PLAT_H_INCLUDED */ | ||
diff --git a/include/linux/platform_data/mipi-csis.h b/include/linux/platform_data/mipi-csis.h deleted file mode 100644 index c2fd9024717c..000000000000 --- a/include/linux/platform_data/mipi-csis.h +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2010 - 2012 Samsung Electronics Co., Ltd. | ||
| 3 | * | ||
| 4 | * Samsung S5P/Exynos SoC series MIPI CSIS device support | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __PLAT_SAMSUNG_MIPI_CSIS_H_ | ||
| 12 | #define __PLAT_SAMSUNG_MIPI_CSIS_H_ __FILE__ | ||
| 13 | |||
| 14 | /** | ||
| 15 | * struct s5p_platform_mipi_csis - platform data for S5P MIPI-CSIS driver | ||
| 16 | * @clk_rate: bus clock frequency | ||
| 17 | * @wclk_source: CSI wrapper clock selection: 0 - bus clock, 1 - ext. SCLK_CAM | ||
| 18 | * @lanes: number of data lanes used | ||
| 19 | * @hs_settle: HS-RX settle time | ||
| 20 | */ | ||
| 21 | struct s5p_platform_mipi_csis { | ||
| 22 | unsigned long clk_rate; | ||
| 23 | u8 wclk_source; | ||
| 24 | u8 lanes; | ||
| 25 | u8 hs_settle; | ||
| 26 | }; | ||
| 27 | |||
| 28 | #endif /* __PLAT_SAMSUNG_MIPI_CSIS_H_ */ | ||
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h index 3e9dd6676b97..660c029d694f 100644 --- a/include/linux/platform_data/mtd-nand-omap2.h +++ b/include/linux/platform_data/mtd-nand-omap2.h | |||
| @@ -31,6 +31,8 @@ enum omap_ecc { | |||
| 31 | OMAP_ECC_BCH8_CODE_HW_DETECTION_SW, | 31 | OMAP_ECC_BCH8_CODE_HW_DETECTION_SW, |
| 32 | /* 8-bit ECC calculation by GPMC, Error detection by ELM */ | 32 | /* 8-bit ECC calculation by GPMC, Error detection by ELM */ |
| 33 | OMAP_ECC_BCH8_CODE_HW, | 33 | OMAP_ECC_BCH8_CODE_HW, |
| 34 | /* 16-bit ECC calculation by GPMC, Error detection by ELM */ | ||
| 35 | OMAP_ECC_BCH16_CODE_HW, | ||
| 34 | }; | 36 | }; |
| 35 | 37 | ||
| 36 | struct gpmc_nand_regs { | 38 | struct gpmc_nand_regs { |
| @@ -50,6 +52,9 @@ struct gpmc_nand_regs { | |||
| 50 | void __iomem *gpmc_bch_result1[GPMC_BCH_NUM_REMAINDER]; | 52 | void __iomem *gpmc_bch_result1[GPMC_BCH_NUM_REMAINDER]; |
| 51 | void __iomem *gpmc_bch_result2[GPMC_BCH_NUM_REMAINDER]; | 53 | void __iomem *gpmc_bch_result2[GPMC_BCH_NUM_REMAINDER]; |
| 52 | void __iomem *gpmc_bch_result3[GPMC_BCH_NUM_REMAINDER]; | 54 | void __iomem *gpmc_bch_result3[GPMC_BCH_NUM_REMAINDER]; |
| 55 | void __iomem *gpmc_bch_result4[GPMC_BCH_NUM_REMAINDER]; | ||
| 56 | void __iomem *gpmc_bch_result5[GPMC_BCH_NUM_REMAINDER]; | ||
| 57 | void __iomem *gpmc_bch_result6[GPMC_BCH_NUM_REMAINDER]; | ||
| 53 | }; | 58 | }; |
| 54 | 59 | ||
| 55 | struct omap_nand_platform_data { | 60 | struct omap_nand_platform_data { |
diff --git a/include/linux/platform_data/mtd-nand-pxa3xx.h b/include/linux/platform_data/mtd-nand-pxa3xx.h index a94147124929..ac4ea2e641c7 100644 --- a/include/linux/platform_data/mtd-nand-pxa3xx.h +++ b/include/linux/platform_data/mtd-nand-pxa3xx.h | |||
| @@ -58,6 +58,9 @@ struct pxa3xx_nand_platform_data { | |||
| 58 | /* use an flash-based bad block table */ | 58 | /* use an flash-based bad block table */ |
| 59 | bool flash_bbt; | 59 | bool flash_bbt; |
| 60 | 60 | ||
| 61 | /* requested ECC strength and ECC step size */ | ||
| 62 | int ecc_strength, ecc_step_size; | ||
| 63 | |||
| 61 | const struct mtd_partition *parts[NUM_CHIP_SELECT]; | 64 | const struct mtd_partition *parts[NUM_CHIP_SELECT]; |
| 62 | unsigned int nr_parts[NUM_CHIP_SELECT]; | 65 | unsigned int nr_parts[NUM_CHIP_SELECT]; |
| 63 | 66 | ||
diff --git a/include/linux/platform_data/omap4-keypad.h b/include/linux/platform_data/omap4-keypad.h deleted file mode 100644 index 4eef5fb05a17..000000000000 --- a/include/linux/platform_data/omap4-keypad.h +++ /dev/null | |||
| @@ -1,13 +0,0 @@ | |||
| 1 | #ifndef __LINUX_INPUT_OMAP4_KEYPAD_H | ||
| 2 | #define __LINUX_INPUT_OMAP4_KEYPAD_H | ||
| 3 | |||
| 4 | #include <linux/input/matrix_keypad.h> | ||
| 5 | |||
| 6 | struct omap4_keypad_platform_data { | ||
| 7 | const struct matrix_keymap_data *keymap_data; | ||
| 8 | |||
| 9 | u8 rows; | ||
| 10 | u8 cols; | ||
| 11 | }; | ||
| 12 | |||
| 13 | #endif /* __LINUX_INPUT_OMAP4_KEYPAD_H */ | ||
diff --git a/include/linux/platform_data/pwm-renesas-tpu.h b/include/linux/platform_data/pwm-renesas-tpu.h deleted file mode 100644 index a7220b10ddab..000000000000 --- a/include/linux/platform_data/pwm-renesas-tpu.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | #ifndef __PWM_RENESAS_TPU_H__ | ||
| 2 | #define __PWM_RENESAS_TPU_H__ | ||
| 3 | |||
| 4 | #include <linux/pwm.h> | ||
| 5 | |||
| 6 | #define TPU_CHANNEL_MAX 4 | ||
| 7 | |||
| 8 | struct tpu_pwm_channel_data { | ||
| 9 | enum pwm_polarity polarity; | ||
| 10 | }; | ||
| 11 | |||
| 12 | struct tpu_pwm_platform_data { | ||
| 13 | struct tpu_pwm_channel_data channels[TPU_CHANNEL_MAX]; | ||
| 14 | }; | ||
| 15 | |||
| 16 | #endif /* __PWM_RENESAS_TPU_H__ */ | ||
diff --git a/include/linux/platform_data/shtc1.h b/include/linux/platform_data/shtc1.h new file mode 100644 index 000000000000..7b8c353f7dc8 --- /dev/null +++ b/include/linux/platform_data/shtc1.h | |||
| @@ -0,0 +1,23 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2014 Sensirion AG, Switzerland | ||
| 3 | * Author: Johannes Winkelmann <johannes.winkelmann@sensirion.com> | ||
| 4 | * | ||
| 5 | * This software is licensed under the terms of the GNU General Public | ||
| 6 | * License version 2, as published by the Free Software Foundation, and | ||
| 7 | * may be copied, distributed, and modified under those terms. | ||
| 8 | * | ||
| 9 | * This program is distributed in the hope that it will be useful, | ||
| 10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 12 | * GNU General Public License for more details. | ||
| 13 | * | ||
| 14 | */ | ||
| 15 | |||
| 16 | #ifndef __SHTC1_H_ | ||
| 17 | #define __SHTC1_H_ | ||
| 18 | |||
| 19 | struct shtc1_platform_data { | ||
| 20 | bool blocking_io; | ||
| 21 | bool high_precision; | ||
| 22 | }; | ||
| 23 | #endif /* __SHTC1_H_ */ | ||
diff --git a/include/linux/platform_data/st21nfca.h b/include/linux/platform_data/st21nfca.h new file mode 100644 index 000000000000..1730312398ff --- /dev/null +++ b/include/linux/platform_data/st21nfca.h | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | /* | ||
| 2 | * Driver include for the ST21NFCA NFC chip. | ||
| 3 | * | ||
| 4 | * Copyright (C) 2014 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 _ST21NFCA_HCI_H_ | ||
| 20 | #define _ST21NFCA_HCI_H_ | ||
| 21 | |||
| 22 | #include <linux/i2c.h> | ||
| 23 | |||
| 24 | #define ST21NFCA_HCI_DRIVER_NAME "st21nfca_hci" | ||
| 25 | |||
| 26 | struct st21nfca_nfc_platform_data { | ||
| 27 | unsigned int gpio_irq; | ||
| 28 | unsigned int gpio_ena; | ||
| 29 | unsigned int irq_polarity; | ||
| 30 | }; | ||
| 31 | |||
| 32 | #endif /* _ST21NFCA_HCI_H_ */ | ||
diff --git a/include/linux/platform_data/syscon.h b/include/linux/platform_data/syscon.h new file mode 100644 index 000000000000..2354c6fa3726 --- /dev/null +++ b/include/linux/platform_data/syscon.h | |||
| @@ -0,0 +1,8 @@ | |||
| 1 | #ifndef PLATFORM_DATA_SYSCON_H | ||
| 2 | #define PLATFORM_DATA_SYSCON_H | ||
| 3 | |||
| 4 | struct syscon_platform_data { | ||
| 5 | const char *label; | ||
| 6 | }; | ||
| 7 | |||
| 8 | #endif | ||
