Skip to contentSkip to conversation

ARM: tegra: add platform suspend support

PATCH Superseded Joseph Lo 3 participants 14 messages Mar 13, 2013 – Mar 27, 2013

Subsystems (5)

v3 of 6 Superseded Latest is v6 →

lore
Share & tools
lore

Joseph Lo

author
#0 lore raw

v3 cover ARM: tegra: add platform suspend support

This series introduces a basic functionality for Tegra to support the platform suspend and resume.

Note: This series only adds the support for Tegra20 and Tegra30. The Tegra114 will be supported later.

This series were depending on the patch below that not yet be merged into linux-mmc tree.
"mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings"

Verified on Seaboard and Cardhu.

V3:
* fix the PMC DT configurations for paz00 board
* add a protection for only support LP2 suspend mode

V2:
* re-order the patch sequence to make sure the suspend function can be enabled well after the last patch be merged
* squash the patches that defined the PM bindings for PMC and the implementation

Joseph Lo (9):
gpio: tegra: add gpio wakeup source handling
ARM: tegra: irq: add wake up handling
ARM: dt: tegra: add bindings of power management configurations for
PMC
ARM: tegra: pm: add platform suspend support
ARM: dts: tegra: add power gpio keys to DT
ARM: dts: tegra: whistler: add wakeup source for KBC
ARM: dts: tegra: add non-removable and keep-power-in-suspend property
for MMC
ARM: tegra: config: defconfig update
ARM: dts: tegra: add the PM configurations of PMC

 .../bindings/arm/tegra/nvidia,tegra20-pmc.txt      |  42 ++++++-
 arch/arm/boot/dts/tegra20-harmony.dts              |  17 +++
 arch/arm/boot/dts/tegra20-paz00.dts                |   7 ++
 arch/arm/boot/dts/tegra20-seaboard.dts             |   8 ++
 arch/arm/boot/dts/tegra20-trimslice.dts            |  20 +++
 arch/arm/boot/dts/tegra20-ventana.dts              |  19 +++
 arch/arm/boot/dts/tegra20-whistler.dts             |  10 ++
 arch/arm/boot/dts/tegra30-beaver.dts               |   8 ++
 arch/arm/boot/dts/tegra30-cardhu-a02.dts           |   1 +
 arch/arm/boot/dts/tegra30-cardhu-a04.dts           |   1 +
 arch/arm/boot/dts/tegra30-cardhu.dtsi              |   8 ++
 arch/arm/configs/tegra_defconfig                   |   1 +
 arch/arm/mach-tegra/common.c                       |   3 +
 arch/arm/mach-tegra/irq.c                          |  95 +++++++++++++-
 arch/arm/mach-tegra/irq.h                          |   6 +
 arch/arm/mach-tegra/pm.c                           |  71 +++++++++++
 arch/arm/mach-tegra/pm.h                           |   6 +
 arch/arm/mach-tegra/pmc.c                          | 136 +++++++++++++++++++++
 arch/arm/mach-tegra/pmc.h                          |  17 +++
 drivers/gpio/gpio-tegra.c                          |  21 +++-
 20 files changed, 493 insertions(+), 4 deletions(-)
Signature · 1 line
1.8.1.5
author
#1 lore raw

PATCH v3 1/9 gpio: tegra: add gpio wakeup source handling

This patch add the gpio wakeup source handling for the Tegra platform. It was be done by enabling the irq for the gpio in the gpio controller and enabling the bank irq of the gpio in the Tegra legacy irq controller when the system going to suspend.

Based on the work by:
Varun Wadekar <[email protected]>

Cc Grant Likely <[email protected]>
Cc Linus Walleij <[email protected]>

---
V3:
* no change
V2:
* no change

---
 drivers/gpio/gpio-tegra.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/gpio/gpio-tegra.c +19 -2
index a78a81f..2f1b265 100644
@@ -72,6 +72,7 @@ struct tegra_gpio_bank {
 	u32 oe[4];
 	u32 int_enb[4];
 	u32 int_lvl[4];
+	u32 wake_enb[4];
 #endif
 };
 
@@ -333,15 +334,31 @@ static int tegra_gpio_suspend(struct device *dev)
 			bank->oe[p] = tegra_gpio_readl(GPIO_OE(gpio));
 			bank->int_enb[p] = tegra_gpio_readl(GPIO_INT_ENB(gpio));
 			bank->int_lvl[p] = tegra_gpio_readl(GPIO_INT_LVL(gpio));
