September 12, 2024 at 8:11 PM, "Devarsh Thakkar" <devarsht@xxxxxx mailto:devarsht@xxxxxx?to=%22Devarsh%20Thakkar%22%20%3Cdevarsht%40ti.com%3E > wrote: > > Modify license to include dual licensing as GPL-2.0-only OR MIT license for > tidss display driver. This allows other operating system ecosystems such as > Zephyr and also the commercial firmwares to refer and derive code from this > display driver in a more permissive manner. > > Signed-off-by: Devarsh Thakkar <devarsht@xxxxxx> Acked-by: Jyri Sarha <jyri.sarha@xxxxxx> I guess tehnically my ack would not be needed as TI owns the code I've writen for tidss, but here it goes anyway. Best regards, Jyri > --- > drivers/gpu/drm/tidss/Makefile | 2 +- > drivers/gpu/drm/tidss/tidss_crtc.c | 2 +- > drivers/gpu/drm/tidss/tidss_crtc.h | 2 +- > drivers/gpu/drm/tidss/tidss_dispc.c | 2 +- > drivers/gpu/drm/tidss/tidss_dispc.h | 2 +- > drivers/gpu/drm/tidss/tidss_dispc_regs.h | 2 +- > drivers/gpu/drm/tidss/tidss_drv.c | 2 +- > drivers/gpu/drm/tidss/tidss_drv.h | 2 +- > drivers/gpu/drm/tidss/tidss_encoder.c | 2 +- > drivers/gpu/drm/tidss/tidss_encoder.h | 2 +- > drivers/gpu/drm/tidss/tidss_irq.c | 2 +- > drivers/gpu/drm/tidss/tidss_irq.h | 2 +- > drivers/gpu/drm/tidss/tidss_kms.c | 2 +- > drivers/gpu/drm/tidss/tidss_kms.h | 2 +- > drivers/gpu/drm/tidss/tidss_plane.c | 2 +- > drivers/gpu/drm/tidss/tidss_plane.h | 2 +- > drivers/gpu/drm/tidss/tidss_scale_coefs.c | 2 +- > drivers/gpu/drm/tidss/tidss_scale_coefs.h | 2 +- > 18 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/tidss/Makefile b/drivers/gpu/drm/tidss/Makefile > index 312645271014..c67ff32d02e1 100644 > --- a/drivers/gpu/drm/tidss/Makefile > +++ b/drivers/gpu/drm/tidss/Makefile > @@ -1,4 +1,4 @@ > -# SPDX-License-Identifier: GPL-2.0 > +# SPDX-License-Identifier: GPL-2.0 OR MIT > > tidss-y := tidss_crtc.o \ > tidss_drv.o \ > diff --git a/drivers/gpu/drm/tidss/tidss_crtc.c b/drivers/gpu/drm/tidss/tidss_crtc.c > index 94f8e3178df5..43dfbead9fa9 100644 > --- a/drivers/gpu/drm/tidss/tidss_crtc.c > +++ b/drivers/gpu/drm/tidss/tidss_crtc.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0 OR MIT > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_crtc.h b/drivers/gpu/drm/tidss/tidss_crtc.h > index 040d1205496b..da03873e2ef0 100644 > --- a/drivers/gpu/drm/tidss/tidss_crtc.h > +++ b/drivers/gpu/drm/tidss/tidss_crtc.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_dispc.c b/drivers/gpu/drm/tidss/tidss_dispc.c > index 1ad711f8d2a8..3321a1c731b1 100644 > --- a/drivers/gpu/drm/tidss/tidss_dispc.c > +++ b/drivers/gpu/drm/tidss/tidss_dispc.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0 OR MIT > /* > * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Jyri Sarha <jsarha@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_dispc.h b/drivers/gpu/drm/tidss/tidss_dispc.h > index 086327d51a90..e6e4396a0d63 100644 > --- a/drivers/gpu/drm/tidss/tidss_dispc.h > +++ b/drivers/gpu/drm/tidss/tidss_dispc.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_dispc_regs.h b/drivers/gpu/drm/tidss/tidss_dispc_regs.h > index 13feedfe5d6d..6e27b6d444ab 100644 > --- a/drivers/gpu/drm/tidss/tidss_dispc_regs.h > +++ b/drivers/gpu/drm/tidss/tidss_dispc_regs.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Jyri Sarha <jsarha@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c > index d15f836dca95..b060e420ddec 100644 > --- a/drivers/gpu/drm/tidss/tidss_drv.c > +++ b/drivers/gpu/drm/tidss/tidss_drv.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0 OR MIT > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_drv.h b/drivers/gpu/drm/tidss/tidss_drv.h > index d7f27b0b0315..d4209234f59c 100644 > --- a/drivers/gpu/drm/tidss/tidss_drv.h > +++ b/drivers/gpu/drm/tidss/tidss_drv.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_encoder.c b/drivers/gpu/drm/tidss/tidss_encoder.c > index 17a86bed8054..9749fbc0e056 100644 > --- a/drivers/gpu/drm/tidss/tidss_encoder.c > +++ b/drivers/gpu/drm/tidss/tidss_encoder.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0 OR MIT > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_encoder.h b/drivers/gpu/drm/tidss/tidss_encoder.h > index 3e561d6b1e83..85db3835a335 100644 > --- a/drivers/gpu/drm/tidss/tidss_encoder.h > +++ b/drivers/gpu/drm/tidss/tidss_encoder.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_irq.c b/drivers/gpu/drm/tidss/tidss_irq.c > index 604334ef526a..51939744695a 100644 > --- a/drivers/gpu/drm/tidss/tidss_irq.c > +++ b/drivers/gpu/drm/tidss/tidss_irq.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0 OR MIT > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_irq.h b/drivers/gpu/drm/tidss/tidss_irq.h > index b512614d5863..cbfd684ecd26 100644 > --- a/drivers/gpu/drm/tidss/tidss_irq.h > +++ b/drivers/gpu/drm/tidss/tidss_irq.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_kms.c b/drivers/gpu/drm/tidss/tidss_kms.c > index f371518f8697..05afd57b9128 100644 > --- a/drivers/gpu/drm/tidss/tidss_kms.c > +++ b/drivers/gpu/drm/tidss/tidss_kms.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0 OR MIT > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_kms.h b/drivers/gpu/drm/tidss/tidss_kms.h > index 632d79f5983f..69b6bca14550 100644 > --- a/drivers/gpu/drm/tidss/tidss_kms.h > +++ b/drivers/gpu/drm/tidss/tidss_kms.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_plane.c b/drivers/gpu/drm/tidss/tidss_plane.c > index a5d86822c9e3..37ffaea15c73 100644 > --- a/drivers/gpu/drm/tidss/tidss_plane.c > +++ b/drivers/gpu/drm/tidss/tidss_plane.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0 OR MIT > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_plane.h b/drivers/gpu/drm/tidss/tidss_plane.h > index e933e158b617..3e00bc853813 100644 > --- a/drivers/gpu/drm/tidss/tidss_plane.h > +++ b/drivers/gpu/drm/tidss/tidss_plane.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Tomi Valkeinen <tomi.valkeinen@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_scale_coefs.c b/drivers/gpu/drm/tidss/tidss_scale_coefs.c > index c2b84fea89a5..686ea63e0f45 100644 > --- a/drivers/gpu/drm/tidss/tidss_scale_coefs.c > +++ b/drivers/gpu/drm/tidss/tidss_scale_coefs.c > @@ -1,4 +1,4 @@ > -// SPDX-License-Identifier: GPL-2.0 > +// SPDX-License-Identifier: GPL-2.0 OR MIT > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Jyri Sarha <jsarha@xxxxxx> > diff --git a/drivers/gpu/drm/tidss/tidss_scale_coefs.h b/drivers/gpu/drm/tidss/tidss_scale_coefs.h > index 9c560d0fdac0..4689109fe560 100644 > --- a/drivers/gpu/drm/tidss/tidss_scale_coefs.h > +++ b/drivers/gpu/drm/tidss/tidss_scale_coefs.h > @@ -1,4 +1,4 @@ > -/* SPDX-License-Identifier: GPL-2.0 */ > +/* SPDX-License-Identifier: GPL-2.0 OR MIT */ > /* > * Copyright (C) 2018 Texas Instruments Incorporated - https://www.ti.com/ > * Author: Jyri Sarha <jsarha@xxxxxx> > -- > 2.39.1 >