Merge remote-tracking branches 'spi/topic/lm70llp', 'spi/topic/loopback',... (41d5a700) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/devicetree/bindings/spi/spi-mt65xx.txt

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -2,9 +2,10 @@ Binding for MTK SPI controller

	Required properties:		Required properties:
	- compatible: should be one of the following.		- compatible: should be one of the following.
	- mediatek,mt8173-spi: for mt8173 platforms		- mediatek,mt2701-spi: for mt2701 platforms
	- mediatek,mt8135-spi: for mt8135 platforms
	- mediatek,mt6589-spi: for mt6589 platforms		- mediatek,mt6589-spi: for mt6589 platforms
			- mediatek,mt8135-spi: for mt8135 platforms
			- mediatek,mt8173-spi: for mt8173 platforms

	- #address-cells: should be 1.		- #address-cells: should be 1.

	@@ -29,10 +30,10 @@ Required properties:
	muxes clock, and "spi-clk" for the clock gate.		muxes clock, and "spi-clk" for the clock gate.

	Optional properties:		Optional properties:
	-cs-gpios: see spi-bus.txt, only required for MT8173.		-cs-gpios: see spi-bus.txt.

	- mediatek,pad-select: specify which pins group(ck/mi/mo/cs) spi		- mediatek,pad-select: specify which pins group(ck/mi/mo/cs) spi
	controller used. This is a array, the element value should be 0~3,		controller used. This is an array, the element value should be 0~3,
	only required for MT8173.		only required for MT8173.
	0: specify GPIO69,70,71,72 for spi pins.		0: specify GPIO69,70,71,72 for spi pins.
	1: specify GPIO102,103,104,105 for spi pins.		1: specify GPIO102,103,104,105 for spi pins.

drivers/spi/Kconfig

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -689,6 +689,15 @@ config SPI_SPIDEV
	Note that this application programming interface is EXPERIMENTAL		Note that this application programming interface is EXPERIMENTAL
	and hence SUBJECT TO CHANGE WITHOUT NOTICE while it stabilizes.		and hence SUBJECT TO CHANGE WITHOUT NOTICE while it stabilizes.

			config SPI_LOOPBACK_TEST
			tristate "spi loopback test framework support"
			depends on m
			help
			This enables the SPI loopback testing framework driver

			primarily used for development of spi_master drivers
			and to detect regressions

	config SPI_TLE62X0		config SPI_TLE62X0
	tristate "Infineon TLE62X0 (for power switching)"		tristate "Infineon TLE62X0 (for power switching)"
	depends on SYSFS		depends on SYSFS

drivers/spi/Makefile

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,7 @@ ccflags-$(CONFIG_SPI_DEBUG) := -DDEBUG
	# config declarations into driver model code		# config declarations into driver model code
	obj-$(CONFIG_SPI_MASTER) += spi.o		obj-$(CONFIG_SPI_MASTER) += spi.o
	obj-$(CONFIG_SPI_SPIDEV) += spidev.o		obj-$(CONFIG_SPI_SPIDEV) += spidev.o
			obj-$(CONFIG_SPI_LOOPBACK_TEST) += spi-loopback-test.o

	# SPI master controller drivers (bus)		# SPI master controller drivers (bus)
	obj-$(CONFIG_SPI_ALTERA) += spi-altera.o		obj-$(CONFIG_SPI_ALTERA) += spi-altera.o

drivers/spi/spi-lm70llp.c

+23 −20

