[PATCH 0/2] memory: tegra: EMC scaling is not a clock provider

[PATCH 0/2] memory: tegra: EMC scaling is not a clock provider

[Geert Uytterhoeven]

	Hi all,

The Tegra EMC scaling support code is not a clock provider, but merely a
clock consumer, and thus does not need to include
<linux/clk-provider.h>.

However, drivers/memory/tegra/tegra210-emc-table.c relies on
tegra210-emc.h to include <linux/of.h> through <linux/clk-provider.h>.
Hence the first patch makes <linux/of_reserved_mem.h> self-contained
first.

Thanks for your comments!

Geert Uytterhoeven (2):
  of: Make <linux/of_reserved_mem.h> self-contained
  memory: tegra: Drop <linux/clk-provider.h>

 drivers/memory/tegra/tegra210-emc-core.c | 1 -
 drivers/memory/tegra/tegra210-emc.h      | 1 -
 include/linux/of_reserved_mem.h          | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)

-- 
2.17.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

[PATCH 1/2] of: Make <linux/of_reserved_mem.h> self-contained

[Geert Uytterhoeven]

<linux/of_reserved_mem.h> is not self-contained, as it uses
_OF_DECLARE() to define RESERVEDMEM_OF_DECLARE(), but does not include
<linux/of.h>.

Fix this by adding the missing include.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 include/linux/of_reserved_mem.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/linux/of_reserved_mem.h b/include/linux/of_reserved_mem.h
index a1b427ac291bf73d..8216a415626372ca 100644
--- a/include/linux/of_reserved_mem.h
+++ b/include/linux/of_reserved_mem.h
@@ -3,6 +3,7 @@
 #define __OF_RESERVED_MEM_H
 
 #include <linux/device.h>
+#include <linux/of.h>
 
 struct of_phandle_args;
 struct reserved_mem_ops;
-- 
2.17.1

Re: [PATCH 1/2] of: Make <linux/of_reserved_mem.h> self-contained

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 473 bytes --]

On Wed, May 06, 2020 at 02:32:35PM +0200, Geert Uytterhoeven wrote:
> <linux/of_reserved_mem.h> is not self-contained, as it uses
> _OF_DECLARE() to define RESERVEDMEM_OF_DECLARE(), but does not include
> <linux/of.h>.
> 
> Fix this by adding the missing include.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  include/linux/of_reserved_mem.h | 1 +
>  1 file changed, 1 insertion(+)

Reviewed-by: Thierry Reding <treding@nvidia.com>

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/2] of: Make <linux/of_reserved_mem.h> self-contained

[Stephen Boyd]

Quoting Geert Uytterhoeven (2020-05-06 05:32:35)
> <linux/of_reserved_mem.h> is not self-contained, as it uses
> _OF_DECLARE() to define RESERVEDMEM_OF_DECLARE(), but does not include
> <linux/of.h>.
> 
> Fix this by adding the missing include.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---

Reviewed-by: Stephen Boyd <sboyd@kernel.org>

[PATCH 2/2] memory: tegra: Drop <linux/clk-provider.h>

[Geert Uytterhoeven]

The Tegra EMC scaling support code is not a clock provider, but merely a
clock consumer, and thus does not need to include
<linux/clk-provider.h>.

Fixes: ec37a9a17afbfad5 ("memory: tegra: Add EMC scaling support code for Tegra210")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/memory/tegra/tegra210-emc-core.c | 1 -
 drivers/memory/tegra/tegra210-emc.h      | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/memory/tegra/tegra210-emc-core.c b/drivers/memory/tegra/tegra210-emc-core.c
index d64ffe27c2457c9e..cdd663ba4733d8ff 100644
--- a/drivers/memory/tegra/tegra210-emc-core.c
+++ b/drivers/memory/tegra/tegra210-emc-core.c
@@ -6,7 +6,6 @@
 #include <linux/bitfield.h>
 #include <linux/clk.h>
 #include <linux/clk/tegra.h>
-#include <linux/clk-provider.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/kernel.h>
diff --git a/drivers/memory/tegra/tegra210-emc.h b/drivers/memory/tegra/tegra210-emc.h
index 63b3d0a790f1a908..8988bcf1529072a7 100644
--- a/drivers/memory/tegra/tegra210-emc.h
+++ b/drivers/memory/tegra/tegra210-emc.h
@@ -7,7 +7,6 @@
 #define TEGRA210_EMC_H
 
 #include <linux/clk.h>
-#include <linux/clk-provider.h>
 #include <linux/clk/tegra.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-- 
2.17.1

Re: [PATCH 2/2] memory: tegra: Drop <linux/clk-provider.h>

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 574 bytes --]

On Wed, May 06, 2020 at 02:32:36PM +0200, Geert Uytterhoeven wrote:
> The Tegra EMC scaling support code is not a clock provider, but merely a
> clock consumer, and thus does not need to include
> <linux/clk-provider.h>.
> 
> Fixes: ec37a9a17afbfad5 ("memory: tegra: Add EMC scaling support code for Tegra210")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---
>  drivers/memory/tegra/tegra210-emc-core.c | 1 -
>  drivers/memory/tegra/tegra210-emc.h      | 1 -
>  2 files changed, 2 deletions(-)

