[openwrt/openwrt] bmips: dts: fix syscon-reboot nodes

LEDE Commits lede-commits at lists.infradead.org
Thu Feb 25 14:48:36 EST 2021


noltari pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/c919f7408db0240017ad14db213c873d1ae68a6b

commit c919f7408db0240017ad14db213c873d1ae68a6b
Author: Álvaro Fernández Rojas <noltari at gmail.com>
AuthorDate: Thu Feb 25 20:33:38 2021 +0100

    bmips: dts: fix syscon-reboot nodes
    
    Using regmap with phandles is deprecated.
    
    Signed-off-by: Álvaro Fernández Rojas <noltari at gmail.com>
---
 target/linux/bmips/dts/bcm6318.dtsi  | 13 ++++++-------
 target/linux/bmips/dts/bcm63268.dtsi | 13 ++++++-------
 target/linux/bmips/dts/bcm6328.dtsi  | 13 ++++++-------
 target/linux/bmips/dts/bcm6358.dtsi  | 13 ++++++-------
 target/linux/bmips/dts/bcm6362.dtsi  | 13 ++++++-------
 target/linux/bmips/dts/bcm6368.dtsi  | 13 ++++++-------
 6 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/target/linux/bmips/dts/bcm6318.dtsi b/target/linux/bmips/dts/bcm6318.dtsi
index d19f8ec964..e7016eb1b2 100644
--- a/target/linux/bmips/dts/bcm6318.dtsi
+++ b/target/linux/bmips/dts/bcm6318.dtsi
@@ -131,16 +131,15 @@
 		};
 
 		pll_cntl: syscon at 10000074 {
-			compatible = "syscon";
+			compatible = "syscon", "simple-mfd";
 			reg = <0x10000074 0x4>;
 			native-endian;
-		};
 
-		syscon-reboot {
-			compatible = "syscon-reboot";
-			regmap = <&pll_cntl>;
-			offset = <0>;
-			mask = <0x1>;
+			syscon-reboot {
+				compatible = "syscon-reboot";
+				offset = <0>;
+				mask = <0x1>;
+			};
 		};
 
 		gpio: syscon at 10000080 {
diff --git a/target/linux/bmips/dts/bcm63268.dtsi b/target/linux/bmips/dts/bcm63268.dtsi
index 2a0bc3cbec..5581351311 100644
--- a/target/linux/bmips/dts/bcm63268.dtsi
+++ b/target/linux/bmips/dts/bcm63268.dtsi
@@ -93,16 +93,15 @@
 		};
 
 		pll_cntl: syscon at 10000008 {
-			compatible = "syscon";
+			compatible = "syscon", "simple-mfd";
 			reg = <0x10000008 0x4>;
 			native-endian;
-		};
 
-		syscon-reboot {
-			compatible = "syscon-reboot";
-			regmap = <&pll_cntl>;
-			offset = <0x0>;
-			mask = <0x1>;
+			syscon-reboot {
+				compatible = "syscon-reboot";
+				offset = <0x0>;
+				mask = <0x1>;
+			};
 		};
 
 		periph_rst: reset-controller at 10000010 {
diff --git a/target/linux/bmips/dts/bcm6328.dtsi b/target/linux/bmips/dts/bcm6328.dtsi
index f4f86c381e..62f1309e0a 100644
--- a/target/linux/bmips/dts/bcm6328.dtsi
+++ b/target/linux/bmips/dts/bcm6328.dtsi
@@ -134,16 +134,15 @@
 		};
 
 		pll_cntl: syscon at 10000068 {
-			compatible = "syscon";
+			compatible = "syscon", "simple-mfd";
 			reg = <0x10000068 0x4>;
 			native-endian;
-		};
 
-		syscon-reboot {
-			compatible = "syscon-reboot";
-			regmap = <&pll_cntl>;
-			offset = <0>;
-			mask = <0x1>;
+			syscon-reboot {
+				compatible = "syscon-reboot";
+				offset = <0>;
+				mask = <0x1>;
+			};
 		};
 
 		gpio: syscon at 10000080 {
diff --git a/target/linux/bmips/dts/bcm6358.dtsi b/target/linux/bmips/dts/bcm6358.dtsi
index 8e2c9fa0ee..b396d9335b 100644
--- a/target/linux/bmips/dts/bcm6358.dtsi
+++ b/target/linux/bmips/dts/bcm6358.dtsi
@@ -92,16 +92,15 @@
 		};
 
 		pll_cntl: syscon at fffe0008 {
-			compatible = "syscon";
+			compatible = "syscon", "simple-mfd";
 			reg = <0xfffe0008 0x4>;
 			native-endian;
-		};
 
-		syscon-reboot {
-			compatible = "syscon-reboot";
-			regmap = <&pll_cntl>;
-			offset = <0x0>;
-			mask = <0x1>;
+			syscon-reboot {
+				compatible = "syscon-reboot";
+				offset = <0x0>;
+				mask = <0x1>;
+			};
 		};
 
 		periph_intc: interrupt-controller at fffe000c {
diff --git a/target/linux/bmips/dts/bcm6362.dtsi b/target/linux/bmips/dts/bcm6362.dtsi
index d531ed4fe5..0929d6ea3f 100644
--- a/target/linux/bmips/dts/bcm6362.dtsi
+++ b/target/linux/bmips/dts/bcm6362.dtsi
@@ -93,16 +93,15 @@
 		};
 
 		pll_cntl: syscon at 10000008 {
-			compatible = "syscon";
+			compatible = "syscon", "simple-mfd";
 			reg = <0x10000008 0x4>;
 			native-endian;
-		};
 
-		syscon-reboot {
-			compatible = "syscon-reboot";
-			regmap = <&pll_cntl>;
-			offset = <0x0>;
-			mask = <0x1>;
+			syscon-reboot {
+				compatible = "syscon-reboot";
+				offset = <0x0>;
+				mask = <0x1>;
+			};
 		};
 
 		periph_rst: reset-controller at 10000010 {
diff --git a/target/linux/bmips/dts/bcm6368.dtsi b/target/linux/bmips/dts/bcm6368.dtsi
index 0b434c5c01..2c980f91f4 100644
--- a/target/linux/bmips/dts/bcm6368.dtsi
+++ b/target/linux/bmips/dts/bcm6368.dtsi
@@ -83,16 +83,15 @@
 		};
 
 		pll_cntl: syscon at 10000008 {
-			compatible = "syscon";
+			compatible = "syscon", "simple-mfd";
 			reg = <0x10000008 0x4>;
 			native-endian;
-		};
 
-		syscon-reboot {
-			compatible = "syscon-reboot";
-			regmap = <&pll_cntl>;
-			offset = <0x0>;
-			mask = <0x1>;
+			syscon-reboot {
+				compatible = "syscon-reboot";
+				offset = <0x0>;
+				mask = <0x1>;
+			};
 		};
 
 		periph_rst: reset-controller at 10000010 {



More information about the lede-commits mailing list