diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-31 11:43:47 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-31 11:43:47 -0400 |
| commit | 80cd58b99e8690b05e8537dbf76276e24fcfa652 (patch) | |
| tree | 0684c14480ab87bb3a74c1c70275b5fdc9c8e3c9 /arch | |
| parent | 7c0e5d865ff0b86dfce492b656238919c659d756 (diff) | |
| parent | 897705ec39682ab3bf5bb87bc49d7a491d522051 (diff) | |
| download | u-boot-imx-80cd58b99e8690b05e8537dbf76276e24fcfa652.zip u-boot-imx-80cd58b99e8690b05e8537dbf76276e24fcfa652.tar.gz u-boot-imx-80cd58b99e8690b05e8537dbf76276e24fcfa652.tar.bz2 | |
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/exynos5250-snow.dts | 9 | ||||
| -rw-r--r-- | arch/arm/dts/exynos5250-spring.dts | 8 | ||||
| -rw-r--r-- | arch/arm/dts/exynos5420-peach-pit.dts | 6 | ||||
| -rw-r--r-- | arch/arm/dts/exynos5800-peach-pi.dts | 6 | ||||
| -rw-r--r-- | arch/sandbox/dts/sandbox.dts | 23 | ||||
| -rw-r--r-- | arch/x86/dts/chromebook_link.dts | 5 | ||||
| -rw-r--r-- | arch/x86/dts/chromebox_panther.dts | 5 |
7 files changed, 56 insertions, 6 deletions
diff --git a/arch/arm/dts/exynos5250-snow.dts b/arch/arm/dts/exynos5250-snow.dts index 32c0098..bda5499 100644 --- a/arch/arm/dts/exynos5250-snow.dts +++ b/arch/arm/dts/exynos5250-snow.dts @@ -206,6 +206,15 @@ }; }; + i2c@12C90000 { + clock-frequency = <100000>; + tpm@20 { + reg = <0x20>; + u-boot,i2c-offset-len = <0>; + compatible = "infineon,slb9635tt"; + }; + }; + spi@12d30000 { spi-max-frequency = <50000000>; firmware_storage_spi: flash@0 { diff --git a/arch/arm/dts/exynos5250-spring.dts b/arch/arm/dts/exynos5250-spring.dts index 76d5323..81b3d29 100644 --- a/arch/arm/dts/exynos5250-spring.dts +++ b/arch/arm/dts/exynos5250-spring.dts @@ -59,6 +59,14 @@ <&gpy4 2 0>; }; + i2c@12C90000 { + clock-frequency = <100000>; + tpm@20 { + reg = <0x20>; + compatible = "infineon,slb9645tt"; + }; + }; + mmc@12200000 { samsung,bus-width = <8>; samsung,timing = <1 3 3>; diff --git a/arch/arm/dts/exynos5420-peach-pit.dts b/arch/arm/dts/exynos5420-peach-pit.dts index 2d2b7c9..16d52f4 100644 --- a/arch/arm/dts/exynos5420-peach-pit.dts +++ b/arch/arm/dts/exynos5420-peach-pit.dts @@ -197,9 +197,9 @@ i2c@12E10000 { /* i2c9 */ clock-frequency = <400000>; - tpm@20 { - compatible = "infineon,slb9645tt"; - reg = <0x20>; + tpm@20 { + compatible = "infineon,slb9645tt"; + reg = <0x20>; }; }; diff --git a/arch/arm/dts/exynos5800-peach-pi.dts b/arch/arm/dts/exynos5800-peach-pi.dts index 600c294..1d7ff23 100644 --- a/arch/arm/dts/exynos5800-peach-pi.dts +++ b/arch/arm/dts/exynos5800-peach-pi.dts @@ -72,9 +72,9 @@ i2c@12E10000 { /* i2c9 */ clock-frequency = <400000>; - tpm@20 { - compatible = "infineon,slb9645tt"; - reg = <0x20>; + tpm@20 { + compatible = "infineon,slb9645tt"; + reg = <0x20>; }; }; diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts index 8927527..65b9125 100644 --- a/arch/sandbox/dts/sandbox.dts +++ b/arch/sandbox/dts/sandbox.dts @@ -92,6 +92,8 @@ reg = <0 0>; compatible = "sandbox,i2c"; clock-frequency = <400000>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_i2c0>; eeprom@2c { reg = <0x2c>; compatible = "i2c-eeprom"; @@ -136,6 +138,21 @@ }; }; + pinctrl { + compatible = "sandbox,pinctrl"; + + pinctrl_i2c0: i2c0 { + groups = "i2c"; + function = "i2c"; + bias-pull-up; + }; + + pinctrl_serial0: uart0 { + groups = "serial_a"; + function = "serial"; + }; + }; + spi@0 { #address-cells = <1>; #size-cells = <0>; @@ -156,6 +173,10 @@ sides = <4>; }; + tpm { + compatible = "google,sandbox-tpm"; + }; + triangle { compatible = "demo-shape"; colour = "cyan"; @@ -168,6 +189,8 @@ uart0: serial { compatible = "sandbox,serial"; sandbox,text-colour = "cyan"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_serial0>; }; usb@0 { diff --git a/arch/x86/dts/chromebook_link.dts b/arch/x86/dts/chromebook_link.dts index ad390bf..4291141 100644 --- a/arch/x86/dts/chromebook_link.dts +++ b/arch/x86/dts/chromebook_link.dts @@ -237,6 +237,11 @@ }; }; + tpm { + reg = <0xfed40000 0x5000>; + compatible = "infineon,slb9635lpc"; + }; + microcode { update@0 { #include "microcode/m12306a9_0000001b.dtsi" diff --git a/arch/x86/dts/chromebox_panther.dts b/arch/x86/dts/chromebox_panther.dts index 84eae3a..36feb96 100644 --- a/arch/x86/dts/chromebox_panther.dts +++ b/arch/x86/dts/chromebox_panther.dts @@ -62,4 +62,9 @@ }; }; + tpm { + reg = <0xfed40000 0x5000>; + compatible = "infineon,slb9635lpc"; + }; + }; |