summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/omap2.dtsi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-13 16:27:42 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-13 16:27:42 +0200
commit3abb0c6cdc8a9a8a39f057335a7fa813b78409fe (patch)
tree149d298690a6ae1537b077303ec6143758af21c7 /arch/arm/boot/dts/omap2.dtsi
parentcbd1d63c772a55e49c4385819b75922979380f8c (diff)
parent5c4d9f0d49b0c3beda734687248fc74542566ee9 (diff)
Merge tag 'omap-for-v4.9/dt-pt1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Merge "DTS related changes for omaps for v4.9 merge window" from Tony Lindgren: - Update elm phandle for am335x - Fix overo NAND gpmc ranges, this has always been broken so it can wait for the merge window - Fix NAND and use NAND ready pin for logicpd gpmc, this can wait too as it's been using the older configration since the dts got added - A series of dtc warning fixes for unit names - Keep dcdc3, 5 and 6 enabled during suspend on am347x boards - Disable DDR regulator during rtc-only/poweroff mode for am437x boards - Remove redundant regulator compatibles for am437x boards - Increas QSPI max frequency for dra7 boards - Enable QSPI for am57xx-idk-common - Enable am335x-wega audio support - Workaround for i845 for dra7 - Update binding for logicpd boards - Add gpio-decoder nodes for am335x-icev2 board - Add linux,pci-domain property for dra7 - Fix dra7 clock data gmac_gmii_ref_clk_div and related clock tree entries, these can wait for merge window as Ethernet works on dra7 - A series of changes to drop skeleton.dtsi because of dtc warnings * tag 'omap-for-v4.9/dt-pt1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (54 commits) ARM: dts: dra7: Add missing unit name to memory nodes ARM: dts: dra62x: Add missing unit name to memory nodes ARM: dts: dm8168: Add missing unit name to memory nodes ARM: dts: dm8148: Add missing unit name to memory nodes ARM: dts: am572x: Add missing unit name to memory nodes ARM: dts: am4372: Add missing unit name to memory nodes ARM: dts: am3517: Add missing unit name to memory nodes ARM: dts: am335x: Add missing unit name to memory nodes ARM: dts: omap5: Add missing unit name to memory nodes ARM: dts: omap4: Add missing unit name to memory nodes ARM: dts: omap3: Add missing unit name to memory nodes ARM: dts: omap2: Add missing unit name to memory nodes ARM: dts: am4372: Remove skeleton.dtsi usage ARM: dts: dra7: Remove skeleton.dtsi usage ARM: dts: dm816x: Remove skeleton.dtsi usage ARM: dts: dm814x: Remove skeleton.dtsi usage ARM: dts: am33xx: Remove skeleton.dtsi usage ARM: dts: omap5: Remove skeleton.dtsi usage ARM: dts: omap4: Remove skeleton.dtsi usage ARM: dts: omap3: Remove skeleton.dtsi usage ...
Diffstat (limited to 'arch/arm/boot/dts/omap2.dtsi')
-rw-r--r--arch/arm/boot/dts/omap2.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/omap2.dtsi b/arch/arm/boot/dts/omap2.dtsi
index 578fa2a54dce..4f793a025a72 100644
--- a/arch/arm/boot/dts/omap2.dtsi
+++ b/arch/arm/boot/dts/omap2.dtsi
@@ -12,11 +12,11 @@
#include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/omap.h>
-#include "skeleton.dtsi"
-
/ {
compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
interrupt-parent = <&intc>;
+ #address-cells = <1>;
+ #size-cells = <1>;
aliases {
serial0 = &uart1;