CHROMIUM: exynos: dts: TPM configuration is per board

Move the TPM configuration to board-specific files.
On Daisy and Snow, we have a SLB9635TT TPM with software I2C (the max
bus speed is 100kHz).
On Spring, we have a SLB9645TT TPM with hardware I2c (the max bus speed
is 400kHz).

Signed-off-by: Vincent Palatin <vpalatin@chromium.org>
BUG=chrome-os-partner:17506
TEST=on Snow and Spring, boot and grep the tpm_tis_i2c messages in the
kernel log.

Change-Id: I3c914c8647fad3f93c5273228c5a18e476efe100
Reviewed-on: https://gerrit.chromium.org/gerrit/42333
Tested-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Luigi Semenzato <semenzato@chromium.org>
Commit-Queue: Vincent Palatin <vpalatin@chromium.org>

diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi
index 2bbff97..82834e6 100644 (file)
--- a/arch/arm/boot/dts/cros5250-common.dtsi
+++ b/arch/arm/boot/dts/cros5250-common.dtsi
@@ -256,18 +256,6 @@
 
        };
 
-       i2c@12C90000 {
-               samsung,i2c-sda-delay = <100>;
-               samsung,i2c-max-bus-freq = <66000>;
-               gpios = <&gpa1 2 3 3 0>,
-                       <&gpa1 3 3 3 0>;
-
-               tpm {
-                       compatible = "infineon,slb9635tt";
-                       reg = <0x20>;
-               };
-       };
-
        i2c@12CA0000 {
                samsung,i2c-sda-delay = <100>;
                samsung,i2c-max-bus-freq = <66000>;

diff --git a/arch/arm/boot/dts/exynos5250-daisy.dts b/arch/arm/boot/dts/exynos5250-daisy.dts
index 0736f53..23c107f 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-daisy.dts
+++ b/arch/arm/boot/dts/exynos5250-daisy.dts
@@ -47,6 +47,18 @@
                };
        };
 
+       i2c@12C90000 {
+               samsung,i2c-sda-delay = <100>;
+               samsung,i2c-max-bus-freq = <66000>;
+               gpios = <&gpa1 2 3 3 0>,
+                       <&gpa1 3 3 3 0>;
+
+               tpm {
+                       compatible = "infineon,slb9635tt";
+                       reg = <0x20>;
+               };
+       };
+
        xhci {
                phy {
                        compatible = "samsung,exynos-usbphy";

diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index 3a388a3..3dfe802 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -32,6 +32,18 @@
                        gpio-key,wakeup;
                };
        };
+
+       i2c@12C90000 {
+               samsung,i2c-sda-delay = <100>;
+               samsung,i2c-max-bus-freq = <66000>;
+               gpios = <&gpa1 2 3 3 0>,
+                       <&gpa1 3 3 3 0>;
+
+               tpm {
+                       compatible = "infineon,slb9635tt";
+                       reg = <0x20>;
+               };
+       };
        i2c@12CA0000 {
                samsung,slew-delay-us = <10>;
                samsung,wait-retry-us = <3000>;

diff --git a/arch/arm/boot/dts/exynos5250-spring.dts b/arch/arm/boot/dts/exynos5250-spring.dts
index 8dab763..f0ff631 100644 (file)
--- a/arch/arm/boot/dts/exynos5250-spring.dts
+++ b/arch/arm/boot/dts/exynos5250-spring.dts
@@ -85,6 +85,18 @@
                status = "disabled";
        };
 
+       i2c@12C90000 {
+               samsung,i2c-sda-delay = <100>;
+               samsung,i2c-max-bus-freq = <400000>;
+               gpios = <&gpa1 2 3 3 0>,
+                       <&gpa1 3 3 3 0>;
+
+               tpm {
+                       compatible = "infineon,slb9645tt";
+                       reg = <0x20>;
+               };
+       };
+
        i2c@12CD0000 {
                ps8622-bridge@8 {
                        compatible = "parade,ps8622";