| Message ID | 20201022194313.21980-1-alpernebiyasak@gmail.com |
|---|---|
| State | Accepted |
| Commit | a355ece8e678602de89febe30ede17a337c25836 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | video: rockchip: Restrict EDP, VOP, MIPI files to GPL-2.0 | expand |
On Thu, 22 Oct 2020 at 13:44, Alper Nebi Yasak <alpernebiyasak@gmail.com> wrote: > > These files have a lot of code in common with their counterparts in > coreboot, especially in their earlier revisions: > > U-Boot | coreboot > --------------------------------------|-------------------------------------------- > drivers/video/rockchip/: | src/soc/rockchip/: > - rk_edp.c (GPL-2.0+) | - common/edp.c (GPL-2.0-only) > " | - rk3288/display.c (GPL-2.0-only) > " | - rk3399/display.c (GPL-2.0-only) > - rk_hdmi.h (GPL-2.0+) | (none) > - rk_hdmi.c (GPL-2.0+) | - rk3288/hdmi.c (GPL-2.0-or-later) > - rk3288_hdmi.c (GPL-2.0+) | - rk3288/hdmi.c (GPL-2.0-or-later) > - rk3399_hdmi.c (GPL-2.0+) | (none) > - rk_mipi.h (GPL-2.0+) | (none) > - rk_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) > - rk3288_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) > - rk3399_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) > - rk_lvds.c (GPL-2.0+) | (none) > - rk_vop.h (GPL-2.0+) | (none) > - rk_vop.c (GPL-2.0+) | - common/vop.c (GPL-2.0-only) > - rk3288_vop.c (GPL-2.0+) | - common/vop.c (GPL-2.0-only) > - rk3399_vop.c (GPL-2.0+) | (none) > | > arch/arm/include/asm/arch-rockchip/: | src/soc/rockchip/*/include/soc/*: > - edp_rk3288.h (GPL-2.0+) | - common/.../edp.h (GPL-2.0-only) > " | - rk3288/.../display.h (GPL-2.0-only) > " | - rk3399/.../display.h (GPL-2.0-only) > - vop_rk3288.h (GPL-2.0+) | - common/.../vop.h (GPL-2.0-only) > > Restrict the licenses to match coreboot's so that changes from coreboot > can be imported to U-Boot as necessary. HDMI files are already 2.0+ > there and rk_lvds.c has no counterpart, so keep them as is. > > Cc: Simon Glass <sjg@chromium.org> > Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Cc: Eric Gao <eric.gao@rock-chips.com> > Cc: Jacob Chen <jacob-chen@iotwrt.com> > Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> > --- > See Tom Rini's comment [1] and the preceding discussion for more > context. > > [1] https://patchwork.ozlabs.org/comment/2554434/ > > arch/arm/include/asm/arch-rockchip/edp_rk3288.h | 2 +- > arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 2 +- > drivers/video/rockchip/rk3288_mipi.c | 2 +- > drivers/video/rockchip/rk3288_vop.c | 2 +- > drivers/video/rockchip/rk3399_mipi.c | 2 +- > drivers/video/rockchip/rk3399_vop.c | 2 +- > drivers/video/rockchip/rk_edp.c | 2 +- > drivers/video/rockchip/rk_mipi.c | 2 +- > drivers/video/rockchip/rk_mipi.h | 2 +- > drivers/video/rockchip/rk_vop.c | 2 +- > drivers/video/rockchip/rk_vop.h | 2 +- > 11 files changed, 11 insertions(+), 11 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On 2020/10/23 上午3:43, Alper Nebi Yasak wrote: > These files have a lot of code in common with their counterparts in > coreboot, especially in their earlier revisions: > > U-Boot | coreboot > --------------------------------------|-------------------------------------------- > drivers/video/rockchip/: | src/soc/rockchip/: > - rk_edp.c (GPL-2.0+) | - common/edp.c (GPL-2.0-only) > " | - rk3288/display.c (GPL-2.0-only) > " | - rk3399/display.c (GPL-2.0-only) > - rk_hdmi.h (GPL-2.0+) | (none) > - rk_hdmi.c (GPL-2.0+) | - rk3288/hdmi.c (GPL-2.0-or-later) > - rk3288_hdmi.c (GPL-2.0+) | - rk3288/hdmi.c (GPL-2.0-or-later) > - rk3399_hdmi.c (GPL-2.0+) | (none) > - rk_mipi.h (GPL-2.0+) | (none) > - rk_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) > - rk3288_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) > - rk3399_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) > - rk_lvds.c (GPL-2.0+) | (none) > - rk_vop.h (GPL-2.0+) | (none) > - rk_vop.c (GPL-2.0+) | - common/vop.c (GPL-2.0-only) > - rk3288_vop.c (GPL-2.0+) | - common/vop.c (GPL-2.0-only) > - rk3399_vop.c (GPL-2.0+) | (none) > | > arch/arm/include/asm/arch-rockchip/: | src/soc/rockchip/*/include/soc/*: > - edp_rk3288.h (GPL-2.0+) | - common/.../edp.h (GPL-2.0-only) > " | - rk3288/.../display.h (GPL-2.0-only) > " | - rk3399/.../display.h (GPL-2.0-only) > - vop_rk3288.h (GPL-2.0+) | - common/.../vop.h (GPL-2.0-only) > > Restrict the licenses to match coreboot's so that changes from coreboot > can be imported to U-Boot as necessary. HDMI files are already 2.0+ > there and rk_lvds.c has no counterpart, so keep them as is. > > Cc: Simon Glass <sjg@chromium.org> > Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> > Cc: Eric Gao <eric.gao@rock-chips.com> > Cc: Jacob Chen <jacob-chen@iotwrt.com> > Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> Reviewed-by: Kever Yang<kever.yang@rock-chips.com> Thanks, - Kever > --- > See Tom Rini's comment [1] and the preceding discussion for more > context. > > [1] https://patchwork.ozlabs.org/comment/2554434/ > > arch/arm/include/asm/arch-rockchip/edp_rk3288.h | 2 +- > arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 2 +- > drivers/video/rockchip/rk3288_mipi.c | 2 +- > drivers/video/rockchip/rk3288_vop.c | 2 +- > drivers/video/rockchip/rk3399_mipi.c | 2 +- > drivers/video/rockchip/rk3399_vop.c | 2 +- > drivers/video/rockchip/rk_edp.c | 2 +- > drivers/video/rockchip/rk_mipi.c | 2 +- > drivers/video/rockchip/rk_mipi.h | 2 +- > drivers/video/rockchip/rk_vop.c | 2 +- > drivers/video/rockchip/rk_vop.h | 2 +- > 11 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h > index 105a335dabac..94e5bb674f2d 100644 > --- a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h > +++ b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* > * Copyright (c) 2015 Google, Inc > * Copyright 2014 Rockchip Inc. > diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h > index 872a158b714b..52446e97c691 100644 > --- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h > +++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* > * Copyright (c) 2015 Google, Inc > * Copyright 2014 Rockchip Inc. > diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c > index b232ff0b76b2..8ac0125b502e 100644 > --- a/drivers/video/rockchip/rk3288_mipi.c > +++ b/drivers/video/rockchip/rk3288_mipi.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd > * Author: Eric Gao <eric.gao@rock-chips.com> > diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c > index 68d1507cda46..9ec33e6e511b 100644 > --- a/drivers/video/rockchip/rk3288_vop.c > +++ b/drivers/video/rockchip/rk3288_vop.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH > * Copyright (c) 2015 Google, Inc > diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c > index 113708d97e5a..e5534c36e6ef 100644 > --- a/drivers/video/rockchip/rk3399_mipi.c > +++ b/drivers/video/rockchip/rk3399_mipi.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd > * Author: Eric Gao <eric.gao@rock-chips.com> > diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c > index d5a7aa8ac1b3..55d1be0411db 100644 > --- a/drivers/video/rockchip/rk3399_vop.c > +++ b/drivers/video/rockchip/rk3399_vop.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH > * Copyright (c) 2015 Google, Inc > diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c > index 000bd4814088..87301066ccf6 100644 > --- a/drivers/video/rockchip/rk_edp.c > +++ b/drivers/video/rockchip/rk_edp.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Copyright (c) 2015 Google, Inc > * Copyright 2014 Rockchip Inc. > diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c > index f811913ce5e2..d125a5ba7374 100644 > --- a/drivers/video/rockchip/rk_mipi.c > +++ b/drivers/video/rockchip/rk_mipi.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd > * Author: Eric Gao <eric.gao@rock-chips.com> > diff --git a/drivers/video/rockchip/rk_mipi.h b/drivers/video/rockchip/rk_mipi.h > index 61920f23ad96..3d1e440b0ec5 100644 > --- a/drivers/video/rockchip/rk_mipi.h > +++ b/drivers/video/rockchip/rk_mipi.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* > * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd > * Author: Eric Gao <eric.gao@rock-chips.com> > diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c > index 9032eb430e7f..6475b3e2aff5 100644 > --- a/drivers/video/rockchip/rk_vop.c > +++ b/drivers/video/rockchip/rk_vop.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0+ > +// SPDX-License-Identifier: GPL-2.0 > /* > * Copyright (c) 2015 Google, Inc > * Copyright 2014 Rockchip Inc. > diff --git a/drivers/video/rockchip/rk_vop.h b/drivers/video/rockchip/rk_vop.h > index 8fa2f3893900..53a79c04b5c5 100644 > --- a/drivers/video/rockchip/rk_vop.h > +++ b/drivers/video/rockchip/rk_vop.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > +/* SPDX-License-Identifier: GPL-2.0 */ > /* > * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH > */
diff --git a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h index 105a335dabac..94e5bb674f2d 100644 --- a/arch/arm/include/asm/arch-rockchip/edp_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/edp_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h index 872a158b714b..52446e97c691 100644 --- a/arch/arm/include/asm/arch-rockchip/vop_rk3288.h +++ b/arch/arm/include/asm/arch-rockchip/vop_rk3288.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c index b232ff0b76b2..8ac0125b502e 100644 --- a/drivers/video/rockchip/rk3288_mipi.c +++ b/drivers/video/rockchip/rk3288_mipi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd * Author: Eric Gao <eric.gao@rock-chips.com> diff --git a/drivers/video/rockchip/rk3288_vop.c b/drivers/video/rockchip/rk3288_vop.c index 68d1507cda46..9ec33e6e511b 100644 --- a/drivers/video/rockchip/rk3288_vop.c +++ b/drivers/video/rockchip/rk3288_vop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH * Copyright (c) 2015 Google, Inc diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c index 113708d97e5a..e5534c36e6ef 100644 --- a/drivers/video/rockchip/rk3399_mipi.c +++ b/drivers/video/rockchip/rk3399_mipi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd * Author: Eric Gao <eric.gao@rock-chips.com> diff --git a/drivers/video/rockchip/rk3399_vop.c b/drivers/video/rockchip/rk3399_vop.c index d5a7aa8ac1b3..55d1be0411db 100644 --- a/drivers/video/rockchip/rk3399_vop.c +++ b/drivers/video/rockchip/rk3399_vop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH * Copyright (c) 2015 Google, Inc diff --git a/drivers/video/rockchip/rk_edp.c b/drivers/video/rockchip/rk_edp.c index 000bd4814088..87301066ccf6 100644 --- a/drivers/video/rockchip/rk_edp.c +++ b/drivers/video/rockchip/rk_edp.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c index f811913ce5e2..d125a5ba7374 100644 --- a/drivers/video/rockchip/rk_mipi.c +++ b/drivers/video/rockchip/rk_mipi.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd * Author: Eric Gao <eric.gao@rock-chips.com> diff --git a/drivers/video/rockchip/rk_mipi.h b/drivers/video/rockchip/rk_mipi.h index 61920f23ad96..3d1e440b0ec5 100644 --- a/drivers/video/rockchip/rk_mipi.h +++ b/drivers/video/rockchip/rk_mipi.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2017, Fuzhou Rockchip Electronics Co., Ltd * Author: Eric Gao <eric.gao@rock-chips.com> diff --git a/drivers/video/rockchip/rk_vop.c b/drivers/video/rockchip/rk_vop.c index 9032eb430e7f..6475b3e2aff5 100644 --- a/drivers/video/rockchip/rk_vop.c +++ b/drivers/video/rockchip/rk_vop.c @@ -1,4 +1,4 @@ -// SPDX-License-Identifier: GPL-2.0+ +// SPDX-License-Identifier: GPL-2.0 /* * Copyright (c) 2015 Google, Inc * Copyright 2014 Rockchip Inc. diff --git a/drivers/video/rockchip/rk_vop.h b/drivers/video/rockchip/rk_vop.h index 8fa2f3893900..53a79c04b5c5 100644 --- a/drivers/video/rockchip/rk_vop.h +++ b/drivers/video/rockchip/rk_vop.h @@ -1,4 +1,4 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ +/* SPDX-License-Identifier: GPL-2.0 */ /* * Copyright (c) 2017 Theobroma Systems Design und Consulting GmbH */
These files have a lot of code in common with their counterparts in coreboot, especially in their earlier revisions: U-Boot | coreboot --------------------------------------|-------------------------------------------- drivers/video/rockchip/: | src/soc/rockchip/: - rk_edp.c (GPL-2.0+) | - common/edp.c (GPL-2.0-only) " | - rk3288/display.c (GPL-2.0-only) " | - rk3399/display.c (GPL-2.0-only) - rk_hdmi.h (GPL-2.0+) | (none) - rk_hdmi.c (GPL-2.0+) | - rk3288/hdmi.c (GPL-2.0-or-later) - rk3288_hdmi.c (GPL-2.0+) | - rk3288/hdmi.c (GPL-2.0-or-later) - rk3399_hdmi.c (GPL-2.0+) | (none) - rk_mipi.h (GPL-2.0+) | (none) - rk_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) - rk3288_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) - rk3399_mipi.c (GPL-2.0+) | - rk3399/mipi.c (GPL-2.0-only) - rk_lvds.c (GPL-2.0+) | (none) - rk_vop.h (GPL-2.0+) | (none) - rk_vop.c (GPL-2.0+) | - common/vop.c (GPL-2.0-only) - rk3288_vop.c (GPL-2.0+) | - common/vop.c (GPL-2.0-only) - rk3399_vop.c (GPL-2.0+) | (none) | arch/arm/include/asm/arch-rockchip/: | src/soc/rockchip/*/include/soc/*: - edp_rk3288.h (GPL-2.0+) | - common/.../edp.h (GPL-2.0-only) " | - rk3288/.../display.h (GPL-2.0-only) " | - rk3399/.../display.h (GPL-2.0-only) - vop_rk3288.h (GPL-2.0+) | - common/.../vop.h (GPL-2.0-only) Restrict the licenses to match coreboot's so that changes from coreboot can be imported to U-Boot as necessary. HDMI files are already 2.0+ there and rk_lvds.c has no counterpart, so keep them as is. Cc: Simon Glass <sjg@chromium.org> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com> Cc: Eric Gao <eric.gao@rock-chips.com> Cc: Jacob Chen <jacob-chen@iotwrt.com> Signed-off-by: Alper Nebi Yasak <alpernebiyasak@gmail.com> --- See Tom Rini's comment [1] and the preceding discussion for more context. [1] https://patchwork.ozlabs.org/comment/2554434/ arch/arm/include/asm/arch-rockchip/edp_rk3288.h | 2 +- arch/arm/include/asm/arch-rockchip/vop_rk3288.h | 2 +- drivers/video/rockchip/rk3288_mipi.c | 2 +- drivers/video/rockchip/rk3288_vop.c | 2 +- drivers/video/rockchip/rk3399_mipi.c | 2 +- drivers/video/rockchip/rk3399_vop.c | 2 +- drivers/video/rockchip/rk_edp.c | 2 +- drivers/video/rockchip/rk_mipi.c | 2 +- drivers/video/rockchip/rk_mipi.h | 2 +- drivers/video/rockchip/rk_vop.c | 2 +- drivers/video/rockchip/rk_vop.h | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-)