overlays: adjust overlays for absent pwm_clk

Clocks are now managed by cprman, so pwm_clk no longer exists. Signed-off-by: Phil Elwell <[email protected]>
raspberrypi · Oct 5, 2016 · 6a76bb3 · 6a76bb3
1 parent 893cdb3
commit 6a76bb3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts b/arch/arm/boot/dts/overlays/pwm-2chan-overlay.dts
@@ -29,25 +29,19 @@ N.B.:
 
 	fragment@1 {
 		target = <&pwm>;
-		__overlay__ {
+		frag1: __overlay__ {
 			pinctrl-names = "default";
 			pinctrl-0 = <&pwm_pins>;
+			assigned-clock-rates = <100000000>;
 			status = "okay";
 		};
 	};
 
-	fragment@2 {
-		target = <&clk_pwm>;
-		frag2: __overlay__ {
-			clock-frequency = <100000000>;
-		};
-	};
-
 	__overrides__ {
 		pin   = <&pwm_pins>,"brcm,pins:0";
 		pin2  = <&pwm_pins>,"brcm,pins:4";
 		func  = <&pwm_pins>,"brcm,function:0";
 		func2 = <&pwm_pins>,"brcm,function:4";
-		clock = <&frag2>,"clock-frequency:0";
+		clock = <&frag1>,"assigned-clock-rates:0";
 	};
 };
diff --git a/arch/arm/boot/dts/overlays/pwm-overlay.dts b/arch/arm/boot/dts/overlays/pwm-overlay.dts
@@ -27,23 +27,17 @@ N.B.:
 
 	fragment@1 {
 		target = <&pwm>;
-		__overlay__ {
+		frag1: __overlay__ {
 			pinctrl-names = "default";
 			pinctrl-0 = <&pwm_pins>;
+			assigned-clock-rates = <100000000>;
 			status = "okay";
 		};
 	};
 
-	fragment@2 {
-		target = <&clk_pwm>;
-		frag2: __overlay__ {
-			clock-frequency = <100000000>;
-		};
-	};
-
 	__overrides__ {
 		pin   = <&pwm_pins>,"brcm,pins:0";
 		func  = <&pwm_pins>,"brcm,function:0";
-		clock = <&frag2>,"clock-frequency:0";
+		clock = <&frag1>,"assigned-clock-rates:0";
 	};
 };