Commit 61cdb01853c99e78d8b54db1b77e524c0dce585d
Committed by
Samuel Ortiz
Samuel Ortiz
1 parent
d962ec4922
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
NFC: Move pn544.h to linux/platform_data/
The pn544.h just provides the platform data struct and defines and nothing else. So move it to to linux/platform_data/ now. Signed-off-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Showing 3 changed files with 45 additions and 45 deletions Side-by-side Diff
drivers/nfc/pn544/i2c.c
include/linux/nfc/pn544.h
| 1 | -/* | |
| 2 | - * Driver include for the PN544 NFC chip. | |
| 3 | - * | |
| 4 | - * Copyright (C) Nokia Corporation | |
| 5 | - * | |
| 6 | - * Author: Jari Vanhala <ext-jari.vanhala@nokia.com> | |
| 7 | - * Contact: Matti Aaltoenn <matti.j.aaltonen@nokia.com> | |
| 8 | - * | |
| 9 | - * This program is free software; you can redistribute it and/or | |
| 10 | - * modify it under the terms of the GNU General Public License | |
| 11 | - * version 2 as published by the Free Software Foundation. | |
| 12 | - * | |
| 13 | - * This program is distributed in the hope that it will be useful, | |
| 14 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | - * GNU General Public License for more details. | |
| 17 | - * | |
| 18 | - * You should have received a copy of the GNU General Public License | |
| 19 | - * along with this program; if not, write to the Free Software | |
| 20 | - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 21 | - */ | |
| 22 | - | |
| 23 | -#ifndef _PN544_H_ | |
| 24 | -#define _PN544_H_ | |
| 25 | - | |
| 26 | -#include <linux/i2c.h> | |
| 27 | - | |
| 28 | -enum { | |
| 29 | - NFC_GPIO_ENABLE, | |
| 30 | - NFC_GPIO_FW_RESET, | |
| 31 | - NFC_GPIO_IRQ | |
| 32 | -}; | |
| 33 | - | |
| 34 | -/* board config */ | |
| 35 | -struct pn544_nfc_platform_data { | |
| 36 | - int (*request_resources) (struct i2c_client *client); | |
| 37 | - void (*free_resources) (void); | |
| 38 | - void (*enable) (int fw); | |
| 39 | - int (*test) (void); | |
| 40 | - void (*disable) (void); | |
| 41 | - int (*get_gpio)(int type); | |
| 42 | -}; | |
| 43 | - | |
| 44 | -#endif /* _PN544_H_ */ |
include/linux/platform_data/pn544.h
| 1 | +/* | |
| 2 | + * Driver include for the PN544 NFC chip. | |
| 3 | + * | |
| 4 | + * Copyright (C) Nokia Corporation | |
| 5 | + * | |
| 6 | + * Author: Jari Vanhala <ext-jari.vanhala@nokia.com> | |
| 7 | + * Contact: Matti Aaltoenn <matti.j.aaltonen@nokia.com> | |
| 8 | + * | |
| 9 | + * This program is free software; you can redistribute it and/or | |
| 10 | + * modify it under the terms of the GNU General Public License | |
| 11 | + * version 2 as published by the Free Software Foundation. | |
| 12 | + * | |
| 13 | + * This program is distributed in the hope that it will be useful, | |
| 14 | + * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 15 | + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 16 | + * GNU General Public License for more details. | |
| 17 | + * | |
| 18 | + * You should have received a copy of the GNU General Public License | |
| 19 | + * along with this program; if not, write to the Free Software | |
| 20 | + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
| 21 | + */ | |
| 22 | + | |
| 23 | +#ifndef _PN544_H_ | |
| 24 | +#define _PN544_H_ | |
| 25 | + | |
| 26 | +#include <linux/i2c.h> | |
| 27 | + | |
| 28 | +enum { | |
| 29 | + NFC_GPIO_ENABLE, | |
| 30 | + NFC_GPIO_FW_RESET, | |
| 31 | + NFC_GPIO_IRQ | |
| 32 | +}; | |
| 33 | + | |
| 34 | +/* board config */ | |
| 35 | +struct pn544_nfc_platform_data { | |
| 36 | + int (*request_resources) (struct i2c_client *client); | |
| 37 | + void (*free_resources) (void); | |
| 38 | + void (*enable) (int fw); | |
| 39 | + int (*test) (void); | |
| 40 | + void (*disable) (void); | |
| 41 | + int (*get_gpio)(int type); | |
| 42 | +}; | |
| 43 | + | |
| 44 | +#endif /* _PN544_H_ */ |