+
+			/* Enable gpio irq for wake up source */
+			tegra_gpio_writel(bank->wake_enb[p],
+					  GPIO_INT_ENB(gpio));
 		}
 	}
 	local_irq_restore(flags);
 	return 0;
 }
 
-static int tegra_gpio_wake_enable(struct irq_data *d, unsigned int enable)
+static int tegra_gpio_irq_set_wake(struct irq_data *d, unsigned int enable)
 {
 	struct tegra_gpio_bank *bank = irq_data_get_irq_chip_data(d);
+	int gpio = d->hwirq;
+	u32 port, bit, mask;
+
+	port = GPIO_PORT(gpio);
+	bit = GPIO_BIT(gpio);
+	mask = BIT(bit);
+
+	if (enable)
+		bank->wake_enb[port] |= mask;
+	else
+		bank->wake_enb[port] &= ~mask;
+
 	return irq_set_irq_wake(bank->irq, enable);
 }
 #endif
@@ -353,7 +370,7 @@ static struct irq_chip tegra_gpio_irq_chip = {
 	.irq_unmask	= tegra_gpio_irq_unmask,
 	.irq_set_type	= tegra_gpio_irq_set_type,
 #ifdef CONFIG_PM_SLEEP
-	.irq_set_wake	= tegra_gpio_wake_enable,
+	.irq_set_wake	= tegra_gpio_irq_set_wake,
 #endif
 };
 
Signature · 1 line
1.8.1.5
#2 lore raw

PATCH v3 1/9 gpio: tegra: add gpio wakeup source handling

Quoted 8 lines · Joseph Lo

This patch add the gpio wakeup source handling for the Tegra platform. It was be done by enabling the irq for the gpio in the gpio controller and enabling the bank irq of the gpio in the Tegra legacy irq controller when the system going to suspend.

Based on the work by:
Varun Wadekar <[email protected]>

Quoted 8 lines
Cc Grant Likely <[email protected]>
Cc Linus Walleij <[email protected]>

---
V3:
* no change
V2:
* no change

No patience whatsoever eh? :-)

Yours,
Linus Walleij

author
#3 lore raw

PATCH v3 2/9 ARM: tegra: irq: add wake up handling

In reply to Joseph Lo

Add the wake up handling for legacy irq controller, and using IRQCHIP_MASK_ON_SUSPEND for wake irq handling.

Based on the work by:
Varun Wadekar <[email protected]>

---
V3:
* no change
V2:
* no change

---
 arch/arm/mach-tegra/common.c |  2 +
 arch/arm/mach-tegra/irq.c    | 95 +++++++++++++++++++++++++++++++++++++++++++-
 arch/arm/mach-tegra/irq.h    |  6 +++
 3 files changed, 102 insertions(+), 1 deletion(-)
arch/arm/mach-tegra/common.c +2 -0
index f0315c9..bc7268a 100644
@@ -33,6 +33,7 @@
 #include "common.h"
 #include "fuse.h"
 #include "iomap.h"
+#include "irq.h"
 #include "pmc.h"
 #include "apbio.h"
 #include "sleep.h"
@@ -63,6 +64,7 @@ void __init tegra_dt_init_irq(void)
 	tegra_clocks_init();
 	tegra_init_irq();
 	irqchip_init();
+	tegra_legacy_irq_syscore_init();
 }
 #endif
 
arch/arm/mach-tegra/irq.c +94 -1

131 lines not on this page · raw message

arch/arm/mach-tegra/irq.h +6 -0
index 5142649..bc05ce5 100644
@@ -19,4 +19,10 @@
 
 bool tegra_pending_sgi(void);
 
+#ifdef CONFIG_PM_SLEEP
+int tegra_legacy_irq_syscore_init(void);
+#else
+static inline int tegra_legacy_irq_syscore_init(void) { return 0; }
+#endif
+
 #endif
Signature · 1 line
1.8.1.5
author
#4 lore raw

PATCH v3 3/9 ARM: dt: tegra: add bindings of power management configurations for PMC

In reply to Joseph Lo

The PMC mostly controls the entry and exit of the system from different sleep modes. Different platform or system may have different configurations. The power management configurations of PMC is represented as some properties. The system needs to define the properties when the system supports deep sleep mode (i.e. suspend).

