linux-next: build failure after merge of the omap tree

[Stephen Rothwell]

Hi Tony,

After merging the omap tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/am3517_mt_ventoux.dtb] Error 2
make[2]: *** [arch/arm/boot/dts/omap3430-sdp.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/omap3-beagle-xm.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/omap3-beagle-xm-ab.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/omap3-beagle.dtb] Error 2
make[2]: *** [arch/arm/boot/dts/omap3-devkit8000.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/omap3-cm-t3530.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/omap3-cm-t3730.dtb] Error 2
make[2]: *** [arch/arm/boot/dts/omap3-evm-37xx.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "omap3_scm_general"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/omap3-evm.dtb] Error 2

Presumably caused by commit b8845074cfbb ("ARM: dts: omap3: add minimal
l4 bus layout with control module support") interacting with commit
e52117638b79 ("ARM: dts: omap3: Add DT entries for OMAP 3 ISP") from
the arm-soc tree.

I applied the following merge fix patch for today (probably wrong, but
hopefully builds):

From: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
Date: Tue, 7 Apr 2015 11:30:14 +1000
Subject: [PATCH] ARM: dts: omap3: fixup for merge conflict around
 omap3_scm_general

Signed-off-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
---
 arch/arm/boot/dts/omap34xx.dtsi | 2 +-
 arch/arm/boot/dts/omap36xx.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
index 7bc8c0f72ddb..4f6b2d5b1902 100644
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -46,7 +46,7 @@
 			       0x480bd800 0x017c>;
 			interrupts = <24>;
 			iommus = <&mmu_isp>;
-			syscon = <&omap3_scm_general 0xdc>;
+			syscon = <&scm_conf 0xdc>;
 			ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
 			#clock-cells = <1>;
 			ports {
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 3502fe00ec7d..86253de5a97a 100644
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -78,7 +78,7 @@
 			       0x480bd800 0x0600>;
 			interrupts = <24>;
 			iommus = <&mmu_isp>;
-			syscon = <&omap3_scm_general 0x2f0>;
+			syscon = <&scm_conf 0x2f0>;
 			ti,phy-type = <OMAP3ISP_PHY_TYPE_CSIPHY>;
 			#clock-cells = <1>;
 			ports {
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgps85s4Y26Fr.pgp
Description: OpenPGP digital signature