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

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

Merge "drivers: input: misc: add snapshot of AKM8963 3-axis compass driver"

parents e11ea640 ceab0e6f

Documentation/devicetree/bindings/input/misc/akm8963.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ AKM AK8963 3-axis electronic compass driver 


Required properties:



 - compatible		: Should be "ak,ak8963".

 - compatible		: Should be "ak,ak8963" or "akm,akm8963".

 - reg			: i2c address of the device.

 - pinctrl-names	: The pinctrl configration names of this sensor driver. Should be "ak8963_default".

 - pinctrl-0		: The pinctrl node corresponding to "ak8963_default", should be <&ak8963_default>.

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ adapteva Adapteva, Inc. 
adi	Analog Devices, Inc.

aeroflexgaisler	Aeroflex Gaisler AB

ak	Asahi Kasei Corp.

akm	Asahi Kasei Microdevices.

allwinner	Allwinner Technology Co., Ltd.

altr	Altera Corp.

amcc	Applied Micro Circuits Corporation (APM, formally AMCC)

drivers/input/misc/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -239,6 +239,17 @@ config SENSORS_MPU6050 
	  To compile this driver as a module, choose M here: the

	  module will be called mpu6050.



config SENSORS_AKM8963

	tristate "AKM8963 3-axis electronic compass sensor driver"

	depends on I2C

	default n

	help

	  Say Y here if you want to enable the akm8963 ecompass sensor

	  driver.



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

	  module will be called akm8963.



config INPUT_APANEL

	tristate "Fujitsu Lifebook Application Panel buttons"

	depends on X86 && I2C && LEDS_CLASS

drivers/input/misc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ obj-$(CONFIG_INPUT_MC13783_PWRBUTTON) += mc13783-pwrbutton.o 
obj-$(CONFIG_INPUT_MMA8450)		+= mma8450.o

obj-$(CONFIG_INPUT_MPU3050)		+= mpu3050.o

obj-$(CONFIG_SENSORS_MPU6050)		+= mpu6050.o

obj-$(CONFIG_SENSORS_AKM8963)		+= akm8963.o

obj-$(CONFIG_INPUT_PALMAS_PWRBUTTON)	+= palmas-pwrbutton.o

obj-$(CONFIG_INPUT_PCAP)		+= pcap_keys.o

obj-$(CONFIG_INPUT_PCF50633_PMU)	+= pcf50633-input.o