diff mbox series

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

Message ID 20201016075158.31574-1-o.rempel@pengutronix.de
State New
Headers show
Series [v1] ARM: dts: imx6/7: sync fsl,stop-mode with current flexcan driver | expand

Commit Message

Oleksij Rempel Oct. 16, 2020, 7:51 a.m. UTC
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>

 # Please enter the commit message for your changes. Lines starting
---
 arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--
 arch/arm/boot/dts/imx6sx.dtsi  | 4 ++--
 arch/arm/boot/dts/imx6ul.dtsi  | 4 ++--
 arch/arm/boot/dts/imx7s.dtsi   | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

Comments

Joakim Zhang Oct. 16, 2020, 8:06 a.m. UTC | #1
> -----Original Message-----

> From: Oleksij Rempel <o.rempel@pengutronix.de>

> Sent: 2020年10月16日 15:52

> To: mkl@pengutronix.de; Wolfgang Grandegger <wg@grandegger.com>;

> David S. Miller <davem@davemloft.net>; Jakub Kicinski <kuba@kernel.org>;

> Rob Herring <robh+dt@kernel.org>; Shawn Guo <shawnguo@kernel.org>;

> Sascha Hauer <s.hauer@pengutronix.de>

> Cc: Oleksij Rempel <o.rempel@pengutronix.de>; kernel@pengutronix.de;

> linux-can@vger.kernel.org; netdev@vger.kernel.org;

> devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org;

> linux-kernel@vger.kernel.org; Fabio Estevam <festevam@gmail.com>; Joakim

> Zhang <qiangqing.zhang@nxp.com>

> Subject: [PATCH v1] 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>


Best Regards,
Joakim Zhang
>  # Please enter the commit message for your changes. Lines starting

> ---

>  arch/arm/boot/dts/imx6qdl.dtsi | 4 ++--  arch/arm/boot/dts/imx6sx.dtsi  |

> 4 ++--  arch/arm/boot/dts/imx6ul.dtsi  | 4 ++--

>  arch/arm/boot/dts/imx7s.dtsi   | 4 ++--

>  4 files changed, 8 insertions(+), 8 deletions(-)

> 

> diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi

> index 43edbf1156c7..5efb9b923bf9 100644

> --- a/arch/arm/boot/dts/imx6qdl.dtsi

> +++ b/arch/arm/boot/dts/imx6qdl.dtsi

> @@ -549,7 +549,7 @@ can1: flexcan@2090000 {

>  				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 @@ can2: flexcan@2094000 {

>  				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 b480dfa9e251..8770e522d21c 100644

> --- a/arch/arm/boot/dts/imx6sx.dtsi

> +++ b/arch/arm/boot/dts/imx6sx.dtsi

> @@ -463,7 +463,7 @@ flexcan1: can@2090000 {

>  				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 @@ flexcan2: can@2094000 {

>  				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 2b088f210331..4a059708ff20 100644

> --- a/arch/arm/boot/dts/imx6ul.dtsi

> +++ b/arch/arm/boot/dts/imx6ul.dtsi

> @@ -430,7 +430,7 @@ can1: flexcan@2090000 {

>  				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 @@ can2: flexcan@2094000 {

>  				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

> 1cfaf410aa43..837f0da08686 100644

> --- a/arch/arm/boot/dts/imx7s.dtsi

> +++ b/arch/arm/boot/dts/imx7s.dtsi

> @@ -971,7 +971,7 @@ flexcan1: can@30a00000 {

>  				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 @@ flexcan2: can@30a10000 {

>  				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";

>  			};

> 

> --

> 2.28.0
Shawn Guo Oct. 31, 2020, 8:33 a.m. UTC | #2
On Fri, Oct 16, 2020 at 09:51:58AM +0200, Oleksij Rempel wrote:
> 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>

> 

>  # Please enter the commit message for your changes. Lines starting


It shouldn't be here.

Fixed it up and applied the patch.

Shawn
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index 43edbf1156c7..5efb9b923bf9 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -549,7 +549,7 @@  can1: flexcan@2090000 {
 				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 @@  can2: flexcan@2094000 {
 				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 b480dfa9e251..8770e522d21c 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -463,7 +463,7 @@  flexcan1: can@2090000 {
 				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 @@  flexcan2: can@2094000 {
 				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 2b088f210331..4a059708ff20 100644
--- a/arch/arm/boot/dts/imx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -430,7 +430,7 @@  can1: flexcan@2090000 {
 				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 @@  can2: flexcan@2094000 {
 				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 1cfaf410aa43..837f0da08686 100644
--- a/arch/arm/boot/dts/imx7s.dtsi
+++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -971,7 +971,7 @@  flexcan1: can@30a00000 {
 				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 @@  flexcan2: can@30a10000 {
 				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";
 			};