* [GIT PULL 1/5] omap device tree changes for v3.6 merge window
@ 2012-07-10 13:05 Tony Lindgren
0 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2012-07-10 13:05 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL 1/5] omap device tree changes for v3.6 merge window
@ 2012-07-10 13:05 Tony Lindgren
2012-07-13 6:14 ` Mohammed, Afzal
0 siblings, 1 reply; 13+ messages in thread
From: Tony Lindgren @ 2012-07-10 13:05 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread
* RE: [GIT PULL 1/5] omap device tree changes for v3.6 merge window
2012-07-10 13:05 Tony Lindgren
@ 2012-07-13 6:14 ` Mohammed, Afzal
0 siblings, 0 replies; 13+ messages in thread
From: Mohammed, Afzal @ 2012-07-13 6:14 UTC (permalink / raw)
To: Tony Lindgren, Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
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.
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";
+ };
};
};
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [GIT PULL 1/5] omap device tree changes for v3.6 merge window
@ 2012-07-13 6:14 ` Mohammed, Afzal
0 siblings, 0 replies; 13+ messages in thread
From: Mohammed, Afzal @ 2012-07-13 6:14 UTC (permalink / raw)
To: linux-arm-kernel
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.
Regards
Afzal
[1] http://www.mail-archive.com/linux-omap at 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 at 44e35000 {
+ compatible = "ti,omap3-wdt";
+ ti,hwmods = "wd_timer2";
+ };
};
};
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [GIT PULL 1/5] omap device tree changes for v3.6 merge window
2012-07-13 6:14 ` Mohammed, Afzal
@ 2012-07-13 6:41 ` Tony Lindgren
-1 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2012-07-13 6:41 UTC (permalink / raw)
To: Mohammed, Afzal
Cc: Arnd Bergmann, Olof Johansson, linux-omap, linux-arm-kernel
* 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";
> + };
> };
> };
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL 1/5] omap device tree changes for v3.6 merge window
@ 2012-07-13 6:41 ` Tony Lindgren
0 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2012-07-13 6:41 UTC (permalink / raw)
To: linux-arm-kernel
* 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 at 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 at 44e35000 {
> + compatible = "ti,omap3-wdt";
> + ti,hwmods = "wd_timer2";
> + };
> };
> };
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL 1/5] omap device tree changes for v3.6 merge window
2012-07-13 6:41 ` Tony Lindgren
@ 2012-07-13 7:56 ` Tony Lindgren
-1 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2012-07-13 7:56 UTC (permalink / raw)
To: Mohammed, Afzal
Cc: Arnd Bergmann, Olof Johansson, linux-omap, linux-arm-kernel
* 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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL 1/5] omap device tree changes for v3.6 merge window
@ 2012-07-13 7:56 ` Tony Lindgren
0 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2012-07-13 7:56 UTC (permalink / raw)
To: linux-arm-kernel
* 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 at 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 at 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 at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PULL 1/5] omap device tree changes for v3.6 merge window
2012-07-13 7:56 ` Tony Lindgren
@ 2012-08-07 7:13 ` Tony Lindgren
-1 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2012-08-07 7:13 UTC (permalink / raw)
To: Mohammed, Afzal
Cc: Arnd Bergmann, Olof Johansson, linux-omap, linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120713 01:01]:
> * Tony Lindgren <tony@atomide.com> [120712 23:46]:
> > * Mohammed, Afzal <afzal@ti.com> [120712 23:19]:
> > > > 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.
Now with -rc1 out, I'll queue the following fix.
Regards,
Tony
From: Afzal Mohammed <afzal@ti.com>
Date: Wed, 4 Jul 2012 18:00:37 +0530
Subject: [PATCH] arm/dts: Fix am33xx wdt node
Add am33xx wdt node.
Signed-off-by: Afzal Mohammed <afzal@ti.com>
[tony@atomide.com: I messed up and produced an empty commit db27ac80 with stg apply]
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 59509c4..bd0cff3 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -154,5 +154,10 @@
#size-cells = <0>;
ti,hwmods = "i2c3";
};
+
+ wdt2: wdt@44e35000 {
+ compatible = "ti,omap3-wdt";
+ ti,hwmods = "wd_timer2";
+ };
};
};
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [GIT PULL 1/5] omap device tree changes for v3.6 merge window
@ 2012-08-07 7:13 ` Tony Lindgren
0 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2012-08-07 7:13 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120713 01:01]:
> * Tony Lindgren <tony@atomide.com> [120712 23:46]:
> > * Mohammed, Afzal <afzal@ti.com> [120712 23:19]:
> > > > 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.
Now with -rc1 out, I'll queue the following fix.
Regards,
Tony
From: Afzal Mohammed <afzal@ti.com>
Date: Wed, 4 Jul 2012 18:00:37 +0530
Subject: [PATCH] arm/dts: Fix am33xx wdt node
Add am33xx wdt node.
Signed-off-by: Afzal Mohammed <afzal@ti.com>
[tony at atomide.com: I messed up and produced an empty commit db27ac80 with stg apply]
Signed-off-by: Tony Lindgren <tony@atomide.com>
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 59509c4..bd0cff3 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -154,5 +154,10 @@
#size-cells = <0>;
ti,hwmods = "i2c3";
};
+
+ wdt2: wdt at 44e35000 {
+ compatible = "ti,omap3-wdt";
+ ti,hwmods = "wd_timer2";
+ };
};
};
^ permalink raw reply related [flat|nested] 13+ messages in thread
* RE: [GIT PULL 1/5] omap device tree changes for v3.6 merge window
2012-08-07 7:13 ` Tony Lindgren
@ 2012-08-07 7:29 ` Mohammed, Afzal
-1 siblings, 0 replies; 13+ messages in thread
From: Mohammed, Afzal @ 2012-08-07 7:29 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Arnd Bergmann, Olof Johansson, linux-omap, linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL 1/5] omap device tree changes for v3.6 merge window
@ 2012-08-07 7:29 ` Mohammed, Afzal
0 siblings, 0 replies; 13+ messages in thread
From: Mohammed, Afzal @ 2012-08-07 7:29 UTC (permalink / raw)
To: linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [GIT PULL 1/5] omap device tree changes for v3.6 merge window
@ 2012-07-10 13:05 Tony Lindgren
0 siblings, 0 replies; 13+ messages in thread
From: Tony Lindgren @ 2012-07-10 13:05 UTC (permalink / raw)
To: Arnd Bergmann, Olof Johansson; +Cc: linux-omap, linux-arm-kernel
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
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2012-08-07 7:29 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-10 13:05 [GIT PULL 1/5] omap device tree changes for v3.6 merge window Tony Lindgren
-- strict thread matches above, loose matches on Subject: below --
2012-07-10 13:05 Tony Lindgren
2012-07-13 6:14 ` Mohammed, Afzal
2012-07-13 6:14 ` Mohammed, Afzal
2012-07-13 6:41 ` Tony Lindgren
2012-07-13 6:41 ` Tony Lindgren
2012-07-13 7:56 ` Tony Lindgren
2012-07-13 7:56 ` Tony Lindgren
2012-08-07 7:13 ` Tony Lindgren
2012-08-07 7:13 ` Tony Lindgren
2012-08-07 7:29 ` Mohammed, Afzal
2012-08-07 7:29 ` Mohammed, Afzal
2012-07-10 13:05 Tony Lindgren
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.