From 1266f8970eb044013a563a47c7ab90413a2cacc3 Mon Sep 17 00:00:00 2001 From: Marc Dietrich Date: Tue, 31 Jan 2012 19:53:21 +0100 Subject: [PATCH 1/5] ARM: dt: tegra: add ADT7461 temperature sensor to paz00 device tree Add the ADT7461 temperature monitoring IC which is connected via the DVC controller. Signed-off-by: Marc Dietrich Acked-by: Stephen Warren Signed-off-by: Olof Johansson --- arch/arm/boot/dts/tegra-paz00.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 1a1d7023b69b..22d12f312318 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>; + }; }; serial@70006000 { From d8d56c84224ae3d61800f6ce6df0ce6b63872617 Mon Sep 17 00:00:00 2001 From: Marc Dietrich Date: Sat, 28 Jan 2012 20:03:07 +0100 Subject: [PATCH 2/5] ARM: dt: tegra: add the power gpio key to paz00 device tree This adds the wakeup gpio which is connected to the embedded controller to the device tree of paz00. Signed-off-by: Marc Dietrich Signed-off-by: Olof Johansson --- arch/arm/boot/dts/tegra-paz00.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 22d12f312318..95c39c999788 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts @@ -79,4 +79,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; + }; + }; }; From 80c9473dc132de2dc345c5698a1aaca1a3ee4c14 Mon Sep 17 00:00:00 2001 From: Marc Dietrich Date: Sat, 28 Jan 2012 20:03:08 +0100 Subject: [PATCH 3/5] ARM: dt: tegra: add the wifi led to paz00 device tree This adds the wifi led bound to the rfkill0 event to the device tree of paz00. Signed-off-by: Marc Dietrich Signed-off-by: Olof Johansson --- arch/arm/boot/dts/tegra-paz00.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/boot/dts/tegra-paz00.dts b/arch/arm/boot/dts/tegra-paz00.dts index 95c39c999788..bd8964ae4691 100644 --- a/arch/arm/boot/dts/tegra-paz00.dts +++ b/arch/arm/boot/dts/tegra-paz00.dts @@ -90,4 +90,14 @@ gpio-key,wakeup; }; }; + + gpio-leds { + compatible = "gpio-leds"; + + wifi { + label = "wifi-led"; + gpios = <&gpio 24 0>; + linux,default-trigger = "rfkill0"; + }; + }; }; From 1dbe1dfa8591fce98acbac6a9398284a3f1ecc6e Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Mon, 20 Feb 2012 08:57:27 +0100 Subject: [PATCH 4/5] ARM: tegra: PCIe: Provide 3.3V supply voltage The PCIe reference clock needs a 3.3V supply voltage to work properly. Signed-off-by: Thierry Reding Acked-by: Stephen Warren Signed-off-by: Olof Johansson --- arch/arm/mach-tegra/board-harmony-power.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-tegra/board-harmony-power.c b/arch/arm/mach-tegra/board-harmony-power.c index 21d1285731b3..c0298b3f7d63 100644 --- a/arch/arm/mach-tegra/board-harmony-power.c +++ b/arch/arm/mach-tegra/board-harmony-power.c @@ -36,13 +36,14 @@ static struct regulator_consumer_supply tps658621_ldo0_supply[] = { static struct regulator_init_data ldo0_data = { .constraints = { - .min_uV = 1250 * 1000, + .min_uV = 3300 * 1000, .max_uV = 3300 * 1000, .valid_modes_mask = (REGULATOR_MODE_NORMAL | REGULATOR_MODE_STANDBY), .valid_ops_mask = (REGULATOR_CHANGE_MODE | REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_VOLTAGE), + .apply_uV = 1, }, .num_consumer_supplies = ARRAY_SIZE(tps658621_ldo0_supply), .consumer_supplies = tps658621_ldo0_supply, From c5444f39620b2b7801eb1997c41befdc8bcf78ea Mon Sep 17 00:00:00 2001 From: Stephen Warren Date: Mon, 27 Feb 2012 18:26:16 -0700 Subject: [PATCH 5/5] ARM: tegra: match SoC name not board name in DT board files board-dt-tegra*.c should support any board using Tegra when booted using device tree. Instead of explicitly listing all the supported boards, which requires a kernel change for each new board, list the supported SoC model instead. Note that the board files do currently have explicit support for setting up each board's pinmux. However, it's fairly likely that at least the basic devices on any new board will work just fine as set up by the boot- loader, and the pinmux data should be moving into device tree soon anyway. Signed-off-by: Stephen Warren Signed-off-by: Olof Johansson --- arch/arm/mach-tegra/board-dt-tegra20.c | 6 +----- arch/arm/mach-tegra/board-dt-tegra30.c | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index 7a95e0bc4aba..e20b419d5983 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c @@ -131,11 +131,7 @@ static void __init tegra_dt_init(void) } static const char *tegra20_dt_board_compat[] = { - "compulab,trimslice", - "nvidia,harmony", - "compal,paz00", - "nvidia,seaboard", - "nvidia,ventana", + "nvidia,tegra20", NULL }; diff --git a/arch/arm/mach-tegra/board-dt-tegra30.c b/arch/arm/mach-tegra/board-dt-tegra30.c index 3c197e2440b7..6db4df28e6cd 100644 --- a/arch/arm/mach-tegra/board-dt-tegra30.c +++ b/arch/arm/mach-tegra/board-dt-tegra30.c @@ -47,7 +47,7 @@ static void __init tegra30_dt_init(void) } static const char *tegra30_dt_board_compat[] = { - "nvidia,cardhu", + "nvidia,tegra30", NULL };