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

Commit 694215f8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "serial: msm_geni_serial: Add 4-wire UART functionality" into msm-4.9

parents b3471428 7115f4e0

Documentation/devicetree/bindings/serial/qcom,msm-geni-uart.txt

+2 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ Required properties: 
Optional properties:

- qcom,bus-mas: contains the bus master id needed to put in bus bandwidth votes

		for inter-connect buses.

- qcom,wakeup-byte: Byte to be injected in the tty layer during wakeup isr.



Example:

qupv3_uart11: qcom,qup_uart@0xa88000 {
@@ -34,4 +35,5 @@ qupv3_uart11: qcom,qup_uart@0xa88000 { 
	pinctrl-1 = <&qup_1_uart_3_sleep>;

	interrupts = <0 355 0>;

	qcom,bus-mas = <MASTER_BLSP_2>;

	qcom,wakeup-byte = <0xFF>;

};

drivers/tty/serial/msm_geni_serial.c

+472 −69

File changed.

Preview size limit exceeded, changes collapsed.

include/linux/qcom-geni-se.h

+6 −1
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ struct se_geni_rsc { 
#define SE_GENI_TX_WATERMARK_REG	(0x80C)

#define SE_GENI_RX_WATERMARK_REG	(0x810)

#define SE_GENI_RX_RFR_WATERMARK_REG	(0x814)

#define SE_GENI_IOS			(0x908)

#define SE_GENI_M_GP_LENGTH		(0x910)

#define SE_GENI_S_GP_LENGTH		(0x914)

#define SE_GSI_EVENT_EN			(0xE18)
@@ -228,6 +229,10 @@ struct se_geni_rsc { 
#define GENI_M_EVENT_EN		(BIT(2))

#define GENI_S_EVENT_EN		(BIT(3))



/* SE_GENI_IOS fields */

#define IO2_DATA_IN		(BIT(1))

#define RX_DATA_IN		(BIT(0))



/* SE_IRQ_EN fields */

#define DMA_RX_IRQ_EN		(BIT(0))

#define DMA_TX_IRQ_EN		(BIT(1))
@@ -275,7 +280,7 @@ static inline unsigned int geni_read_reg(void __iomem *base, int offset) 
static inline void geni_write_reg(unsigned int value, void __iomem *base,

				int offset)

{

	return writel_relaxed(value, (base + offset));

	writel_relaxed(value, (base + offset));

}



static inline int get_se_proto(void __iomem *base)

include/uapi/asm-generic/ioctls.h

+3 −0
Original line number Diff line number Diff line
@@ -77,6 +77,9 @@ 
#define TIOCGPKT	_IOR('T', 0x38, int) /* Get packet mode state */

#define TIOCGPTLCK	_IOR('T', 0x39, int) /* Get Pty lock state */

#define TIOCGEXCL	_IOR('T', 0x40, int) /* Get exclusive mode state */

#define TIOCPMGET	0x5441	/* PM get */

#define TIOCPMPUT	0x5442	/* PM put */

#define TIOCPMACT	0x5443	/* PM is active */



#define FIONCLEX	0x5450

#define FIOCLEX		0x5451