Applied to for-5.8/memory, thanks.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 2/2] memory: tegra: Drop <linux/clk-provider.h>

[Geert Uytterhoeven]

Hi Thierry,

On Thu, May 7, 2020 at 10:04 PM Thierry Reding <thierry.reding@gmail.com> wrote:
> On Wed, May 06, 2020 at 02:32:36PM +0200, Geert Uytterhoeven wrote:
> > The Tegra EMC scaling support code is not a clock provider, but merely a
> > clock consumer, and thus does not need to include
> > <linux/clk-provider.h>.
> >
> > Fixes: ec37a9a17afbfad5 ("memory: tegra: Add EMC scaling support code for Tegra210")
> > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > ---
> >  drivers/memory/tegra/tegra210-emc-core.c | 1 -
> >  drivers/memory/tegra/tegra210-emc.h      | 1 -
> >  2 files changed, 2 deletions(-)
>
> Applied to for-5.8/memory, thanks.

Which hasn't made it into v5.8-rc1, and was rebased.
New fixes tag is
Fixes: 01218c59f9bcf067 ("memory: tegra: Add EMC scaling support code
for Tegra210")

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 2/2] memory: tegra: Drop <linux/clk-provider.h>

[Stephen Boyd]

Quoting Geert Uytterhoeven (2020-05-06 05:32:36)
> The Tegra EMC scaling support code is not a clock provider, but merely a
> clock consumer, and thus does not need to include
> <linux/clk-provider.h>.
> 
> Fixes: ec37a9a17afbfad5 ("memory: tegra: Add EMC scaling support code for Tegra210")
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> ---

Reviewed-by: Stephen Boyd <sboyd@kernel.org>

Re: [PATCH 0/2] memory: tegra: EMC scaling is not a clock provider

[Thierry Reding]

[-- Attachment #1: Type: text/plain, Size: 1167 bytes --]

On Wed, May 06, 2020 at 02:32:34PM +0200, Geert Uytterhoeven wrote:
> 	Hi all,
> 
> The Tegra EMC scaling support code is not a clock provider, but merely a
> clock consumer, and thus does not need to include
> <linux/clk-provider.h>.
> 
> However, drivers/memory/tegra/tegra210-emc-table.c relies on
> tegra210-emc.h to include <linux/of.h> through <linux/clk-provider.h>.
> Hence the first patch makes <linux/of_reserved_mem.h> self-contained
> first.
> 
> Thanks for your comments!
> 
> Geert Uytterhoeven (2):
>   of: Make <linux/of_reserved_mem.h> self-contained
>   memory: tegra: Drop <linux/clk-provider.h>
> 
>  drivers/memory/tegra/tegra210-emc-core.c | 1 -
>  drivers/memory/tegra/tegra210-emc.h      | 1 -
>  include/linux/of_reserved_mem.h          | 1 +
>  3 files changed, 1 insertion(+), 2 deletions(-)

Ah... I should've read the cover letter first. Looks like I need to take
that first patch through the Tegra tree as well to avoid introducing the
build error in the second patch.

Rob, do you mind if I pick up patch 1 of this into the same OF branch
that I already carry the memory-region-names patches on?

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 0/2] memory: tegra: EMC scaling is not a clock provider

[Rob Herring]

On Thu, May 07, 2020 at 10:07:18PM +0200, Thierry Reding wrote:
> On Wed, May 06, 2020 at 02:32:34PM +0200, Geert Uytterhoeven wrote:
> > 	Hi all,
> > 
> > The Tegra EMC scaling support code is not a clock provider, but merely a
> > clock consumer, and thus does not need to include
> > <linux/clk-provider.h>.
> > 
> > However, drivers/memory/tegra/tegra210-emc-table.c relies on
> > tegra210-emc.h to include <linux/of.h> through <linux/clk-provider.h>.
> > Hence the first patch makes <linux/of_reserved_mem.h> self-contained
> > first.
> > 
> > Thanks for your comments!
> > 
> > Geert Uytterhoeven (2):
> >   of: Make <linux/of_reserved_mem.h> self-contained
> >   memory: tegra: Drop <linux/clk-provider.h>
> > 
> >  drivers/memory/tegra/tegra210-emc-core.c | 1 -
> >  drivers/memory/tegra/tegra210-emc.h      | 1 -
> >  include/linux/of_reserved_mem.h          | 1 +
> >  3 files changed, 1 insertion(+), 2 deletions(-)
> 
> Ah... I should've read the cover letter first. Looks like I need to take
> that first patch through the Tegra tree as well to avoid introducing the
> build error in the second patch.
> 
> Rob, do you mind if I pick up patch 1 of this into the same OF branch
> that I already carry the memory-region-names patches on?

No, it's fine.

Acked-by: Rob Herring <robh@kernel.org>