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

Unverified Commit a368550c authored by derfelot's avatar derfelot Committed by GitHub
Browse files

Merge pull request #8 from linckandrea/lineage-17.1_update 

lineage-17.1_update
parents ee7b7fb5 5d221905

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7611,6 +7611,12 @@ S: Maintained 
F:	Documentation/scsi/NinjaSCSI.txt

F:	drivers/scsi/nsp32*



NINTENDO HID DRIVER

M:	Daniel J. Ogorchock <djogorchock@gmail.com>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/hid-nintendo*



NIOS2 ARCHITECTURE

M:	Ley Foon Tan <lftan@altera.com>

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

arch/arm64/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ config ARM64 
	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_INT128 if GCC_VERSION >= 50000 || CC_IS_CLANG

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARCH_WANT_FRAME_POINTERS

arch/arm64/lib/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ lib-y := bitops.o clear_user.o delay.o copy_from_user.o \ 
		   copy_to_user.o copy_in_user.o copy_page.o		\

		   clear_page.o memchr.o memcpy.o memmove.o memset.o	\

		   memcmp.o strcmp.o strncmp.o strlen.o strnlen.o	\

		   strchr.o strrchr.o

		   strchr.o strrchr.o tishift.o



# Tell the compiler to treat all general purpose registers (with the

# exception of the IP registers, which are already handled by the caller

arch/arm64/lib/tishift.S

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/linkage.h>



ENTRY(__ashlti3)

	cbz	x2, 1f

	mov	x3, #64

	sub	x3, x3, x2

	cmp	x3, #0

	b.le	2f

	lsl	x1, x1, x2

	lsr	x3, x0, x3

	lsl	x2, x0, x2

	orr	x1, x1, x3

	mov	x0, x2

1:

	ret

2:

	neg	w1, w3

	mov	x2, #0

	lsl	x1, x0, x1

	mov	x0, x2

	ret

ENDPROC(__ashlti3)



ENTRY(__ashrti3)

	cbz	x2, 3f

	mov	x3, #64

	sub	x3, x3, x2

	cmp	x3, #0

	b.le	4f

	lsr	x0, x0, x2

	lsl	x3, x1, x3

	asr	x2, x1, x2

	orr	x0, x0, x3

	mov	x1, x2

3:

	ret

4:

	neg	w0, w3

	asr	x2, x1, #63

	asr	x0, x1, x0

	mov	x1, x2

	ret

ENDPROC(__ashrti3)

drivers/hid/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -134,6 +134,12 @@ config HID_APPLEIR 


	Say Y here if you want support for Apple infrared remote control.



config HID_ASUS_GAMEPAD

	tristate "Asus Gamepad"

	depends on HID

	---help---

	Support for Asus Gamepad joystick.



config HID_AUREAL

	tristate "Aureal"

	depends on HID
@@ -536,6 +542,17 @@ config HID_MULTITOUCH 
	  To compile this driver as a module, choose M here: the

	  module will be called hid-multitouch.



config HID_NINTENDO

	tristate "Nintendo Joy-Con and Pro Controller support"

	depends on HID

	help

	Adds support for the Nintendo Switch Joy-Cons and Pro Controller.

	All controllers support bluetooth, and the Pro Controller also supports

	its USB mode.



	To compile this driver as a module, choose M here: the

	module will be called hid-nintendo.



config HID_NTRIG

	tristate "N-Trig touch screen"

	depends on USB_HID