ARM: dts: imx6/7: sync fsl,stop-mode with current flexcan driver

After this patch we need 2 arguments less for the fsl,stop-mode
property:

| commit d9b081e3fc4bdc33e672dcb7bb256394909432fc
| Author: Marc Kleine-Budde <mkl@pengutronix.de>
| Date:   Sun Jun 14 21:09:20 2020 +0200
|
| can: flexcan: remove ack_grp and ack_bit handling from driver
|
| Since commit:
|
|  048e3a34a2e7 can: flexcan: poll MCR_LPM_ACK instead of GPR ACK for stop mode acknowledgment
|
| the driver polls the IP core's internal bit MCR[LPM_ACK] as stop mode
| acknowledge and not the acknowledgment on chip level.
|
| This means the 4th and 5th value of the property "fsl,stop-mode" isn't used
| anymore. This patch removes the used "ack_gpr" and "ack_bit" from the driver.

This patch removes the two last arguments, as they are not needed
anymore.

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Joakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 7a8837cbe21bf153f6d8d09b914a670e053eb51f..bc98b63922b015e141388a9f6e9e0e8a238af716 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -549,7 +549,7 @@
                                clocks = <&clks IMX6QDL_CLK_CAN1_IPG>,
                                         <&clks IMX6QDL_CLK_CAN1_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x34 28 0x10 17>;
+                               fsl,stop-mode = <&gpr 0x34 28>;
                                status = "disabled";
                        };
 
@@ -560,7 +560,7 @@
                                clocks = <&clks IMX6QDL_CLK_CAN2_IPG>,
                                         <&clks IMX6QDL_CLK_CAN2_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x34 29 0x10 18>;
+                               fsl,stop-mode = <&gpr 0x34 29>;
                                status = "disabled";
                        };
 

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index dfdca1804f9f81ee7b1b4d5dd1363d64d3e17f45..6c604c38c790b3c9edd1ffa06288f9653a373b9a 100644 (file)
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -463,7 +463,7 @@
                                clocks = <&clks IMX6SX_CLK_CAN1_IPG>,
                                         <&clks IMX6SX_CLK_CAN1_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
+                               fsl,stop-mode = <&gpr 0x10 1>;
                                status = "disabled";
                        };
 
@@ -474,7 +474,7 @@
                                clocks = <&clks IMX6SX_CLK_CAN2_IPG>,
                                         <&clks IMX6SX_CLK_CAN2_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
+                               fsl,stop-mode = <&gpr 0x10 2>;
                                status = "disabled";
                        };
 

diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi
index d7d9f3e46b92a259679b83a61e0acd0c7fee429b..713a4bb341dbb28456958086aca6f8af0586ec51 100644 (file)
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -430,7 +430,7 @@
                                clocks = <&clks IMX6UL_CLK_CAN1_IPG>,
                                         <&clks IMX6UL_CLK_CAN1_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
+                               fsl,stop-mode = <&gpr 0x10 1>;
                                status = "disabled";
                        };
 
@@ -441,7 +441,7 @@
                                clocks = <&clks IMX6UL_CLK_CAN2_IPG>,
                                         <&clks IMX6UL_CLK_CAN2_SERIAL>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
+                               fsl,stop-mode = <&gpr 0x10 2>;
                                status = "disabled";
                        };
 

diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi
index 84d9cc13afb955d9f749c2288820f9d013e18dc8..b58262acba11d306d7a7e0d253c4d615c7899e02 100644 (file)
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -971,7 +971,7 @@
                                clocks = <&clks IMX7D_CLK_DUMMY>,
                                        <&clks IMX7D_CAN1_ROOT_CLK>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x10 1 0x10 17>;
+                               fsl,stop-mode = <&gpr 0x10 1>;
                                status = "disabled";
                        };
 
@@ -982,7 +982,7 @@
                                clocks = <&clks IMX7D_CLK_DUMMY>,
                                        <&clks IMX7D_CAN2_ROOT_CLK>;
                                clock-names = "ipg", "per";
-                               fsl,stop-mode = <&gpr 0x10 2 0x10 18>;
+                               fsl,stop-mode = <&gpr 0x10 2>;
                                status = "disabled";
                        };