Original line number	Original line	Diff line number	Diff line
	@@ -14,6 +14,8 @@
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*/		*/

			#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

	#include <linux/init.h>		#include <linux/init.h>
	#include <linux/module.h>		#include <linux/module.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	@@ -23,11 +25,9 @@
	#include <linux/sysfs.h>		#include <linux/sysfs.h>
	#include <linux/workqueue.h>		#include <linux/workqueue.h>


	#include <linux/spi/spi.h>		#include <linux/spi/spi.h>
	#include <linux/spi/spi_bitbang.h>		#include <linux/spi/spi_bitbang.h>


	/*		/*
	* The LM70 communicates with a host processor using a 3-wire variant of		* The LM70 communicates with a host processor using a 3-wire variant of
	* the SPI/Microwire bus interface. This driver specifically supports an		* the SPI/Microwire bus interface. This driver specifically supports an
	@@ -88,7 +88,6 @@ struct spi_lm70llp {
	/* REVISIT : ugly global ; provides "exclusive open" facility */		/* REVISIT : ugly global ; provides "exclusive open" facility */
	static struct spi_lm70llp *lm70llp;		static struct spi_lm70llp *lm70llp;


	/-------------------------------------------------------------------/		/-------------------------------------------------------------------/

	static inline struct spi_lm70llp spidev_to_pp(struct spi_device spi)		static inline struct spi_lm70llp spidev_to_pp(struct spi_device spi)
	@@ -122,12 +121,14 @@ static inline void assertCS(struct spi_lm70llp *pp)
	static inline void clkHigh(struct spi_lm70llp *pp)		static inline void clkHigh(struct spi_lm70llp *pp)
	{		{
	u8 data = parport_read_data(pp->port);		u8 data = parport_read_data(pp->port);

	parport_write_data(pp->port, data \| SCLK);		parport_write_data(pp->port, data \| SCLK);
	}		}

	static inline void clkLow(struct spi_lm70llp *pp)		static inline void clkLow(struct spi_lm70llp *pp)
	{		{
	u8 data = parport_read_data(pp->port);		u8 data = parport_read_data(pp->port);

	parport_write_data(pp->port, data & ~SCLK);		parport_write_data(pp->port, data & ~SCLK);
	}		}

	@@ -166,8 +167,10 @@ static inline void setmosi(struct spi_device *s, int is_on)
	static inline int getmiso(struct spi_device *s)		static inline int getmiso(struct spi_device *s)
	{		{
	struct spi_lm70llp *pp = spidev_to_pp(s);		struct spi_lm70llp *pp = spidev_to_pp(s);

	return ((SIO == (parport_read_status(pp->port) & SIO)) ? 0 : 1);		return ((SIO == (parport_read_status(pp->port) & SIO)) ? 0 : 1);
	}		}

	/--------------------------------------------------------------------/		/--------------------------------------------------------------------/

	#include "spi-bitbang-txrx.h"		#include "spi-bitbang-txrx.h"
	@@ -196,11 +199,10 @@ static void spi_lm70llp_attach(struct parport *p)
	struct spi_lm70llp *pp;		struct spi_lm70llp *pp;
	struct spi_master *master;		struct spi_master *master;
	int status;		int status;
			struct pardev_cb lm70llp_cb;

	if (lm70llp) {		if (lm70llp) {
	printk(KERN_WARNING		pr_warn("spi_lm70llp instance already loaded. Aborting.\n");
	"%s: spi_lm70llp instance already loaded. Aborting.\n",
	DRVNAME);
	return;		return;
	}		}

	@@ -227,9 +229,11 @@ static void spi_lm70llp_attach(struct parport *p)
	* Parport hookup		* Parport hookup
	*/		*/
	pp->port = p;		pp->port = p;
	pd = parport_register_device(p, DRVNAME,		memset(&lm70llp_cb, 0, sizeof(lm70llp_cb));
	NULL, NULL, NULL,		lm70llp_cb.private = pp;
	PARPORT_FLAG_EXCL, pp);		lm70llp_cb.flags = PARPORT_FLAG_EXCL;
			pd = parport_register_dev_model(p, DRVNAME, &lm70llp_cb, 0);

	if (!pd) {		if (!pd) {
	status = -ENOMEM;		status = -ENOMEM;
	goto out_free_master;		goto out_free_master;
	@@ -245,9 +249,8 @@ static void spi_lm70llp_attach(struct parport *p)
	*/		*/
	status = spi_bitbang_start(&pp->bitbang);		status = spi_bitbang_start(&pp->bitbang);
	if (status < 0) {		if (status < 0) {
	printk(KERN_WARNING		dev_warn(&pd->dev, "spi_bitbang_start failed with status %d\n",
	"%s: spi_bitbang_start failed with status %d\n",		status);
	DRVNAME, status);
	goto out_off_and_release;		goto out_off_and_release;
	}		}

	@@ -274,7 +277,7 @@ static void spi_lm70llp_attach(struct parport *p)
	dev_dbg(&pp->spidev_lm70->dev, "spidev_lm70 at %s\n",		dev_dbg(&pp->spidev_lm70->dev, "spidev_lm70 at %s\n",
	dev_name(&pp->spidev_lm70->dev));		dev_name(&pp->spidev_lm70->dev));
	else {		else {
	printk(KERN_WARNING "%s: spi_new_device failed\n", DRVNAME);		dev_warn(&pd->dev, "spi_new_device failed\n");
	status = -ENODEV;		status = -ENODEV;
	goto out_bitbang_stop;		goto out_bitbang_stop;
	}		}
	@@ -293,9 +296,9 @@ static void spi_lm70llp_attach(struct parport *p)
	out_parport_unreg:		out_parport_unreg:
	parport_unregister_device(pd);		parport_unregister_device(pd);
	out_free_master:		out_free_master:
	(void) spi_master_put(master);		spi_master_put(master);
	out_fail:		out_fail:
	pr_info("%s: spi_lm70llp probe fail, status %d\n", DRVNAME, status);		pr_info("spi_lm70llp probe fail, status %d\n", status);
	}		}

	static void spi_lm70llp_detach(struct parport *p)		static void spi_lm70llp_detach(struct parport *p)
	@@ -314,16 +317,16 @@ static void spi_lm70llp_detach(struct parport *p)
	parport_release(pp->pd);		parport_release(pp->pd);
	parport_unregister_device(pp->pd);		parport_unregister_device(pp->pd);

	(void) spi_master_put(pp->bitbang.master);		spi_master_put(pp->bitbang.master);

	lm70llp = NULL;		lm70llp = NULL;
	}		}


	static struct parport_driver spi_lm70llp_drv = {		static struct parport_driver spi_lm70llp_drv = {
	.name = DRVNAME,		.name = DRVNAME,
	.attach = spi_lm70llp_attach,		.match_port = spi_lm70llp_attach,
	.detach = spi_lm70llp_detach,		.detach = spi_lm70llp_detach,
			.devmodel = true,
	};		};

	static int __init init_spi_lm70llp(void)		static int __init init_spi_lm70llp(void)

drivers/spi/spi-loopback-test.c

0 → 100644

+1005 −0

File added.

Preview size limit exceeded, changes collapsed.