Reks: update board configs

Remove ALS, GYRO, PD and Volume buttons that Reks not supported.

BUG=chrome-os-partner:45572
BRANCH=firmware-strago-7287.B
TEST='make BOARD=reks'
Signed-off-by: Keith Tzeng <Keith.Tzeng@quantatw.com>

Change-Id: I48ecd42f125960ab605f27b875c9aadea58393c8
Reviewed-on: https://chromium-review.googlesource.com/309170
Tested-by: Keith Tzeng <keith.tzeng@quantatw.com>
Reviewed-by: Shawn N <shawnn@chromium.org>
Commit-Queue: Keith Tzeng <keith.tzeng@quantatw.com>

3 files changed, 7 insertions, 50 deletions

diff --git a/board/reks/board.c b/board/reks/board.c
index 4c4219f1f1..f24ecaebfb 100644
--- a/board/reks/board.c
+++ b/board/reks/board.c
@@ -5,12 +5,10 @@
 /* Reks board-specific configuration */
 
 #include "adc.h"
-#include "als.h"
 #include "button.h"
 #include "charger.h"
 #include "charge_state.h"
 #include "driver/accel_kxcj9.h"
-#include "driver/als_isl29035.h"
 #include "driver/temp_sensor/tmp432.h"
 #include "extpower.h"
 #include "gpio.h"
