From c919f7408db0240017ad14db213c873d1ae68a6b Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Thu, 25 Feb 2021 20:33:38 +0100 Subject: [PATCH] bmips: dts: fix syscon-reboot nodes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Using regmap with phandles is deprecated. Signed-off-by: Álvaro Fernández Rojas --- 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 d19f8ec9641..e7016eb1b2d 100644 --- a/target/linux/bmips/dts/bcm6318.dtsi +++ b/target/linux/bmips/dts/bcm6318.dtsi @@ -131,16 +131,15 @@ }; pll_cntl: syscon@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@10000080 { diff --git a/target/linux/bmips/dts/bcm63268.dtsi b/target/linux/bmips/dts/bcm63268.dtsi index 2a0bc3cbec4..55813513118 100644 --- a/target/linux/bmips/dts/bcm63268.dtsi +++ b/target/linux/bmips/dts/bcm63268.dtsi @@ -93,16 +93,15 @@ }; pll_cntl: syscon@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@10000010 { diff --git a/target/linux/bmips/dts/bcm6328.dtsi b/target/linux/bmips/dts/bcm6328.dtsi index f4f86c381e6..62f1309e0a4 100644 --- a/target/linux/bmips/dts/bcm6328.dtsi +++ b/target/linux/bmips/dts/bcm6328.dtsi @@ -134,16 +134,15 @@ }; pll_cntl: syscon@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@10000080 { diff --git a/target/linux/bmips/dts/bcm6358.dtsi b/target/linux/bmips/dts/bcm6358.dtsi index 8e2c9fa0eeb..b396d9335ba 100644 --- a/target/linux/bmips/dts/bcm6358.dtsi +++ b/target/linux/bmips/dts/bcm6358.dtsi @@ -92,16 +92,15 @@ }; pll_cntl: syscon@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@fffe000c { diff --git a/target/linux/bmips/dts/bcm6362.dtsi b/target/linux/bmips/dts/bcm6362.dtsi index d531ed4fe58..0929d6ea3fd 100644 --- a/target/linux/bmips/dts/bcm6362.dtsi +++ b/target/linux/bmips/dts/bcm6362.dtsi @@ -93,16 +93,15 @@ }; pll_cntl: syscon@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@10000010 { diff --git a/target/linux/bmips/dts/bcm6368.dtsi b/target/linux/bmips/dts/bcm6368.dtsi index 0b434c5c013..2c980f91f4f 100644 --- a/target/linux/bmips/dts/bcm6368.dtsi +++ b/target/linux/bmips/dts/bcm6368.dtsi @@ -83,16 +83,15 @@ }; pll_cntl: syscon@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@10000010 { -- 2.30.2