linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices
@ 2012-01-18  7:13 Vaibhav Hiremath
  2012-01-18  7:13 ` [PATCH 2/2] arm/dts: Add support for TI AM335x EVM board Vaibhav Hiremath
  2012-01-18 20:58 ` [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices Grant Likely
  0 siblings, 2 replies; 6+ messages in thread
From: Vaibhav Hiremath @ 2012-01-18  7:13 UTC (permalink / raw)
  To: linux-arm-kernel

Although we consider am33xx device under omap34xx family of devices,
there is indeed difference between them, for example,

      - Initial required mapping (->map_io)
      - Early init (->init_early)
	Here, the whole sequence/data is different than omap3,
	For example, clock/hwmod/power/voltage data.
      - clock event/source timer (name and instances)

So, this patch adds seperate machine descriptor for AM33XX family
of devices in board-generic.c file.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
CC: Benoit Cousson <b-cousson@ti.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Tony Lindgren <tony@atomide.com>
---
Tested it on AM335x-EVM, AM37xEVM and AM3517EVM.

 arch/arm/mach-omap2/board-generic.c |   19 +++++++++++++++++++
 1 files changed, 19 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index f7b4b24..2faecc8 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -106,6 +106,25 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
 MACHINE_END
 #endif

+#if defined(CONFIG_SOC_OMAPAM33XX)
+static const char *am33xx_boards_compat[] __initdata = {
+	"ti,am33xx",
+	NULL,
+};
+
+DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
+	.atag_offset	= 0x100,
+	.reserve	= omap_reserve,
+	.map_io		= am33xx_map_io,
+	.init_early	= am33xx_init_early,
+	.init_irq	= omap_init_irq,
+	.handle_irq	= omap3_intc_handle_irq,
+	.init_machine	= omap_generic_init,
+	.timer		= &omap3_am33xx_timer,
+	.dt_compat	= am33xx_boards_compat,
+MACHINE_END
+#endif
+
 #if defined(CONFIG_ARCH_OMAP4)
 static const char *omap4_boards_compat[] __initdata = {
 	"ti,omap4",
--
1.7.0.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/2] arm/dts: Add support for TI AM335x EVM board
  2012-01-18  7:13 [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices Vaibhav Hiremath
@ 2012-01-18  7:13 ` Vaibhav Hiremath
  2012-02-03  6:42   ` Hiremath, Vaibhav
  2012-01-18 20:58 ` [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices Grant Likely
  1 sibling, 1 reply; 6+ messages in thread
From: Vaibhav Hiremath @ 2012-01-18  7:13 UTC (permalink / raw)
  To: linux-arm-kernel

Add AM335x EVM DTS file to use the omap3.dtsi SoC file,
along with memory node and i2c information.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/boot/dts/am335x-evm.dts |   39 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 39 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/am335x-evm.dts

diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
new file mode 100644
index 0000000..8cc877f
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+/include/ "omap3.dtsi"
+
+/ {
+	model = "TI AM335x EVM";
+	compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3";
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x10000000>; /* 256 MB */
+	};
+};
+
+&intc {
+	/*
+	 * AM33XX family of devices have 128 interrupts
+	 */
+	ti,intc-size = <128>;
+};
+
+&i2c1 {
+	clock-frequency = <400000>;
+};
+
+&i2c2 {
+	clock-frequency = <400000>;
+};
+
+&i2c3 {
+	clock-frequency = <400000>;
+};
--
1.7.0.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices
  2012-01-18  7:13 [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices Vaibhav Hiremath
  2012-01-18  7:13 ` [PATCH 2/2] arm/dts: Add support for TI AM335x EVM board Vaibhav Hiremath
@ 2012-01-18 20:58 ` Grant Likely
  2012-01-19  8:10   ` Hiremath, Vaibhav
  2012-01-23  8:11   ` Hiremath, Vaibhav
  1 sibling, 2 replies; 6+ messages in thread
From: Grant Likely @ 2012-01-18 20:58 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jan 18, 2012 at 12:43:58PM +0530, Vaibhav Hiremath wrote:
> Although we consider am33xx device under omap34xx family of devices,
> there is indeed difference between them, for example,
> 
>       - Initial required mapping (->map_io)
>       - Early init (->init_early)
> 	Here, the whole sequence/data is different than omap3,
> 	For example, clock/hwmod/power/voltage data.
>       - clock event/source timer (name and instances)
> 
> So, this patch adds seperate machine descriptor for AM33XX family
> of devices in board-generic.c file.
> 
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> CC: Benoit Cousson <b-cousson@ti.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Tony Lindgren <tony@atomide.com>
> ---
> Tested it on AM335x-EVM, AM37xEVM and AM3517EVM.
> 
>  arch/arm/mach-omap2/board-generic.c |   19 +++++++++++++++++++
>  1 files changed, 19 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
> index f7b4b24..2faecc8 100644
> --- a/arch/arm/mach-omap2/board-generic.c
> +++ b/arch/arm/mach-omap2/board-generic.c
> @@ -106,6 +106,25 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
>  MACHINE_END
>  #endif
> 
> +#if defined(CONFIG_SOC_OMAPAM33XX)
> +static const char *am33xx_boards_compat[] __initdata = {
> +	"ti,am33xx",

Don't forget to add the new compatible values to
Documentation/device-tree/bindings.

> +	NULL,
> +};
> +
> +DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
> +	.atag_offset	= 0x100,

Unneeded for DT booting.

Otherwise, you can add:

Acked-by: Grant Likely <grant.likely@secretlab.ca>

> +	.reserve	= omap_reserve,
> +	.map_io		= am33xx_map_io,
> +	.init_early	= am33xx_init_early,
> +	.init_irq	= omap_init_irq,
> +	.handle_irq	= omap3_intc_handle_irq,
> +	.init_machine	= omap_generic_init,
> +	.timer		= &omap3_am33xx_timer,
> +	.dt_compat	= am33xx_boards_compat,
> +MACHINE_END
> +#endif
> +
>  #if defined(CONFIG_ARCH_OMAP4)
>  static const char *omap4_boards_compat[] __initdata = {
>  	"ti,omap4",
> --
> 1.7.0.4
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices
  2012-01-18 20:58 ` [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices Grant Likely
@ 2012-01-19  8:10   ` Hiremath, Vaibhav
  2012-01-23  8:11   ` Hiremath, Vaibhav
  1 sibling, 0 replies; 6+ messages in thread
From: Hiremath, Vaibhav @ 2012-01-19  8:10 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jan 19, 2012 at 02:28:28, Grant Likely wrote:
> On Wed, Jan 18, 2012 at 12:43:58PM +0530, Vaibhav Hiremath wrote:
> > Although we consider am33xx device under omap34xx family of devices,
> > there is indeed difference between them, for example,
> > 
> >       - Initial required mapping (->map_io)
> >       - Early init (->init_early)
> > 	Here, the whole sequence/data is different than omap3,
> > 	For example, clock/hwmod/power/voltage data.
> >       - clock event/source timer (name and instances)
> > 
> > So, this patch adds seperate machine descriptor for AM33XX family
> > of devices in board-generic.c file.
> > 
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > CC: Benoit Cousson <b-cousson@ti.com>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
> > Cc: Tony Lindgren <tony@atomide.com>
> > ---
> > Tested it on AM335x-EVM, AM37xEVM and AM3517EVM.
> > 
> >  arch/arm/mach-omap2/board-generic.c |   19 +++++++++++++++++++
> >  1 files changed, 19 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
> > index f7b4b24..2faecc8 100644
> > --- a/arch/arm/mach-omap2/board-generic.c
> > +++ b/arch/arm/mach-omap2/board-generic.c
> > @@ -106,6 +106,25 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
> >  MACHINE_END
> >  #endif
> > 
> > +#if defined(CONFIG_SOC_OMAPAM33XX)
> > +static const char *am33xx_boards_compat[] __initdata = {
> > +	"ti,am33xx",
> 
> Don't forget to add the new compatible values to
> Documentation/device-tree/bindings.
> 
Thanks for pointing me to this. I will send separate patch updating 
Documentation/devicetree/bindings file for this.

> > +	NULL,
> > +};
> > +
> > +DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
> > +	.atag_offset	= 0x100,
> 
> Unneeded for DT booting.
> 
> Otherwise, you can add:
> 
> Acked-by: Grant Likely <grant.likely@secretlab.ca>
> 

Thanks for review and ack.

Thanks,
Vaibhav

> > +	.reserve	= omap_reserve,
> > +	.map_io		= am33xx_map_io,
> > +	.init_early	= am33xx_init_early,
> > +	.init_irq	= omap_init_irq,
> > +	.handle_irq	= omap3_intc_handle_irq,
> > +	.init_machine	= omap_generic_init,
> > +	.timer		= &omap3_am33xx_timer,
> > +	.dt_compat	= am33xx_boards_compat,
> > +MACHINE_END
> > +#endif
> > +
> >  #if defined(CONFIG_ARCH_OMAP4)
> >  static const char *omap4_boards_compat[] __initdata = {
> >  	"ti,omap4",
> > --
> > 1.7.0.4
> > 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices
  2012-01-18 20:58 ` [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices Grant Likely
  2012-01-19  8:10   ` Hiremath, Vaibhav
@ 2012-01-23  8:11   ` Hiremath, Vaibhav
  1 sibling, 0 replies; 6+ messages in thread
From: Hiremath, Vaibhav @ 2012-01-23  8:11 UTC (permalink / raw)
  To: linux-arm-kernel

On Thu, Jan 19, 2012 at 02:28:28, Grant Likely wrote:
> On Wed, Jan 18, 2012 at 12:43:58PM +0530, Vaibhav Hiremath wrote:
> > Although we consider am33xx device under omap34xx family of devices,
> > there is indeed difference between them, for example,
> > 
> >       - Initial required mapping (->map_io)
> >       - Early init (->init_early)
> > 	Here, the whole sequence/data is different than omap3,
> > 	For example, clock/hwmod/power/voltage data.
> >       - clock event/source timer (name and instances)
> > 
> > So, this patch adds seperate machine descriptor for AM33XX family
> > of devices in board-generic.c file.
> > 
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > CC: Benoit Cousson <b-cousson@ti.com>
> > Cc: Grant Likely <grant.likely@secretlab.ca>
> > Cc: Tony Lindgren <tony@atomide.com>
> > ---
> > Tested it on AM335x-EVM, AM37xEVM and AM3517EVM.
> > 
> >  arch/arm/mach-omap2/board-generic.c |   19 +++++++++++++++++++
> >  1 files changed, 19 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
> > index f7b4b24..2faecc8 100644
> > --- a/arch/arm/mach-omap2/board-generic.c
> > +++ b/arch/arm/mach-omap2/board-generic.c
> > @@ -106,6 +106,25 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
> >  MACHINE_END
> >  #endif
> > 
> > +#if defined(CONFIG_SOC_OMAPAM33XX)
> > +static const char *am33xx_boards_compat[] __initdata = {
> > +	"ti,am33xx",
> 
> Don't forget to add the new compatible values to
> Documentation/device-tree/bindings.
> 
> > +	NULL,
> > +};
> > +
> > +DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
> > +	.atag_offset	= 0x100,
> 
> Unneeded for DT booting.
> 
> Otherwise, you can add:
> 
> Acked-by: Grant Likely <grant.likely@secretlab.ca>
> 

Benoit,

Can you please merge this patch-series for next pull request?

Thanks,
Vaibhav

> > +	.reserve	= omap_reserve,
> > +	.map_io		= am33xx_map_io,
> > +	.init_early	= am33xx_init_early,
> > +	.init_irq	= omap_init_irq,
> > +	.handle_irq	= omap3_intc_handle_irq,
> > +	.init_machine	= omap_generic_init,
> > +	.timer		= &omap3_am33xx_timer,
> > +	.dt_compat	= am33xx_boards_compat,
> > +MACHINE_END
> > +#endif
> > +
> >  #if defined(CONFIG_ARCH_OMAP4)
> >  static const char *omap4_boards_compat[] __initdata = {
> >  	"ti,omap4",
> > --
> > 1.7.0.4
> > 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/2] arm/dts: Add support for TI AM335x EVM board
  2012-01-18  7:13 ` [PATCH 2/2] arm/dts: Add support for TI AM335x EVM board Vaibhav Hiremath
@ 2012-02-03  6:42   ` Hiremath, Vaibhav
  0 siblings, 0 replies; 6+ messages in thread
From: Hiremath, Vaibhav @ 2012-02-03  6:42 UTC (permalink / raw)
  To: linux-arm-kernel

On Wed, Jan 18, 2012 at 12:43:59, Hiremath, Vaibhav wrote:
> Add AM335x EVM DTS file to use the omap3.dtsi SoC file,
> along with memory node and i2c information.
> 
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Cc: Benoit Cousson <b-cousson@ti.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> Cc: Tony Lindgren <tony@atomide.com>
> ---
>  arch/arm/boot/dts/am335x-evm.dts |   39 ++++++++++++++++++++++++++++++++++++++
>  1 files changed, 39 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/boot/dts/am335x-evm.dts
> 
> diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
> new file mode 100644
> index 0000000..8cc877f
> --- /dev/null
> +++ b/arch/arm/boot/dts/am335x-evm.dts
> @@ -0,0 +1,39 @@
> +/*
> + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +/dts-v1/;
> +
> +/include/ "omap3.dtsi"
> +
> +/ {
> +	model = "TI AM335x EVM";
> +	compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3";
> +
> +	memory {
> +		device_type = "memory";
> +		reg = <0x80000000 0x10000000>; /* 256 MB */
> +	};
> +};
> +
> +&intc {
> +	/*
> +	 * AM33XX family of devices have 128 interrupts
> +	 */
> +	ti,intc-size = <128>;
> +};
> +
> +&i2c1 {
> +	clock-frequency = <400000>;
> +};
> +
> +&i2c2 {
> +	clock-frequency = <400000>;
> +};
> +
> +&i2c3 {
> +	clock-frequency = <400000>;
> +};

Grant,

If there are not review comments, can you also ack this patch as well?

Thanks,
Vaibhav

> --
> 1.7.0.4
> 
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2012-02-03  6:42 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-18  7:13 [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices Vaibhav Hiremath
2012-01-18  7:13 ` [PATCH 2/2] arm/dts: Add support for TI AM335x EVM board Vaibhav Hiremath
2012-02-03  6:42   ` Hiremath, Vaibhav
2012-01-18 20:58 ` [PATCH 1/2] arm:omap2:board-generic: Add DT support for AM33xx devices Grant Likely
2012-01-19  8:10   ` Hiremath, Vaibhav
2012-01-23  8:11   ` Hiremath, Vaibhav

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).