diff options
| author | Simon Glass <sjg@chromium.org> | 2015-03-26 09:29:39 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2015-04-18 11:11:16 -0600 |
| commit | 3fbb78711ca6a80151dc847409f913053bb7d985 (patch) | |
| tree | 90b8504a6faaca6ed61a962016ff74a0eb994d77 /arch/arm/dts/exynos5250-snow.dts | |
| parent | ce6adaa4b5b51ddf7dc53d61c1eca0fc0553ac06 (diff) | |
| download | blackbird-obmc-uboot-3fbb78711ca6a80151dc847409f913053bb7d985.tar.gz blackbird-obmc-uboot-3fbb78711ca6a80151dc847409f913053bb7d985.zip | |
cros_ec: exynos: Match up device tree with kernel version
The U-Boot device trees are slightly different in a few places. Adjust them
to remove most of the differences. Note that U-Boot does not support the
concept of interrupts as distinct from GPIOs, so this difference remains.
For sandbox, use the same keyboard file as for ARM boards and drop the
host emulation bus which seems redundant.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/arm/dts/exynos5250-snow.dts')
| -rw-r--r-- | arch/arm/dts/exynos5250-snow.dts | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/dts/exynos5250-snow.dts b/arch/arm/dts/exynos5250-snow.dts index 7d8be69d73..d34ffce3d6 100644 --- a/arch/arm/dts/exynos5250-snow.dts +++ b/arch/arm/dts/exynos5250-snow.dts @@ -40,9 +40,9 @@ }; i2c4: i2c@12ca0000 { - cros-ec@1e { + cros_ec: cros-ec@1e { reg = <0x1e>; - compatible = "google,cros-ec"; + compatible = "google,cros-ec-i2c"; i2c-max-frequency = <100000>; u-boot,i2c-offset-len = <0>; ec-interrupt = <&gpx1 6 GPIO_ACTIVE_LOW>; @@ -65,9 +65,10 @@ spi@131b0000 { spi-max-frequency = <1000000>; spi-deactivate-delay = <100>; - cros_ec: cros-ec@0 { - reg = <0>; - compatible = "google,cros-ec"; + + embedded-controller { + compatible = "google,cros-ec-i2c"; + reg = <0x1e>; spi-max-frequency = <5000000>; ec-interrupt = <&gpx1 6 GPIO_ACTIVE_LOW>; optimise-flash-write; |
