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";
- };
-};
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
