Skip to content

Commit 4774f40

Browse files
agnersdtor
authored andcommitted
Input: ad7879 - move header to platform_data directory
The header file is used by the SPI and I2C variant of the driver. Therefore, move it to a more generic place under platform_data. Signed-off-by: Stefan Agner <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]>
1 parent cd1480a commit 4774f40

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

arch/blackfin/mach-bf527/boards/ezbrd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
279279
#endif
280280

281281
#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
282-
#include <linux/spi/ad7879.h>
282+
#include <linux/platform_data/ad7879.h>
283283
static const struct ad7879_platform_data bfin_ad7879_ts_info = {
284284
.model = 7879, /* Model = AD7879 */
285285
.x_plate_ohms = 620, /* 620 Ohm from the touch datasheet */

arch/blackfin/mach-bf527/boards/ezkit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
477477
#endif
478478

479479
#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
480-
#include <linux/spi/ad7879.h>
480+
#include <linux/platform_data/ad7879.h>
481481
static const struct ad7879_platform_data bfin_ad7879_ts_info = {
482482
.model = 7879, /* Model = AD7879 */
483483
.x_plate_ohms = 620, /* 620 Ohm from the touch datasheet */

arch/blackfin/mach-bf527/boards/tll6527m.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include <asm/dpmc.h>
3030

3131
#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
32-
#include <linux/spi/ad7879.h>
32+
#include <linux/platform_data/ad7879.h>
3333
#define LCD_BACKLIGHT_GPIO 0x40
3434
/* TLL6527M uses TLL7UIQ35 / ADI LCD EZ Extender. AD7879 AUX GPIO is used for
3535
* LCD Backlight Enable

arch/blackfin/mach-bf537/boards/stamp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -776,7 +776,7 @@ static const struct ad7877_platform_data bfin_ad7877_ts_info = {
776776
#endif
777777

778778
#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
779-
#include <linux/spi/ad7879.h>
779+
#include <linux/platform_data/ad7879.h>
780780
static const struct ad7879_platform_data bfin_ad7879_ts_info = {
781781
.model = 7879, /* Model = AD7879 */
782782
.x_plate_ohms = 620, /* 620 Ohm from the touch datasheet */

arch/blackfin/mach-bf538/boards/ezkit.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
521521
#endif /* CONFIG_SPI_BFIN5XX */
522522

523523
#if IS_ENABLED(CONFIG_TOUCHSCREEN_AD7879)
524-
#include <linux/spi/ad7879.h>
524+
#include <linux/platform_data/ad7879.h>
525525
static const struct ad7879_platform_data bfin_ad7879_ts_info = {
526526
.model = 7879, /* Model = AD7879 */
527527
.x_plate_ohms = 620, /* 620 Ohm from the touch datasheet */

drivers/input/touchscreen/ad7879.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <linux/i2c.h>
3232
#include <linux/gpio.h>
3333

34-
#include <linux/spi/ad7879.h>
34+
#include <linux/platform_data/ad7879.h>
3535
#include <linux/module.h>
3636
#include "ad7879.h"
3737

@@ -170,10 +170,10 @@ static int ad7879_report(struct ad7879 *ts)
170170
* filter. The combination of these two techniques provides a robust
171171
* solution, discarding the spurious noise in the signal and keeping
172172
* only the data of interest. The size of both filters is
173-
* programmable. (dev.platform_data, see linux/spi/ad7879.h) Other
174-
* user-programmable conversion controls include variable acquisition
175-
* time, and first conversion delay. Up to 16 averages can be taken
176-
* per conversion.
173+
* programmable. (dev.platform_data, see linux/platform_data/ad7879.h)
174+
* Other user-programmable conversion controls include variable
175+
* acquisition time, and first conversion delay. Up to 16 averages can
176+
* be taken per conversion.
177177
*/
178178

179179
if (likely(x && z1)) {

include/linux/spi/ad7879.h renamed to include/linux/platform_data/ad7879.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* linux/spi/ad7879.h */
1+
/* linux/platform_data/ad7879.h */
22

33
/* Touchscreen characteristics vary between boards and models. The
44
* platform_data for the device's "struct device" holds this information.

0 commit comments

Comments
 (0)