Cc Grant Likely <[email protected]>
Cc Rob Herring <[email protected]>
Cc devicetree-discuss at lists.ozlabs.org

---
V3:
* fix typos
V2:
* squash the patches that defined the PM bindings for PMC and the implementation
* replace the "unsigned long" with "u32" for the variables that are parsed from DT

---
 .../bindings/arm/tegra/nvidia,tegra20-pmc.txt      | 42 ++++++++++-
 arch/arm/mach-tegra/pmc.c                          | 83 ++++++++++++++++++++++
 arch/arm/mach-tegra/pmc.h                          |  8 +++
 3 files changed, 132 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.txt +41 -1
index b5846e2..ae4e3ee 100644
@@ -1,14 +1,46 @@
 NVIDIA Tegra Power Management Controller (PMC)
 
-Properties:
+The PMC block interacts with an external Power Management Unit. The PMC
+mostly controls the entry and exit of the system from different sleep
+modes. It provides power-gating controllers for SoC and CPU power-islands.
+
+Required properties:
 - name : Should be pmc
 - compatible : Should contain "nvidia,tegra<chip>-pmc".
 - reg : Offset and length of the register set for the device
+
+Optional properties:
 - nvidia,invert-interrupt : If present, inverts the PMU interrupt signal.
   The PMU is an external Power Management Unit, whose interrupt output
   signal is fed into the PMC. This signal is optionally inverted, and then
   fed into the ARM GIC. The PMC is not involved in the detection or
   handling of this interrupt signal, merely its inversion.
+- nvidia,suspend-mode : The suspend mode that the platform should use.
+  Valid values are 0, 1 and 2:
+  0 (LP0): CPU + Core voltage off and DRAM in self-refresh
+  1 (LP1): CPU vlotage off and DRAM in self-refresh
+  2 (LP2): CPU voltage off
+- nvidia,core-power-req-active-high : Boolean, core power request active-high
+- nvidia,sys-clock-req-active-high : Boolean, system clock request active-high
+- nvidia,combined-power-req : Boolean, combined power request for CPU & Core
+- nvidia,cpu-pwr-good-en : Boolean, CPU power good signal (from PMIC to PMC)
+			   is enabled.
+
+Required properties when nvidia,suspend-mode is specified:
+- nvidia,cpu-pwr-good-time : CPU power good time in uS.
+- nvidia,cpu-pwr-off-time : CPU power off time in uS.
+- nvidia,core-pwr-good-time : <Oscillator-stable-time Power-stable-time>
+			      Core power good time in uS.
+- nvidia,core-pwr-off-time : Core power off time in uS.
+
+Required properties when nvidia,suspend-mode=<0>:
+- nvidia,lp0-vec : <start length> Starting address and length of LP0 vector
+  The LP0 vector contains the warm boot code that is executed by AVP when
+  resuming from the LP0 state. The AVP (Audio-Video Processor) is an ARM7
+  processor and always being the first boot processor when chip is power on
+  or resume from deep sleep mode. When the system is resumed from the deep
+  sleep mode, the warm boot code will restore some PLLs, clocks and then
+  bring up CPU0 for resuming the system.
 
 Example:
 
@@ -16,4 +48,12 @@ pmc at 7000f400 {
 	compatible = "nvidia,tegra20-pmc";
 	reg = <0x7000e400 0x400>;
 	nvidia,invert-interrupt;
+	nvidia,suspend-mode = <1>;
+	nvidia,cpu-pwr-good-time = <2000>;
+	nvidia,cpu-pwr-off-time = <100>;
+	nvidia,core-pwr-good-time = <3845 3845>;
+	nvidia,core-pwr-off-time = <458>;
+	nvidia,core-power-req-active-high;
+	nvidia,sys-clock-req-active-high;
+	nvidia,lp0-vec = <0xbdffd000 0x2000>;
 };
arch/arm/mach-tegra/pmc.c +83 -0

107 lines not on this page · raw message

arch/arm/mach-tegra/pmc.h +8 -0
index 7d44710..1c4b4de 100644
@@ -18,6 +18,14 @@
 #ifndef __MACH_TEGRA_PMC_H
 #define __MACH_TEGRA_PMC_H
 
