[U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

* [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant
@ 2013-02-01 16:44 Tomas Novotny
  2013-02-01 16:46 ` [U-Boot] [PATCH 2/2] da8xx: Add the missing pinmux for da830 to the gpio driver Tomas Novotny
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Tomas Novotny @ 2013-02-01 16:44 UTC (permalink / raw)
  To: u-boot

Signed-off-by: Tomas Novotny <tomas@novotny.cz>
Cc: Tom Rini <trini@ti.com>
Cc: Stefano Babic <sbabic@denx.de>
---
The second patch in this series adds pinmux for the da830. This pinmux
is selected when CONFIG_SOC_DA850 is not set. Although ea20 has its own
gpio pinmux (because gpio_request() is not used), this patch is added to
prevent possible problems in the future.

 include/configs/ea20.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/configs/ea20.h b/include/configs/ea20.h
index d3eb596..03dfe0a 100644
--- a/include/configs/ea20.h
+++ b/include/configs/ea20.h
@@ -42,6 +42,7 @@
 #define CONFIG_MACH_DAVINCI_DA850_EVM
 #define CONFIG_ARM926EJS		/* arm926ejs CPU core */
 #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
+#define CONFIG_SOC_DA850		/* TI DA850 SoC */
 #define CONFIG_SYS_CLK_FREQ		clk_get(DAVINCI_ARM_CLKID)
 #define CONFIG_SYS_OSCIN_FREQ		24000000
 #define CONFIG_SYS_TIMERBASE		DAVINCI_TIMER0_BASE
-- 
1.7.7

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

* [U-Boot] [PATCH 2/2] da8xx: Add the missing pinmux for da830 to the gpio driver
  2013-02-01 16:44 [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant Tomas Novotny
@ 2013-02-01 16:46 ` Tomas Novotny
  2013-02-04  8:01 ` [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant Stefano Babic
  2013-02-19 16:15 ` [U-Boot] [U-Boot, " Tom Rini
  2 siblings, 0 replies; 4+ messages in thread
From: Tomas Novotny @ 2013-02-01 16:46 UTC (permalink / raw)
  To: u-boot

The pinmux was generated from linux/arch/arm/mach-davinci/da830.c as of
kernel version 3.7.5. If the driver is used for the da850, then SoC
variant must be specified by CONFIG_SOC_DA850.

Signed-off-by: Tomas Novotny <tomas@novotny.cz>
Cc: Tom Rini <trini@ti.com>
---
I'm not sure with selected #defines, so suggestions are welcome. Now the
pinmux for da850 gpios is used by default. This patch may change this
behaviour and da850 pinmux is selected when there is CONFIG_SOC_DA850.
This is true for all mainline da8xx boards, so everything should be ok.

 arch/arm/include/asm/arch-davinci/gpio.h |    4 +
 drivers/gpio/da8xx_gpio.c                |  133 ++++++++++++++++++++++++++++++
 2 files changed, 137 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/arch-davinci/gpio.h b/arch/arm/include/asm/arch-davinci/gpio.h
index ef65ffb..fbbb1f3 100644
--- a/arch/arm/include/asm/arch-davinci/gpio.h
+++ b/arch/arm/include/asm/arch-davinci/gpio.h
@@ -67,7 +67,11 @@ struct davinci_gpio_bank {
 
 #define gpio_status()		gpio_info()
 #define GPIO_NAME_SIZE		20
+#if defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850)
+#define MAX_NUM_GPIOS		128
+#else
 #define MAX_NUM_GPIOS		144
+#endif
 #define GPIO_BANK(gp)		(davinci_gpio_bank01 + ((gp) >> 5))
 #define GPIO_BIT(gp)		((gp) & 0x1F)
 
diff --git a/drivers/gpio/da8xx_gpio.c b/drivers/gpio/da8xx_gpio.c
index 84d2b77..271b8d9 100644
--- a/drivers/gpio/da8xx_gpio.c
+++ b/drivers/gpio/da8xx_gpio.c
@@ -33,6 +33,138 @@ static struct gpio_registry {
 
 #define pinmux(x)       (&davinci_syscfg_regs->pinmux[x])
 
+#if defined(CONFIG_SOC_DA8XX) && !defined(CONFIG_SOC_DA850)
+static const struct pinmux_config gpio_pinmux[] = {
+	{ pinmux(13), 8, 6 },	/* GP0[0] */
+	{ pinmux(13), 8, 7 },
+	{ pinmux(14), 8, 0 },
+	{ pinmux(14), 8, 1 },
+	{ pinmux(14), 8, 2 },
+	{ pinmux(14), 8, 3 },
+	{ pinmux(14), 8, 4 },
+	{ pinmux(14), 8, 5 },
+	{ pinmux(14), 8, 6 },
+	{ pinmux(14), 8, 7 },
+	{ pinmux(15), 8, 0 },
+	{ pinmux(15), 8, 1 },
+	{ pinmux(15), 8, 2 },
+	{ pinmux(15), 8, 3 },
+	{ pinmux(15), 8, 4 },
+	{ pinmux(15), 8, 5 },
+	{ pinmux(15), 8, 6 },	/* GP1[0] */
+	{ pinmux(15), 8, 7 },
+	{ pinmux(16), 8, 0 },
+	{ pinmux(16), 8, 1 },
+	{ pinmux(16), 8, 2 },
+	{ pinmux(16), 8, 3 },
+	{ pinmux(16), 8, 4 },
+	{ pinmux(16), 8, 5 },
+	{ pinmux(16), 8, 6 },
+	{ pinmux(16), 8, 7 },
+	{ pinmux(17), 8, 0 },
+	{ pinmux(17), 8, 1 },
+	{ pinmux(17), 8, 2 },
+	{ pinmux(17), 8, 3 },
+	{ pinmux(17), 8, 4 },
+	{ pinmux(17), 8, 5 },
+	{ pinmux(17), 8, 6 },	/* GP2[0] */
+	{ pinmux(17), 8, 7 },
+	{ pinmux(18), 8, 0 },
+	{ pinmux(18), 8, 1 },
+	{ pinmux(18), 8, 2 },
+	{ pinmux(18), 8, 3 },
+	{ pinmux(18), 8, 4 },
+	{ pinmux(18), 8, 5 },
+	{ pinmux(18), 8, 6 },
+	{ pinmux(18), 8, 7 },
+	{ pinmux(19), 8, 0 },
+	{ pinmux(9), 8, 2 },
+	{ pinmux(9), 8, 3 },
+	{ pinmux(9), 8, 4 },
+	{ pinmux(9), 8, 5 },
+	{ pinmux(9), 8, 6 },
+	{ pinmux(10), 8, 1 },	/* GP3[0] */
+	{ pinmux(10), 8, 2 },
+	{ pinmux(10), 8, 3 },
+	{ pinmux(10), 8, 4 },
+	{ pinmux(10), 8, 5 },
+	{ pinmux(10), 8, 6 },
+	{ pinmux(10), 8, 7 },
+	{ pinmux(11), 8, 0 },
+	{ pinmux(11), 8, 1 },
+	{ pinmux(11), 8, 2 },
+	{ pinmux(11), 8, 3 },
+	{ pinmux(11), 8, 4 },
+	{ pinmux(9), 8, 7 },
+	{ pinmux(2), 8, 6 },
+	{ pinmux(11), 8, 5 },
+	{ pinmux(11), 8, 6 },
+	{ pinmux(12), 8, 4 },	/* GP4[0] */
+	{ pinmux(12), 8, 5 },
+	{ pinmux(12), 8, 6 },
+	{ pinmux(12), 8, 7 },
+	{ pinmux(13), 8, 0 },
+	{ pinmux(13), 8, 1 },
+	{ pinmux(13), 8, 2 },
+	{ pinmux(13), 8, 3 },
+	{ pinmux(13), 8, 4 },
+	{ pinmux(13), 8, 5 },
+	{ pinmux(11), 8, 7 },
+	{ pinmux(12), 8, 0 },
+	{ pinmux(12), 8, 1 },
+	{ pinmux(12), 8, 2 },
+	{ pinmux(12), 8, 3 },
+	{ pinmux(9), 8, 1 },
+	{ pinmux(7), 8, 3 },	/* GP5[0] */
+	{ pinmux(7), 8, 4 },
+	{ pinmux(7), 8, 5 },
+	{ pinmux(7), 8, 6 },
+	{ pinmux(7), 8, 7 },
+	{ pinmux(8), 8, 0 },
+	{ pinmux(8), 8, 1 },
+	{ pinmux(8), 8, 2 },
+	{ pinmux(8), 8, 3 },
+	{ pinmux(8), 8, 4 },
+	{ pinmux(8), 8, 5 },
+	{ pinmux(8), 8, 6 },
+	{ pinmux(8), 8, 7 },
+	{ pinmux(9), 8, 0 },
+	{ pinmux(7), 8, 1 },
+	{ pinmux(7), 8, 2 },
+	{ pinmux(5), 8, 1 },	/* GP6[0] */
+	{ pinmux(5), 8, 2 },
+	{ pinmux(5), 8, 3 },
+	{ pinmux(5), 8, 4 },
+	{ pinmux(5), 8, 5 },
+	{ pinmux(5), 8, 6 },
+	{ pinmux(5), 8, 7 },
+	{ pinmux(6), 8, 0 },
+	{ pinmux(6), 8, 1 },
+	{ pinmux(6), 8, 2 },
+	{ pinmux(6), 8, 3 },
+	{ pinmux(6), 8, 4 },
+	{ pinmux(6), 8, 5 },
+	{ pinmux(6), 8, 6 },
+	{ pinmux(6), 8, 7 },
+	{ pinmux(7), 8, 0 },
+	{ pinmux(1), 8, 0 },	/* GP7[0] */
+	{ pinmux(1), 8, 1 },
+	{ pinmux(1), 8, 2 },
+	{ pinmux(1), 8, 3 },
+	{ pinmux(1), 8, 4 },
+	{ pinmux(1), 8, 5 },
+	{ pinmux(1), 8, 6 },
+	{ pinmux(1), 8, 7 },
+	{ pinmux(2), 8, 0 },
+	{ pinmux(2), 8, 1 },
+	{ pinmux(2), 8, 2 },
+	{ pinmux(2), 8, 3 },
+	{ pinmux(2), 8, 4 },
+	{ pinmux(2), 8, 5 },
+	{ pinmux(0), 1, 0 },
+	{ pinmux(0), 1, 1 },
+};
+#else
 static const struct pinmux_config gpio_pinmux[] = {
 	{ pinmux(1), 8, 7 },	/* GP0[0] */
 	{ pinmux(1), 8, 6 },
@@ -179,6 +311,7 @@ static const struct pinmux_config gpio_pinmux[] = {
 	{ pinmux(18), 8, 3 },
 	{ pinmux(18), 8, 2 },
 };
+#endif
 
 int gpio_request(unsigned gpio, const char *label)
 {
-- 
1.7.7

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

* [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant
  2013-02-01 16:44 [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant Tomas Novotny
  2013-02-01 16:46 ` [U-Boot] [PATCH 2/2] da8xx: Add the missing pinmux for da830 to the gpio driver Tomas Novotny
@ 2013-02-04  8:01 ` Stefano Babic
  2013-02-19 16:15 ` [U-Boot] [U-Boot, " Tom Rini
  2 siblings, 0 replies; 4+ messages in thread
From: Stefano Babic @ 2013-02-04  8:01 UTC (permalink / raw)
  To: u-boot

On 01/02/2013 17:44, Tomas Novotny wrote:
> Signed-off-by: Tomas Novotny <tomas@novotny.cz>
> Cc: Tom Rini <trini@ti.com>
> Cc: Stefano Babic <sbabic@denx.de>
> ---
> The second patch in this series adds pinmux for the da830. This pinmux
> is selected when CONFIG_SOC_DA850 is not set. Although ea20 has its own
> gpio pinmux (because gpio_request() is not used), this patch is added to
> prevent possible problems in the future.
> 
>  include/configs/ea20.h |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/include/configs/ea20.h b/include/configs/ea20.h
> index d3eb596..03dfe0a 100644
> --- a/include/configs/ea20.h
> +++ b/include/configs/ea20.h
> @@ -42,6 +42,7 @@
>  #define CONFIG_MACH_DAVINCI_DA850_EVM
>  #define CONFIG_ARM926EJS		/* arm926ejs CPU core */
>  #define CONFIG_SOC_DA8XX		/* TI DA8xx SoC */
> +#define CONFIG_SOC_DA850		/* TI DA850 SoC */
>  #define CONFIG_SYS_CLK_FREQ		clk_get(DAVINCI_ARM_CLKID)
>  #define CONFIG_SYS_OSCIN_FREQ		24000000
>  #define CONFIG_SYS_TIMERBASE		DAVINCI_TIMER0_BASE
> 

Acked-by: Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================

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

* [U-Boot] [U-Boot, 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant
  2013-02-01 16:44 [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant Tomas Novotny
  2013-02-01 16:46 ` [U-Boot] [PATCH 2/2] da8xx: Add the missing pinmux for da830 to the gpio driver Tomas Novotny
  2013-02-04  8:01 ` [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant Stefano Babic
@ 2013-02-19 16:15 ` Tom Rini
  2 siblings, 0 replies; 4+ messages in thread
From: Tom Rini @ 2013-02-19 16:15 UTC (permalink / raw)
  To: u-boot

On Fri, Feb 01, 2013 at 06:44:06AM -0000, Tomas Novotny wrote:

> Signed-off-by: Tomas Novotny <tomas@novotny.cz>
> Cc: Tom Rini <trini@ti.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Acked-by: Stefano Babic <sbabic@denx.de>

This and 2/2 have been applied to u-boot-ti/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130219/8e03088d/attachment.pgp>

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

end of thread, other threads:[~2013-02-19 16:15 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-01 16:44 [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant Tomas Novotny
2013-02-01 16:46 ` [U-Boot] [PATCH 2/2] da8xx: Add the missing pinmux for da830 to the gpio driver Tomas Novotny
2013-02-04  8:01 ` [U-Boot] [PATCH 1/2] da8xx: ea20: Add the configuration define for the exact SoC variant Stefano Babic
2013-02-19 16:15 ` [U-Boot] [U-Boot, " Tom Rini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox