diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-04-24 17:30:16 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-04-24 17:30:16 +0400 |
| commit | 191bcd8120eb59c707e33ff159699a57db796eda (patch) | |
| tree | 459e836162cd669eb58d15f3a83e17a3a165f4c7 /arch/arm/boot/dts/kirkwood-laplug.dts | |
| parent | cab4d50389c6b23fc3d7184d794856186bdc6651 (diff) | |
| parent | 33faf20b8ebe2770f2d7b52796f5f35eeb87ab6f (diff) | |
| download | linux-191bcd8120eb59c707e33ff159699a57db796eda.tar.xz | |
Merge tag 'mvebu-dt-fixes-non-crit-3.15' of git://git.infradead.org/linux-mvebu into fixes
mvebu DT fixes-non-critical (for v3.15-rc1)
- kirkwood
- add some missing vendor prefixes to keep checkpatch happy
- mvebu
- add clock ref to mdio node on 370/XP/38x
* tag 'mvebu-dt-fixes-non-crit-3.15' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: ensure the mdio node has a clock reference on Armada 38x
ARM: mvebu: ensure the mdio node has a clock reference on Armada 370/XP
ARM: Kirkwood: DT: Add missing vendor prefix
ARM: Kirkwood: Fix Atmel vendor prefix
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-laplug.dts')
| -rw-r--r-- | arch/arm/boot/dts/kirkwood-laplug.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/kirkwood-laplug.dts b/arch/arm/boot/dts/kirkwood-laplug.dts index c9e82eff9bf2..6761ffa2c4ab 100644 --- a/arch/arm/boot/dts/kirkwood-laplug.dts +++ b/arch/arm/boot/dts/kirkwood-laplug.dts @@ -48,7 +48,7 @@ status = "okay"; eeprom@50 { - compatible = "at,24c04"; + compatible = "atmel,24c04"; pagesize = <16>; reg = <0x50>; }; |