Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 12 Dec 2018 21:10:35 +0000 (UTC)
From:      Emmanuel Vadot <manu@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r342006 - head/sys/dts/arm64/overlays
Message-ID:  <201812122110.wBCLAZrX078519@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: manu
Date: Wed Dec 12 21:10:34 2018
New Revision: 342006
URL: https://svnweb.freebsd.org/changeset/base/342006

Log:
  arm64: allwinner: Fix pwm dtso
  
  Double patched files ended up in the tree
  
  Reported by:	kevans

Modified:
  head/sys/dts/arm64/overlays/sun50i-a64-pwm.dtso
  head/sys/dts/arm64/overlays/sun50i-a64-rpwm.dtso

Modified: head/sys/dts/arm64/overlays/sun50i-a64-pwm.dtso
==============================================================================
--- head/sys/dts/arm64/overlays/sun50i-a64-pwm.dtso	Wed Dec 12 21:02:22 2018	(r342005)
+++ head/sys/dts/arm64/overlays/sun50i-a64-pwm.dtso	Wed Dec 12 21:10:34 2018	(r342006)
@@ -24,29 +24,3 @@
 		function = "pwm";
 	};
 };
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "allwinner,sun50i-a64";
-};
-
-&{/soc} {
-	pwm: pwm@1c21400 {
-		compatible = "allwinner,sun50i-a64-pwm",
-			     "allwinner,sun5i-a13-pwm";
-		reg = <0x01c21400 0x400>;
-		clocks = <&osc24M>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pwm_pin>;
-		#pwm-cells = <3>;
-		status = "disabled";
-	};
-};
-
-&{/soc/pinctrl@1c20800} {
-	pwm_pin: pwm_pin {
-		pins = "PD22";
-		function = "pwm";
-	};
-};

Modified: head/sys/dts/arm64/overlays/sun50i-a64-rpwm.dtso
==============================================================================
--- head/sys/dts/arm64/overlays/sun50i-a64-rpwm.dtso	Wed Dec 12 21:02:22 2018	(r342005)
+++ head/sys/dts/arm64/overlays/sun50i-a64-rpwm.dtso	Wed Dec 12 21:10:34 2018	(r342006)
@@ -24,29 +24,3 @@
 		function = "s_pwm";
 	};
 };
-/dts-v1/;
-/plugin/;
-
-/ {
-	compatible = "allwinner,sun50i-a64";
-};
-
-&{/soc} {
-	r_pwm: pwm@1f03800 {
-		compatible = "allwinner,sun50i-a64-pwm",
-			     "allwinner,sun5i-a13-pwm";
-		reg = <0x01f03800 0x400>;
-		clocks = <&osc24M>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&r_pwm_pin>;
-		#pwm-cells = <3>;
-		status = "okay";
-	};
-};
-
-&{/soc/pinctrl@1f02c00} {
-	r_pwm_pin: pwm {
-		pins = "PL10";
-		function = "s_pwm";
-	};
-};

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201812122110.wBCLAZrX078519>