@@ -59,10 +57,6 @@ BUILD_ASSERT(ARRAY_SIZE(power_signal_list) == POWER_SIGNAL_COUNT);
 const struct i2c_port_t i2c_ports[]  = {
 	{"batt_chg", MEC1322_I2C0_0, 100,
 		GPIO_I2C_PORT0_0_SCL, GPIO_I2C_PORT0_0_SDA},
-	{"muxes", MEC1322_I2C0_1, 100,
-		GPIO_I2C_PORT0_1_SCL, GPIO_I2C_PORT0_1_SDA},
-	{"pd_mcu", MEC1322_I2C1, 1000,
-		GPIO_I2C_PORT1_SCL, GPIO_I2C_PORT1_SDA},
 	{"sensors", MEC1322_I2C2, 100,
 		GPIO_I2C_PORT2_SCL, GPIO_I2C_PORT2_SDA},
 	{"thermal", MEC1322_I2C3, 100,
@@ -93,12 +87,6 @@ const struct temp_sensor_t temp_sensors[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT);
 
-/* ALS instances. Must be in same order as enum als_id. */
-struct als_t als[] = {
-	{"ISL", isl29035_read_lux, 5},
-};
-BUILD_ASSERT(ARRAY_SIZE(als) == ALS_COUNT);
-
 /* Thermal limits for each temp sensor. All temps are in degrees K. Must be in
  * same order as enum temp_sensor_id. To always ignore any temp, use 0.
  */
@@ -110,14 +98,6 @@ struct ec_thermal_config thermal_params[] = {
 };
 BUILD_ASSERT(ARRAY_SIZE(thermal_params) == TEMP_SENSOR_COUNT);
 
-const struct button_config buttons[] = {
-	{"Volume Down", KEYBOARD_BUTTON_VOLUME_DOWN, GPIO_VOLUME_DOWN,
-		30 * MSEC, 0},
-	{"Volume Up", KEYBOARD_BUTTON_VOLUME_UP, GPIO_VOLUME_UP,
-		30 * MSEC, 0},
-};
-BUILD_ASSERT(ARRAY_SIZE(buttons) == CONFIG_BUTTON_COUNT);
-
 /* Four Motion sensors */
 /* kxcj9 mutex and local/private data*/
 static struct mutex g_kxcj9_mutex[2];
diff --git a/board/reks/board.h b/board/reks/board.h
index f6f600cbb9..e5ad655a36 100644
--- a/board/reks/board.h
+++ b/board/reks/board.h
@@ -46,8 +46,6 @@
 
 #define CONFIG_PMIC
 
-#define CONFIG_ALS
-#define CONFIG_ALS_ISL29035
 #define CONFIG_BATTERY_CUT_OFF
 #define CONFIG_BATTERY_SMART
 #define CONFIG_CHARGER
@@ -72,9 +70,6 @@
 #define CONFIG_LID_ANGLE_SENSOR_BASE	0
 #define CONFIG_LID_ANGLE_SENSOR_LID	1
 
-/* Number of buttons */
-#define CONFIG_BUTTON_COUNT		2
-
 /* Modules we want to exclude */
 #undef CONFIG_EEPROM
 #undef CONFIG_EOPTION
@@ -90,11 +85,7 @@
 /* I2C ports */
 #define I2C_PORT_BATTERY	MEC1322_I2C0_0
 #define I2C_PORT_CHARGER	MEC1322_I2C0_0
-#define I2C_PORT_PD_MCU		MEC1322_I2C1
-#define I2C_PORT_TCPC		MEC1322_I2C1
 #define I2C_PORT_ACCEL		MEC1322_I2C2
-#define I2C_PORT_GYRO		MEC1322_I2C2
-#define I2C_PORT_ALS		MEC1322_I2C2
 #define I2C_PORT_THERMAL	MEC1322_I2C3
 
 /* ADC signal */
@@ -134,13 +125,6 @@ enum temp_sensor_id {
 	TEMP_SENSOR_COUNT
 };
 
-/* Light sensors */
-enum als_id {
-	ALS_ISL29035 = 0,
-
-	ALS_COUNT,
-};
-
 #endif /* !__ASSEMBLER__ */
 
 #endif /* __CROS_EC_BOARD_H */
diff --git a/board/reks/gpio.inc b/board/reks/gpio.inc
index 4b60205775..c86575c6d2 100644
--- a/board/reks/gpio.inc
+++ b/board/reks/gpio.inc
@@ -29,12 +29,12 @@ GPIO(NC_USBPD_BOOT0,    PIN(12), GPIO_INPUT | GPIO_PULL_DOWN)   /* NC */
 GPIO(USB_ILIM_SEL,      PIN(13), GPIO_OUT_HIGH)                 /* USB current control */
 GPIO(I2C_PORT0_0_SCL,   PIN(15), GPIO_INPUT)
 GPIO(I2C_PORT0_0_SDA,   PIN(16), GPIO_INPUT)
-GPIO(I2C_PORT0_1_SCL,   PIN(134), GPIO_INPUT)
-GPIO(I2C_PORT0_1_SDA,   PIN(17), GPIO_INPUT)
-GPIO(I2C_PORT1_SCL,     PIN(22), GPIO_INPUT)
-GPIO(I2C_PORT1_SDA,     PIN(23), GPIO_INPUT)
-GPIO(I2C_PORT2_SCL,     PIN(20), GPIO_INPUT)
-GPIO(I2C_PORT2_SDA,     PIN(21), GPIO_INPUT)
+GPIO(I2C_PORT0_1_SCL,   PIN(134), GPIO_ODR_HIGH)
+GPIO(I2C_PORT0_1_SDA,   PIN(17), GPIO_ODR_HIGH)
+GPIO(I2C_PORT1_SCL,     PIN(22), GPIO_ODR_HIGH)
+GPIO(I2C_PORT1_SDA,     PIN(23), GPIO_ODR_HIGH)
+GPIO(I2C_PORT2_SCL,     PIN(20), GPIO_ODR_HIGH)
+GPIO(I2C_PORT2_SDA,     PIN(21), GPIO_ODR_HIGH)
 GPIO(I2C_PORT3_SCL,     PIN(24), GPIO_INPUT)
 GPIO(I2C_PORT3_SDA,     PIN(25), GPIO_INPUT)
 GPIO(PCH_SCI_L,         PIN(26), GPIO_ODR_HIGH)                 /* SCI output */
@@ -111,7 +111,7 @@ GPIO(GPIO_3_EC,         PIN(211), GPIO_OUT_LOW)                  /* Sleep SOIX s
 ALTERNATE(PIN_MASK(16, 0x24),   1,    MODULE_UART,            0)                    /* UART0 */
 
 ALTERNATE(PIN_MASK(1,  0x60),   2,    MODULE_I2C,             GPIO_OPEN_DRAIN)      /* I2C0: Battery Charger */
-ALTERNATE(PIN_MASK(2,  0x3f),   2,    MODULE_I2C,             GPIO_OPEN_DRAIN)      /* I2C1: Temp Sensor / I2C2: SOC / I2C3: VNN */
+ALTERNATE(PIN_MASK(2,  0x30),   2,    MODULE_I2C,             GPIO_OPEN_DRAIN)      /* I2C3: Temp Sensor */
 
 ALTERNATE(PIN_MASK(0,  0xfc),   3,    MODULE_KEYBOARD_SCAN,   GPIO_KB_OUTPUT)
 ALTERNATE(PIN_MASK(1,  0x03),   3,    MODULE_KEYBOARD_SCAN,   GPIO_KB_OUTPUT)
@@ -141,10 +141,3 @@ ALTERNATE(PIN_MASK(11, 0x9e),   0,      MODULE_GPIO,          GPIO_ODR_HIGH)
 ALTERNATE(PIN_MASK(11, 0x40),   0,      MODULE_GPIO,          GPIO_ODR_HIGH)         /* 116: LRESET# */
 ALTERNATE(PIN_MASK(12, 0x01),   0,      MODULE_GPIO,          GPIO_ODR_HIGH)         /* 120: LFRAME# */
 
-/* I2C pins */
-/* I2C0_0 CLK - GPIO015, I2C0_0 DAT - GPIO016, I2C0_1 DAT - GPIO017 */
-ALTERNATE(PIN_MASK(1,  0xe0), 2, MODULE_I2C, GPIO_ODR_HIGH)
-/* I2C0_1 CLK - GPIO134 */
-ALTERNATE(PIN_MASK(13, 0x10), 2, MODULE_I2C, GPIO_ODR_HIGH)
-/* I2C{1,2,3} CLK / DAT - GPIO022-GPIO025*/
-ALTERNATE(PIN_MASK(2,  0x3f), 2, MODULE_I2C, GPIO_ODR_HIGH)