* [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3
@ 2013-10-17 22:15 Tony Lindgren
2013-10-18 15:55 ` Benoit Cousson
2013-11-10 23:47 ` Sebastian Reichel
0 siblings, 2 replies; 6+ messages in thread
From: Tony Lindgren @ 2013-10-17 22:15 UTC (permalink / raw)
To: linux-arm-kernel
Looks like omap3 is still relying on hwmod data for some basic
device tree information. Let's add the information to omap3.dtsi
so we can remove the related hwmod data once omap3 is DT only.
Cc: Benoit Cousson <bcousson@baylibre.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -37,6 +37,7 @@
pmu {
compatible = "arm,cortex-a8-pmu";
+ reg = <0x54000000 0x800000>;
interrupts = <3>;
ti,hwmods = "debugss";
};
@@ -71,6 +72,8 @@
*/
ocp {
compatible = "simple-bus";
+ reg = <0x68000000 0x10000>;
+ interrupts = <9 10>;
#address-cells = <1>;
#size-cells = <1>;
ranges;
@@ -193,24 +196,40 @@
uart1: serial at 4806a000 {
compatible = "ti,omap3-uart";
+ reg = <0x4806a000 0x2000>;
+ interrupts = <72>;
+ dmas = <&sdma 49 &sdma 50>;
+ dma-names = "tx", "rx";
ti,hwmods = "uart1";
clock-frequency = <48000000>;
};
uart2: serial at 4806c000 {
compatible = "ti,omap3-uart";
+ reg = <0x4806c000 0x400>;
+ interrupts = <73>;
+ dmas = <&sdma 51 &sdma 52>;
+ dma-names = "tx", "rx";
ti,hwmods = "uart2";
clock-frequency = <48000000>;
};
uart3: serial at 49020000 {
compatible = "ti,omap3-uart";
+ reg = <0x49020000 0x400>;
+ interrupts = <74>;
+ dmas = <&sdma 53 &sdma 54>;
+ dma-names = "tx", "rx";
ti,hwmods = "uart3";
clock-frequency = <48000000>;
};
i2c1: i2c at 48070000 {
compatible = "ti,omap3-i2c";
+ reg = <0x48070000 0x80>;
+ interrupts = <56>;
+ dmas = <&sdma 27 &sdma 28>;
+ dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c1";
@@ -218,6 +237,10 @@
i2c2: i2c at 48072000 {
compatible = "ti,omap3-i2c";
+ reg = <0x48072000 0x80>;
+ interrupts = <57>;
+ dmas = <&sdma 29 &sdma 30>;
+ dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c2";
@@ -225,6 +248,10 @@
i2c3: i2c at 48060000 {
compatible = "ti,omap3-i2c";
+ reg = <0x48060000 0x80>;
+ interrupts = <61>;
+ dmas = <&sdma 25 &sdma 26>;
+ dma-names = "tx", "rx";
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "i2c3";
@@ -232,6 +259,8 @@
mcspi1: spi at 48098000 {
compatible = "ti,omap2-mcspi";
+ reg = <0x48098000 0x100>;
+ interrupts = <65>;
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi1";
@@ -250,6 +279,8 @@
mcspi2: spi at 4809a000 {
compatible = "ti,omap2-mcspi";
+ reg = <0x4809a000 0x100>;
+ interrupts = <66>;
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi2";
@@ -263,6 +294,8 @@
mcspi3: spi at 480b8000 {
compatible = "ti,omap2-mcspi";
+ reg = <0x480b8000 0x100>;
+ interrupts = <91>;
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi3";
@@ -276,6 +309,8 @@
mcspi4: spi at 480ba000 {
compatible = "ti,omap2-mcspi";
+ reg = <0x480ba000 0x100>;
+ interrupts = <48>;
#address-cells = <1>;
#size-cells = <0>;
ti,hwmods = "mcspi4";
@@ -284,8 +319,17 @@
dma-names = "tx0", "rx0";
};
+ hdqw1w: 1w at 480b2000 {
+ compatible = "ti,omap3-1w";
+ reg = <0x480b2000 0x1000>;
+ interrupts = <58>;
+ ti,hwmods = "hdq1w";
+ };
+
mmc1: mmc at 4809c000 {
compatible = "ti,omap3-hsmmc";
+ reg = <0x4809c000 0x200>;
+ interrupts = <83>;
ti,hwmods = "mmc1";
ti,dual-volt;
dmas = <&sdma 61>, <&sdma 62>;
@@ -294,6 +338,8 @@
mmc2: mmc at 480b4000 {
compatible = "ti,omap3-hsmmc";
+ reg = <0x480b4000 0x200>;
+ interrupts = <86>;
ti,hwmods = "mmc2";
dmas = <&sdma 47>, <&sdma 48>;
dma-names = "tx", "rx";
@@ -301,6 +347,8 @@
mmc3: mmc at 480ad000 {
compatible = "ti,omap3-hsmmc";
+ reg = <0x480ad000 0x200>;
+ interrupts = <94>;
ti,hwmods = "mmc3";
dmas = <&sdma 77>, <&sdma 78>;
dma-names = "tx", "rx";
@@ -308,6 +356,7 @@
wdt2: wdt at 48314000 {
compatible = "ti,omap3-wdt";
+ reg = <0x48314000 0x80>;
ti,hwmods = "wd_timer2";
};
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index f8b3765..380c22e 100644
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -31,6 +31,10 @@
ocp {
uart4: serial at 49042000 {
compatible = "ti,omap3-uart";
+ reg = <0x49042000 0x400>;
+ interrupts = <80>;
+ dmas = <&sdma 81 &sdma 82>;
+ dma-names = "tx", "rx";
ti,hwmods = "uart4";
clock-frequency = <48000000>;
};
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3
2013-10-17 22:15 [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3 Tony Lindgren
@ 2013-10-18 15:55 ` Benoit Cousson
2013-11-10 23:47 ` Sebastian Reichel
1 sibling, 0 replies; 6+ messages in thread
From: Benoit Cousson @ 2013-10-18 15:55 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tony,
On 18/10/2013 00:15, Tony Lindgren wrote:
> Looks like omap3 is still relying on hwmod data for some basic
> device tree information. Let's add the information to omap3.dtsi
> so we can remove the related hwmod data once omap3 is DT only.
>
> Cc: Benoit Cousson <bcousson@baylibre.com>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
Acked-by: Benoit Cousson <bcousson@baylibre.com>
Regards,
Benoit
>
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -37,6 +37,7 @@
>
> pmu {
> compatible = "arm,cortex-a8-pmu";
> + reg = <0x54000000 0x800000>;
> interrupts = <3>;
> ti,hwmods = "debugss";
> };
> @@ -71,6 +72,8 @@
> */
> ocp {
> compatible = "simple-bus";
> + reg = <0x68000000 0x10000>;
> + interrupts = <9 10>;
> #address-cells = <1>;
> #size-cells = <1>;
> ranges;
> @@ -193,24 +196,40 @@
>
> uart1: serial at 4806a000 {
> compatible = "ti,omap3-uart";
> + reg = <0x4806a000 0x2000>;
> + interrupts = <72>;
> + dmas = <&sdma 49 &sdma 50>;
> + dma-names = "tx", "rx";
> ti,hwmods = "uart1";
> clock-frequency = <48000000>;
> };
>
> uart2: serial at 4806c000 {
> compatible = "ti,omap3-uart";
> + reg = <0x4806c000 0x400>;
> + interrupts = <73>;
> + dmas = <&sdma 51 &sdma 52>;
> + dma-names = "tx", "rx";
> ti,hwmods = "uart2";
> clock-frequency = <48000000>;
> };
>
> uart3: serial at 49020000 {
> compatible = "ti,omap3-uart";
> + reg = <0x49020000 0x400>;
> + interrupts = <74>;
> + dmas = <&sdma 53 &sdma 54>;
> + dma-names = "tx", "rx";
> ti,hwmods = "uart3";
> clock-frequency = <48000000>;
> };
>
> i2c1: i2c at 48070000 {
> compatible = "ti,omap3-i2c";
> + reg = <0x48070000 0x80>;
> + interrupts = <56>;
> + dmas = <&sdma 27 &sdma 28>;
> + dma-names = "tx", "rx";
> #address-cells = <1>;
> #size-cells = <0>;
> ti,hwmods = "i2c1";
> @@ -218,6 +237,10 @@
>
> i2c2: i2c at 48072000 {
> compatible = "ti,omap3-i2c";
> + reg = <0x48072000 0x80>;
> + interrupts = <57>;
> + dmas = <&sdma 29 &sdma 30>;
> + dma-names = "tx", "rx";
> #address-cells = <1>;
> #size-cells = <0>;
> ti,hwmods = "i2c2";
> @@ -225,6 +248,10 @@
>
> i2c3: i2c at 48060000 {
> compatible = "ti,omap3-i2c";
> + reg = <0x48060000 0x80>;
> + interrupts = <61>;
> + dmas = <&sdma 25 &sdma 26>;
> + dma-names = "tx", "rx";
> #address-cells = <1>;
> #size-cells = <0>;
> ti,hwmods = "i2c3";
> @@ -232,6 +259,8 @@
>
> mcspi1: spi at 48098000 {
> compatible = "ti,omap2-mcspi";
> + reg = <0x48098000 0x100>;
> + interrupts = <65>;
> #address-cells = <1>;
> #size-cells = <0>;
> ti,hwmods = "mcspi1";
> @@ -250,6 +279,8 @@
>
> mcspi2: spi at 4809a000 {
> compatible = "ti,omap2-mcspi";
> + reg = <0x4809a000 0x100>;
> + interrupts = <66>;
> #address-cells = <1>;
> #size-cells = <0>;
> ti,hwmods = "mcspi2";
> @@ -263,6 +294,8 @@
>
> mcspi3: spi at 480b8000 {
> compatible = "ti,omap2-mcspi";
> + reg = <0x480b8000 0x100>;
> + interrupts = <91>;
> #address-cells = <1>;
> #size-cells = <0>;
> ti,hwmods = "mcspi3";
> @@ -276,6 +309,8 @@
>
> mcspi4: spi at 480ba000 {
> compatible = "ti,omap2-mcspi";
> + reg = <0x480ba000 0x100>;
> + interrupts = <48>;
> #address-cells = <1>;
> #size-cells = <0>;
> ti,hwmods = "mcspi4";
> @@ -284,8 +319,17 @@
> dma-names = "tx0", "rx0";
> };
>
> + hdqw1w: 1w at 480b2000 {
> + compatible = "ti,omap3-1w";
> + reg = <0x480b2000 0x1000>;
> + interrupts = <58>;
> + ti,hwmods = "hdq1w";
> + };
> +
> mmc1: mmc at 4809c000 {
> compatible = "ti,omap3-hsmmc";
> + reg = <0x4809c000 0x200>;
> + interrupts = <83>;
> ti,hwmods = "mmc1";
> ti,dual-volt;
> dmas = <&sdma 61>, <&sdma 62>;
> @@ -294,6 +338,8 @@
>
> mmc2: mmc at 480b4000 {
> compatible = "ti,omap3-hsmmc";
> + reg = <0x480b4000 0x200>;
> + interrupts = <86>;
> ti,hwmods = "mmc2";
> dmas = <&sdma 47>, <&sdma 48>;
> dma-names = "tx", "rx";
> @@ -301,6 +347,8 @@
>
> mmc3: mmc at 480ad000 {
> compatible = "ti,omap3-hsmmc";
> + reg = <0x480ad000 0x200>;
> + interrupts = <94>;
> ti,hwmods = "mmc3";
> dmas = <&sdma 77>, <&sdma 78>;
> dma-names = "tx", "rx";
> @@ -308,6 +356,7 @@
>
> wdt2: wdt at 48314000 {
> compatible = "ti,omap3-wdt";
> + reg = <0x48314000 0x80>;
> ti,hwmods = "wd_timer2";
> };
>
> diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
> index f8b3765..380c22e 100644
> --- a/arch/arm/boot/dts/omap36xx.dtsi
> +++ b/arch/arm/boot/dts/omap36xx.dtsi
> @@ -31,6 +31,10 @@
> ocp {
> uart4: serial at 49042000 {
> compatible = "ti,omap3-uart";
> + reg = <0x49042000 0x400>;
> + interrupts = <80>;
> + dmas = <&sdma 81 &sdma 82>;
> + dma-names = "tx", "rx";
> ti,hwmods = "uart4";
> clock-frequency = <48000000>;
> };
> --
> To unsubscribe from this list: send the line "unsubscribe devicetree" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Beno?t Cousson
BayLibre
Embedded Linux Technology Lab
www.baylibre.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3
2013-10-17 22:15 [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3 Tony Lindgren
2013-10-18 15:55 ` Benoit Cousson
@ 2013-11-10 23:47 ` Sebastian Reichel
2013-11-11 16:56 ` Tony Lindgren
1 sibling, 1 reply; 6+ messages in thread
From: Sebastian Reichel @ 2013-11-10 23:47 UTC (permalink / raw)
To: linux-arm-kernel
Hi Tony,
On Thu, Oct 17, 2013 at 03:15:22PM -0700, Tony Lindgren wrote:
> Looks like omap3 is still relying on hwmod data for some basic
> device tree information. Let's add the information to omap3.dtsi
> so we can remove the related hwmod data once omap3 is DT only.
This patch fixes a regression in omap3 DT boot introduced by
commit 2a0b965cfb6efc667228831fc3a30308b4f94a87. This commit
assumes, that interrupts are specified via DT data if booted
via DT.
-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131111/afce4521/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3
2013-11-10 23:47 ` Sebastian Reichel
@ 2013-11-11 16:56 ` Tony Lindgren
2013-11-11 17:48 ` Sebastian Reichel
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2013-11-11 16:56 UTC (permalink / raw)
To: linux-arm-kernel
* Sebastian Reichel <sre@ring0.de> [131110 15:48]:
> Hi Tony,
>
> On Thu, Oct 17, 2013 at 03:15:22PM -0700, Tony Lindgren wrote:
> > Looks like omap3 is still relying on hwmod data for some basic
> > device tree information. Let's add the information to omap3.dtsi
> > so we can remove the related hwmod data once omap3 is DT only.
>
> This patch fixes a regression in omap3 DT boot introduced by
> commit 2a0b965cfb6efc667228831fc3a30308b4f94a87. This commit
> assumes, that interrupts are specified via DT data if booted
> via DT.
Yes sorry about that, this should have been merged as a fix
earlier to avoid breaking things during the merge window.
Looks like I only tested 2a0b965cfb6efc667228831fc3a30308b4f94a87
separately on omap4 or something and forgot about the dependency.
Regards,
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3
2013-11-11 16:56 ` Tony Lindgren
@ 2013-11-11 17:48 ` Sebastian Reichel
2013-11-11 18:16 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Sebastian Reichel @ 2013-11-11 17:48 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Nov 11, 2013 at 08:56:39AM -0800, Tony Lindgren wrote:
> * Sebastian Reichel <sre@ring0.de> [131110 15:48]:
> > Hi Tony,
> >
> > On Thu, Oct 17, 2013 at 03:15:22PM -0700, Tony Lindgren wrote:
> > > Looks like omap3 is still relying on hwmod data for some basic
> > > device tree information. Let's add the information to omap3.dtsi
> > > so we can remove the related hwmod data once omap3 is DT only.
> >
> > This patch fixes a regression in omap3 DT boot introduced by
> > commit 2a0b965cfb6efc667228831fc3a30308b4f94a87. This commit
> > assumes, that interrupts are specified via DT data if booted
> > via DT.
>
> Yes sorry about that, this should have been merged as a fix
> earlier to avoid breaking things during the merge window.
> Looks like I only tested 2a0b965cfb6efc667228831fc3a30308b4f94a87
> separately on omap4 or something and forgot about the dependency.
No problem, but I think its currently not queued for 3.13.
-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20131111/98359bd6/attachment.sig>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3
2013-11-11 17:48 ` Sebastian Reichel
@ 2013-11-11 18:16 ` Tony Lindgren
0 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2013-11-11 18:16 UTC (permalink / raw)
To: linux-arm-kernel
* Sebastian Reichel <sre@ring0.de> [131111 09:49]:
> On Mon, Nov 11, 2013 at 08:56:39AM -0800, Tony Lindgren wrote:
> > * Sebastian Reichel <sre@ring0.de> [131110 15:48]:
> > > Hi Tony,
> > >
> > > On Thu, Oct 17, 2013 at 03:15:22PM -0700, Tony Lindgren wrote:
> > > > Looks like omap3 is still relying on hwmod data for some basic
> > > > device tree information. Let's add the information to omap3.dtsi
> > > > so we can remove the related hwmod data once omap3 is DT only.
> > >
> > > This patch fixes a regression in omap3 DT boot introduced by
> > > commit 2a0b965cfb6efc667228831fc3a30308b4f94a87. This commit
> > > assumes, that interrupts are specified via DT data if booted
> > > via DT.
> >
> > Yes sorry about that, this should have been merged as a fix
> > earlier to avoid breaking things during the merge window.
> > Looks like I only tested 2a0b965cfb6efc667228831fc3a30308b4f94a87
> > separately on omap4 or something and forgot about the dependency.
>
> No problem, but I think its currently not queued for 3.13.
Should be merged now it seems.
Regards,
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-11-11 18:16 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-17 22:15 [PATCH] ARM: dts: Add missing reg, interrupt and dma entries for omap3 Tony Lindgren
2013-10-18 15:55 ` Benoit Cousson
2013-11-10 23:47 ` Sebastian Reichel
2013-11-11 16:56 ` Tony Lindgren
2013-11-11 17:48 ` Sebastian Reichel
2013-11-11 18:16 ` Tony Lindgren
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).