From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.9 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B98CC48BE8 for ; Fri, 18 Jun 2021 14:54:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 21DEC610A3 for ; Fri, 18 Jun 2021 14:54:13 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 21DEC610A3 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=mail.ru Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=wh3dZz3hh7cgyHDp8q0KUs5OmagVg2RUDiPO7R8hiyo=; b=oflbRo49pXVk+A +0YDtzbAV8E+s8w09cq0Cap9FTkQ6GJReH0sZ9mrresuLzjzqJFob3vBsgQmyiwDk5GPdnUQJo+PD KQJ7tOBf15Nnn0ECTDAgGRncH1Tu2cXM/GHHrHFoH1AVUs73kgyDaJicwKTMT+Ti6V7AGAw01COH5 D4GBYk5QhO0EoO8Ml5w//U1RIt+397QgotwohPCdOxfEYjB03/DeNLyngUPXJJaP49MU1evNPbr9y ytBhv9pZPC77dZbCvueIAsqjW22H5m5PwwdJNSOJk8b63Yeyd1F3sdiwf8FzLJCSsGpggXF0+1N3p RZTHfj7KRMLH7GAm//kA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1luFr0-00EZAW-G4; Fri, 18 Jun 2021 14:52:18 +0000 Received: from smtp49.i.mail.ru ([94.100.177.109]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1luFqv-00EZ9U-LN for linux-arm-kernel@lists.infradead.org; Fri, 18 Jun 2021 14:52:16 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mail.ru; s=mail3; h=Content-Transfer-Encoding:MIME-Version:Message-Id:Date:Subject:Cc:To:From:From:Subject:Content-Type:Content-Transfer-Encoding:To:Cc; bh=ijK73F/lg2DhM4aUQACgPn0lF4hO8YJZvqHfVCtI7Wg=; b=EDi2Plvg1/ja+JijN4zKK6hejdvt+Q6zz9/M0jk4H+0vZdl3MUzgDkSaYnK7TCd8BijmkQrdAVel8ondsmxT4e39HykgMuYtdV6Z3Tw18yBbJyBI97P/g/WvUu+b7fNRVoNkj3W26C7A+eceFWw1aRRJZ6gzhQHVd8YIagxKVKY=; Received: by smtp49.i.mail.ru with esmtpa (envelope-from ) id 1luFqq-0001bv-09; Fri, 18 Jun 2021 17:52:08 +0300 From: Sergey Larin To: Dmitry Torokhov , Maxime Coquelin , Alexandre Torgue Cc: linux-input@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sergey Larin Subject: [PATCH] Input: stmpe-keypad - add STMPE1801 support Date: Fri, 18 Jun 2021 17:51:49 +0300 Message-Id: <20210618145149.10136-1-cerg2010cerg2010@mail.ru> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Authentication-Results: smtp49.i.mail.ru; auth=pass smtp.auth=cerg2010cerg2010@mail.ru smtp.mailfrom=cerg2010cerg2010@mail.ru X-7564579A: 646B95376F6C166E X-77F55803: 4F1203BC0FB41BD91C2C07775F13263A075164279ADA4DEE4DF6CBEA76D0A4B700894C459B0CD1B96A756C19C813DA90BB093D7B977E284D4A4F2FA72D6FC0293DBFFC9DE3409321 X-7FA49CB5: FF5795518A3D127A4AD6D5ED66289B5278DA827A17800CE73C696014E2DCCA1EEA1F7E6F0F101C67BD4B6F7A4D31EC0BCC500DACC3FED6E28638F802B75D45FF8AA50765F7900637E78B284398E2029E8638F802B75D45FF36EB9D2243A4F8B5A6FCA7DBDB1FC311F39EFFDF887939037866D6147AF826D8F8B8055A963F40B626E7A556CE19E2A76F9789CCF6C18C3F8528715B7D10C86878DA827A17800CE7850F8B975A76562C9FA2833FD35BB23D9E625A9149C048EE26055571C92BF10FF04B652EEC242312D2E47CDBA5A96583BD4B6F7A4D31EC0BC014FD901B82EE079FA2833FD35BB23D27C277FBC8AE2E8B44DFDAE72D78788F389733CBF5DBD5E9B5C8C57E37DE458BD9DD9810294C998ED8FC6C240DEA76428AA50765F79006379B52A4D16EC328CCD81D268191BDAD3DBD4B6F7A4D31EC0BEA7A3FFF5B025636D81D268191BDAD3D78DA827A17800CE74FED4A516E967888EC76A7562686271EEC990983EF5C03292E808ACE2090B5E14AD6D5ED66289B5259CC434672EE63711DD303D21008E298D5E8D9A59859A8B6B372FE9A2E580EFC725E5C173C3A84C330F6261E3B51B4EA089D37D7C0E48F6C5571747095F342E88FB05168BE4CE3AF X-C1DE0DAB: C20DE7B7AB408E4181F030C43753B8186998911F362727C414F749A5E30D975C128C1281A48FD13C64F4A1F1B4D66FAFC7E6C40DD18CCA4C9C2B6934AE262D3EE7EAB7254005DCED3E00E3B59223EED21E0A4E2319210D9B64D260DF9561598F01A9E91200F654B0F5DD670F6F5D62878E8E86DC7131B365E7726E8460B7C23C X-C8649E89: 4E36BF7865823D7055A7F0CF078B5EC49A30900B95165D3451BBE684D17D7221757BAAD8DC2B9EAAD333B539987F6C4E5B7FB3CC35ECC8C531AD0C459A615C441D7E09C32AA3244C3855E112C3B7D6A21133044E8F827AA65595C85A795C7BAEAD832FF50B3043B1 X-D57D3AED: 3ZO7eAau8CL7WIMRKs4sN3D3tLDjz0dLbV79QFUyzQ2Ujvy7cMT6pYYqY16iZVKkSc3dCLJ7zSJH7+u4VD18S7Vl4ZUrpaVfd2+vE6kuoey4m4VkSEu530nj6fImhcD4MUrOEAnl0W826KZ9Q+tr5ycPtXkTV4k65bRjmOUUP8cvGozZ33TWg5HZplvhhXbhDGzqmQDTd6OAevLeAnq3Ra9uf7zvY2zzsIhlcp/Y7m53TZgf2aB4JOg4gkr2bioj0Roc5o5ut94anVs539TTpA== X-Mailru-Sender: 24CCEAA761B392C83D438B890C7CDC3C81E547FAADE5F02D8733E1D2EFA86DA86CCF71F689FD47EECAD91EC71FC00F3837D2A27E1A8065646C7A2150F6097340301919DCEDD5454186FA049C4F996C4B5FEEDEB644C299C0ED14614B50AE0675 X-Mras: Ok X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210618_075214_093510_06C42CC2 X-CRM114-Status: GOOD ( 19.84 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org This chip variant differs from others - it has different register map and swapped rows/columns. Signed-off-by: Sergey Larin --- drivers/input/keyboard/stmpe-keypad.c | 108 ++++++++++++++++++++------ 1 file changed, 85 insertions(+), 23 deletions(-) diff --git a/drivers/input/keyboard/stmpe-keypad.c b/drivers/input/keyboard/stmpe-keypad.c index 7bf97285e30c..ed74578927a3 100644 --- a/drivers/input/keyboard/stmpe-keypad.c +++ b/drivers/input/keyboard/stmpe-keypad.c @@ -13,7 +13,7 @@ #include #include -/* These are at the same addresses in all STMPE variants */ +/* These are at the same addresses in all STMPE variants, except 1801 */ #define STMPE_KPC_COL 0x60 #define STMPE_KPC_ROW_MSB 0x61 #define STMPE_KPC_ROW_LSB 0x62 @@ -42,14 +42,15 @@ #define STMPE_KEYPAD_MAX_DEBOUNCE 127 #define STMPE_KEYPAD_MAX_SCAN_COUNT 15 -#define STMPE_KEYPAD_MAX_ROWS 8 -#define STMPE_KEYPAD_MAX_COLS 8 +#define STMPE_KEYPAD_MAX_ROWS 10 +#define STMPE_KEYPAD_MAX_COLS 12 #define STMPE_KEYPAD_ROW_SHIFT 3 #define STMPE_KEYPAD_KEYMAP_MAX_SIZE \ (STMPE_KEYPAD_MAX_ROWS * STMPE_KEYPAD_MAX_COLS) #define STMPE1601_NUM_DATA 5 +#define STMPE1801_NUM_DATA 5 #define STMPE2401_NUM_DATA 3 #define STMPE2403_NUM_DATA 5 @@ -67,6 +68,12 @@ * @max_rows: maximum number of rows supported * @col_gpios: bitmask of gpios which can be used for columns * @row_gpios: bitmask of gpios which can be used for rows + * @col_regs: registers for setting column pins + * @row_regs: registers for setting row pins + * @data_regs: registers for reading key data + * @ctrl_msb_reg: register for setting scan count + * @ctrl_lsb_reg: register for setting debounce time + * @cmd_reg: register for toggling scan mode */ struct stmpe_keypad_variant { bool auto_increment; @@ -77,6 +84,18 @@ struct stmpe_keypad_variant { int max_rows; unsigned int col_gpios; unsigned int row_gpios; + +#define MAX_COL_REGS 3 +#define MAX_ROW_REGS 3 +#define MAX_DATA_REGS 5 + + u8 col_regs[MAX_COL_REGS]; + u8 row_regs[MAX_ROW_REGS]; + u8 data_regs[MAX_DATA_REGS]; + u8 ctrl_msb_reg; + u8 ctrl_lsb_reg; + u8 cmd_reg; + bool read_inverted; }; static const struct stmpe_keypad_variant stmpe_keypad_variants[] = { @@ -88,6 +107,29 @@ static const struct stmpe_keypad_variant stmpe_keypad_variants[] = { .max_rows = 8, .col_gpios = 0x000ff, /* GPIO 0 - 7 */ .row_gpios = 0x0ff00, /* GPIO 8 - 15 */ + .col_regs = { 0x60 }, + .row_regs = { 0x62, 0x61 }, + .data_regs = { 0x68, 0x69, 0x6a, 0x6b, 0x6c }, + .ctrl_msb_reg = 0x63, + .ctrl_lsb_reg = 0x64, + .cmd_reg = 0x64, + .read_inverted = 0, + }, + [STMPE1801] = { + .auto_increment = true, + .num_data = STMPE1801_NUM_DATA, + .num_normal_data = 3, + .max_cols = 10, + .max_rows = 8, + .col_gpios = 0x3ff00, /* GPIO 8 - 17 */ + .row_gpios = 0x000ff, /* GPIO 0 - 7 */ + .col_regs = { 0x31, 0x32 }, + .row_regs = { 0x30 }, + .data_regs = { 0x3a, 0x3b, 0x3c, 0x3d, 0x3e }, + .ctrl_msb_reg = 0x33, + .ctrl_lsb_reg = 0x34, + .cmd_reg = 0x36, + .read_inverted = 1, }, [STMPE2401] = { .auto_increment = false, @@ -98,6 +140,13 @@ static const struct stmpe_keypad_variant stmpe_keypad_variants[] = { .max_rows = 12, .col_gpios = 0x0000ff, /* GPIO 0 - 7*/ .row_gpios = 0x1f7f00, /* GPIO 8-14, 16-20 */ + .col_regs = { 0x60 }, + .row_regs = { 0x62, 0x61 }, + .data_regs = { 0x68, 0x69, 0x6a, 0x6b, 0x6c }, + .ctrl_msb_reg = 0x63, + .ctrl_lsb_reg = 0x64, + .cmd_reg = 0x64, + .read_inverted = 0, }, [STMPE2403] = { .auto_increment = true, @@ -108,6 +157,13 @@ static const struct stmpe_keypad_variant stmpe_keypad_variants[] = { .max_rows = 12, .col_gpios = 0x0000ff, /* GPIO 0 - 7*/ .row_gpios = 0x1fef00, /* GPIO 8-14, 16-20 */ + .col_regs = { 0x60 }, + .row_regs = { 0x62, 0x61 }, + .data_regs = { 0x68, 0x69, 0x6a, 0x6b, 0x6c }, + .ctrl_msb_reg = 0x63, + .ctrl_lsb_reg = 0x64, + .cmd_reg = 0x64, + .read_inverted = 0, }, }; @@ -145,11 +201,11 @@ static int stmpe_keypad_read_data(struct stmpe_keypad *keypad, u8 *data) int i; if (variant->auto_increment) - return stmpe_block_read(stmpe, STMPE_KPC_DATA_BYTE0, + return stmpe_block_read(stmpe, variant->data_regs[0], variant->num_data, data); for (i = 0; i < variant->num_data; i++) { - ret = stmpe_reg_read(stmpe, STMPE_KPC_DATA_BYTE0 + i); + ret = stmpe_reg_read(stmpe, variant->data_regs[i]); if (ret < 0) return ret; @@ -176,7 +232,9 @@ static irqreturn_t stmpe_keypad_irq(int irq, void *dev) u8 data = fifo[i]; int row = (data & STMPE_KPC_DATA_ROW) >> 3; int col = data & STMPE_KPC_DATA_COL; - int code = MATRIX_SCAN_CODE(row, col, STMPE_KEYPAD_ROW_SHIFT); + int code = variant->read_inverted ? + MATRIX_SCAN_CODE(col, row, STMPE_KEYPAD_ROW_SHIFT) + : MATRIX_SCAN_CODE(row, col, STMPE_KEYPAD_ROW_SHIFT); bool up = data & STMPE_KPC_DATA_UP; if ((data & STMPE_KPC_DATA_NOKEY_MASK) @@ -265,7 +323,7 @@ static int stmpe_keypad_chip_init(struct stmpe_keypad *keypad) { const struct stmpe_keypad_variant *variant = keypad->variant; struct stmpe *stmpe = keypad->stmpe; - int ret; + int ret, val, i; if (keypad->debounce_ms > STMPE_KEYPAD_MAX_DEBOUNCE) return -EINVAL; @@ -281,33 +339,37 @@ static int stmpe_keypad_chip_init(struct stmpe_keypad *keypad) if (ret < 0) return ret; - ret = stmpe_reg_write(stmpe, STMPE_KPC_COL, keypad->cols); - if (ret < 0) - return ret; - - ret = stmpe_reg_write(stmpe, STMPE_KPC_ROW_LSB, keypad->rows); - if (ret < 0) - return ret; + val = keypad->cols; + i = 0; + do { + ret = stmpe_reg_write(stmpe, variant->col_regs[i++], val & 0xff); + if (ret < 0) + return ret; + } while ((val >>= 8) != 0); - if (variant->max_rows > 8) { - ret = stmpe_set_bits(stmpe, STMPE_KPC_ROW_MSB, - STMPE_KPC_ROW_MSB_ROWS, - keypad->rows >> 8); + val = keypad->rows; + i = 0; + do { + ret = stmpe_reg_write(stmpe, variant->row_regs[i++], val & 0xff); if (ret < 0) return ret; - } + } while ((val >>= 8) != 0); - ret = stmpe_set_bits(stmpe, STMPE_KPC_CTRL_MSB, + ret = stmpe_set_bits(stmpe, variant->ctrl_msb_reg, STMPE_KPC_CTRL_MSB_SCAN_COUNT, keypad->scan_count << 4); if (ret < 0) return ret; - return stmpe_set_bits(stmpe, STMPE_KPC_CTRL_LSB, - STMPE_KPC_CTRL_LSB_SCAN | + ret = stmpe_set_bits(stmpe, variant->ctrl_lsb_reg, STMPE_KPC_CTRL_LSB_DEBOUNCE, - STMPE_KPC_CTRL_LSB_SCAN | (keypad->debounce_ms << 1)); + if (ret < 0) + return ret; + + return stmpe_set_bits(stmpe, variant->cmd_reg, + STMPE_KPC_CTRL_LSB_SCAN, + STMPE_KPC_CTRL_LSB_SCAN); } static void stmpe_keypad_fill_used_pins(struct stmpe_keypad *keypad, -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel