Tegra board patches

To give one place to setup the pins that are used as GPIOs instead of as their pinmuxed functions. Specifying enabled as false explicitly disables the gpio mode of that pin (if left on by firmware).

This should remove the need for calling these from specific drivers and thus reduce tegra-specific code from them.

Signed-off-by Olof Johansson<[email protected]>

arch/arm/mach-tegra/include/mach/gpio.h +1 -0

index e31f486..2369fba 100644
@@ -20,6 +20,7 @@
  #ifndef __MACH_TEGRA_GPIO_H
  #define __MACH_TEGRA_GPIO_H
 
+#include<linux/init.h>
  #include<mach/irqs.h>
 
  #define TEGRA_NR_GPIOS		INT_GPIO_NR

Quoted 1 line

+void __init tegra_gpio_config(struct tegra_gpio_table *table, int num);

? You don't need to annotate the declaration as __init.

arch/arm/mach-tegra/gpio.c +14 -0

+void __init tegra_gpio_config(struct tegra_gpio_table *table, int num)
+{
+ ? ? ? int i;
+
+ ? ? ? for (i = 0; i < num; i++) {
+ ? ? ? ? ? ? ? int gpio = table[i].gpio;
+
+ ? ? ? ? ? ? ? if (table[i].enable)
+ ? ? ? ? ? ? ? ? ? ? ? tegra_gpio_enable(gpio);
+ ? ? ? ? ? ? ? else
+ ? ? ? ? ? ? ? ? ? ? ? tegra_gpio_disable(gpio);
+ ? ? ? }
+}
+

?#ifdef CONFIG_DEBUG_FS

?#include <linux/debugfs.h>

arch/arm/mach-tegra/include/mach/gpio.h +0 -0

index e31f486..2369fba 100644
@@ -20,6 +20,7 @@

?#ifndef __MACH_TEGRA_GPIO_H
?#define __MACH_TEGRA_GPIO_H

+#include <linux/init.h>
?#include <mach/irqs.h>

?#define TEGRA_NR_GPIOS ? ? ? ? INT_GPIO_NR

arch/arm/mach-tegra/include/mach/gpio.h +6 -1

@@ -47,6 +48,12 @@ static inline int irq_to_gpio(unsigned int irq)
 ? ? ? ?return -EINVAL;
 ?}
 
+struct tegra_gpio_table {
+ ? ? ? int ? ? gpio; ? /* GPIO number */
+ ? ? ? bool ? ?enable; /* Enable for GPIO at init? */
+};
+
+void __init tegra_gpio_config(struct tegra_gpio_table *table, int num);
 ?void tegra_gpio_enable(int gpio);
 ?void tegra_gpio_disable(int gpio);
 
--

1.7.0.4

Can you split the boardfile changes into their own patch? ?Also see the below whitespace only change. ?Other than that, looks good.

Quoted 3 lines

?}
-
?postcore_initcall(tegra_gpio_init);

whitespace only change

Hi

Quoted 2 lines · Erik Gilling

Can you split the boardfile changes into their own patch? ?Also see the below whitespace only change. ?Other than that, looks good.

Ok, done (will push separately, no need to repost just with the split though).

Thanks.

Quoted 5 lines

Quoted 3 lines

?}
-
?postcore_initcall(tegra_gpio_init);

whitespace only change

D'oh, sloppy of me. Fixed.

-Olof

#include <linux/kernel.h>
#include <mach/pinmux.h>
+#include <mach/gpio.h>

Quoted 3 lines · Olof Johansson

?#include <linux/kernel.h>
?#include <mach/pinmux.h>
+#include <mach/gpio.h>

linux/gpio.h please

Remove dead atag handling code for nvidia-specific tags.

Signed-off-by Olof Johansson <[email protected]>

---
?arch/arm/mach-tegra/board-harmony.c | ? 25 ------------------------- ?1 files changed, 0 insertions(+), 25 deletions(-)

arch/arm/mach-tegra/board-harmony.c +0 -0

index b9dbdb1..f6ad58b 100644
@@ -35,31 +35,6 @@

?#include "board-harmony.h"
?#include "clock.h"

arch/arm/mach-tegra/board-harmony.c +0 -25

