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

Commit 7ffc4558 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Enable KinecticsXR Nordic chip for SKU4"

parents b99b6bd8 8580a692
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ CONFIG_OKL4_USER_VIRQ=y
CONFIG_WIGIG_SENSING_SPI=m
CONFIG_QTI_XR_SMRTVWR_MISC=y
CONFIG_QTI_MAXIM_FAN_CONTROLLER=y
CONFIG_KINECTICS_XR_NORDIC=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_SG=y
+1 −0
Original line number Diff line number Diff line
@@ -307,6 +307,7 @@ CONFIG_OKL4_USER_VIRQ=y
CONFIG_WIGIG_SENSING_SPI=m
CONFIG_QTI_XR_SMRTVWR_MISC=y
CONFIG_QTI_MAXIM_FAN_CONTROLLER=y
CONFIG_KINECTICS_XR_NORDIC=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_CHR_DEV_SG=y
+9 −0
Original line number Diff line number Diff line
@@ -622,6 +622,15 @@ config QTI_MAXIM_FAN_CONTROLLER
	  Also, this driver initializes the power for the fan controller
	  and exposes sysfs node to control different speeds of fan.

config KINECTICS_XR_NORDIC
	tristate "Nordic Misc driver support in XR Reference devices"
	help
	  This driver supports Nordic Chip in XR Reference devices.
	  This driver interfaces with SoC to Nordic chip over SPI and contains
	  code to power up the Nordic chip and initializes SPI interface. Also,
	  this also parses the gpios and interrupts from device tree and sets
	  the gpios and interrupt handler for handling the interrupt.

source "drivers/misc/c2port/Kconfig"
source "drivers/misc/eeprom/Kconfig"
source "drivers/misc/cb710/Kconfig"
+1 −0
Original line number Diff line number Diff line
@@ -77,3 +77,4 @@ obj-$(CONFIG_QTI_MAXIM_FAN_CONTROLLER) += max31760.o
obj-$(CONFIG_QTI_XR_SMRTVWR_MISC) += qxr-stdalonevwr.o
obj-$(CONFIG_FPR_FPC)		+= fpr_FingerprintCard/
obj-y                           += qrc/
obj-$(CONFIG_KINECTICS_XR_NORDIC) += kxrctrl/
+7 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0-only
#
# Makefile for the Kinectics Nordic Driver.


obj-$(CONFIG_KINECTICS_XR_NORDIC)		+=  aphost.o