Merge remote-tracking branches 'spi/topic/s3c64xx', 'spi/topic/sc18is602',... (81235b4e) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/devicetree/bindings/spi/sh-hspi.txt

+25 −3

Original line number	Original line	Diff line number	Diff line
	Renesas HSPI.		Renesas HSPI.

	Required properties:		Required properties:
	- compatible : "renesas,hspi"		- compatible : "renesas,hspi-<soctype>", "renesas,hspi" as fallback.
			Examples with soctypes are:
			- "renesas,hspi-r8a7778" (R-Car M1)
			- "renesas,hspi-r8a7779" (R-Car H1)
	- reg : Offset and length of the register set for the device		- reg : Offset and length of the register set for the device
	- interrupts : interrupt line used by HSPI		- interrupt-parent : The phandle for the interrupt controller that
			services interrupts for this device
			- interrupts : Interrupt specifier
			- #address-cells : Must be <1>
			- #size-cells : Must be <0>

			Pinctrl properties might be needed, too. See
			Documentation/devicetree/bindings/pinctrl/renesas,*.

			Example:

			hspi0: spi@fffc7000 {
			compatible = "renesas,hspi-r8a7778", "renesas,hspi";
			reg = <0xfffc7000 0x18>;
			interrupt-parent = <&gic>;
			interrupts = <0 63 IRQ_TYPE_LEVEL_HIGH>;
			#address-cells = <1>;
			#size-cells = <0>;
			status = "disabled";
			};

Documentation/devicetree/bindings/spi/sh-msiof.txt

+35 −7

Original line number	Original line	Diff line number	Diff line
	Renesas MSIOF spi controller		Renesas MSIOF spi controller

	Required properties:		Required properties:
	- compatible : "renesas,sh-msiof" for SuperH or		- compatible : "renesas,msiof-<soctype>" for SoCs,
	"renesas,sh-mobile-msiof" for SH Mobile series		"renesas,sh-msiof" for SuperH, or
			"renesas,sh-mobile-msiof" for SH Mobile series.
			Examples with soctypes are:
			"renesas,msiof-r8a7790" (R-Car H2)
			"renesas,msiof-r8a7791" (R-Car M2)
	- reg : Offset and length of the register set for the device		- reg : Offset and length of the register set for the device
	- interrupts : interrupt line used by MSIOF		- interrupt-parent : The phandle for the interrupt controller that
			services interrupts for this device
			- interrupts : Interrupt specifier
			- #address-cells : Must be <1>
			- #size-cells : Must be <0>

	Optional properties:		Optional properties:
	- num-cs : total number of chip-selects		- clocks : Must contain a reference to the functional clock.
			- num-cs : Total number of chip-selects (default is 1)

			Optional properties, deprecated for soctype-specific bindings:
	- renesas,tx-fifo-size : Overrides the default tx fifo size given in words		- renesas,tx-fifo-size : Overrides the default tx fifo size given in words
			(default is 64)
	- renesas,rx-fifo-size : Overrides the default rx fifo size given in words		- renesas,rx-fifo-size : Overrides the default rx fifo size given in words
			(default is 64, or 256 on R-Car H2 and M2)

			Pinctrl properties might be needed, too. See
			Documentation/devicetree/bindings/pinctrl/renesas,*.

			Example:

			msiof0: spi@e6e20000 {
			compatible = "renesas,msiof-r8a7791";
			reg = <0 0xe6e20000 0 0x0064>;
			interrupts = <0 156 IRQ_TYPE_LEVEL_HIGH>;
			clocks = <&mstp0_clks R8A7791_CLK_MSIOF0>;
			#address-cells = <1>;
			#size-cells = <0>;
			status = "disabled";
			};

Documentation/spi/spidev

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -85,6 +85,12 @@ settings for data transfer parameters:
	SPI_MODE_0..SPI_MODE_3; or if you prefer you can combine SPI_CPOL		SPI_MODE_0..SPI_MODE_3; or if you prefer you can combine SPI_CPOL
	(clock polarity, idle high iff this is set) or SPI_CPHA (clock phase,		(clock polarity, idle high iff this is set) or SPI_CPHA (clock phase,
	sample on trailing edge iff this is set) flags.		sample on trailing edge iff this is set) flags.
			Note that this request is limited to SPI mode flags that fit in a
			single byte.

			SPI_IOC_RD_MODE32, SPI_IOC_WR_MODE32 ... pass a pointer to a uin32_t
			which will return (RD) or assign (WR) the full SPI transfer mode,
			not limited to the bits that fit in one byte.

	SPI_IOC_RD_LSB_FIRST, SPI_IOC_WR_LSB_FIRST ... pass a pointer to a byte		SPI_IOC_RD_LSB_FIRST, SPI_IOC_WR_LSB_FIRST ... pass a pointer to a byte
	which will return (RD) or assign (WR) the bit justification used to		which will return (RD) or assign (WR) the bit justification used to

Documentation/spi/spidev_fdx.c

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -78,10 +78,10 @@ static void do_msg(int fd, int len)

	static void dumpstat(const char *name, int fd)		static void dumpstat(const char *name, int fd)
	{		{
	__u8 mode, lsb, bits;		__u8 lsb, bits;
	__u32 speed;		__u32 mode, speed;

	if (ioctl(fd, SPI_IOC_RD_MODE, &mode) < 0) {		if (ioctl(fd, SPI_IOC_RD_MODE32, &mode) < 0) {
	perror("SPI rd_mode");		perror("SPI rd_mode");
	return;		return;
	}		}
	@@ -98,7 +98,7 @@ static void dumpstat(const char *name, int fd)
	return;		return;
	}		}

	printf("%s: spi mode %d, %d bits %sper word, %d Hz max\n",		printf("%s: spi mode 0x%x, %d bits %sper word, %d Hz max\n",
	name, mode, bits, lsb ? "(lsb first) " : "", speed);		name, mode, bits, lsb ? "(lsb first) " : "", speed);
	}		}

