diff options
| author | Jongpil Jung <jongpil19.jung@samsung.com> | 2017-11-16 16:27:53 +0900 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2017-11-21 21:36:14 -0800 |
| commit | 247d4b398cfd929c94b64cbfe43879e7a925671d (patch) | |
| tree | 468581622e007bf6ab455884db9ab3cfae730c16 | |
| parent | 46c0695dcad23e24d18b9612904d0fb931314da4 (diff) | |
| download | chrome-ec-247d4b398cfd929c94b64cbfe43879e7a925671d.tar.gz | |
nautilus: enable touchpad,backlight and disable base.
clean up base enable/disable for nautilus.
enable touchpad and backlight.
BUG=b:69389497
BRANCH=none
TEST=build/flash nautilus rev1, power on and boot ok.
check lcd backlight. check touchpad with evtest.
Change-Id: I6e2ddc61737254f088de0867fbb02b09e1099718
Signed-off-by: Jongpil Jung <jongpil19.jung@samsung.com>
Reviewed-on: https://chromium-review.googlesource.com/773721
Commit-Ready: Jongpil Jung <jongpil19.jung@samsung.corp-partner.google.com>
Tested-by: Jongpil Jung <jongpil19.jung@samsung.corp-partner.google.com>
Reviewed-by: Philip Chen <philipchen@chromium.org>
Reviewed-by: Shawn N <shawnn@chromium.org>
| -rw-r--r-- | board/nautilus/board.c | 19 | ||||
| -rw-r--r-- | board/nautilus/gpio.inc | 6 |
2 files changed, 4 insertions, 21 deletions
diff --git a/board/nautilus/board.c b/board/nautilus/board.c index 90951f793b..31ccfb6ca6 100644 --- a/board/nautilus/board.c +++ b/board/nautilus/board.c @@ -278,21 +278,6 @@ void base_detect_interrupt(enum gpio_signal signal) base_detect_debounce_time = time_now + BASE_DETECT_DEBOUNCE_US; } -static void base_enable(void) -{ - /* Enable base detection interrupt. */ - base_detect_debounce_time = get_time().val; - hook_call_deferred(&base_detect_deferred_data, 0); - gpio_enable_interrupt(GPIO_BASE_DET_A); -} - -static void base_disable(void) -{ - /* Disable base detection interrupt and disable power to base. */ - gpio_disable_interrupt(GPIO_BASE_DET_A); - base_detect_change(BASE_DISCONNECTED); -} - #include "gpio_list.h" /* power signal list. Must match order of enum power_signal. */ @@ -872,7 +857,7 @@ static void board_chipset_startup(void) i2c_write8(I2C_PORT_PMIC, I2C_ADDR_BD99992, 0x41, 0x01); i2c_write8(I2C_PORT_PMIC, I2C_ADDR_BD99992, 0x2a, 0x02); - base_enable(); + gpio_set_level(GPIO_ENABLE_TOUCHPAD, 1); } DECLARE_HOOK(HOOK_CHIPSET_STARTUP, board_chipset_startup, HOOK_PRIO_DEFAULT); @@ -887,7 +872,7 @@ static void board_chipset_shutdown(void) i2c_write8(I2C_PORT_PMIC, I2C_ADDR_BD99992, 0x41, 0x0); i2c_write8(I2C_PORT_PMIC, I2C_ADDR_BD99992, 0x2a, 0x0); - base_disable(); + gpio_set_level(GPIO_ENABLE_TOUCHPAD, 0); } DECLARE_HOOK(HOOK_CHIPSET_SHUTDOWN, board_chipset_shutdown, HOOK_PRIO_DEFAULT); diff --git a/board/nautilus/gpio.inc b/board/nautilus/gpio.inc index b05199aba0..2fe349b2f5 100644 --- a/board/nautilus/gpio.inc +++ b/board/nautilus/gpio.inc @@ -23,8 +23,6 @@ GPIO_INT(RSMRST_L_PGOOD, PIN(B, 0), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(PMIC_DPWROK, PIN(C, 7), GPIO_INT_BOTH, power_signal_interrupt) GPIO_INT(POWER_BUTTON_L, PIN(0, 4), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt) GPIO_INT(LID_OPEN, PIN(6, 7), GPIO_INT_BOTH, lid_interrupt) -/* TODO(b/35585396): Make use of reverse dock signal. */ -GPIO_INT(REVERSE_DOCK, PIN(B, 7), GPIO_INT_BOTH, lid_interrupt) GPIO_INT(VOLUME_DOWN_L, PIN(8, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(VOLUME_UP_L, PIN(8, 2), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt) GPIO_INT(WP_L, PIN(4, 0), GPIO_INT_BOTH, switch_interrupt) @@ -34,10 +32,10 @@ GPIO_INT(USB_C1_VBUS_WAKE_L, PIN(9, 7), GPIO_INT_BOTH | GPIO_PULL_UP, vbus1_evt) GPIO_INT(USB_C0_BC12_INT_L, PIN(D, 3), GPIO_INT_FALLING, usb0_evt) GPIO_INT(USB_C1_BC12_INT_L, PIN(3, 3), GPIO_INT_FALLING, usb1_evt) GPIO_INT(ACCELGYRO3_INT_L, PIN(3, 6), GPIO_INT_FALLING, bmi160_interrupt) -GPIO_INT(BASE_DET_A, PIN(4, 5), GPIO_INT_BOTH, base_detect_interrupt) +GPIO(ENABLE_TOUCHPAD, PIN(4, 5), GPIO_OUT_LOW) GPIO(PCH_RTCRST, PIN(2, 7), GPIO_OUT_LOW) /* RTCRST# to SOC (>= rev4) */ -GPIO(ENABLE_BACKLIGHT, PIN(2, 6), GPIO_OUT_LOW) /* Enable Backlight */ +GPIO(ENABLE_BACKLIGHT, PIN(5, 6), GPIO_OUT_LOW) /* Enable Backlight */ GPIO(WLAN_OFF_L, PIN(7, 2), GPIO_OUT_LOW) /* Disable WLAN */ GPIO(PP3300_DX_WLAN, PIN(A, 7), GPIO_OUT_LOW) /* Enable WLAN 3.3V Power */ GPIO(CPU_PROCHOT, PIN(8, 1), GPIO_OUT_HIGH) /* PROCHOT# to SOC */ |