diff options
| author | Tom Rini <trini@konsulko.com> | 2017-06-24 18:18:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-06-24 18:18:41 -0400 |
| commit | 524b42bc2c6ae0a3d1d73a83de59346e4b3becd7 (patch) | |
| tree | 21e4c068d383ba640804b7b53126f216589504e3 /arch/arm/dts/uniphier-pro4-ace.dts | |
| parent | 7df4ff2c2689a6d3c16eb0c3cce098fcac622b0c (diff) | |
| parent | 7bf378043f653d4edd0dc4a54a0a4c43fa8914c2 (diff) | |
Merge git://git.denx.de/u-boot-uniphier
- fix sparse warnings
- sync DT with Linux
- add new board support (LD11/LD20 global)
Diffstat (limited to 'arch/arm/dts/uniphier-pro4-ace.dts')
| -rw-r--r-- | arch/arm/dts/uniphier-pro4-ace.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/dts/uniphier-pro4-ace.dts b/arch/arm/dts/uniphier-pro4-ace.dts index 679e48b5ae..9276f8d913 100644 --- a/arch/arm/dts/uniphier-pro4-ace.dts +++ b/arch/arm/dts/uniphier-pro4-ace.dts @@ -4,7 +4,7 @@ * Copyright (C) 2016 Socionext Inc. * Author: Masahiro Yamada <yamada.masahiro@socionext.com> * - * SPDX-License-Identifier: GPL-2.0+ X11 + * SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ /dts-v1/; @@ -52,7 +52,7 @@ status = "okay"; eeprom@54 { - compatible = "st,24c64", "i2c-eeprom"; + compatible = "st,24c64", "atmel,24c64", "i2c-eeprom"; reg = <0x54>; pagesize = <32>; u-boot,i2c-offset-len = <2>; |