lmb: Rename _lmb_alloc_addr() to lmb_alloc_addr_flags()

[J-u-boot.git] / include / key_matrix.h

diff --git a/include/key_matrix.h b/include/key_matrix.h
index f41331407dc63b795636eb7b293f0c5497320df5..fffe2ddc531662786b94c667c1b999818816e93f 100644 (file)
--- a/include/key_matrix.h
+++ b/include/key_matrix.h
@@ -1,31 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Keyboard matrix helper functions
  *
  * Copyright (c) 2012 The Chromium OS Authors.
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
  */
 
 #ifndef _KEY_MATRIX_H
 #define _KEY_MATRIX_H
 
-#include <common.h>
-
 /* Information about a matrix keyboard */
 struct key_matrix {
        /* Dimensions of the keyboard matrix, in rows and columns */
@@ -40,6 +22,7 @@ struct key_matrix {
        const u8 *plain_keycode;        /* key code for each row / column */
        const u8 *fn_keycode;           /* ...when Fn held down */
        int fn_pos;                     /* position of Fn key in key (or -1) */
+       int ghost_filter;               /* non-zero to enable ghost filter */
 };
 
 /* Information about a particular key (row, column pair) in the matrix */
@@ -81,10 +64,9 @@ int key_matrix_decode(struct key_matrix *config, struct key_matrix_key *keys,
  * @param config        Keyboard matrix config
  * @param blob          FDT blob
  * @param node          Node containing compatible data
- * @return 0 if ok, -1 on error
+ * Return: 0 if ok, -1 on error
  */
-int key_matrix_decode_fdt(struct key_matrix *config, const void *blob,
-                         int node);
+int key_matrix_decode_fdt(struct udevice *dev, struct key_matrix *config);
 
 /**
  * Set up a new key matrix.
@@ -92,8 +74,10 @@ int key_matrix_decode_fdt(struct key_matrix *config, const void *blob,
  * @param config       Keyboard matrix config
  * @param rows         Number of rows in key matrix
  * @param cols         Number of columns in key matrix
- * @return 0 if ok, -1 on error
+ * @param ghost_filter Non-zero to enable ghost filtering
+ * Return: 0 if ok, -1 on error
  */
-int key_matrix_init(struct key_matrix *config, int rows, int cols);
+int key_matrix_init(struct key_matrix *config, int rows, int cols,
+                   int ghost_filter);
 
 #endif