From 10aaea10b251edf55ec3258c03f284cc9a950444 Mon Sep 17 00:00:00 2001
From: Laura Abbott <labbott@fedoraproject.org>
Date: Jul 27 2017 20:54:08 +0000
Subject: Revert patch breaking mustang boot


---

diff --git a/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch b/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
new file mode 100644
index 0000000..3e4fade
--- /dev/null
+++ b/0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
@@ -0,0 +1,49 @@
+From 8bfbdce4d7da6353d1039148a4c90dd463f1fb8f Mon Sep 17 00:00:00 2001
+From: Laura Abbott <labbott@redhat.com>
+Date: Thu, 27 Jul 2017 13:52:17 -0700
+Subject: [PATCH] Revert "xgene: Don't fail probe, if there is no clk resource
+ for SGMII interfaces"
+
+This reverts commit 0db01097cabd97897d123b4c5d805d1a7b061d82.
+
+Signed-off-by: Laura Abbott <labbott@redhat.com>
+---
+ drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 22 ++++++++++------------
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+index 86058a9f3417..d3906f6b01bd 100644
+--- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
++++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
+@@ -1785,18 +1785,16 @@ static int xgene_enet_get_resources(struct xgene_enet_pdata *pdata)
+ 
+ 	xgene_enet_gpiod_get(pdata);
+ 
+-	if (pdata->phy_mode != PHY_INTERFACE_MODE_SGMII) {
+-		pdata->clk = devm_clk_get(&pdev->dev, NULL);
+-		if (IS_ERR(pdata->clk)) {
+-			/* Abort if the clock is defined but couldn't be
+-			 * retrived. Always abort if the clock is missing on
+-			 * DT system as the driver can't cope with this case.
+-			 */
+-			if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
+-				return PTR_ERR(pdata->clk);
+-			/* Firmware may have set up the clock already. */
+-			dev_info(dev, "clocks have been setup already\n");
+-		}
++	pdata->clk = devm_clk_get(&pdev->dev, NULL);
++	if (IS_ERR(pdata->clk)) {
++		/* Abort if the clock is defined but couldn't be retrived.
++		 * Always abort if the clock is missing on DT system as
++		 * the driver can't cope with this case.
++		 */
++		if (PTR_ERR(pdata->clk) != -ENOENT || dev->of_node)
++			return PTR_ERR(pdata->clk);
++		/* Firmware may have set up the clock already. */
++		dev_info(dev, "clocks have been setup already\n");
+ 	}
+ 
+ 	if (pdata->phy_mode != PHY_INTERFACE_MODE_XGMII)
+-- 
+2.13.0
+
diff --git a/kernel.spec b/kernel.spec
index 0a834ef..b06c937 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -621,6 +621,9 @@ Patch320: bcm283x-vc4-Fix-OOPSes-from-trying-to-cache-a-partially-constructed-BO
 # Revert it while I engage upstream to work out what's going on
 Patch322: Revert-ARM-dts-bcm2835-Add-the-DSI-module-nodes-and-.patch
 
+# Breaking mustang booting
+Patch323: 0001-Revert-xgene-Don-t-fail-probe-if-there-is-no-clk-res.patch
+
 # 400 - IBM (ppc/s390x) patches
 
 # 500 - Temp fixes/CVEs etc
@@ -2192,6 +2195,9 @@ fi
 #
 #
 %changelog
+* Thu Jul 27 2017 Laura Abbott <labbott@fedoraproject.org>
+- Revert patch breaking mustang boot
+
 * Thu Jul 27 2017 Laura Abbott <labbott@fedoraproject.org> - 4.13.0-0.rc2.git2.1
 - Linux v4.13-rc2-27-gda08f35b0f82