Qualcomm has given permission for all the dt-bindings to be dual licensed. All of the Linaro authored bindings are easy to change, in terms of the permissions & copyrights, so they've been bundled in this commit. Additionally clean up the syntax of some of the copyright statements. Signed-off-by: Robert Foss <robert.foss@xxxxxxxxxx> --- There are more Qcom bindings that should have the license updated to GPL2+BSD, but since they haven't been authored or copyrighted by Linaro, I think I'll have to hunt down the authors individually. include/dt-bindings/clock/qcom,dispcc-sm8250.h | 2 +- include/dt-bindings/clock/qcom,gcc-msm8916.h | 2 +- include/dt-bindings/clock/qcom,gcc-msm8939.h | 2 +- include/dt-bindings/clock/qcom,gcc-msm8996.h | 2 +- include/dt-bindings/clock/qcom,gcc-msm8998.h | 2 +- include/dt-bindings/clock/qcom,gcc-qcs404.h | 2 +- include/dt-bindings/clock/qcom,gcc-sm8150.h | 2 +- include/dt-bindings/clock/qcom,rpmcc.h | 2 +- include/dt-bindings/clock/qcom,rpmh.h | 6 ++++-- include/dt-bindings/clock/qcom,sm8250-lpass-aoncc.h | 2 +- include/dt-bindings/clock/qcom,sm8250-lpass-audiocc.h | 2 +- include/dt-bindings/clock/qcom,turingcc-qcs404.h | 2 +- 12 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/dt-bindings/clock/qcom,dispcc-sm8250.h b/include/dt-bindings/clock/qcom,dispcc-sm8250.h index ce001cbbc27fb..c139b7f7be203 100644 --- a/include/dt-bindings/clock/qcom,dispcc-sm8250.h +++ b/include/dt-bindings/clock/qcom,dispcc-sm8250.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved. */ diff --git a/include/dt-bindings/clock/qcom,gcc-msm8916.h b/include/dt-bindings/clock/qcom,gcc-msm8916.h index 5630344061841..52db6cd222c96 100644 --- a/include/dt-bindings/clock/qcom,gcc-msm8916.h +++ b/include/dt-bindings/clock/qcom,gcc-msm8916.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright 2015 Linaro Limited */ diff --git a/include/dt-bindings/clock/qcom,gcc-msm8939.h b/include/dt-bindings/clock/qcom,gcc-msm8939.h index 0634467c4ce5a..338b93ba75182 100644 --- a/include/dt-bindings/clock/qcom,gcc-msm8939.h +++ b/include/dt-bindings/clock/qcom,gcc-msm8939.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright 2020 Linaro Limited */ diff --git a/include/dt-bindings/clock/qcom,gcc-msm8996.h b/include/dt-bindings/clock/qcom,gcc-msm8996.h index 03bf49d43d24c..fb1523c3b44ee 100644 --- a/include/dt-bindings/clock/qcom,gcc-msm8996.h +++ b/include/dt-bindings/clock/qcom,gcc-msm8996.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright (c) 2015, The Linux Foundation. All rights reserved. */ diff --git a/include/dt-bindings/clock/qcom,gcc-msm8998.h b/include/dt-bindings/clock/qcom,gcc-msm8998.h index 1badb4f9c58fd..6566881f7056e 100644 --- a/include/dt-bindings/clock/qcom,gcc-msm8998.h +++ b/include/dt-bindings/clock/qcom,gcc-msm8998.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright (c) 2016, The Linux Foundation. All rights reserved. */ diff --git a/include/dt-bindings/clock/qcom,gcc-qcs404.h b/include/dt-bindings/clock/qcom,gcc-qcs404.h index bc30515433470..c8d4c7f993418 100644 --- a/include/dt-bindings/clock/qcom,gcc-qcs404.h +++ b/include/dt-bindings/clock/qcom,gcc-qcs404.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright (c) 2018, The Linux Foundation. All rights reserved. */ diff --git a/include/dt-bindings/clock/qcom,gcc-sm8150.h b/include/dt-bindings/clock/qcom,gcc-sm8150.h index dfefd5e8bf6e9..614ab995de4c0 100644 --- a/include/dt-bindings/clock/qcom,gcc-sm8150.h +++ b/include/dt-bindings/clock/qcom,gcc-sm8150.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright (c) 2019, The Linux Foundation. All rights reserved. */ diff --git a/include/dt-bindings/clock/qcom,rpmcc.h b/include/dt-bindings/clock/qcom,rpmcc.h index 015db95303d19..c0c21762b2340 100644 --- a/include/dt-bindings/clock/qcom,rpmcc.h +++ b/include/dt-bindings/clock/qcom,rpmcc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright 2015 Linaro Limited */ diff --git a/include/dt-bindings/clock/qcom,rpmh.h b/include/dt-bindings/clock/qcom,rpmh.h index 0a7d1be0d1246..2d882cb44e8bf 100644 --- a/include/dt-bindings/clock/qcom,rpmh.h +++ b/include/dt-bindings/clock/qcom,rpmh.h @@ -1,5 +1,7 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (c) 2018, 2020, The Linux Foundation. All rights reserved. */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ +/* + * Copyright (c) 2018, 2020, The Linux Foundation. All rights reserved. + */ #ifndef _DT_BINDINGS_CLK_MSM_RPMH_H diff --git a/include/dt-bindings/clock/qcom,sm8250-lpass-aoncc.h b/include/dt-bindings/clock/qcom,sm8250-lpass-aoncc.h index f5a1cfac86129..35e952aa00fcd 100644 --- a/include/dt-bindings/clock/qcom,sm8250-lpass-aoncc.h +++ b/include/dt-bindings/clock/qcom,sm8250-lpass-aoncc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ #ifndef _DT_BINDINGS_CLK_LPASS_AONCC_SM8250_H #define _DT_BINDINGS_CLK_LPASS_AONCC_SM8250_H diff --git a/include/dt-bindings/clock/qcom,sm8250-lpass-audiocc.h b/include/dt-bindings/clock/qcom,sm8250-lpass-audiocc.h index a1aa6cb5d8400..9d4eca95a8984 100644 --- a/include/dt-bindings/clock/qcom,sm8250-lpass-audiocc.h +++ b/include/dt-bindings/clock/qcom,sm8250-lpass-audiocc.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ #ifndef _DT_BINDINGS_CLK_LPASS_AUDIOCC_SM8250_H #define _DT_BINDINGS_CLK_LPASS_AUDIOCC_SM8250_H diff --git a/include/dt-bindings/clock/qcom,turingcc-qcs404.h b/include/dt-bindings/clock/qcom,turingcc-qcs404.h index 838faef57c670..cea4894089729 100644 --- a/include/dt-bindings/clock/qcom,turingcc-qcs404.h +++ b/include/dt-bindings/clock/qcom,turingcc-qcs404.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* * Copyright (c) 2019, Linaro Ltd */ -- 2.34.1