[PATCH 0/5] paz00 updates for 3.4

[PATCH 0/5] paz00 updates for 3.4

[Marc Dietrich]

The first two patches contain non-critical bug fixes (wrong power gpio
and wrong uart port). The last three patches add the temperature sensor,
the power gpio, and the wifi led to the device tree.

What's missing (after sound has been added) is rfkill and usb-utmi support.
Is anyone planing to add DT support to these drivers? If not, I will try my
best (you have been warned).

Marc Dietrich (5):
  ARM: tegra: paz00: fix wrong SD1 power gpio
  ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
  ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree
  ARM: dt: tegra: add the power gpio key to paz00 device tree
  ARM: dt: tegra: add the wifi led to paz00 device tree

 arch/arm/boot/dts/tegra-paz00.dts |   32 +++++++++++++++++++++++++++++---
 arch/arm/mach-tegra/board-paz00.c |    8 ++++----
 arch/arm/mach-tegra/board-paz00.h |    2 +-
 3 files changed, 34 insertions(+), 8 deletions(-)

-- 
1.7.5.4

[PATCH 1/5] ARM: tegra: paz00: fix wrong SD1 power gpio

[Marc Dietrich]

The power gpio for the external memory card was specified wrongly.
Replace it with the correct value (tested with warmboot with fastboot).

Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
---
 arch/arm/boot/dts/tegra-paz00.dts |    2 +-
 arch/arm/mach-tegra/board-paz00.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 4d1bcdc..1e08934 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -72,7 +72,7 @@
 	sdhci@c8000000 {
 		cd-gpios = <&gpio 173 0>; /* gpio PV5 */
 		wp-gpios = <&gpio 57 0>;  /* gpio PH1 */
-		power-gpios = <&gpio 155 0>; /* gpio PT3 */
+		power-gpios = <&gpio 169 0>; /* gpio PV1 */
 	};
 
 	sdhci@c8000200 {
diff --git a/arch/arm/mach-tegra/board-paz00.h b/arch/arm/mach-tegra/board-paz00.h
index ffa83f5..3c9f8da 100644
--- a/arch/arm/mach-tegra/board-paz00.h
+++ b/arch/arm/mach-tegra/board-paz00.h
@@ -22,7 +22,7 @@
 /* SDCARD */
 #define TEGRA_GPIO_SD1_CD		TEGRA_GPIO_PV5
 #define TEGRA_GPIO_SD1_WP		TEGRA_GPIO_PH1
-#define TEGRA_GPIO_SD1_POWER		TEGRA_GPIO_PT3
+#define TEGRA_GPIO_SD1_POWER		TEGRA_GPIO_PV1
 
 /* ULPI */
 #define TEGRA_ULPI_RST			TEGRA_GPIO_PV0
-- 
1.7.5.4

[PATCH 2/5] ARM: tegra: paz00: fix wrong UART port on mini-pcie plug

[Marc Dietrich]

UARTC is connected to the mini-pcie port.

Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
---
 arch/arm/boot/dts/tegra-paz00.dts |    4 ++--
 arch/arm/mach-tegra/board-paz00.c |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 1e08934..f667343 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -58,11 +58,11 @@
 	};
 
 	serial@70006200 {
-		status = "disable";
+		clock-frequency = <216000000>;
 	};
 
 	serial@70006300 {
-		clock-frequency = <216000000>;
+		status = "disable";
 	};
 
 	serial@70006400 {
diff --git a/arch/arm/mach-tegra/board-paz00.c b/arch/arm/mach-tegra/board-paz00.c
index fcf4f37..330afdf 100644
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@ -60,9 +60,9 @@ static struct plat_serial8250_port debug_uart_platform_data[] = {
 		.uartclk	= 216000000,
 	}, {
 		/* serial port on mini-pcie */
-		.membase	= IO_ADDRESS(TEGRA_UARTD_BASE),
-		.mapbase	= TEGRA_UARTD_BASE,
-		.irq		= INT_UARTD,
+		.membase	= IO_ADDRESS(TEGRA_UARTC_BASE),
+		.mapbase	= TEGRA_UARTC_BASE,
+		.irq		= INT_UARTC,
 		.flags		= UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
 		.type		= PORT_TEGRA,
 		.iotype		= UPIO_MEM,
@@ -174,7 +174,7 @@ static void __init tegra_paz00_fixup(struct tag *tags, char **cmdline,
 static __initdata struct tegra_clk_init_table paz00_clk_init_table[] = {
 	/* name		parent		rate		enabled */
 	{ "uarta",	"pll_p",	216000000,	true },
-	{ "uartd",	"pll_p",	216000000,	true },
+	{ "uartc",	"pll_p",	216000000,	true },
 
 	{ "pll_p_out4",	"pll_p",	24000000,	true },
 	{ "usbd",	"clk_m",	12000000,	false },
-- 
1.7.5.4

[PATCH 3/5] ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree

[Marc Dietrich]

Add the ADT7461 temperature monitoring IC which is connected via
the DVC controller.

Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
---
 arch/arm/boot/dts/tegra-paz00.dts |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index f667343..f03ca40 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -35,6 +35,11 @@
 
 	i2c@7000d000 {
 		clock-frequency = <400000>;
+
+		adt7461@4c {
+			compatible = "adt7461";
+			reg = <0x4c>;
+		};
 	};
 
 	i2s@70002800 {
-- 
1.7.5.4

[PATCH 4/5] ARM: dt: tegra: add the power gpio key to paz00 device tree

[Marc Dietrich]

This adds the wakeup gpio which is connected to the embedded
controller to the device tree of paz00.

Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
---
 arch/arm/boot/dts/tegra-paz00.dts |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index f03ca40..2a16ff0 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -91,4 +91,15 @@
 	sdhci@c8000600 {
 		support-8bit;
 	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		power {
+			label = "Power";
+			gpios = <&gpio 79 1>; /* gpio PJ7, active low */
+			linux,code = <116>; /* KEY_POWER */
+			gpio-key,wakeup;
+		};
+	};
 };
-- 
1.7.5.4

[PATCH 5/5] ARM: dt: tegra: add the wifi led to paz00 device tree

[Marc Dietrich]

This adds the wifi led bound to the rfkill0 event to the device
tree of paz00.

Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
---
 arch/arm/boot/dts/tegra-paz00.dts |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts
index 2a16ff0..31c2d08 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -102,4 +102,14 @@
 			gpio-key,wakeup;
 		};
 	};
+
+	gpio-leds {
+		compatible = "gpio-leds";
+
+		wifi {
+			label = "wifi-led";
+			gpios = <&gpio 24 0>;
+			linux,default-trigger = "rfkill0";
+		};
+	};
 };
-- 
1.7.5.4

RE: [PATCH 3/5] ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree

[Stephen Warren]

Marc Dietrich wrote at Saturday, January 28, 2012 12:03 PM:
> Add the ADT7461 temperature monitoring IC which is connected via
> the DVC controller.

> diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts

> +		adt7461@4c {
> +			compatible = "adt7461";

Compatible should have a vendor prefix, so "adi,adt7461".

-- 
nvpublic

RE: [PATCH 0/5] paz00 updates for 3.4

[Stephen Warren]

Marc Dietrich wrote at Saturday, January 28, 2012 12:03 PM:
...
> Marc Dietrich (5):
>   ARM: tegra: paz00: fix wrong SD1 power gpio
>   ARM: tegra: paz00: fix wrong UART port on mini-pcie plug
>   ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree
>   ARM: dt: tegra: add the power gpio key to paz00 device tree
>   ARM: dt: tegra: add the wifi led to paz00 device tree

Aside from the one comment I made, the series:

Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

-- 
nvpublic

Re: RE: [PATCH 3/5] ARM: dt: tegra: add ADT7461 temperature sensor topaz00 device tree

[Marc Dietrich]

Am Montag, 30. Januar 2012, 09:26:47 schrieb Stephen Warren:
> Marc Dietrich wrote at Saturday, January 28, 2012 12:03 PM:
> > Add the ADT7461 temperature monitoring IC which is connected via
> > the DVC controller.
> > 
> > diff --git a/arch/arm/boot/dts/tegra-paz00.dts
> > b/arch/arm/boot/dts/tegra-paz00.dts
> > 
> > +		adt7461@4c {
> > +			compatible = "adt7461";
> 
> Compatible should have a vendor prefix, so "adi,adt7461".

you are right, that's the problem when just copy-n-paste from seaboard. On the other 
hand, I wonder why this worked at all, because lm90 does not contain an 
of_match_table yet. Is there also some "hidden" DT->platfrom_data conversion? 

grep adi arch/*/boot/dts/ shows the PowerPC people are also using "adi,...". I'll 
send an update of the series with the correction and Acked-By.

Thanks

Marc

RE: RE: [PATCH 3/5] ARM: dt: tegra: add ADT7461 temperature sensor topaz00 device tree

[Stephen Warren]

Marc Dietrich wrote at Tuesday, January 31, 2012 4:49 AM:
> Am Montag, 30. Januar 2012, 09:26:47 schrieb Stephen Warren:
> > Marc Dietrich wrote at Saturday, January 28, 2012 12:03 PM:
> > > Add the ADT7461 temperature monitoring IC which is connected via
> > > the DVC controller.
> > >
> > > diff --git a/arch/arm/boot/dts/tegra-paz00.dts
> > > b/arch/arm/boot/dts/tegra-paz00.dts
> > >
> > > +		adt7461@4c {
> > > +			compatible = "adt7461";
> >
> > Compatible should have a vendor prefix, so "adi,adt7461".
> 
> you are right, that's the problem when just copy-n-paste from seaboard. On the other
> hand, I wonder why this worked at all, because lm90 does not contain an
> of_match_table yet. Is there also some "hidden" DT->platfrom_data conversion?

I2C drivers can bind in two ways:

1) Direct use of an of_match_table.

2) Use of the i2c_device_id table. In this case, the I2C or OF core strips
the vendor prefix (if any) from the compatible value, and checks it
against all the entries in i2c_driver.id_table.

The latter is how your patch worked.

-- 
nvpublic

[PATCH v2 3/5] ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree

[Marc Dietrich]

Add the ADT7461 temperature monitoring IC which is connected via
the DVC controller.

Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
---
 arch/arm/boot/dts/tegra-paz00.dts |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-
paz00.dts
index f667343..81e1d30 100644
--- a/arch/arm/boot/dts/tegra-paz00.dts
+++ b/arch/arm/boot/dts/tegra-paz00.dts
@@ -35,6 +35,11 @@
 
        i2c@7000d000 {
                clock-frequency = <400000>;
+
+               adt7461@4c {
+                       compatible = "adi,adt7461";
+                       reg = <0x4c>;
+               };
        };
 
        i2s@70002800 {
-- 
1.7.5.4

Re: [PATCH 3/5] ARM: dt: tegra: add ADT7461 temperature sensortopaz00 device tree

[Marc Dietrich]

Hi Stephen,

On Tuesday 31 January 2012 09:27:17 Stephen Warren wrote:
> Marc Dietrich wrote at Tuesday, January 31, 2012 4:49 AM:
> > Am Montag, 30. Januar 2012, 09:26:47 schrieb Stephen Warren:
> > > Marc Dietrich wrote at Saturday, January 28, 2012 12:03 PM:
> > > > Add the ADT7461 temperature monitoring IC which is connected via
> > > > the DVC controller.
> > > > 
> > > > diff --git a/arch/arm/boot/dts/tegra-paz00.dts
> > > > b/arch/arm/boot/dts/tegra-paz00.dts
> > > > 
> > > > +		adt7461@4c {
> > > > +			compatible = "adt7461";
> > > 
> > > Compatible should have a vendor prefix, so "adi,adt7461".
> > 
> > you are right, that's the problem when just copy-n-paste from seaboard.
> > On the other hand, I wonder why this worked at all, because lm90 does
> > not contain an of_match_table yet. Is there also some "hidden"
> > DT->platfrom_data conversion?
> I2C drivers can bind in two ways:
> 
> 1) Direct use of an of_match_table.
> 
> 2) Use of the i2c_device_id table. In this case, the I2C or OF core strips
> the vendor prefix (if any) from the compatible value, and checks it
> against all the entries in i2c_driver.id_table.
> 
> The latter is how your patch worked.

ah, thanks for the explanation.

Marc

RE: [PATCH v2 3/5] ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree

[Stephen Warren]

Marc Dietrich wrote at Tuesday, January 31, 2012 11:53 AM:
> Add the ADT7461 temperature monitoring IC which is connected via
> the DVC controller.
> 
> Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>

Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

-- 
nvpublic

Re: [PATCH v2 3/5] ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree

[Olof Johansson]

On Tue, Jan 31, 2012 at 07:53:21PM +0100, Marc Dietrich wrote:
> Add the ADT7461 temperature monitoring IC which is connected via
> the DVC controller.
> 
> Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
> ---
>  arch/arm/boot/dts/tegra-paz00.dts |    5 +++++
>  1 files changed, 5 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-
> paz00.dts
> index f667343..81e1d30 100644
> --- a/arch/arm/boot/dts/tegra-paz00.dts
> +++ b/arch/arm/boot/dts/tegra-paz00.dts
> @@ -35,6 +35,11 @@
>  
>         i2c@7000d000 {
>                 clock-frequency = <400000>;
> +
> +               adt7461@4c {
> +                       compatible = "adi,adt7461";
> +                       reg = <0x4c>;
> +               };

It's common to name the device node temp-sensor (or temperature-sensor) instead
of the model of the actual chip. The name isn't significant for the binding,
but it's a practice that's been used on other platforms for a long time.

I'll just fix it up when applying, if ok with you. No need to respin just for
this.


-Olof

Re: Re: [PATCH v2 3/5] ARM: dt: tegra: add ADT7461 temperature sensor topaz00 device tree

[Marc Dietrich]

Am Mittwoch, 1. Februar 2012, 00:26:04 schrieb Olof Johansson:
> On Tue, Jan 31, 2012 at 07:53:21PM +0100, Marc Dietrich wrote:
> > Add the ADT7461 temperature monitoring IC which is connected via
> > the DVC controller.
> > 
> > Signed-off-by: Marc Dietrich <marvin24-Mmb7MZpHnFY@public.gmane.org>
> > ---
> > 
> >  arch/arm/boot/dts/tegra-paz00.dts |    5 +++++
> >  1 files changed, 5 insertions(+), 0 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-
> > paz00.dts
> > index f667343..81e1d30 100644
> > --- a/arch/arm/boot/dts/tegra-paz00.dts
> > +++ b/arch/arm/boot/dts/tegra-paz00.dts
> > @@ -35,6 +35,11 @@
> > 
> >         i2c@7000d000 {
> >         
> >                 clock-frequency = <400000>;
> > 
> > +
> > +               adt7461@4c {
> > +                       compatible = "adi,adt7461";
> > +                       reg = <0x4c>;
> > +               };
> 
> It's common to name the device node temp-sensor (or temperature-sensor) instead
> of the model of the actual chip. The name isn't significant for the binding,
> but it's a practice that's been used on other platforms for a long time.
> 
> I'll just fix it up when applying, if ok with you. No need to respin just for
> this.

Renaming it to something like "temp-sensor" is also ok for me. Feel free to change 
this.

Thanks!

Marc