Merge pull request linux4kix#17 from linux4kix/linux-linaro-lsk-v3.14…

…-mx6 PWM and fec initialization cleanup
tomlohave · Oct 23, 2014 · ee05b81 · ee05b81
2 parents 828f1bb + dc5edb8
commit ee05b81
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 0 deletions.
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi
@@ -273,6 +273,13 @@
 				MX6QDL_PAD_EIM_DA4__GPIO3_IO04 0x80000000
 			>;
 		};
+
+		pinctrl_pwm1: pwm1grp {
+			fsl,pins = <
+				MX6QDL_PAD_DISP0_DAT8__PWM1_OUT 0x1b0b1
+			>;
+		};
+
 	};
 };
 
@@ -339,3 +346,22 @@
 	no-msi;
 };
 
+&pwm1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_pwm1>;
+        status = "okay";
+};
+
+&pwm2 {
+        pinctrl-names = "default";
+        status = "okay";
+};
+
+&pwm3 {
+	status = "disabled";
+};
+
+&pwm4 {
+	status = "disabled";
+};
+
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
@@ -2704,6 +2704,8 @@ fec_probe(struct platform_device *pdev)
 failed_init:
 	if (fep->reg_phy)
 		regulator_disable(fep->reg_phy);
+	if (fep->ptp_clock)
+		ptp_clock_unregister(fep->ptp_clock);
 failed_regulator:
 	fec_enet_clk_enable(ndev, false);
 failed_clk: