Patchwork [GIT,PULL,1/5] omap device tree changes for v3.6 merge window

login
register
mail settings
Submitter Tony Lindgren
Date July 10, 2012, 1:05 p.m.
Message ID <pull-1341925556-888624>
Download mbox
Permalink /patch/170172/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6

Comments

Tony Lindgren - July 10, 2012, 1:05 p.m.
The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:

  Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6

for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89:

  arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700)

----------------------------------------------------------------
Device tree related patches for omaps

----------------------------------------------------------------
Afzal Mohammed (1):
      arm/dts: am33xx wdt node

AnilKumar Ch (4):
      arm/dts: Add initial DT support for AM33XX SoC family
      arm/dts: Add support for AM335x EVM
      arm/dts: Add support for AM335x BeagleBone
      arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi

Jon Hunter (1):
      arm/dts: OMAP2: Add support for OMAP2420H4 Board

Peter Ujfalusi (7):
      arm/dts: omap4: Add entry for OMAP McPDM IP
      arm/dts: omap4: Add entry for OMAP DMIC IP
      arm/dts: omap4-sdp: Add fixed regulator to represent VBAT
      arm/dts: omap4-sdp: Add support for twl6040
      arm/dts: omap4-sdp: Enable audio support via device tree
      arm/dts: omap4-panda: Audio support for PandaBoard 4430
      arm/dts: New dts file for PandaBoardES (4460)

Uri Yosef (1):
      arm/dts: OMAP4: Add Variscite OMAP4 System-On-Modeule support

Vaibhav Hiremath (2):
      arm/dts: Add support for TI AM3517/05 EVM board
      arm/dts: omap3-evm: Add i2c and twl4030 support

Xiao Jiang (3):
      arm/dts: add wdt node for omap3 and omap4
      ARM: OMAP: avoid build wdt platform device if with dt support
      watchdog: omap_wdt: add device tree support

 .../devicetree/bindings/arm/omap/omap.txt          |    3 +
 .../devicetree/bindings/watchdog/omap-wdt.txt      |   14 ++
 arch/arm/boot/dts/am335x-bone.dts                  |   20 +++
 arch/arm/boot/dts/am335x-evm.dts                   |   20 +++
 arch/arm/boot/dts/am33xx.dtsi                      |  158 ++++++++++++++++++++
 arch/arm/boot/dts/am3517-evm.dts                   |   32 ++++
 arch/arm/boot/dts/omap2420-h4.dts                  |   20 +++
 arch/arm/boot/dts/omap3-evm.dts                    |   28 ++++
 arch/arm/boot/dts/omap3.dtsi                       |    5 +
 arch/arm/boot/dts/omap4-panda.dts                  |   37 +++++
 arch/arm/boot/dts/omap4-pandaES.dts                |   24 +++
 arch/arm/boot/dts/omap4-sdp.dts                    |   68 +++++++++
 arch/arm/boot/dts/omap4-var_som.dts                |   96 ++++++++++++
 arch/arm/boot/dts/omap4.dtsi                       |   23 +++
 arch/arm/mach-omap2/devices.c                      |    2 +-
 drivers/watchdog/omap_wdt.c                        |    7 +
 16 files changed, 556 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/watchdog/omap-wdt.txt
 create mode 100644 arch/arm/boot/dts/am335x-bone.dts
 create mode 100644 arch/arm/boot/dts/am335x-evm.dts
 create mode 100644 arch/arm/boot/dts/am33xx.dtsi
 create mode 100644 arch/arm/boot/dts/am3517-evm.dts
 create mode 100644 arch/arm/boot/dts/omap2420-h4.dts
 create mode 100644 arch/arm/boot/dts/omap4-pandaES.dts
 create mode 100644 arch/arm/boot/dts/omap4-var_som.dts
Arnd Bergmann - July 10, 2012, 3:53 p.m.
On Tuesday 10 July 2012, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [120710 06:21]:
> > The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2:
> > 
> >   ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap devel-omap5
> 
> FYI, I got some merge conflicts with the am33xx and PM/smartreflex
> changes, here's how I resolved them.
> 

Pulled all five branches now.

I put the am33xx clk data into the next/clk branch, as that seemed convenient.
The omap5 branch is in the next/newsoc branch, together with the new Marvell
ArmadaXP port.

