diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-04-15 22:35:22 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-04-15 22:41:13 +0300 |
| commit | 30ecc84eea691cfb0b731d71839bdcba88df5f75 (patch) | |
| tree | 831527106aaa10e5b13267275a843b50076fb4e5 /arch/arm/boot/dts/am4372.dtsi | |
| parent | 9705feacb778d2aa8bb868e8a9ab40557f7f7043 (diff) | |
| parent | 10709c0858d89716b10b7bbf6d825044f2f59602 (diff) | |
| download | linux-30ecc84eea691cfb0b731d71839bdcba88df5f75.tar.xz | |
Merge branch 'omap/dt' into next/late
As pointed out by Stephen Rothwell, commit e52117638b79 ("ARM: dts:
omap3: Add DT entries for OMAP 3 ISP") conflicts with b8845074cfbb
("ARM: dts: omap3: add minimal l4 bus layout with control module support")
in non-obvious ways, causing a build failure when both patches
are present.
This merges the two branches that introduce the respective changes
into the next/late branch to resolve the way that Stephen suggested,
as confirmed by Tony.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lkml.org/lkml/2015/4/6/436
Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/boot/dts/am4372.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am4372.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 2f6f0c2040db..48c9bea8df10 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -897,7 +897,7 @@ }; hdq: hdq@48347000 { - compatible = "ti,am43xx-hdq"; + compatible = "ti,am4372-hdq"; reg = <0x48347000 0x1000>; interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; clocks = <&func_12m_clk>; |