+enum tegra_suspend_mode {
+	TEGRA_SUSPEND_NONE = 0,
+	TEGRA_SUSPEND_LP2,	/* CPU voltage off */
+	TEGRA_SUSPEND_LP1,	/* CPU voltage off, DRAM self-refresh */
+	TEGRA_SUSPEND_LP0,      /* CPU + core voltage off, DRAM self-refresh */
+	TEGRA_MAX_SUSPEND_MODE,
+};
+
 bool tegra_pmc_cpu_is_powered(int cpuid);
 int tegra_pmc_cpu_power_on(int cpuid);
 int tegra_pmc_cpu_remove_clamping(int cpuid);
Signature · 1 line
1.8.1.5
author
#5 lore raw

PATCH v3 4/9 ARM: tegra: pm: add platform suspend support

In reply to Joseph Lo

Adding suspend to RAM support for Tegra platform. There are three suspend mode for Tegra. The difference were below.

* LP2: CPU voltage off
* LP1: CPU voltage off, DRAM in self-refresh
* LP0: CPU + Core voltage off, DRAM in self-refresh

After this patch, the LP2 suspend mode will be supported.

---
V3:
* add a protection for only support LP2 suspend mode V2:
* add the PM_SLEEP protection for "tegra_init_suspend"
* remove "tegra_suspend_{enter/exit}_lp2"
* refactor the "tegra_pmc_pm_set" for non-used parameter
* replace "unsigned long" with "u32" for tegra_pmc_get_cpu_time

---
 arch/arm/mach-tegra/common.c |  1 +
 arch/arm/mach-tegra/pm.c     | 71 ++++++++++++++++++++++++++++++++++++++++++++
 arch/arm/mach-tegra/pm.h     |  6 ++++
 arch/arm/mach-tegra/pmc.c    | 53 +++++++++++++++++++++++++++++++++
 arch/arm/mach-tegra/pmc.h    |  9 ++++++
 5 files changed, 140 insertions(+)
arch/arm/mach-tegra/common.c +1 -0
index bc7268a..fd67efa 100644
@@ -65,6 +65,7 @@ void __init tegra_dt_init_irq(void)
 	tegra_init_irq();
 	irqchip_init();
 	tegra_legacy_irq_syscore_init();
+	tegra_init_suspend();
 }
 #endif
 
arch/arm/mach-tegra/pm.c +71 -0

87 lines not on this page · raw message

arch/arm/mach-tegra/pm.h +6 -0
index 787335c..e7cbfeb 100644
@@ -32,4 +32,10 @@ bool tegra_set_cpu_in_lp2(int phy_cpu_id);
 void tegra_idle_lp2_last(u32 cpu_on_time, u32 cpu_off_time);
 extern void (*tegra_tear_down_cpu)(void);
 
+#ifdef CONFIG_PM_SLEEP
+void tegra_init_suspend(void);
+#else
+static inline void tegra_init_suspend(void) {}
+#endif
+
 #endif /* _MACH_TEGRA_PM_H_ */
arch/arm/mach-tegra/pmc.c +53 -0

66 lines not on this page · raw message

arch/arm/mach-tegra/pmc.h +9 -0
index 1c4b4de..72b2cee 100644
@@ -26,6 +26,15 @@ enum tegra_suspend_mode {
 	TEGRA_MAX_SUSPEND_MODE,
 };
 
+#ifdef CONFIG_PM_SLEEP
+enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void);
+void tegra_pmc_set_suspend_mode(enum tegra_suspend_mode mode);
+u32 tegra_pmc_get_cpu_good_time(void);
+u32 tegra_pmc_get_cpu_off_time(void);
+void tegra_pmc_pm_set(void);
+void tegra_pmc_suspend_init(void);
+#endif
+
 bool tegra_pmc_cpu_is_powered(int cpuid);
 int tegra_pmc_cpu_power_on(int cpuid);
 int tegra_pmc_cpu_remove_clamping(int cpuid);
Signature · 1 line
1.8.1.5
#6 lore raw

PATCH v3 4/9 ARM: tegra: pm: add platform suspend support

Quoted 12 lines · Joseph Lo

Adding suspend to RAM support for Tegra platform. There are three suspend mode for Tegra. The difference were below.

* LP2: CPU voltage off
* LP1: CPU voltage off, DRAM in self-refresh
* LP0: CPU + Core voltage off, DRAM in self-refresh

After this patch, the LP2 suspend mode will be supported.

arch/arm/mach-tegra/pm.c +1 -0
 
