diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 15:38:00 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-03-07 15:38:00 +0100 |
| commit | e94e5cb859293daa41e9386b3134e4c3265c1840 (patch) | |
| tree | 56c17831c65e445070a549120595a6806ca43d01 /arch/arm/boot/dts/am335x-boneblue.dts | |
| parent | d5a77eca71d40dac9185f10722a74e988801915a (diff) | |
| parent | 47eee072bf90374ce98a15668e6b450de313100a (diff) | |
Merge tag 'omap-for-v4.17/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "Device tree changes for omap variants for v4.17" from Tony Lindgren:
This series of changes updates the device tree files for omaps:
- Nokia N9 support for magnetometer
- Update at24 to use atmel as manufacturer for am335x-boneblue
- Add support for am33xx based PDU001 board
- Update Droid 4 touchscreen for reset-gpios and add audio
codec and soundcard
- Remove unused dra7 cooling level nodes
- A series of changes to configure am335x and am437x for PM
- Add pinmuxing for i2c2 and 3 for LogicPD boards
- Add EMIF interrupt infor for am437x and am335x
- Add missing omap3 sound-dai-cells
* tag 'omap-for-v4.17/dt-signed' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (21 commits)
ARM: dts: omap4-droid4: add soundcard
ARM: dts: motorola-cpcap-mapphone: add audio-codec
ARM: dts: omap3: Add missing #sound-dai-cells
ARM: dts: am43xx: add emif interrupt info
ARM: dts: am33xx: add emif interrupt info
ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD SOM-LV
ARM: dts: Add pinmuxing for i2c2 and i2c3 for LogicPD torpedo
ARM: dts: am4372: Mark omap_l3_noc with ti,no-idle
ARM: dts: am4372: Mark emif with ti,no-idle
ARM: dts: am33xx: Mark emif with ti,no-idle
ARM: dts: am4372: Add soc node
ARM: dts: am33xx: Add pm-sram phandle to soc node
ARM: dts: am4372: Update emif node
ARM: dts: am33xx: Update emif node
ARM: dts: am4372: Reserve pm code and data regions in ocmcram sram node
ARM: dts: am33xx: Reserve pm code and data regions in ocmcram sram node
ARM: dts: omap: Remove "cooling-{min|max}-level" for CPU nodes
ARM: dts: omap4-droid4: update touchscreen
ARM: dts: am33xx: add PDU001 board
ARM: dts: use 'atmel' as at24 manufacturer in am335x-boneblue
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/am335x-boneblue.dts')
| -rw-r--r-- | arch/arm/boot/dts/am335x-boneblue.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts index 3f2480d05a3b..58baee158e64 100644 --- a/arch/arm/boot/dts/am335x-boneblue.dts +++ b/arch/arm/boot/dts/am335x-boneblue.dts @@ -342,7 +342,7 @@ }; baseboard_eeprom: baseboard_eeprom@50 { - compatible = "at,24c256"; + compatible = "atmel,24c256"; reg = <0x50>; #address-cells = <1>; |