aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-07-04 11:22:04 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2019-07-04 11:22:04 -0700
commitdd87ae3c04080715a3d077fe10e199ae8ee256f5 (patch)
treeb98536f78a3efb39b1ee48a64a557f1c520bcab1
parent1d896794630f5cc9006a372c09c27bdd9a1ade45 (diff)
parent66fd23c9124a22fef74102ecae99c181b099f6ab (diff)
Merge "input: touchscreen: cyttsp5: add code copyright" into LE.UM.3.2.1_rb1.3LE.UM.3.2.1-00910-SDX24
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_core.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c3
-rw-r--r--drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c3
15 files changed, 30 insertions, 15 deletions
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c
index 0150990c9d0b..83d2e821492e 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_btn.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c
index a8f1df3b1aa6..6cab8bcab6e5 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_core.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c
index 698a144c77ab..bfacde331d7e 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_debug.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c
index 2cdea6fad07c..4a47d9ef2e78 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_device_access.c
@@ -10,7 +10,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c
index 783082a309b2..c6e55963fd50 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_devtree.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2013-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c
index 930741166252..5479487070a7 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_i2c.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c
index b548489ac31b..9f3f586467cc 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_loader.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor, Inc.
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c
index 69fe9979d62c..d6503925b345 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mt_common.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c
index 25089dbaf4dc..931ad18958f6 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mta.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c
index 5846d6e2dc21..286eb326355a 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_mtb.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c
index 9e305354b9d5..308ac0c8d7c0 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_platform.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2013-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c
index 8704b038a617..18b9baa51fe4 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_proximity.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2013-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h
index 933daaefd537..631e00b29a1a 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_regs.h
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c
index 3cbfecc52a1b..70df0cd58d56 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_spi.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or
diff --git a/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c
index f7ee817fc587..dc9a29bfaf3a 100644
--- a/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c
+++ b/drivers/input/touchscreen/cyttsp5/cyttsp5_test_device_access_api.c
@@ -9,7 +9,8 @@
* CYTT21XXX
* CYTT31XXX
*
- * Copyright (C) 2015-2019 Parade Technologies
+ * Copyright (c) 2019 The Linux Foundation. All rights reserved.
+ * Copyright (C) 2015 Parade Technologies
* Copyright (C) 2012-2015 Cypress Semiconductor
*
* This program is free software; you can redistribute it and/or