Commit bf39eda7 authored by Unknown's avatar Unknown
Browse files

Merge remote-tracking branch 'origin/oreo'

parents eba387ff 8ec98cd4

arch/arm64/boot/dts/k5fpr.dts

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ memory@00000000 { 
	tpd-resolution = <1080 1920>;

	use-tpd-button = <1>;

	tpd-key-num = <3>;

	tpd-key-local= <139 172 158 0>;

	tpd-key-local= <580 172 158 0>;

	tpd-key-dim-local = <90 883 100 40 230 883 100 40 370 883 100 40 0 0 0 0>;

	tpd-max-touch-num = <5>;

	tpd-filter-enable = <1>;

arch/arm64/configs/k5fpr_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -599,6 +599,7 @@ CONFIG_SWITCH=y 
CONFIG_RTC_CLASS=y

# lenovo-sw zhouwl, k5, wm8281 need change,2015-01-18 begin >>

CONFIG_SWITCH_ARIZONA=y

CONFIG_SWITCH_ARIZONA_INPUT_EVENT=y

CONFIG_ARCH_MTK_BOARD=y

CONFIG_ARCH_MTK_FLORIDA_BOARD=y

# lenovo-sw zhouwl, k5, wm8281 need change,2015-01-18 end <<
@@ -725,6 +726,8 @@ CONFIG_MTK_LENS_AK7345AF_SUPPORT=y 
# CONFIG_CPU_BOOST is not set

# CONFIG_TOUCH_BOOST is not set

# CONFIG_MTK_DYNAMIC_BOOST is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=20

CONFIG_SENSORS_FPC_1020=y

# CONFIG_MTK_FINGERPRINT is not set

drivers/mfd/arizona-core.c

+1 −1
Original line number Diff line number Diff line
@@ -2285,7 +2285,7 @@ int arizona_dev_init(struct arizona *arizona) 
	arizona_request_irq(arizona, ARIZONA_IRQ_UNDERCLOCKED, "Underclocked",

			    arizona_underclocked, arizona);



	arizona->hp_impedance = 32;

	arizona->hp_impedance_x100 = 3200;

	switch (arizona->type) {

	case WM5102:

		ret = mfd_add_devices(arizona->dev, -1, wm5102_devs,

drivers/switch/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -19,4 +19,10 @@ config SWITCH_ARIZONA 
	  Say Y here to enable support for external accessory detection

	  with Wolfson Arizona devices. These are audio CODECs with

	  advanced audio accessory detection support.



config SWITCH_ARIZONA_INPUT_EVENT

	bool "Report events through input key events"

	depends on SWITCH_ARIZONA

	default n



endif # SWITCH

drivers/switch/switch-arizona.c

+367 −823

File changed.

Preview size limit exceeded, changes collapsed.