+void __init tegra_init_suspend(void)

...

arch/arm/mach-tegra/pm.c void tegra_idle_lp2_last(u32 cpu_on_time, u32 cpu_off_time) · line 267

Quoted 3 lines
arch/arm/mach-tegra/pm.c +3 -0
+	/* We only support LP2 suspend mode right now. */
+	if (mode > TEGRA_SUSPEND_LP2)
+		tegra_pmc_set_suspend_mode(TEGRA_SUSPEND_LP2);

I see that in patch 3/9, tegra_pmc_parse_dt() simply assigns directly to pmc_pm_data.suspend_mode rather than calling a function. If it's useful to call a function here, isn't doing so also useful in tegra_pmc_parse_dt()?

I guess you did this because pmc_pm_data is static so you can't just assign it here.

Instead, I would suggest that tegra_pmc_parse_dt() does this validation itself, either by:

a) Enhancing tegra_pmc_parse_dt() to know which modes are supported itself.

or:

b) Have tegra_pmc_parse_dt() call a function in pm.c to determine whether the user-selected suspend mode is valid or not. Something like:

pmc_pm_data.suspend_mode = tegra_pm_validate_suspend_mode(suspend_mode);

That way, tegra_pm_validate_suspend_mode() can encapsulate all details of which suspend modes are supported, any SoC-specific differences (e.g. not Tegra114 in any mode, but any earlier chip in LP2 mode for example).

(a) is slightly simpler. (b) is probably more flexible. I guess I'd prefer (b).

author
#7 lore raw

PATCH v3 5/9 ARM: dts: tegra: add power gpio keys to DT

In reply to Joseph Lo

This adds the power gpio key to DT and enable the wakeup of the gpio key for the device. The Seaboard and paz00 already had the power gpio key binding and the power key of Whistler was on KBC. So these boards' device tree didn't include in this patch.

---
V3:
* no change
V2:
* no change

---
 arch/arm/boot/dts/tegra20-harmony.dts   | 11 +++++++++++
 arch/arm/boot/dts/tegra20-trimslice.dts | 11 +++++++++++
 arch/arm/boot/dts/tegra20-ventana.dts   | 11 +++++++++++
 3 files changed, 33 insertions(+)
arch/arm/boot/dts/tegra20-harmony.dts +11 -0
index 1f79c0d..3532853 100644
@@ -568,6 +568,17 @@
 				0x1F0400D6>;	/* KEY_QUESTION */
 	};
 
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		power {
+			label = "Power";
+			gpios = <&gpio 170 1>; /* gpio PV2, active low */
+			linux,code = <116>; /* KEY_POWER */
+			gpio-key,wakeup;
+		};
+	};
+
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;
arch/arm/boot/dts/tegra20-trimslice.dts +11 -0
index 98f3e44..3cfd9ed 100644
@@ -335,6 +335,17 @@
 		gpios = <&gpio 191 1>; /* gpio PX7, active low */
 	};
 
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		power {
+			label = "Power";
+			gpios = <&gpio 190 1>; /* gpio PX6, active low */
+			linux,code = <116>; /* KEY_POWER */
+			gpio-key,wakeup;
+		};
+	};
+
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;
arch/arm/boot/dts/tegra20-ventana.dts +11 -0
index 4aef56f..ede91c0 100644
@@ -531,6 +531,17 @@
 		bus-width = <8>;
 	};
 
