diff options
| -rw-r--r-- | baseboard/kalista/baseboard.c | 1 | ||||
| -rw-r--r-- | baseboard/kalista/baseboard.h | 5 | ||||
| -rw-r--r-- | board/karma/board.h | 6 | ||||
| -rw-r--r-- | board/karma/build.mk | 1 | ||||
| -rw-r--r-- | driver/build.mk | 1 | ||||
| -rw-r--r-- | driver/led/oz554.c (renamed from board/karma/board.c) | 35 | ||||
| -rw-r--r-- | driver/led/oz554.h | 15 | ||||
| -rw-r--r-- | include/config.h | 1 |
8 files changed, 38 insertions, 27 deletions
diff --git a/baseboard/kalista/baseboard.c b/baseboard/kalista/baseboard.c index 8b9cec5cb4..f7c4cb7962 100644 --- a/baseboard/kalista/baseboard.c +++ b/baseboard/kalista/baseboard.c @@ -33,6 +33,7 @@ #include "host_command.h" #include "i2c.h" #include "math_util.h" +#include "oz554.h" #include "pi3usb9281.h" #include "power.h" #include "power_button.h" diff --git a/baseboard/kalista/baseboard.h b/baseboard/kalista/baseboard.h index 2ad12be3c0..6b271575b3 100644 --- a/baseboard/kalista/baseboard.h +++ b/baseboard/kalista/baseboard.h @@ -146,6 +146,11 @@ #define CONFIG_VSTORE_SLOT_COUNT 1 /* + * LED backlight controller + */ +#define CONFIG_LED_DRIVER_OZ554 + +/* * Flash layout. Since config_flash_layout.h is included before board.h, * we can only overwrite (=undef/define) these parameters here. * diff --git a/board/karma/board.h b/board/karma/board.h index 85c4642fcb..372b18509b 100644 --- a/board/karma/board.h +++ b/board/karma/board.h @@ -10,10 +10,4 @@ #include "baseboard.h" -#ifndef __ASSEMBLER__ - -void backlight_enable_interrupt(enum gpio_signal signal); - -#endif /* !__ASSEMBLER__ */ - #endif /* __CROS_EC_BOARD_H */ diff --git a/board/karma/build.mk b/board/karma/build.mk index 82d7890946..05884cf221 100644 --- a/board/karma/build.mk +++ b/board/karma/build.mk @@ -9,4 +9,3 @@ CHIP:=npcx CHIP_VARIANT:=npcx5m6g BASEBOARD:=kalista -board-y=board.o diff --git a/driver/build.mk b/driver/build.mk index 5d48edb242..592498d941 100644 --- a/driver/build.mk +++ b/driver/build.mk @@ -77,6 +77,7 @@ driver-$(CONFIG_LED_DRIVER_DS2413)+=led/ds2413.o driver-$(CONFIG_LED_DRIVER_LM3509)+=led/lm3509.o driver-$(CONFIG_LED_DRIVER_LM3630A)+=led/lm3630a.o driver-$(CONFIG_LED_DRIVER_LP5562)+=led/lp5562.o +driver-$(CONFIG_LED_DRIVER_OZ554)+=led/oz554.o # Voltage regulators driver-$(CONFIG_REGULATOR_IR357X)+=regulator_ir357x.o diff --git a/board/karma/board.c b/driver/led/oz554.c index 49f1b919a3..f53b25f138 100644 --- a/board/karma/board.c +++ b/driver/led/oz554.c @@ -1,6 +1,8 @@ /* Copyright 2018 The Chromium OS Authors. All rights reserved. * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. + * + * O2 Micro OZ554 LED driver. */ #include "console.h" @@ -10,8 +12,8 @@ #include "task.h" #include "timer.h" -#define CPRINTS(format, args...) cprints(CC_GPIO, format, ## args) -#define CPRINTF(format, args...) cprintf(CC_GPIO, format, ## args) +#define CPRINTS(format, args...) cprints(CC_I2C, format, ## args) +#define CPRINTF(format, args...) cprintf(CC_I2C, format, ## args) #define I2C_ADDR_OZ554 0x62 #define OZ554_DATA_SIZE 6 @@ -22,7 +24,7 @@ struct oz554_value { }; /* This ordering is suggested by vendor. */ -static const struct oz554_value oz554_order[] = { +static const struct oz554_value order[] = { /* * Reigster 0x01: Operation frequency control * Frequency selection: 300(KHz) @@ -61,23 +63,18 @@ static const struct oz554_value oz554_order[] = { */ {.offset = 0, .data = 0xF2}, }; -BUILD_ASSERT(ARRAY_SIZE(oz554_order) == OZ554_DATA_SIZE); +BUILD_ASSERT(ARRAY_SIZE(order) == OZ554_DATA_SIZE); static void set_oz554_reg(void) { - int i, rv; + int i; for (i = 0; i < OZ554_DATA_SIZE; ++i) { - rv = i2c_write8( - NPCX_I2C_PORT1, - I2C_ADDR_OZ554, - oz554_order[i].offset, - oz554_order[i].data); - + int rv = i2c_write8(I2C_PORT_BACKLIGHT, I2C_ADDR_OZ554, + order[i].offset, order[i].data); if (rv) { - CPRINTS("Write OZ554 register index %d failed, rv = %d" - , i, rv); - break; + CPRINTS("Write OZ554 register %d failed rv=%d" , i, rv); + return; } } } @@ -94,16 +91,14 @@ void backlight_enable_interrupt(enum gpio_signal signal) hook_call_deferred(&backlight_enable_deferred_data, 30 * MSEC); } -static void karma_chipset_resume(void) +static void on_chipset_resume(void) { - /* Enable panel backlight interrupt. */ gpio_enable_interrupt(GPIO_PANEL_BACKLIGHT_EN); } -DECLARE_HOOK(HOOK_CHIPSET_RESUME, karma_chipset_resume, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_CHIPSET_RESUME, on_chipset_resume, HOOK_PRIO_DEFAULT); -static void karma_chipset_shutdown(void) +static void on_chipset_shutdown(void) { - /* Disable panel backlight interrupt. */ gpio_disable_interrupt(GPIO_PANEL_BACKLIGHT_EN); } -DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, karma_chipset_shutdown, HOOK_PRIO_DEFAULT); +DECLARE_HOOK(HOOK_CHIPSET_SUSPEND, on_chipset_shutdown, HOOK_PRIO_DEFAULT); diff --git a/driver/led/oz554.h b/driver/led/oz554.h new file mode 100644 index 0000000000..d9b5400111 --- /dev/null +++ b/driver/led/oz554.h @@ -0,0 +1,15 @@ +/* Copyright 2018 The Chromium OS Authors. All rights reserved. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + * + * O2 Micro OZ554 LED driver. + */ + +#ifndef __CROS_EC_OZ554_H +#define __CROS_EC_OZ554_H + +#include "gpio.h" + +void backlight_enable_interrupt(enum gpio_signal signal); + +#endif diff --git a/include/config.h b/include/config.h index 9a693a0dbc..df677ef7cf 100644 --- a/include/config.h +++ b/include/config.h @@ -2258,6 +2258,7 @@ #undef CONFIG_LED_DRIVER_LM3509 /* LM3509, on I2C interface */ #undef CONFIG_LED_DRIVER_LM3630A /* LM3630A, on I2C interface */ #undef CONFIG_LED_DRIVER_LP5562 /* LP5562, on I2C interface */ +#undef CONFIG_LED_DRIVER_OZ554 /* O2Micro OZ554, on I2C */ /* Offset in flash where little firmware will live. */ #undef CONFIG_LFW_OFFSET |