From cb74de97f36c8f69dd53d6ec539120273e3864cb Mon Sep 17 00:00:00 2001 From: Vincent Palatin Date: Wed, 30 Jan 2013 10:45:37 -0800 Subject: [PATCH] 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 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 Reviewed-by: Luigi Semenzato Commit-Queue: Vincent Palatin --- arch/arm/boot/dts/cros5250-common.dtsi | 12 ------------ arch/arm/boot/dts/exynos5250-daisy.dts | 12 ++++++++++++ arch/arm/boot/dts/exynos5250-snow.dts | 12 ++++++++++++ arch/arm/boot/dts/exynos5250-spring.dts | 12 ++++++++++++ 4 files changed, 36 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/cros5250-common.dtsi b/arch/arm/boot/dts/cros5250-common.dtsi index 2bbff9766829..82834e629b13 100644 --- 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 0736f533ed4e..23c107f75f41 100644 --- 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 3a388a36ee59..3dfe8025eb2d 100644 --- 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 8dab76311771..f0ff631f8439 100644 --- 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"; -- 2.20.1