]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ARM: dts: Add mask-tpm-reset node in exynos5420-peach-pit
authorDoug Anderson <dianders@chromium.org>
Tue, 15 Jul 2014 17:38:39 +0000 (02:38 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 15 Jul 2014 17:39:18 +0000 (02:39 +0900)
The mask-tpm-reset GPIO is used by the kernel to prevent the TPM from
being reset across sleep/wake.  If we don't set it to anything then
the TPM will be reset.  U-Boot will detect this as invalid
and will reset the system on resume time. This GPIO can always be low
and not hurt anything.  It will get pulled back high again during a
normal warm reset when it will default back to an input.

To properly preserve the TPM state across suspend/resume and to make
the chrome U-Boot happy, properly set the GPIO to mask the
reset to the TPM.

Signed-off-by: Doug Anderson <dianders@chromium.org>
Signed-off-by: Vikas Sajjan <vikas.sajjan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/boot/dts/exynos5420-peach-pit.dts

index 6c7cab0eba25bbe81ab4b21cf29b4f8ddc996816..c7b2bbae71a9dc9ab9f68af6fd1088a6dd724383 100644 (file)
@@ -211,6 +211,9 @@ slot@0 {
 
 
 &pinctrl_0 {
+       pinctrl-names = "default";
+       pinctrl-0 = <&mask_tpm_reset>;
+
        max98090_irq: max98090-irq {
                samsung,pins = "gpx0-2";
                samsung,pin-function = <0>;
@@ -218,6 +221,15 @@ max98090_irq: max98090-irq {
                samsung,pin-drv = <0>;
        };
 
+       /* We need GPX0_6 to be low at sleep time; just keep it low always */
+       mask_tpm_reset: mask-tpm-reset {
+               samsung,pins = "gpx0-6";
+               samsung,pin-function = <1>;
+               samsung,pin-pud = <0>;
+               samsung,pin-drv = <0>;
+               samsung,pin-val = <0>;
+       };
+
        tpm_irq: tpm-irq {
                samsung,pins = "gpx1-0";
                samsung,pin-function = <0>;