Documentation/spi/spidev_test.c

+39 −6

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ static void pabort(const char *s)
	}		}

	static const char *device = "/dev/spidev1.1";		static const char *device = "/dev/spidev1.1";
	static uint8_t mode;		static uint32_t mode;
	static uint8_t bits = 8;		static uint8_t bits = 8;
	static uint32_t speed = 500000;		static uint32_t speed = 500000;
	static uint16_t delay;		static uint16_t delay;
	@@ -57,6 +57,21 @@ static void transfer(int fd)
	.bits_per_word = bits,		.bits_per_word = bits,
	};		};

			if (mode & SPI_TX_QUAD)
			tr.tx_nbits = 4;
			else if (mode & SPI_TX_DUAL)
			tr.tx_nbits = 2;
			if (mode & SPI_RX_QUAD)
			tr.rx_nbits = 4;
			else if (mode & SPI_RX_DUAL)
			tr.rx_nbits = 2;
			if (!(mode & SPI_LOOP)) {
			if (mode & (SPI_TX_QUAD \| SPI_TX_DUAL))
			tr.rx_buf = 0;
			else if (mode & (SPI_RX_QUAD \| SPI_RX_DUAL))
			tr.tx_buf = 0;
			}

	ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr);		ret = ioctl(fd, SPI_IOC_MESSAGE(1), &tr);
	if (ret < 1)		if (ret < 1)
	pabort("can't send spi message");		pabort("can't send spi message");
	@@ -81,7 +96,11 @@ static void print_usage(const char *prog)
	" -O --cpol clock polarity\n"		" -O --cpol clock polarity\n"
	" -L --lsb least significant bit first\n"		" -L --lsb least significant bit first\n"
	" -C --cs-high chip select active high\n"		" -C --cs-high chip select active high\n"
	" -3 --3wire SI/SO signals shared\n");		" -3 --3wire SI/SO signals shared\n"
			" -N --no-cs no chip select\n"
			" -R --ready slave pulls low to pause\n"
			" -2 --dual dual transfer\n"
			" -4 --quad quad transfer\n");
	exit(1);		exit(1);
	}		}

	@@ -101,11 +120,13 @@ static void parse_opts(int argc, char *argv[])
	{ "3wire", 0, 0, '3' },		{ "3wire", 0, 0, '3' },
	{ "no-cs", 0, 0, 'N' },		{ "no-cs", 0, 0, 'N' },
	{ "ready", 0, 0, 'R' },		{ "ready", 0, 0, 'R' },
			{ "dual", 0, 0, '2' },
			{ "quad", 0, 0, '4' },
	{ NULL, 0, 0, 0 },		{ NULL, 0, 0, 0 },
	};		};
	int c;		int c;

	c = getopt_long(argc, argv, "D:s:d:b:lHOLC3NR", lopts, NULL);		c = getopt_long(argc, argv, "D:s:d:b:lHOLC3NR24", lopts, NULL);

	if (c == -1)		if (c == -1)
	break;		break;
	@@ -147,11 +168,23 @@ static void parse_opts(int argc, char *argv[])
	case 'R':		case 'R':
	mode \|= SPI_READY;		mode \|= SPI_READY;
	break;		break;
			case '2':
			mode \|= SPI_TX_DUAL;
			break;
			case '4':
			mode \|= SPI_TX_QUAD;
			break;
	default:		default:
	print_usage(argv[0]);		print_usage(argv[0]);
	break;		break;
	}		}
	}		}
			if (mode & SPI_LOOP) {
			if (mode & SPI_TX_DUAL)
			mode \|= SPI_RX_DUAL;
			if (mode & SPI_TX_QUAD)
			mode \|= SPI_RX_QUAD;
			}
	}		}

	int main(int argc, char *argv[])		int main(int argc, char *argv[])
	@@ -168,11 +201,11 @@ int main(int argc, char *argv[])
	/*		/*
	* spi mode		* spi mode
	*/		*/
	ret = ioctl(fd, SPI_IOC_WR_MODE, &mode);		ret = ioctl(fd, SPI_IOC_WR_MODE32, &mode);
	if (ret == -1)		if (ret == -1)
	pabort("can't set spi mode");		pabort("can't set spi mode");

	ret = ioctl(fd, SPI_IOC_RD_MODE, &mode);		ret = ioctl(fd, SPI_IOC_RD_MODE32, &mode);
	if (ret == -1)		if (ret == -1)
	pabort("can't get spi mode");		pabort("can't get spi mode");

	@@ -198,7 +231,7 @@ int main(int argc, char *argv[])
	if (ret == -1)		if (ret == -1)
	pabort("can't get max speed hz");		pabort("can't get max speed hz");

	printf("spi mode: %d\n", mode);		printf("spi mode: 0x%x\n", mode);
	printf("bits per word: %d\n", bits);		printf("bits per word: %d\n", bits);
	printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000);		printf("max speed: %d Hz (%d KHz)\n", speed, speed/1000);