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

Commit 93708a49 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.14-p.83 (7d4b4b55) into msm-4.14"

parents 858c55cb 1f8e1735

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 81

SUBLEVEL = 83

EXTRAVERSION =

NAME = Petit Gorille

arch/alpha/include/asm/termios.h

+7 −1
Original line number Diff line number Diff line
@@ -73,9 +73,15 @@ 
})



#define user_termios_to_kernel_termios(k, u) \

	copy_from_user(k, u, sizeof(struct termios))

	copy_from_user(k, u, sizeof(struct termios2))



#define kernel_termios_to_user_termios(u, k) \

	copy_to_user(u, k, sizeof(struct termios2))



#define user_termios_to_kernel_termios_1(k, u) \

	copy_from_user(k, u, sizeof(struct termios))



#define kernel_termios_to_user_termios_1(u, k) \

	copy_to_user(u, k, sizeof(struct termios))



#endif	/* _ALPHA_TERMIOS_H */

arch/alpha/include/uapi/asm/ioctls.h

+5 −0
Original line number Diff line number Diff line
@@ -32,6 +32,11 @@ 
#define TCXONC		_IO('t', 30)

#define TCFLSH		_IO('t', 31)



#define TCGETS2		_IOR('T', 42, struct termios2)

#define TCSETS2		_IOW('T', 43, struct termios2)

#define TCSETSW2	_IOW('T', 44, struct termios2)

#define TCSETSF2	_IOW('T', 45, struct termios2)



#define TIOCSWINSZ	_IOW('t', 103, struct winsize)

#define TIOCGWINSZ	_IOR('t', 104, struct winsize)

#define	TIOCSTART	_IO('t', 110)		/* start output, like ^Q */

arch/alpha/include/uapi/asm/termbits.h

+17 −0
Original line number Diff line number Diff line
@@ -26,6 +26,19 @@ struct termios { 
	speed_t c_ospeed;		/* output speed */

};



/* Alpha has identical termios and termios2 */



struct termios2 {

	tcflag_t c_iflag;		/* input mode flags */

	tcflag_t c_oflag;		/* output mode flags */

	tcflag_t c_cflag;		/* control mode flags */

	tcflag_t c_lflag;		/* local mode flags */

	cc_t c_cc[NCCS];		/* control characters */

	cc_t c_line;			/* line discipline (== c_cc[19]) */

	speed_t c_ispeed;		/* input speed */

	speed_t c_ospeed;		/* output speed */

};



/* Alpha has matching termios and ktermios */



struct ktermios {
@@ -148,6 +161,7 @@ struct ktermios { 
#define B3000000  00034

#define B3500000  00035

#define B4000000  00036

#define BOTHER    00037



#define CSIZE	00001400

#define   CS5	00000000
@@ -165,6 +179,9 @@ struct ktermios { 
#define CMSPAR	  010000000000		/* mark or space (stick) parity */

#define CRTSCTS	  020000000000		/* flow control */



#define CIBAUD	07600000

#define IBSHIFT	16



/* c_lflag bits */

#define ISIG	0x00000080

#define ICANON	0x00000100

arch/arm/boot/dts/r8a7791.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 


			trips {

				cpu-crit {

					temperature	= <115000>;

					temperature	= <95000>;

					hysteresis	= <0>;

					type		= "critical";

				};