I'm not extremely happy with the multi-level dependencies, but it's still
manageable at the moment, especially since I have a relatively large number
of next/* branches.

If others submit pull requests that create additional dependencies I might
have to reject them if that gets too complex.

	Arnd
Tony Lindgren - July 11, 2012, 6:04 a.m.
* Arnd Bergmann <arnd@arndb.de> [120710 08:57]:
> On Tuesday 10 July 2012, Tony Lindgren wrote:
> > * Tony Lindgren <tony@atomide.com> [120710 06:21]:
> > > The following changes since commit fb584511c4664573097ece7df0de06ad00b713a2:
> > > 
> > >   ARM: OMAP: sdrc: Fix the build break for OMAP4 only builds (2012-07-09 01:44:11 -0700)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap devel-omap5
> > 
> > FYI, I got some merge conflicts with the am33xx and PM/smartreflex
> > changes, here's how I resolved them.
> > 
> 
> Pulled all five branches now.

OK thanks.
 
> I put the am33xx clk data into the next/clk branch, as that seemed convenient.
> The omap5 branch is in the next/newsoc branch, together with the new Marvell
> ArmadaXP port.

OK
 
> I'm not extremely happy with the multi-level dependencies, but it's still
> manageable at the moment, especially since I have a relatively large number
> of next/* branches.

Yes me neither, that causes a lot of extra work keeping thing working.

The clean-up we did caused quite a bit of these dependencies, but
was necessary for adding am33xx and omap5 in somewhat clean way to avoid
patching all over the place to add more soc_is_omapxxxx() calls. So this
amount of dependencies should be rare.

All the clean-up should really have been in the first clean-up branch, but
was not quite ready yet at that point. That would have simplified things
a lot.
 
> If others submit pull requests that create additional dependencies I might
> have to reject them if that gets too complex.

Yes sorry about that, I too was considering leaving some of these branches
for v3.7 to let the dependencies clear out.. Anyways thanks again for the
extra effort on your part too.

Regards,

Tony
Tony Lindgren - July 13, 2012, 6:41 a.m.
* Mohammed, Afzal <afzal@ti.com> [120712 23:19]:
> Hi Tony,
> 
> On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote:
> > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
> > 
> >   Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
> > 
> > are available in the git repository at:
> > 
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6
> > 
> > for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89:
> > 
> >   arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700)
> > 
> > ----------------------------------------------------------------
> > Device tree related patches for omaps
> > 
> > ----------------------------------------------------------------
> > Afzal Mohammed (1):
> >       arm/dts: am33xx wdt node
> 
> The above patch seems to be an empty one, actual changes in it as in
> original patch [1] is missing, same changes are shown below for your
> reference [2].
> 
> Can you please do the needful so that the intended change of this
> patch makes to mainline this merge window.

Argh. Thanks for letting me know. I must have something wrong with
my scripts when applying patches. We'll have to apply this as a fix.

Regards,

Tony
 
> Regards
> Afzal
> 
> [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg71644.html
> [2]
> diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> index f46e353..08b2a5b 100644
> --- a/arch/arm/boot/dts/am33xx.dtsi
> +++ b/arch/arm/boot/dts/am33xx.dtsi
> @@ -185,5 +185,10 @@
>                         compatible = "ti,omap3-hsmmc";
>                         ti,hwmods = "mmc3";
>                 };
> +
> +               wdt2: wdt@44e35000 {
> +                       compatible = "ti,omap3-wdt";
> +                       ti,hwmods = "wd_timer2";
> +               };
>         };
>  };
Tony Lindgren - July 13, 2012, 7:56 a.m.
* Tony Lindgren <tony@atomide.com> [120712 23:46]:
> * Mohammed, Afzal <afzal@ti.com> [120712 23:19]:
> > Hi Tony,
> > 
> > On Tue, Jul 10, 2012 at 18:35:55, Tony Lindgren wrote:
> > > The following changes since commit 6887a4131da3adaab011613776d865f4bcfb5678:
> > > 
> > >   Linux 3.5-rc5 (2012-06-30 16:08:57 -0700)
> > > 
> > > are available in the git repository at:
> > > 
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-devel-dt-for-v3.6
> > > 
> > > for you to fetch changes up to f700c4d780f14125f61b70e86d805908efe3fb89:
> > > 
> > >   arm/dts: New dts file for PandaBoardES (4460) (2012-07-09 05:37:05 -0700)
> > > 
> > > ----------------------------------------------------------------
> > > Device tree related patches for omaps
> > > 
> > > ----------------------------------------------------------------
> > > Afzal Mohammed (1):
> > >       arm/dts: am33xx wdt node
> > 
> > The above patch seems to be an empty one, actual changes in it as in
> > original patch [1] is missing, same changes are shown below for your
> > reference [2].
> > 
> > Can you please do the needful so that the intended change of this
> > patch makes to mainline this merge window.
> 
> Argh. Thanks for letting me know. I must have something wrong with
> my scripts when applying patches. We'll have to apply this as a fix.

Arnd and Olof, let me know if you want me to resubmit a new branch instead
of the already pulled devel-dt branch. That branch should not have other
dependencies as it's based on -rc5. Of course is it's buried into other
DT patches it's too late.
 
> Regards,
> 
> Tony
>  
> > Regards
> > Afzal
> > 
> > [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg71644.html
> > [2]
> > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
> > index f46e353..08b2a5b 100644
> > --- a/arch/arm/boot/dts/am33xx.dtsi
> > +++ b/arch/arm/boot/dts/am33xx.dtsi
> > @@ -185,5 +185,10 @@
> >                         compatible = "ti,omap3-hsmmc";
> >                         ti,hwmods = "mmc3";
> >                 };
> > +
> > +               wdt2: wdt@44e35000 {
> > +                       compatible = "ti,omap3-wdt";
> > +                       ti,hwmods = "wd_timer2";
> > +               };
> >         };
> >  };
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mohammed Afzal - Aug. 7, 2012, 7:29 a.m.
On Tue, Aug 07, 2012 at 12:43:51, Tony Lindgren wrote:
> * Tony Lindgren <tony@atomide.com> [120713 01:01]:
> > * Tony Lindgren <tony@atomide.com> [120712 23:46]:

> > > my scripts when applying patches. We'll have to apply this as a fix.
> > Arnd and Olof, let me know if you want me to resubmit a new branch instead
> > of the already pulled devel-dt branch. That branch should not have other
> > dependencies as it's based on -rc5. Of course is it's buried into other
> > DT patches it's too late.
> 
> Now with -rc1 out, I'll queue the following fix.

Thanks Tony

Regards
Afzal