Commit cc8a4ea1 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra Committed by Benson Leung
Browse files

platform/chrome: Move mfd/cros_ec_lpc* includes to drivers/platform. 



The cros-ec-lpc driver lives in drivers/platform because is platform
specific, however there are two includes (cros_ec_lpc_mec.h and
cros_ec_lpc_reg.h) that lives in include/linux/mfd. These two includes
are only used for the platform driver and are not really related to the
MFD subsystem, so move the includes from include/linux/mfd to
drivers/platform/chrome.

Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Signed-off-by: default avatarBenson Leung <bleung@chromium.org>
parent 57361846

drivers/platform/chrome/cros_ec_lpc.c

+2 −1
Original line number Diff line number Diff line
@@ -27,12 +27,13 @@ 
#include <linux/io.h>

#include <linux/mfd/cros_ec.h>

#include <linux/mfd/cros_ec_commands.h>

#include <linux/mfd/cros_ec_lpc_reg.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/printk.h>

#include <linux/suspend.h>



#include "cros_ec_lpc_reg.h"



#define DRV_NAME "cros_ec_lpcs"

#define ACPI_DRV_NAME "GOOG0004"

drivers/platform/chrome/cros_ec_lpc_mec.c

+2 −1
Original line number Diff line number Diff line
@@ -24,10 +24,11 @@ 
#include <linux/delay.h>

#include <linux/io.h>

#include <linux/mfd/cros_ec_commands.h>

#include <linux/mfd/cros_ec_lpc_mec.h>

#include <linux/mutex.h>

#include <linux/types.h>



#include "cros_ec_lpc_mec.h"



/*

 * This mutex must be held while accessing the EMI unit. We can't rely on the

 * EC mutex because memmap data may be accessed without it being held.

include/linux/mfd/cros_ec_lpc_mec.h→drivers/platform/chrome/cros_ec_lpc_mec.h

+3 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
 * expensive.

 */



#ifndef __LINUX_MFD_CROS_EC_MEC_H

#define __LINUX_MFD_CROS_EC_MEC_H

#ifndef __CROS_EC_LPC_MEC_H

#define __CROS_EC_LPC_MEC_H



#include <linux/mfd/cros_ec_commands.h>
@@ -87,4 +87,4 @@ void cros_ec_lpc_mec_destroy(void); 
u8 cros_ec_lpc_io_bytes_mec(enum cros_ec_lpc_mec_io_type io_type,

			    unsigned int offset, unsigned int length, u8 *buf);



#endif /* __LINUX_MFD_CROS_EC_MEC_H */
 
#endif /* __CROS_EC_LPC_MEC_H */

drivers/platform/chrome/cros_ec_lpc_reg.c

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ 
#include <linux/io.h>

#include <linux/mfd/cros_ec.h>

#include <linux/mfd/cros_ec_commands.h>

#include <linux/mfd/cros_ec_lpc_mec.h>



#include "cros_ec_lpc_mec.h"



static u8 lpc_read_bytes(unsigned int offset, unsigned int length, u8 *dest)

{

include/linux/mfd/cros_ec_lpc_reg.h→drivers/platform/chrome/cros_ec_lpc_reg.h

+3 −3
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ 
 * expensive.

 */



#ifndef __LINUX_MFD_CROS_EC_REG_H

#define __LINUX_MFD_CROS_EC_REG_H

#ifndef __CROS_EC_LPC_REG_H

#define __CROS_EC_LPC_REG_H



/**

 * cros_ec_lpc_read_bytes - Read bytes from a given LPC-mapped address.
@@ -58,4 +58,4 @@ void cros_ec_lpc_reg_init(void); 
 */

void cros_ec_lpc_reg_destroy(void);



#endif /* __LINUX_MFD_CROS_EC_REG_H */
 
#endif /* __CROS_EC_LPC_REG_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE