| Message ID | 1461099580-3866-6-git-send-email-swarren@wwwdotorg.org |
|---|---|
| State | Rejected |
| Delegated to: | Tom Warren |
| Headers | show |
On 19 April 2016 at 14:58, Stephen Warren <swarren@wwwdotorg.org> wrote: > From: Stephen Warren <swarren@nvidia.com> > > Tegra's pwm.h only contains private definitions for use inside the Tegra > PWM driver. Move it out of the global include directory since nothing > needs to access it there. > > Signed-off-by: Stephen Warren <swarren@nvidia.com> > --- > arch/arm/include/asm/arch-tegra124/pwm.h | 14 -------------- > arch/arm/include/asm/arch-tegra20/pwm.h | 14 -------------- > drivers/pwm/tegra_pwm.c | 3 ++- > .../asm/arch-tegra/pwm.h => drivers/pwm/tegra_pwm_priv.h | 6 +++--- > drivers/video/tegra.c | 1 - > drivers/video/tegra124/display.c | 2 +- > 6 files changed, 6 insertions(+), 34 deletions(-) > delete mode 100644 arch/arm/include/asm/arch-tegra124/pwm.h > delete mode 100644 arch/arm/include/asm/arch-tegra20/pwm.h > rename arch/arm/include/asm/arch-tegra/pwm.h => drivers/pwm/tegra_pwm_priv.h (86%) Reviewed-by: Simon Glass <sjg@chromium.org>
Dear Stephen, In message <1461099580-3866-6-git-send-email-swarren@wwwdotorg.org> you wrote: > > Tegra's pwm.h only contains private definitions for use inside the Tegra > PWM driver. Move it out of the global include directory since nothing > needs to access it there. If I understand correctly, all this is just a reorganisation of code. There is no new code or functionality added, right? > -/* > - * Tegra pulse width frequency modulator definitions > - * > - * Copyright (c) 2011 The Chromium OS Authors. ... > -/* > - * Tegra pulse width frequency modulator definitions > - * > - * Copyright (c) 2011 The Chromium OS Authors. ... > /* > * Copyright 2016 Google Inc. > + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. ... But then, you drop the original copyright notices of the Chromium project, and replace it by a Nvidia note, and even with this exasperating "All rights reserved" note. Sorry, but this seems politically incorrect to me. Best regards, Wolfgang Denk
On 04/24/2016 04:20 AM, Wolfgang Denk wrote: > Dear Stephen, > > In message <1461099580-3866-6-git-send-email-swarren@wwwdotorg.org> you wrote: >> >> Tegra's pwm.h only contains private definitions for use inside the Tegra >> PWM driver. Move it out of the global include directory since nothing >> needs to access it there. > > If I understand correctly, all this is just a reorganisation of code. > There is no new code or functionality added, right? That's true in this patch, certainly. >> -/* >> - * Tegra pulse width frequency modulator definitions >> - * >> - * Copyright (c) 2011 The Chromium OS Authors. > ... > >> -/* >> - * Tegra pulse width frequency modulator definitions >> - * >> - * Copyright (c) 2011 The Chromium OS Authors. > ... > >> /* >> * Copyright 2016 Google Inc. >> + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. > ... > > > But then, you drop the original copyright notices of the Chromium > project, Those copyright messages were deleted because those files were deleted. In this case (this patch) at least, those files contained nothing but a #include for other files. For files that were moved (e.g. arch/arm/include/asm/arch-tegra/pwm.h in this patch), all original copyright messages (in this case, both Chromium OS and NVIDIA) were maintained. I'm not aware of any deletions of copyright messages in files that were not completely deleted, or where the same content was moved elsewhere. If you find any, it was a simple oversight.
diff --git a/arch/arm/include/asm/arch-tegra124/pwm.h b/arch/arm/include/asm/arch-tegra124/pwm.h deleted file mode 100644 index 3d2c4324dc1d..000000000000 --- a/arch/arm/include/asm/arch-tegra124/pwm.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Tegra pulse width frequency modulator definitions - * - * Copyright (c) 2011 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __ASM_ARCH_TEGRA124_PWM_H -#define __ASM_ARCH_TEGRA124_PWM_H - -#include <asm/arch-tegra/pwm.h> - -#endif /* __ASM_ARCH_TEGRA124_PWM_H */ diff --git a/arch/arm/include/asm/arch-tegra20/pwm.h b/arch/arm/include/asm/arch-tegra20/pwm.h deleted file mode 100644 index 2207d9cd4d74..000000000000 --- a/arch/arm/include/asm/arch-tegra20/pwm.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Tegra pulse width frequency modulator definitions - * - * Copyright (c) 2011 The Chromium OS Authors. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#ifndef __ASM_ARCH_TEGRA20_PWM_H -#define __ASM_ARCH_TEGRA20_PWM_H - -#include <asm/arch-tegra/pwm.h> - -#endif /* __ASM_ARCH_TEGRA20_PWM_H */ diff --git a/drivers/pwm/tegra_pwm.c b/drivers/pwm/tegra_pwm.c index 10e1fdc9b562..a0f204a216de 100644 --- a/drivers/pwm/tegra_pwm.c +++ b/drivers/pwm/tegra_pwm.c @@ -1,5 +1,6 @@ /* * Copyright 2016 Google Inc. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ */ @@ -9,7 +10,7 @@ #include <pwm.h> #include <asm/io.h> #include <asm/arch/clock.h> -#include <asm/arch/pwm.h> +#include "tegra_pwm_priv.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/include/asm/arch-tegra/pwm.h b/drivers/pwm/tegra_pwm_priv.h similarity index 86% rename from arch/arm/include/asm/arch-tegra/pwm.h rename to drivers/pwm/tegra_pwm_priv.h index b69c0b041f40..25943494fb5c 100644 --- a/arch/arm/include/asm/arch-tegra/pwm.h +++ b/drivers/pwm/tegra_pwm_priv.h @@ -7,8 +7,8 @@ * SPDX-License-Identifier: GPL-2.0+ */ -#ifndef __ASM_ARCH_TEGRA_PWM_H -#define __ASM_ARCH_TEGRA_PWM_H +#ifndef _TEGRA_PWM_PRIV_H +#define _TEGRA_PWM_PRIV_H /* This is a single PWM channel */ struct pwm_ctlr { @@ -26,4 +26,4 @@ struct pwm_ctlr { #define PWM_DIVIDER_SHIFT 0 #define PWM_DIVIDER_MASK (0x1FFF << PWM_DIVIDER_SHIFT) -#endif /* __ASM_ARCH_TEGRA_PWM_H */ +#endif diff --git a/drivers/video/tegra.c b/drivers/video/tegra.c index 13b10645478e..b4c83b674147 100644 --- a/drivers/video/tegra.c +++ b/drivers/video/tegra.c @@ -17,7 +17,6 @@ #include <asm/arch/clock.h> #include <asm/arch/funcmux.h> #include <asm/arch/pinmux.h> -#include <asm/arch/pwm.h> #include <asm/arch/display.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/drivers/video/tegra124/display.c b/drivers/video/tegra124/display.c index 2f1f0df20eb1..d627285b8081 100644 --- a/drivers/video/tegra124/display.c +++ b/drivers/video/tegra124/display.c @@ -1,5 +1,6 @@ /* * Copyright 2014 Google Inc. + * Copyright (c) 2014-2016, NVIDIA CORPORATION. All rights reserved. * * SPDX-License-Identifier: GPL-2.0+ * @@ -18,7 +19,6 @@ #include <asm/gpio.h> #include <asm/io.h> #include <asm/arch/clock.h> -#include <asm/arch/pwm.h> #include <asm/arch-tegra/dc.h> #include <dm/uclass-internal.h> #include "displayport.h"