diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2017-10-20 00:26:04 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 00:38:54 +0200 |
| commit | c94c81390fe2cdff12a8d6313c92a6a0ff85135d (patch) | |
| tree | b1e82fe663be86b4f6e335f7b9314870cb2ea70f | |
| parent | Merge tag 'samsung-dt-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/soc (diff) | |
| parent | ARM: dts: zynq: Add generic compatible string for I2C EEPROM (diff) | |
| download | wireguard-linux-c94c81390fe2cdff12a8d6313c92a6a0ff85135d.tar.xz wireguard-linux-c94c81390fe2cdff12a8d6313c92a6a0ff85135d.zip | |
Merge tag 'zynq-dt-for-4.15' of https://github.com/Xilinx/linux-xlnx into next/soc
Pull "arm: Xilinx ZynqMP DT changes for v4.15" from Michal Simek:
- Change 24c08 compatible string
* tag 'zynq-dt-for-4.15' of https://github.com/Xilinx/linux-xlnx:
ARM: dts: zynq: Add generic compatible string for I2C EEPROM
Diffstat (limited to '')
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc702.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/zynq-zc706.dts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/zynq-zc702.dts b/arch/arm/boot/dts/zynq-zc702.dts index 34e8277fce0d..70a5de76b7db 100644 --- a/arch/arm/boot/dts/zynq-zc702.dts +++ b/arch/arm/boot/dts/zynq-zc702.dts @@ -152,7 +152,7 @@ #size-cells = <0>; reg = <2>; eeprom@54 { - compatible = "at,24c08"; + compatible = "atmel,24c08"; reg = <0x54>; }; }; diff --git a/arch/arm/boot/dts/zynq-zc706.dts b/arch/arm/boot/dts/zynq-zc706.dts index 7ebc8c5ae39d..cdc326ec3335 100644 --- a/arch/arm/boot/dts/zynq-zc706.dts +++ b/arch/arm/boot/dts/zynq-zc706.dts @@ -108,7 +108,7 @@ #size-cells = <0>; reg = <2>; eeprom@54 { - compatible = "at,24c08"; + compatible = "atmel,24c08"; reg = <0x54>; }; }; |