Commit 3188677d authored by Linus Walleij's avatar Linus Walleij Committed by Sebastian Reichel
Browse files

power: supply: max8903: Absorb pdata header 



The platform data header is not included by any other file in
the kernel but the driver itself. Decomission the stand-alone
header and absorb it into the driver itself.

Cc: Chris Lapa <chris@lapa.com.au>
Cc: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSebastian Reichel <sebastian.reichel@collabora.com>
parent ed3c19bd

drivers/power/supply/max8903_charger.c

+31 −1
Original line number Diff line number Diff line
@@ -15,7 +15,37 @@ 
#include <linux/slab.h>

#include <linux/power_supply.h>

#include <linux/platform_device.h>

#include <linux/power/max8903_charger.h>



struct max8903_pdata {

	/*

	 * GPIOs

	 * cen, chg, flt, dcm and usus are optional.

	 * dok and uok are not optional depending on the status of

	 * dc_valid and usb_valid.

	 */

	int cen;	/* Charger Enable input */

	int dok;	/* DC(Adapter) Power OK output */

	int uok;	/* USB Power OK output */

	int chg;	/* Charger status output */

	int flt;	/* Fault output */

	int dcm;	/* Current-Limit Mode input (1: DC, 2: USB) */

	int usus;	/* USB Suspend Input (1: suspended) */



	/*

	 * DC(Adapter/TA) is wired

	 * When dc_valid is true,

	 *	dok should be valid.

	 *

	 * At least one of dc_valid or usb_valid should be true.

	 */

	bool dc_valid;

	/*

	 * USB is wired

	 * When usb_valid is true,

	 *	uok should be valid.

	 */

	bool usb_valid;

};



struct max8903_data {

	struct max8903_pdata *pdata;

include/linux/power/max8903_charger.h

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * max8903_charger.h - Maxim 8903 USB/Adapter Charger Driver

 *

 * Copyright (C) 2011 Samsung Electronics

 * MyungJoo Ham <myungjoo.ham@samsung.com>

 */



#ifndef __MAX8903_CHARGER_H__

#define __MAX8903_CHARGER_H__



struct max8903_pdata {

	/*

	 * GPIOs

	 * cen, chg, flt, dcm and usus are optional.

	 * dok and uok are not optional depending on the status of

	 * dc_valid and usb_valid.

	 */

	int cen;	/* Charger Enable input */

	int dok;	/* DC(Adapter) Power OK output */

	int uok;	/* USB Power OK output */

	int chg;	/* Charger status output */

	int flt;	/* Fault output */

	int dcm;	/* Current-Limit Mode input (1: DC, 2: USB) */

	int usus;	/* USB Suspend Input (1: suspended) */



	/*

	 * DC(Adapter/TA) is wired

	 * When dc_valid is true,

	 *	dok should be valid.

	 *

	 * At least one of dc_valid or usb_valid should be true.

	 */

	bool dc_valid;

	/*

	 * USB is wired

	 * When usb_valid is true,

	 *	uok should be valid.

	 */

	bool usb_valid;

};



#endif /* __MAX8903_CHARGER_H__ */