Revert "drivers/ddr/fsl: Dual-license DDR driver"

Upon further review, not all code authors are in favour of this change.
This reverts commit ee3556bcafbb05e59aabdc31368984e76acaabc4.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/drivers/ddr/fsl/arm_ddr_gen3.c b/drivers/ddr/fsl/arm_ddr_gen3.c
index 4fa0d5d4e41bd27bd23bc94bad61a6b61b3f1c7b..aaf4dfb1e79514a79a036c2e184a6e224afe6db2 100644 (file)
--- a/drivers/ddr/fsl/arm_ddr_gen3.c
+++ b/drivers/ddr/fsl/arm_ddr_gen3.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * Derived from mpc85xx_ddr_gen3.c, removed all workarounds
  */

diff --git a/drivers/ddr/fsl/ctrl_regs.c b/drivers/ddr/fsl/ctrl_regs.c
index 73083090e4e254e68d3b03a5005aa7b456351411..8b8727116dadb47fd060e3004febbd92cf1d3984 100644 (file)
--- a/drivers/ddr/fsl/ctrl_regs.c
+++ b/drivers/ddr/fsl/ctrl_regs.c
@@ -2,7 +2,7 @@
  * Copyright 2008-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*

diff --git a/drivers/ddr/fsl/ddr1_dimm_params.c b/drivers/ddr/fsl/ddr1_dimm_params.c
index 8a8c17cae9e348bce698a45576272ba2de908bd7..c02725e611493c57317500b86718fbfa70f975b3 100644 (file)
--- a/drivers/ddr/fsl/ddr1_dimm_params.c
+++ b/drivers/ddr/fsl/ddr1_dimm_params.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/ddr2_dimm_params.c b/drivers/ddr/fsl/ddr2_dimm_params.c
index 3ff35aa5c919e09227bc2611edb0f6d58708f665..062c849075356afd15de7fb223c5927862efe07e 100644 (file)
--- a/drivers/ddr/fsl/ddr2_dimm_params.c
+++ b/drivers/ddr/fsl/ddr2_dimm_params.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/ddr3_dimm_params.c b/drivers/ddr/fsl/ddr3_dimm_params.c
index d8f170e605c9d8b703a89d23be1d392c46fbfbf8..8a0587a64624f54f88825d15677bdae415dee6c9 100644 (file)
--- a/drivers/ddr/fsl/ddr3_dimm_params.c
+++ b/drivers/ddr/fsl/ddr3_dimm_params.c
@@ -6,7 +6,7 @@
  * from ddr3 spd, please refer to the spec
  * JEDEC standard No.21-C 4_01_02_11R18.pdf
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/ddr4_dimm_params.c b/drivers/ddr/fsl/ddr4_dimm_params.c
index 343b0ff86665268117a29dc7899f71fc4fc263b6..4867fbc932bbf8b9f078e681bb027c1fa6578b18 100644 (file)
--- a/drivers/ddr/fsl/ddr4_dimm_params.c
+++ b/drivers/ddr/fsl/ddr4_dimm_params.c
@@ -2,7 +2,7 @@
  * Copyright 2014-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * calculate the organization and timing parameter
  * from ddr3 spd, please refer to the spec

diff --git a/drivers/ddr/fsl/fsl_ddr_gen4.c b/drivers/ddr/fsl/fsl_ddr_gen4.c
index 1829aa4fa453c1175435a218db593e85ec12b8c1..c225c8e723e5a6d89f19f4e7fe3e2b16f9b3a5e1 100644 (file)
--- a/drivers/ddr/fsl/fsl_ddr_gen4.c
+++ b/drivers/ddr/fsl/fsl_ddr_gen4.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014-2015 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/fsl_mmdc.c b/drivers/ddr/fsl/fsl_mmdc.c
index 1312c081c5d8b5023f59a4f60e1fb15612d6a287..52eec0f9e9908cf643e6ecd975073a43b1ce2384 100644 (file)
--- a/drivers/ddr/fsl/fsl_mmdc.c
+++ b/drivers/ddr/fsl/fsl_mmdc.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:     GPL-2.0+       BSD-3-Clause
+ * SPDX-License-Identifier:     GPL-2.0+
  */
 
 /*

diff --git a/drivers/ddr/fsl/interactive.c b/drivers/ddr/fsl/interactive.c
index f5c21e44685e7b99c5a03dec0888c4f27d815788..1fa35c3c427c8c52e4f21cd5ad97123aa5591dfc 100644 (file)
--- a/drivers/ddr/fsl/interactive.c
+++ b/drivers/ddr/fsl/interactive.c
@@ -2,7 +2,7 @@
  * Copyright 2010-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 /*

diff --git a/drivers/ddr/fsl/lc_common_dimm_params.c b/drivers/ddr/fsl/lc_common_dimm_params.c
index 3d28abda5422d2539231917b5b091c0e5ee12c38..6599901893d4682c1f7c4d6665ad4d5bd449df96 100644 (file)
--- a/drivers/ddr/fsl/lc_common_dimm_params.c
+++ b/drivers/ddr/fsl/lc_common_dimm_params.c
@@ -2,7 +2,7 @@
  * Copyright 2008-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/main.c b/drivers/ddr/fsl/main.c
index 85897b16b65d62d5e95362e44341784040d411dd..d0a7b3f107630e67b2bb0d2f4248b10774e7efaf 100644 (file)
--- a/drivers/ddr/fsl/main.c
+++ b/drivers/ddr/fsl/main.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 /*

diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
index f74bf32c647b3d8b1cd94a74ca2fda058b28770c..c005f5294cb8245e35fdf72212424734229129cd 100644 (file)
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen1.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
index 6da4400566b02939563b220b827f899306e6d90f..898b0cd33cd593eaf3a5c68db55250b2c41a5773 100644 (file)
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen2.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-2011 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
index e58f76ae65f2b47487af72bf14cf2d8575991843..afbed598c8d2cac5c7b037de2c4e626e2f0c3a13 100644 (file)
--- a/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
+++ b/drivers/ddr/fsl/mpc85xx_ddr_gen3.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-2012 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/mpc86xx_ddr.c b/drivers/ddr/fsl/mpc86xx_ddr.c
index bda5b83df5c62f680593041fda8959b215c26273..a65eb3144fc4d868bf508424d6fd35adef5ba54b 100644 (file)
--- a/drivers/ddr/fsl/mpc86xx_ddr.c
+++ b/drivers/ddr/fsl/mpc86xx_ddr.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/options.c b/drivers/ddr/fsl/options.c
index 1abea1dfed05591cb751d626cfb1b6f3de0e40db..85ec48c28e38814bbaaf171088118996bc9e8051 100644 (file)
--- a/drivers/ddr/fsl/options.c
+++ b/drivers/ddr/fsl/options.c
@@ -2,7 +2,7 @@
  * Copyright 2008, 2010-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>

diff --git a/drivers/ddr/fsl/util.c b/drivers/ddr/fsl/util.c
index 11731cb9b9dc8b0b899a84f238d6bd0239166b13..d6e6e78de3241fbbb52c4412edd886827b126a08 100644 (file)
--- a/drivers/ddr/fsl/util.c
+++ b/drivers/ddr/fsl/util.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #include <common.h>

diff --git a/include/common_timing_params.h b/include/common_timing_params.h
index 3881456a96fd3d616426ed4eb9afd97ad49cb697..070010728b85684de293c817f5c2bd5d35a515e4 100644 (file)
--- a/include/common_timing_params.h
+++ b/include/common_timing_params.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef COMMON_TIMING_PARAMS_H

diff --git a/include/fsl_ddr.h b/include/fsl_ddr.h
index 996723c636a28cf040534794f33a4fbbc68a298c..261b94e9845eb926dacb6175addde42b15049844 100644 (file)
--- a/include/fsl_ddr.h
+++ b/include/fsl_ddr.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2008-2014 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef FSL_DDR_MAIN_H

diff --git a/include/fsl_ddr_dimm_params.h b/include/fsl_ddr_dimm_params.h
index af673fd3405bd13c9ca9f86696519ab944ed0512..1632a8fd3665b384cdaecf137de4a319d306bbcf 100644 (file)
--- a/include/fsl_ddr_dimm_params.h
+++ b/include/fsl_ddr_dimm_params.h
@@ -2,7 +2,7 @@
  * Copyright 2008-2016 Freescale Semiconductor, Inc.
  * Copyright 2017-2018 NXP Semiconductor
  *
- * SPDX-License-Identifier:    GPL-2.0 BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0
  */
 
 #ifndef DDR2_DIMM_PARAMS_H

diff --git a/include/fsl_ddrc_version.h b/include/fsl_ddrc_version.h
index 4c5aed474c4bff953415682a118ffe731ab2b455..60ba98bf8107483f90cae8d1c52dab4bb7cd04e8 100644 (file)
--- a/include/fsl_ddrc_version.h
+++ b/include/fsl_ddrc_version.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __FSL_DDRC_VER_H

diff --git a/include/fsl_immap.h b/include/fsl_immap.h
index e210c4c472ea5ed4d6ec01238157d239534e17e7..4f5a19cdc1abc835dbb88a61cb5a6aa8ce03354b 100644 (file)
--- a/include/fsl_immap.h
+++ b/include/fsl_immap.h
@@ -3,7 +3,7 @@
  *
  * Copyright 2013-2014 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __FSL_IMMAP_H

diff --git a/include/fsl_mmdc.h b/include/fsl_mmdc.h
index d364e0751931868926d8462a31258a88e7548094..d5c4f8d59a7c66bb298c08db44a1424fb64d191e 100644 (file)
--- a/include/fsl_mmdc.h
+++ b/include/fsl_mmdc.h
@@ -1,7 +1,7 @@
 /*
  * Copyright 2016 Freescale Semiconductor, Inc.
  *
- * SPDX-License-Identifier:    GPL-2.0+        BSD-3-Clause
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef FSL_MMDC_H