Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4116fd25 authored by Enric Balletbo i Serra's avatar Enric Balletbo i Serra
Browse files

platform/chrome: cros_ec_lpc: Merge cros_ec_lpc and cros_ec_lpc_reg 



The cros_ec_lpc_reg files are only used by the cros_ec_lpc core and
there isn't logical separation between them. So, merge those files into
the cros_ec_lpc also allowing us to drop the header file used for the
interface between the two.

Signed-off-by: default avatarEnric Balletbo i Serra <enric.balletbo@collabora.com>
Reviewed-by: default avatarNick Crews <ncrews@chromium.org>
parent d096aa3e

drivers/platform/chrome/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o 
obj-$(CONFIG_CROS_EC_ISHTP)		+= cros_ec_ishtp.o

obj-$(CONFIG_CROS_EC_RPMSG)		+= cros_ec_rpmsg.o

obj-$(CONFIG_CROS_EC_SPI)		+= cros_ec_spi.o

cros_ec_lpcs-objs			:= cros_ec_lpc.o cros_ec_lpc_reg.o

cros_ec_lpcs-objs			:= cros_ec_lpc.o

cros_ec_lpcs-$(CONFIG_CROS_EC_LPC_MEC)	+= cros_ec_lpc_mec.o

obj-$(CONFIG_CROS_EC_LPC)		+= cros_ec_lpcs.o

obj-$(CONFIG_CROS_EC_PROTO)		+= cros_ec_proto.o cros_ec_trace.o

drivers/platform/chrome/cros_ec_lpc.c

+96 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include <linux/printk.h>

#include <linux/suspend.h>



#include "cros_ec_lpc_reg.h"

#include "cros_ec_lpc_mec.h"



#define DRV_NAME "cros_ec_lpcs"

#define ACPI_DRV_NAME "GOOG0004"
@@ -31,6 +31,101 @@ 
/* True if ACPI device is present */

static bool cros_ec_lpc_acpi_device_found;



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

{

	int sum = 0;

	int i;



	for (i = 0; i < length; ++i) {

		dest[i] = inb(offset + i);

		sum += dest[i];

	}



	/* Return checksum of all bytes read */

	return sum;

}



static u8 lpc_write_bytes(unsigned int offset, unsigned int length, u8 *msg)

{

	int sum = 0;

	int i;



	for (i = 0; i < length; ++i) {

		outb(msg[i], offset + i);

		sum += msg[i];

	}



	/* Return checksum of all bytes written */

	return sum;

}



#ifdef CONFIG_CROS_EC_LPC_MEC



static u8 cros_ec_lpc_read_bytes(unsigned int offset, unsigned int length,

				 u8 *dest)

{

	int in_range = cros_ec_lpc_mec_in_range(offset, length);



	if (in_range < 0)

		return 0;



	return in_range ?

		cros_ec_lpc_io_bytes_mec(MEC_IO_READ,

					 offset - EC_HOST_CMD_REGION0,

					 length, dest) :

		lpc_read_bytes(offset, length, dest);

}



static u8 cros_ec_lpc_write_bytes(unsigned int offset, unsigned int length,

				  u8 *msg)

{

	int in_range = cros_ec_lpc_mec_in_range(offset, length);



	if (in_range < 0)

		return 0;



	return in_range ?

		cros_ec_lpc_io_bytes_mec(MEC_IO_WRITE,

					 offset - EC_HOST_CMD_REGION0,

					 length, msg) :

		lpc_write_bytes(offset, length, msg);

}



static void cros_ec_lpc_reg_init(void)

{

	cros_ec_lpc_mec_init(EC_HOST_CMD_REGION0,

			     EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SIZE);

}



static void cros_ec_lpc_reg_destroy(void)

{

	cros_ec_lpc_mec_destroy();

}



#else /* CONFIG_CROS_EC_LPC_MEC */



static u8 cros_ec_lpc_read_bytes(unsigned int offset, unsigned int length,

				 u8 *dest)

{

	return lpc_read_bytes(offset, length, dest);

}



static u8 cros_ec_lpc_write_bytes(unsigned int offset, unsigned int length,

				  u8 *msg)

{

	return lpc_write_bytes(offset, length, msg);

}



static void cros_ec_lpc_reg_init(void)

{

}



