Commit 053fdaa8 authored by Rob Herring's avatar Rob Herring Committed by David S. Miller
Browse files

nfc: mrvl: Move platform_data struct into driver 



There are no users of nfcmrvl platform_data struct outside of the
driver and none will be added, so move it into the driver.

Signed-off-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarSimon Horman <simon.horman@corigine.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ba13995

drivers/nfc/nfcmrvl/nfcmrvl.h

+28 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#ifndef _NFCMRVL_H_

#define _NFCMRVL_H_



#include <linux/platform_data/nfcmrvl.h>



#include "fw_dnld.h"



/* Define private flags: */
@@ -50,6 +48,34 @@ enum nfcmrvl_phy { 
	NFCMRVL_PHY_SPI		= 3,

};



struct nfcmrvl_platform_data {

	/*

	 * Generic

	 */



	/* GPIO that is wired to RESET_N signal */

	int reset_n_io;

	/* Tell if transport is muxed in HCI one */

	unsigned int hci_muxed;



	/*

	 * UART specific

	 */



	/* Tell if UART needs flow control at init */

	unsigned int flow_control;

	/* Tell if firmware supports break control for power management */

	unsigned int break_control;





	/*

	 * I2C specific

	 */



	unsigned int irq;

	unsigned int irq_polarity;

};



struct nfcmrvl_private {



	unsigned long flags;

include/linux/platform_data/nfcmrvl.h

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2015, Marvell International Ltd.

 *

 * This software file (the "File") is distributed by Marvell International

 * Ltd. under the terms of the GNU General Public License Version 2, June 1991

 * (the "License").  You may use, redistribute and/or modify this File in

 * accordance with the terms and conditions of the License, a copy of which

 * is available on the worldwide web at

 * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.

 *

 * THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE

 * ARE EXPRESSLY DISCLAIMED.  The License provides additional details about

 * this warranty disclaimer.

 */



#ifndef _NFCMRVL_PTF_H_

#define _NFCMRVL_PTF_H_



struct nfcmrvl_platform_data {

	/*

	 * Generic

	 */



	/* GPIO that is wired to RESET_N signal */

	int reset_n_io;

	/* Tell if transport is muxed in HCI one */

	unsigned int hci_muxed;



	/*

	 * UART specific

	 */



	/* Tell if UART needs flow control at init */

	unsigned int flow_control;

	/* Tell if firmware supports break control for power management */

	unsigned int break_control;





	/*

	 * I2C specific

	 */



	unsigned int irq;

	unsigned int irq_polarity;

};



#endif /* _NFCMRVL_PTF_H_ */