-/* NVidia bootloader tags */
-#define ATAG_NVIDIA ? ? ? ? ? ?0x41000801
-
-#define ATAG_NVIDIA_RM ? ? ? ? ? ? ? ? 0x1
-#define ATAG_NVIDIA_DISPLAY ? ? ? ? ? ?0x2
-#define ATAG_NVIDIA_FRAMEBUFFER ? ? ? ? ? ? ? ?0x3
-#define ATAG_NVIDIA_CHIPSHMOO ? ? ? ? ?0x4
-#define ATAG_NVIDIA_CHIPSHMOOPHYS ? ? ?0x5
-#define ATAG_NVIDIA_PRESERVED_MEM_0 ? ?0x10000
-#define ATAG_NVIDIA_PRESERVED_MEM_N ? ?2
-#define ATAG_NVIDIA_FORCE_32 ? ? ? ? ? 0x7fffffff
-
-struct tag_tegra {
- ? ? ? __u32 bootarg_key;
- ? ? ? __u32 bootarg_len;
- ? ? ? char bootarg[1];
-};
-
-static int __init parse_tag_nvidia(const struct tag *tag)
-{
-
- ? ? ? return 0;
-}
-__tagtable(ATAG_NVIDIA, parse_tag_nvidia);
-

?static struct plat_serial8250_port debug_uart_platform_data[] = { ? ? ? ?{
? ? ? ? ? ? ? ?.membase ? ? ? ?= IO_ADDRESS(TEGRA_UARTD_BASE), --
1.7.0.4

Add the 3 sdhci devices that are available on Harmony as platform devices. Two go to slots (one 4-lane, one 8-lane), and one goes to onboard wifi.

Signed-off-by Olof Johansson <[email protected]>

---
 arch/arm/mach-tegra/board-harmony.c |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

arch/arm/mach-tegra/board-harmony.c +26 -0

index f6ad58b..7010774 100644
@@ -30,10 +30,13 @@
 
 #include <mach/iomap.h>
 #include <mach/irqs.h>
+#include <mach/sdhci.h>
 
 #include "board.h"
 #include "board-harmony.h"
 #include "clock.h"
+#include "devices.h"
+#include "gpio-names.h"
 
 static struct plat_serial8250_port debug_uart_platform_data[] = {
 	{

@@ -59,6 +62,9 @@ static struct platform_device debug_uart = {
 
 static struct platform_device *harmony_devices[] __initdata = {
 	&debug_uart,
+	&tegra_sdhci_device1,
+	&tegra_sdhci_device2,
+	&tegra_sdhci_device4,
 };
 
 static void __init tegra_harmony_fixup(struct machine_desc *desc,

@@ -77,6 +83,26 @@ static __initdata struct tegra_clk_init_table harmony_clk_init_table[] = {
 	{ NULL,		NULL,		0,		0},
 };
 
+
+static struct tegra_sdhci_platform_data sdhci_pdata1 = {
+	.cd_gpio	= -1,
+	.wp_gpio	= -1,
+	.power_gpio	= -1,
+};
+
+static struct tegra_sdhci_platform_data sdhci_pdata2 = {
+	.cd_gpio	= TEGRA_GPIO_PI5,
+	.wp_gpio	= TEGRA_GPIO_PH1,
+	.power_gpio	= TEGRA_GPIO_PT3,
+};
+
+static struct tegra_sdhci_platform_data sdhci_pdata4 = {
+	.cd_gpio	= TEGRA_GPIO_PH2,
+	.wp_gpio	= TEGRA_GPIO_PH3,
+	.power_gpio	= TEGRA_GPIO_PI6,
+	.is_8bit	= 1,
+};
+
 static void __init tegra_harmony_init(void)
 {
 	tegra_common_init();

arch/arm/mach-tegra/board-harmony.c +0 -0

 	platform_add_devices(harmony_devices, ARRAY_SIZE(harmony_devices));
 }
 

Hi Olof,
Sorry for jumping late, haven't thought about the proposal below yesterday. I'm not objecting to applying the patch as is, we can refactor the code afterwards as well.

Review static void __init tegra_harmony_init(void) · line 117

Quoted 11 lines

?static void __init tegra_harmony_init(void)
?{
? ? ? tegra_common_init();

(quoted diff) +4 -0

@@ -85,6 +111,10 @@ static void __init tegra_harmony_init(void)
 
 ? ? ? harmony_pinmux_init();
 
+ ? ? tegra_sdhci_device1.dev.platform_data = &sdhci_pdata1;
+ ? ? tegra_sdhci_device2.dev.platform_data = &sdhci_pdata2;
+ ? ? tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4;
+

I think that instead of copying explicit initialization of the platform_data member from board to board we can do something similar to what PXA does. The board file would have to call something like tegra_set_device_X_info(struct tegra_device_X_platform_data *data); and then static registration of platform devices in the board files can be dropped.

For instance, the devices.c would have

void __init tegra_register_device(struct platform_device *dev, void *data) {
? ? ? ?int ret;

? ? ? ?dev->dev.platform_data = data;

? ? ? ?ret = platform_device_register(dev);
? ? ? ?if (ret)
? ? ? ? ? ? ? ?dev_err(&dev->dev, "unable to register device: %d\n", ret); }

void __init tegra_set_sdhci1_info(struct tegra_sdhci_platform_data *info) {
? ? ? ?tegra_register_device(&tegra_sdhci_device1, info);
}

and the board files would just call tegra_set_sdhci1_info to pass the platform data for the tegra_sdhci_device1 and register the device.

This way we could reduce amount of copy/paste between the board files. Besides, if/when tegra will be using device trees, handling of the device registration in common place would make the transition easier.

Quoted 4 lines · Mike Rapoport

Hi Olof,
Sorry for jumping late, haven't thought about the proposal below yesterday. I'm not objecting to applying the patch as is, we can refactor the code afterwards as well.

Thanks for the input. And yeah, I'd say we can refactor later when we see how things will fit well with flat devicetrees. More below.

Quoted 36 lines

Review static void __init tegra_harmony_init(void) · line 117

Quoted 11 lines

?static void __init tegra_harmony_init(void)
?{
? ? ? tegra_common_init();

(quoted diff) +4 -0

@@ -85,6 +111,10 @@ static void __init tegra_harmony_init(void)
 
 ? ? ? harmony_pinmux_init();
 
+ ? ? tegra_sdhci_device1.dev.platform_data = &sdhci_pdata1;
+ ? ? tegra_sdhci_device2.dev.platform_data = &sdhci_pdata2;
+ ? ? tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4;
+

I think that instead of copying explicit initialization of the platform_data member from board to board we can do something similar to what PXA does. The board file would have to call something like tegra_set_device_X_info(struct tegra_device_X_platform_data *data); and then static registration of platform devices in the board files can be dropped.

For instance, the devices.c would have

void __init tegra_register_device(struct platform_device *dev, void *data) {
? ? ? ?int ret;

? ? ? ?dev->dev.platform_data = data;

? ? ? ?ret = platform_device_register(dev);
? ? ? ?if (ret)
? ? ? ? ? ? ? ?dev_err(&dev->dev, "unable to register device: %d\n", ret); }

void __init tegra_set_sdhci1_info(struct tegra_sdhci_platform_data *info) {
? ? ? ?tegra_register_device(&tegra_sdhci_device1, info);
}

Quoted 6 lines

and the board files would just call tegra_set_sdhci1_info to pass the platform data for the tegra_sdhci_device1 and register the device.

This way we could reduce amount of copy/paste between the board files. Besides, if/when tegra will be using device trees, handling of the device registration in common place would make the transition easier.

I don't see how that reduces the amount of copy and paste (significantly), since you still need the platform_data defined per board so you'll need to add the calls there. Maybe a generic "set_platform_data" hook instead of doing the pointer assignment open-coded would be an improvement though.

I'm personally not a fan of the style where data is described as code, i.e. where there would be a tegra_set_<dev>_info function for every possible device out there. If anything that adds to the amount of copy-and-paste (per device), when it could just be handled with one common function being passed the appropriate data (i.e. like tegra_register_device).

Anyway, I'm not looking to argue over it. :) I think we'll see when the FDT pieces start to take shape what kind of model will work well, and there's no reason to do premature refactoring.

-Olof

Add the 3 sdhci devices that are available on Harmony as platform devices. Two go to slots (one 4-lane, one 8-lane), and one goes to onboard wifi.

Signed-off-by Olof Johansson <[email protected]>

---
?arch/arm/mach-tegra/board-harmony.c | ? 30 ++++++++++++++++++++++++++++++ ?1 files changed, 30 insertions(+), 0 deletions(-)

arch/arm/mach-tegra/board-harmony.c +0 -0

index f6ad58b..7010774 100644
@@ -30,10 +30,13 @@
 

?#include <mach/iomap.h>
?#include <mach/irqs.h>
+#include <mach/sdhci.h>

?#include "board.h"
?#include "board-harmony.h"
?#include "clock.h"

arch/arm/mach-tegra/board-harmony.c +2 -0

+#include "devices.h"
+#include "gpio-names.h"

?static struct plat_serial8250_port debug_uart_platform_data[] = { ? ? ? ?{

arch/arm/mach-tegra/board-harmony.c +27 -1

@@ -59,6 +62,9 @@ static struct platform_device debug_uart = {
 
 ?static struct platform_device *harmony_devices[] __initdata = {
 ? ? ? ?&debug_uart,
+ ? ? ? &tegra_sdhci_device1,
+ ? ? ? &tegra_sdhci_device2,
+ ? ? ? &tegra_sdhci_device4,
 ?};
 
 ?static void __init tegra_harmony_fixup(struct machine_desc *desc,

@@ -77,6 +83,26 @@ static __initdata struct tegra_clk_init_table harmony_clk_init_table[] = {
 ? ? ? ?{ NULL, ? ? ? ? NULL, ? ? ? ? ? 0, ? ? ? ? ? ? ?0},
 ?};
 
+
+static struct tegra_sdhci_platform_data sdhci_pdata1 = {
+ ? ? ? .cd_gpio ? ? ? ?= -1,
+ ? ? ? .wp_gpio ? ? ? ?= -1,
+ ? ? ? .power_gpio ? ? = -1,
+};
+
+static struct tegra_sdhci_platform_data sdhci_pdata2 = {
+ ? ? ? .cd_gpio ? ? ? ?= TEGRA_GPIO_PI5,
+ ? ? ? .wp_gpio ? ? ? ?= TEGRA_GPIO_PH1,
+ ? ? ? .power_gpio ? ? = TEGRA_GPIO_PT3,
+};
+
+static struct tegra_sdhci_platform_data sdhci_pdata4 = {
+ ? ? ? .cd_gpio ? ? ? ?= TEGRA_GPIO_PH2,
+ ? ? ? .wp_gpio ? ? ? ?= TEGRA_GPIO_PH3,
+ ? ? ? .power_gpio ? ? = TEGRA_GPIO_PI6,
+ ? ? ? .is_8bit ? ? ? ?= 1,
+};
+
 ?static void __init tegra_harmony_init(void)
 ?{
 ? ? ? ?tegra_common_init();

@@ -85,6 +111,10 @@ static void __init tegra_harmony_init(void)
 
 ? ? ? ?harmony_pinmux_init();
 
+ ? ? ? tegra_sdhci_device1.dev.platform_data = &sdhci_pdata1;
+ ? ? ? tegra_sdhci_device2.dev.platform_data = &sdhci_pdata2;
+ ? ? ? tegra_sdhci_device4.dev.platform_data = &sdhci_pdata4;
+
 ? ? ? ?platform_add_devices(harmony_devices, ARRAY_SIZE(harmony_devices));
 ?}
 
--

1.7.0.4

This adds board support for the Seaboard eval platform and some of the derivatives that are very similar. Since they only differ in some very minor ways, most of the code is shared.

Signed-off-by Olof Johansson <[email protected]>

+config MACH_SEABOARD
+ ? ? ? bool "Seaboard board family"

+#include <mach/io.h>

+++ b/arch/arm/mach-tegra/board-seaboard-pinmux.c

arch/arm/mach-tegra/board-seaboard-pinmux.c new file +10 -0

@@ -0,0 +1,179 @@
+/*
+ * Copyright (C) 2010 NVIDIA Corporation
+ *
+ * This software is licensed under the terms of the GNU General Public
+ * License version 2, as published by the Free Software Foundation, and
+ * may be copied, distributed, and modified under those terms.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

Quoted 1 line

+#include <mach/gpio.h>

Another linux/gpio.h please.