Skip to contentSkip to conversation

video: rockchip: Restrict EDP, VOP, MIPI files to GPL-2.0

PATCH New Alper Nebi Yasak 3 participants 3 messages Oct 22, 2020 – Nov 13, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 video: rockchip: Restrict EDP, VOP, MIPI files to GPL-2.0

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 <[email protected]>
Cc Philipp Tomsich <[email protected]>
Cc Eric Gao <[email protected]>
Cc Jacob Chen <[email protected]>

---
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(-)
arch/arm/include/asm/arch-rockchip/edp_rk3288.h +1 -1
index 105a335dabac..94e5bb674f2d 100644
@@ -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.
arch/arm/include/asm/arch-rockchip/vop_rk3288.h +1 -1
index 872a158b714b..52446e97c691 100644
@@ -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.
drivers/video/rockchip/rk3288_mipi.c +1 -1
index b232ff0b76b2..8ac0125b502e 100644
@@ -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 <[email protected]>
drivers/video/rockchip/rk3288_vop.c +1 -1
index 68d1507cda46..9ec33e6e511b 100644
@@ -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
drivers/video/rockchip/rk3399_mipi.c +1 -1
index 113708d97e5a..e5534c36e6ef 100644
@@ -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 <[email protected]>
drivers/video/rockchip/rk3399_vop.c +1 -1
index d5a7aa8ac1b3..55d1be0411db 100644
@@ -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
drivers/video/rockchip/rk_edp.c +1 -1
index 000bd4814088..87301066ccf6 100644
@@ -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.
drivers/video/rockchip/rk_mipi.c +1 -1
index f811913ce5e2..d125a5ba7374 100644
@@ -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 <[email protected]>
drivers/video/rockchip/rk_mipi.h +1 -1
index 61920f23ad96..3d1e440b0ec5 100644
@@ -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 <[email protected]>
drivers/video/rockchip/rk_vop.c +1 -1
index 9032eb430e7f..6475b3e2aff5 100644
@@ -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.
drivers/video/rockchip/rk_vop.h +1 -1
index 8fa2f3893900..53a79c04b5c5 100644
@@ -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
  */
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 video: rockchip: Restrict EDP, VOP, MIPI files to GPL-2.0

Quoted 45 lines · Alper Nebi Yasak

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 <[email protected]>
Cc Philipp Tomsich <[email protected]>
Cc Eric Gao <[email protected]>
Cc Jacob Chen <[email protected]>

---
See Tom Rini's comment [1] and the preceding discussion for more context.

[1] https://patchwork.ozlabs.org/comment/2554434/

Quoted 12 lines
 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(-)
#2 lore raw

PATCH 1/1 video: rockchip: Restrict EDP, VOP, MIPI files to GPL-2.0

In reply to Alper Nebi Yasak
Quoted 33 lines · Alper Nebi Yasak

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.

Quoted 5 lines
Cc Simon Glass <[email protected]>
Cc Philipp Tomsich <[email protected]>
Cc Eric Gao <[email protected]>
Cc Jacob Chen <[email protected]>

Thanks,
- Kever

Quoted 129 lines

---
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(-)
arch/arm/include/asm/arch-rockchip/edp_rk3288.h +1 -1
index 105a335dabac..94e5bb674f2d 100644
@@ -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.
arch/arm/include/asm/arch-rockchip/vop_rk3288.h +1 -1
index 872a158b714b..52446e97c691 100644
@@ -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.
drivers/video/rockchip/rk3288_mipi.c +1 -1
index b232ff0b76b2..8ac0125b502e 100644
@@ -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 <[email protected]>
drivers/video/rockchip/rk3288_vop.c +1 -1
index 68d1507cda46..9ec33e6e511b 100644
@@ -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
drivers/video/rockchip/rk3399_mipi.c +1 -1
index 113708d97e5a..e5534c36e6ef 100644
@@ -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 <[email protected]>
drivers/video/rockchip/rk3399_vop.c +1 -1
index d5a7aa8ac1b3..55d1be0411db 100644
@@ -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
drivers/video/rockchip/rk_edp.c +1 -1
index 000bd4814088..87301066ccf6 100644
@@ -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.
drivers/video/rockchip/rk_mipi.c +1 -1
index f811913ce5e2..d125a5ba7374 100644
@@ -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 <[email protected]>
drivers/video/rockchip/rk_mipi.h +1 -1
index 61920f23ad96..3d1e440b0ec5 100644
@@ -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 <[email protected]>
drivers/video/rockchip/rk_vop.c +1 -1
index 9032eb430e7f..6475b3e2aff5 100644
@@ -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.
drivers/video/rockchip/rk_vop.h +1 -1
index 8fa2f3893900..53a79c04b5c5 100644
@@ -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
   */