projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot
[platform/kernel/u-boot.git]
/
include
/
key_matrix.h
diff --git
a/include/key_matrix.h
b/include/key_matrix.h
index
8db6860
..
519722f
100644
(file)
--- a/
include/key_matrix.h
+++ b/
include/key_matrix.h
@@
-1,9
+1,8
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* Keyboard matrix helper functions
*
* Copyright (c) 2012 The Chromium OS Authors.
/*
* Keyboard matrix helper functions
*
* Copyright (c) 2012 The Chromium OS Authors.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _KEY_MATRIX_H
*/
#ifndef _KEY_MATRIX_H
@@
-69,8
+68,7
@@
int key_matrix_decode(struct key_matrix *config, struct key_matrix_key *keys,
* @param node Node containing compatible data
* @return 0 if ok, -1 on error
*/
* @param node Node containing compatible data
* @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.
/**
* Set up a new key matrix.