mbox

[GIT,PULL] Fourth Round of Renesas ARM Based SoC DT Updates for v3.18

Message ID cover.1410396013.git.horms+renesas@verge.net.au
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt4-for-v3.18

Message

Simon Horman Sept. 11, 2014, 12:57 a.m. UTC
Hi Olof, Hi Kevin, Hi Arnd,

Please consider these fourth round of Renesas ARM based SoC DT updates for
v3.18.

This pull request is based on the previous round of
such requests, tagged as renesas-dt3-for-v3.18,
which you have already pulled.


The following changes since commit 40c488df84f9fbf4b84b4baed6e2cec4a2d946ed:

  ARM: shmobile: kzm9g-reference dts: Use tabs for indentation (2014-09-02 10:22:42 +0900)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt4-for-v3.18

for you to fetch changes up to a742795be9ceae2853ca71f216193f29da151da8:

  ARM: shmobile: Initial Alt board device tree (2014-09-09 11:29:27 +0900)

----------------------------------------------------------------
Fourth Round of Renesas ARM Based SoC DT Updates for v3.18

* Add r8a7794 SoC and Alt board device tree
* Correct lager memory map

----------------------------------------------------------------
Simon Horman (1):
      ARM: shmobile: lager: correct memory map

Ulrich Hecht (2):
      ARM: shmobile: Initial r8a7794 SoC device tree
      ARM: shmobile: Initial Alt board device tree

 arch/arm/boot/dts/Makefile                |   3 +-
 arch/arm/boot/dts/r8a7790-lager.dts       |   2 +-
 arch/arm/boot/dts/r8a7794-alt.dts         |  47 +++
 arch/arm/boot/dts/r8a7794.dtsi            | 531 ++++++++++++++++++++++++++++++
 include/dt-bindings/clock/r8a7794-clock.h |  80 +++++
 5 files changed, 661 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/boot/dts/r8a7794-alt.dts
 create mode 100644 arch/arm/boot/dts/r8a7794.dtsi
 create mode 100644 include/dt-bindings/clock/r8a7794-clock.h

Comments

Arnd Bergmann Sept. 11, 2014, 8:21 a.m. UTC | #1
On Thursday 11 September 2014 09:57:15 Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
> 
> Please consider these fourth round of Renesas ARM based SoC DT updates for
> v3.18.
> 
> This pull request is based on the previous round of
> such requests, tagged as renesas-dt3-for-v3.18,
> which you have already pulled.
> 

Pulled into next/dt, thanks!

There is one new warning I got in the for-next branch after the last round
of pull requests, in mackerel_defconfig:

arch/arm/mach-shmobile/pm-sh7372.c:116:33: warning: 'sh7372_pm_domains' defined but not used [-Wunused-variable]
 static struct rmobile_pm_domain sh7372_pm_domains[] = {
                                 ^

I haven't looked at it in detail, can you find out what caused it and
send a fix with your next round?

	Arnd
Geert Uytterhoeven Sept. 11, 2014, 8:46 a.m. UTC | #2
Hi Arnd,

On Thu, Sep 11, 2014 at 10:21 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> There is one new warning I got in the for-next branch after the last round
> of pull requests, in mackerel_defconfig:
>
> arch/arm/mach-shmobile/pm-sh7372.c:116:33: warning: 'sh7372_pm_domains' defined but not used [-Wunused-variable]
>  static struct rmobile_pm_domain sh7372_pm_domains[] = {
>                                  ^
>
> I haven't looked at it in detail, can you find out what caused it and
> send a fix with your next round?

That's due to sh7372_init_pm_domains() being protected by #ifdef CONFIG_PM,
while rmobile_init_domains() is a dummy macro if !CONFIG_PM_RMOBILE.

I think the first #ifdef should also test for CONFIG_PM_RMOBILE, to be
consistent.

However, I don't see the warning with my current tree, nor with next-20140910,
as both are selected with mackerel_defconfig, due to:

 config ARCH_RMOBILE
        bool
        select PM_RMOBILE if PM && !ARCH_SHMOBILE_MULTI

Perhaps this change hadn't trickled from Simon's tree into your tree, due
to following a different merge path?

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
Arnd Bergmann Sept. 11, 2014, 8:54 a.m. UTC | #3
On Thursday 11 September 2014 10:46:02 Geert Uytterhoeven wrote:
> However, I don't see the warning with my current tree, nor with next-20140910,
> as both are selected with mackerel_defconfig, due to:
> 
>  config ARCH_RMOBILE
>         bool
>         select PM_RMOBILE if PM && !ARCH_SHMOBILE_MULTI
> 
> Perhaps this change hadn't trickled from Simon's tree into your tree, due
> to following a different merge path?

Ah, you are right, I was testing with another branch merged in that changed
some of the Kconfig statements in shmobile to work around randconfig build
problems. Apparently one of the patches in my branch was wrong, the
shmobile branches are all good.

Sorry for the noise.

	Arnd
Geert Uytterhoeven Sept. 24, 2014, 12:24 p.m. UTC | #4
On Thu, Sep 11, 2014 at 2:57 AM, Simon Horman
<horms+renesas@verge.net.au> wrote:
> --- /dev/null
> +++ b/arch/arm/boot/dts/r8a7794-alt.dts

> +/ {
> +       model = "Alt";
> +       compatible = "renesas,alt", "renesas,r8a7794";
> +
> +       aliases {
> +               serial0 = &scif2;

Is this correct, i.e. does "scif2" match "ttySC0" below?

> +       };
> +
> +       chosen {
> +               bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
> +       };

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
Geert Uytterhoeven Sept. 24, 2014, 1:46 p.m. UTC | #5
On Wed, Sep 24, 2014 at 2:24 PM, Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
> On Thu, Sep 11, 2014 at 2:57 AM, Simon Horman
> <horms+renesas@verge.net.au> wrote:
>> --- /dev/null
>> +++ b/arch/arm/boot/dts/r8a7794-alt.dts
>
>> +/ {
>> +       model = "Alt";
>> +       compatible = "renesas,alt", "renesas,r8a7794";
>> +
>> +       aliases {
>> +               serial0 = &scif2;
>
> Is this correct, i.e. does "scif2" match "ttySC0" below?
>
>> +       };
>> +
>> +       chosen {
>> +               bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
>> +       };

To answer my own question: the alias means that "ttySC0" will be mapped to
the scif2 hardware block, using of_alias_get_id().

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