diff mbox series

[v2,11/34] ARM: dts: sama7g5: switch to PMC bindings

Message ID 20201205100316.179531-12-eugen.hristev@microchip.com
State Accepted
Commit 394f52070965621ce1c1e2fa454644636dd605b3
Delegated to: Eugen Hristev
Headers show
Series Sama7g5 Evaluation Kit support | expand

Commit Message

Eugen Hristev Dec. 5, 2020, 10:02 a.m. UTC
From: Claudiu Beznea <claudiu.beznea@microchip.com>

Get rid of software defined MCK and switch to PMC bindings
for IPs currently present in device tree.

Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
---
 arch/arm/dts/sama7g5.dtsi          | 13 ++++---------
 arch/arm/dts/sama7g5ek-u-boot.dtsi |  4 ----
 2 files changed, 4 insertions(+), 13 deletions(-)
diff mbox series

Patch

diff --git a/arch/arm/dts/sama7g5.dtsi b/arch/arm/dts/sama7g5.dtsi
index 28faa412dd..94e0b535cc 100644
--- a/arch/arm/dts/sama7g5.dtsi
+++ b/arch/arm/dts/sama7g5.dtsi
@@ -10,6 +10,7 @@ 
  */
 
 #include "skeleton.dtsi"
+#include <dt-bindings/clk/at91.h>
 
 / {
 	model = "Microchip SAMA7G5 family SoC";
@@ -37,12 +38,6 @@ 
 			compatible = "fixed-clock";
 			#clock-cells = <0>;
 		};
-
-		mck: mck {
-			compatible = "fixed-clock";
-			#clock-cells = <0>;
-			clock-frequency = <200000000>;
-		};
 	};
 
 	ahb {
@@ -74,15 +69,15 @@ 
 			sdmmc1: sdio-host@e1208000 {
 				compatible = "microchip,sama7g5-sdhci";
 				reg = <0xe1208000 0x300>;
-				clocks = <&mck>, <&mck>, <&mck>;
-				clock-names = "hclock", "multclk", "baseclk";
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 81>, <&pmc PMC_TYPE_GCK 81>;
+				clock-names = "hclock", "multclk";
 				status = "disabled";
 			};
 
 			uart0: serial@e1824200 {
 				compatible = "atmel,at91sam9260-usart";
 				reg = <0xe1824200 0x200>;
-				clocks = <&mck>;
+				clocks = <&pmc PMC_TYPE_PERIPHERAL 41>;
 				clock-names = "usart";
 				status = "disabled";
 			};
diff --git a/arch/arm/dts/sama7g5ek-u-boot.dtsi b/arch/arm/dts/sama7g5ek-u-boot.dtsi
index 428b98c303..95d9c3bff2 100644
--- a/arch/arm/dts/sama7g5ek-u-boot.dtsi
+++ b/arch/arm/dts/sama7g5ek-u-boot.dtsi
@@ -47,7 +47,3 @@ 
 	u-boot,dm-pre-reloc;
 };
 
-&mck {
-	u-boot,dm-pre-reloc;
-};
-