static void cros_ec_lpc_reg_destroy(void)

{

}



#endif /* CONFIG_CROS_EC_LPC_MEC */



static int ec_response_timed_out(void)

{

	unsigned long one_second = jiffies + HZ;

drivers/platform/chrome/cros_ec_lpc_reg.c

deleted100644 → 0
+0 −101
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// LPC interface for ChromeOS Embedded Controller

//

// Copyright (C) 2016 Google, Inc



#include <linux/io.h>

#include <linux/mfd/cros_ec.h>

#include <linux/mfd/cros_ec_commands.h>



#include "cros_ec_lpc_mec.h"



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

{

	int i;

	int sum = 0;



	for (i = 0; i < length; ++i) {

		dest[i] = inb(offset + i);

		sum += dest[i];

	}



	/* Return checksum of all bytes read */

	return sum;

}



static u8 lpc_write_bytes(unsigned int offset, unsigned int length, u8 *msg)

{

	int i;

	int sum = 0;



	for (i = 0; i < length; ++i) {

		outb(msg[i], offset + i);

		sum += msg[i];

	}



	/* Return checksum of all bytes written */

	return sum;

}



#ifdef CONFIG_CROS_EC_LPC_MEC



u8 cros_ec_lpc_read_bytes(unsigned int offset, unsigned int length, u8 *dest)

{

	int in_range = cros_ec_lpc_mec_in_range(offset, length);



	if (in_range < 0)

		return 0;



	return in_range ?

		cros_ec_lpc_io_bytes_mec(MEC_IO_READ,

					 offset - EC_HOST_CMD_REGION0,

					 length, dest) :

		lpc_read_bytes(offset, length, dest);

}



u8 cros_ec_lpc_write_bytes(unsigned int offset, unsigned int length, u8 *msg)

{

	int in_range = cros_ec_lpc_mec_in_range(offset, length);



	if (in_range < 0)

		return 0;



	return in_range ?

		cros_ec_lpc_io_bytes_mec(MEC_IO_WRITE,

					 offset - EC_HOST_CMD_REGION0,

					 length, msg) :

		lpc_write_bytes(offset, length, msg);

}



void cros_ec_lpc_reg_init(void)

{

	cros_ec_lpc_mec_init(EC_HOST_CMD_REGION0,

			     EC_LPC_ADDR_MEMMAP + EC_MEMMAP_SIZE);

}



void cros_ec_lpc_reg_destroy(void)

{

	cros_ec_lpc_mec_destroy();

}



#else /* CONFIG_CROS_EC_LPC_MEC */



u8 cros_ec_lpc_read_bytes(unsigned int offset, unsigned int length, u8 *dest)

{

	return lpc_read_bytes(offset, length, dest);

}



u8 cros_ec_lpc_write_bytes(unsigned int offset, unsigned int length, u8 *msg)

{

	return lpc_write_bytes(offset, length, msg);

}



void cros_ec_lpc_reg_init(void)

{

}



void cros_ec_lpc_reg_destroy(void)

{

}



#endif /* CONFIG_CROS_EC_LPC_MEC */

drivers/platform/chrome/cros_ec_lpc_reg.h

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

/*

 * LPC interface for ChromeOS Embedded Controller

 *

 * Copyright (C) 2016 Google, Inc

 */



#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.

 * Returns 8-bit checksum of all bytes read.

 *

 * @offset: Base read address

 * @length: Number of bytes to read

 * @dest: Destination buffer

 */

u8 cros_ec_lpc_read_bytes(unsigned int offset, unsigned int length, u8 *dest);



/**

 * cros_ec_lpc_write_bytes - Write bytes to a given LPC-mapped address.

 * Returns 8-bit checksum of all bytes written.

 *

 * @offset: Base write address

 * @length: Number of bytes to write

 * @msg: Write data buffer

 */

u8 cros_ec_lpc_write_bytes(unsigned int offset, unsigned int length, u8 *msg);



/**

 * cros_ec_lpc_reg_init

 *

 * Initialize register I/O.

 */

void cros_ec_lpc_reg_init(void);



/**

 * cros_ec_lpc_reg_destroy

 *

 * Cleanup reg I/O.

 */

void cros_ec_lpc_reg_destroy(void);



#endif /* __CROS_EC_LPC_REG_H */