+	gpio-keys {
+		compatible = "gpio-keys";
+
+		power {
+			label = "Power";
+			gpios = <&gpio 170 1>; /* gpio PV2, active low */
+			linux,code = <116>; /* KEY_POWER */
+			gpio-key,wakeup;
+		};
+	};
+
 	regulators {
 		compatible = "simple-bus";
 		#address-cells = <1>;
Signature · 1 line
1.8.1.5
author
#8 lore raw

PATCH v3 6/9 ARM: dts: tegra: whistler: add wakeup source for KBC

In reply to Joseph Lo

Adding KBC as a wakeup source for Whistler board.

---
V3:
* no change
V2:
* no change

---
 arch/arm/boot/dts/tegra20-whistler.dts | 1 +
 1 file changed, 1 insertion(+)
arch/arm/boot/dts/tegra20-whistler.dts +1 -0
index 5762188..4afcae1 100644
@@ -526,6 +526,7 @@
 		nvidia,repeat-delay-ms = <160>;
 		nvidia,kbc-row-pins = <0 1 2>;
 		nvidia,kbc-col-pins = <16 17>;
+		nvidia,wakeup-source;
 		linux,keymap = <0x00000074	/* KEY_POWER */
 				0x01000066	/* KEY_HOME */
 				0x0101009E	/* KEY_BACK */
Signature · 1 line
1.8.1.5
author
#9 lore raw

PATCH v3 7/9 ARM: dts: tegra: add non-removable and keep-power-in-suspend property for MMC

In reply to Joseph Lo

This patch adds "non-removable" property of MMC host where the eMMC device is for Tegra platform.

And the "keep-power-in-suspend" property was used for the SDIO device that need this to go into suspend mode (e.g. BRCM43xx series).

---
V3:
* no change
V2:
* no change

---
 arch/arm/boot/dts/tegra20-paz00.dts      | 1 +
 arch/arm/boot/dts/tegra20-seaboard.dts   | 2 ++
 arch/arm/boot/dts/tegra20-ventana.dts    | 2 ++
 arch/arm/boot/dts/tegra20-whistler.dts   | 1 +
 arch/arm/boot/dts/tegra30-beaver.dts     | 1 +
 arch/arm/boot/dts/tegra30-cardhu-a02.dts | 1 +
 arch/arm/boot/dts/tegra30-cardhu-a04.dts | 1 +
 arch/arm/boot/dts/tegra30-cardhu.dtsi    | 1 +
 8 files changed, 10 insertions(+)
arch/arm/boot/dts/tegra20-paz00.dts +1 -0
index 9db36da..41e82e3 100644
@@ -445,6 +445,7 @@
 	sdhci at c8000600 {
 		status = "okay";
 		bus-width = <8>;
+		non-removable;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra20-seaboard.dts +2 -0
index 715a8b8..fd0e1cf 100644
@@ -580,6 +580,7 @@
 		status = "okay";
 		power-gpios = <&gpio 86 0>; /* gpio PK6 */
 		bus-width = <4>;
+		keep-power-in-suspend;
 	};
 
 	sdhci at c8000400 {
@@ -593,6 +594,7 @@
 	sdhci at c8000600 {
 		status = "okay";
 		bus-width = <8>;
+		non-removable;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra20-ventana.dts +2 -0
index ede91c0..826a6cc 100644
@@ -516,6 +516,7 @@
 		status = "okay";
 		power-gpios = <&gpio 86 0>; /* gpio PK6 */
 		bus-width = <4>;
+		keep-power-in-suspend;
 	};
 
 	sdhci at c8000400 {
@@ -529,6 +530,7 @@
 	sdhci at c8000600 {
 		status = "okay";
 		bus-width = <8>;
+		non-removable;
 	};
 
 	gpio-keys {
arch/arm/boot/dts/tegra20-whistler.dts +1 -0
index 4afcae1..847383f 100644
@@ -518,6 +518,7 @@
 	sdhci at c8000600 {
 		status = "okay";
 		bus-width = <8>;
+		non-removable;
 	};
 
 	kbc {
arch/arm/boot/dts/tegra30-beaver.dts +1 -0
index 0a2cd24..89eb495 100644
@@ -266,6 +266,7 @@
 	sdhci at 78000600 {
 		status = "okay";
 		bus-width = <8>;
+		non-removable;
 	};
 
 	regulators {
arch/arm/boot/dts/tegra30-cardhu-a02.dts +1 -0
index adc88aa..e392bd2 100644
@@ -88,6 +88,7 @@
 		status = "okay";
 		power-gpios = <&gpio 28 0>; /* gpio PD4 */
 		bus-width = <4>;
+		keep-power-in-suspend;
 	};
 };
 
arch/arm/boot/dts/tegra30-cardhu-a04.dts +1 -0
index 08163e1..d0db6c7 100644
@@ -100,5 +100,6 @@
 		status = "okay";
 		power-gpios = <&gpio 27 0>; /* gpio PD3 */
 		bus-width = <4>;
+		keep-power-in-suspend;
 	};
 };
arch/arm/boot/dts/tegra30-cardhu.dtsi +1 -0
index 3e2d210..b448fca 100644
@@ -320,6 +320,7 @@
 	sdhci at 78000600 {
 		status = "okay";
 		bus-width = <8>;
+		non-removable;
 	};
 
 	regulators {
Signature · 1 line
1.8.1.5
author
#10 lore raw

PATCH v3 8/9 ARM: tegra: config: defconfig update

In reply to Joseph Lo

KEYBOARD_GPIO:
* Enable gpio-key driver

---
V3:
* no change
V2:
* no change

---
 arch/arm/configs/tegra_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/tegra_defconfig +1 -0
index aba4881..6eee91d 100644
@@ -108,6 +108,7 @@ CONFIG_RT2X00=y
 CONFIG_RT2800USB=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_TEGRA=y
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MPU3050=y
 # CONFIG_LEGACY_PTYS is not set
Signature · 1 line
1.8.1.5
author
#11 lore raw

PATCH v3 9/9 ARM: dts: tegra: add the PM configurations of PMC

In reply to Joseph Lo

Adding the PM configuration of PMC when the platform support suspend function.

---
V3:
* fix the configuration for paz00 board
V2:
* no change

---
 arch/arm/boot/dts/tegra20-harmony.dts   | 6 ++++++
 arch/arm/boot/dts/tegra20-paz00.dts     | 6 ++++++
 arch/arm/boot/dts/tegra20-seaboard.dts  | 6 ++++++
 arch/arm/boot/dts/tegra20-trimslice.dts | 9 +++++++++
 arch/arm/boot/dts/tegra20-ventana.dts   | 6 ++++++
 arch/arm/boot/dts/tegra20-whistler.dts  | 8 ++++++++
 arch/arm/boot/dts/tegra30-beaver.dts    | 7 +++++++
 arch/arm/boot/dts/tegra30-cardhu.dtsi   | 7 +++++++
 8 files changed, 55 insertions(+)
arch/arm/boot/dts/tegra20-harmony.dts +6 -0
index 3532853..06f4f68 100644
@@ -416,6 +416,12 @@
 
 	pmc {
 		nvidia,invert-interrupt;
+		nvidia,suspend-mode = <2>;
+		nvidia,cpu-pwr-good-time = <5000>;
+		nvidia,cpu-pwr-off-time = <5000>;
+		nvidia,core-pwr-good-time = <3845 3845>;
+		nvidia,core-pwr-off-time = <3875>;
+		nvidia,sys-clock-req-active-high;
 	};
 
 	usb at c5000000 {
arch/arm/boot/dts/tegra20-paz00.dts +6 -0
index 41e82e3..3679382 100644
@@ -415,6 +415,12 @@
 
 	pmc {
 		nvidia,invert-interrupt;
+		nvidia,suspend-mode = <2>;
+		nvidia,cpu-pwr-good-time = <2000>;
+		nvidia,cpu-pwr-off-time = <0>;
+		nvidia,core-pwr-good-time = <3845 3845>;
+		nvidia,core-pwr-off-time = <0>;
+		nvidia,sys-clock-req-active-high;
 	};
 
 	usb at c5000000 {
arch/arm/boot/dts/tegra20-seaboard.dts +6 -0
index fd0e1cf..fd2a109 100644
@@ -517,6 +517,12 @@
 
 	pmc {
 		nvidia,invert-interrupt;
+		nvidia,suspend-mode = <2>;
+		nvidia,cpu-pwr-good-time = <5000>;
+		nvidia,cpu-pwr-off-time = <5000>;
+		nvidia,core-pwr-good-time = <3845 3845>;
+		nvidia,core-pwr-off-time = <3875>;
+		nvidia,sys-clock-req-active-high;
 	};
 
 	memory-controller at 7000f400 {
arch/arm/boot/dts/tegra20-trimslice.dts +9 -0
index 3cfd9ed..e210b24 100644
@@ -300,6 +300,15 @@
 		};
 	};
 
+	pmc {
+		nvidia,suspend-mode = <2>;
+		nvidia,cpu-pwr-good-time = <5000>;
+		nvidia,cpu-pwr-off-time = <5000>;
+		nvidia,core-pwr-good-time = <3845 3845>;
+		nvidia,core-pwr-off-time = <3875>;
+		nvidia,sys-clock-req-active-high;
+	};
+
 	usb at c5000000 {
 		status = "okay";
 		nvidia,vbus-gpio = <&gpio 170 0>; /* gpio PV2 */
arch/arm/boot/dts/tegra20-ventana.dts +6 -0
index 826a6cc..0d6b8d7 100644
@@ -493,6 +493,12 @@
 
 	pmc {
 		nvidia,invert-interrupt;
+		nvidia,suspend-mode = <2>;
+		nvidia,cpu-pwr-good-time = <2000>;
+		nvidia,cpu-pwr-off-time = <100>;
+		nvidia,core-pwr-good-time = <3845 3845>;
+		nvidia,core-pwr-off-time = <458>;
+		nvidia,sys-clock-req-active-high;
 	};
 
 	usb at c5000000 {
arch/arm/boot/dts/tegra20-whistler.dts +8 -0
index 847383f..073e65a 100644
@@ -496,6 +496,14 @@
 
 	pmc {
 		nvidia,invert-interrupt;
+		nvidia,suspend-mode = <2>;
+		nvidia,cpu-pwr-good-time = <2000>;
+		nvidia,cpu-pwr-off-time = <1000>;
+		nvidia,core-pwr-good-time = <0 3845>;
+		nvidia,core-pwr-off-time = <93727>;
+		nvidia,core-power-req-active-high;
+		nvidia,sys-clock-req-active-high;
+		nvidia,combined-power-req;
 	};
 
 	usb at c5000000 {
arch/arm/boot/dts/tegra30-beaver.dts +7 -0
index 89eb495..698a634 100644
@@ -253,6 +253,13 @@
 	pmc {
 		status = "okay";
 		nvidia,invert-interrupt;
+		nvidia,suspend-mode = <2>;
+		nvidia,cpu-pwr-good-time = <2000>;
+		nvidia,cpu-pwr-off-time = <200>;
+		nvidia,core-pwr-good-time = <3845 3845>;
+		nvidia,core-pwr-off-time = <0>;
+		nvidia,core-power-req-active-high;
+		nvidia,sys-clock-req-active-high;
 	};
 
 	sdhci at 78000000 {
arch/arm/boot/dts/tegra30-cardhu.dtsi +7 -0
index b448fca..4e26020 100644
@@ -307,6 +307,13 @@
 	pmc {
 		status = "okay";
 		nvidia,invert-interrupt;
+		nvidia,suspend-mode = <2>;
+		nvidia,cpu-pwr-good-time = <2000>;
+		nvidia,cpu-pwr-off-time = <200>;
+		nvidia,core-pwr-good-time = <3845 3845>;
+		nvidia,core-pwr-off-time = <0>;
+		nvidia,core-power-req-active-high;
+		nvidia,sys-clock-req-active-high;
 	};
 
 	sdhci at 78000000 {
Signature · 1 line
1.8.1.5
#12 lore raw

v3 cover ARM: tegra: add platform suspend support

In reply to Joseph Lo
Quoted 9 lines · Joseph Lo

This series introduces a basic functionality for Tegra to support the platform suspend and resume.

Note: This series only adds the support for Tegra20 and Tegra30. The Tegra114 will be supported later.

This series were depending on the patch below that not yet be merged into linux-mmc tree.
"mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings"

Is that a compile-time dependency, or a run-time dependency? I assume this is simply a run-time dependency, and is also only a dependency for suspend itself to work; there wouldn't be any other regressions due to ignoring that dependency?

In other words, if I simply apply this series without "mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings", then the only issue is that suspend, a new feature, won't work correctly yet? If so, I believe I will ignore that dependency. The new feature will work in linux-next and 3.10-rc1.

author
#13 lore raw

v3 cover ARM: tegra: add platform suspend support

Quoted 7 lines · Stephen Warren
Quoted 6 lines · Joseph Lo

This series introduces a basic functionality for Tegra to support the platform suspend and resume.

Note: This series only adds the support for Tegra20 and Tegra30. The Tegra114 will be supported later.

Quoted 8 lines
Quoted 3 lines

This series were depending on the patch below that not yet be merged into linux-mmc tree.
"mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings"

Is that a compile-time dependency, or a run-time dependency? I assume this is simply a run-time dependency, and is also only a dependency for suspend itself to work; there wouldn't be any other regressions due to ignoring that dependency?

Exactly.

Quoted 5 lines

In other words, if I simply apply this series without "mmc: tegra: use mmc_of_parse to get the support of standard MMC DT bindings", then the only issue is that suspend, a new feature, won't work correctly yet? If so, I believe I will ignore that dependency. The new feature will work in linux-next and 3.10-rc1.

OK.

Thanks,
Joseph