Commit 73db2151 authored by Oleksij Rempel's avatar Oleksij Rempel Committed by Shawn Guo

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 d9b081e3
| 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:
|
|  048e3a34 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: default avatarOleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: default avatarJoakim Zhang <qiangqing.zhang@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 97f1dd5b
...@@ -549,7 +549,7 @@ can1: flexcan@2090000 { ...@@ -549,7 +549,7 @@ can1: flexcan@2090000 {
clocks = <&clks IMX6QDL_CLK_CAN1_IPG>, clocks = <&clks IMX6QDL_CLK_CAN1_IPG>,
<&clks IMX6QDL_CLK_CAN1_SERIAL>; <&clks IMX6QDL_CLK_CAN1_SERIAL>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
fsl,stop-mode = <&gpr 0x34 28 0x10 17>; fsl,stop-mode = <&gpr 0x34 28>;
status = "disabled"; status = "disabled";
}; };
...@@ -560,7 +560,7 @@ can2: flexcan@2094000 { ...@@ -560,7 +560,7 @@ can2: flexcan@2094000 {
clocks = <&clks IMX6QDL_CLK_CAN2_IPG>, clocks = <&clks IMX6QDL_CLK_CAN2_IPG>,
<&clks IMX6QDL_CLK_CAN2_SERIAL>; <&clks IMX6QDL_CLK_CAN2_SERIAL>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
fsl,stop-mode = <&gpr 0x34 29 0x10 18>; fsl,stop-mode = <&gpr 0x34 29>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -463,7 +463,7 @@ flexcan1: can@2090000 { ...@@ -463,7 +463,7 @@ flexcan1: can@2090000 {
clocks = <&clks IMX6SX_CLK_CAN1_IPG>, clocks = <&clks IMX6SX_CLK_CAN1_IPG>,
<&clks IMX6SX_CLK_CAN1_SERIAL>; <&clks IMX6SX_CLK_CAN1_SERIAL>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
fsl,stop-mode = <&gpr 0x10 1 0x10 17>; fsl,stop-mode = <&gpr 0x10 1>;
status = "disabled"; status = "disabled";
}; };
...@@ -474,7 +474,7 @@ flexcan2: can@2094000 { ...@@ -474,7 +474,7 @@ flexcan2: can@2094000 {
clocks = <&clks IMX6SX_CLK_CAN2_IPG>, clocks = <&clks IMX6SX_CLK_CAN2_IPG>,
<&clks IMX6SX_CLK_CAN2_SERIAL>; <&clks IMX6SX_CLK_CAN2_SERIAL>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
fsl,stop-mode = <&gpr 0x10 2 0x10 18>; fsl,stop-mode = <&gpr 0x10 2>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -430,7 +430,7 @@ can1: flexcan@2090000 { ...@@ -430,7 +430,7 @@ can1: flexcan@2090000 {
clocks = <&clks IMX6UL_CLK_CAN1_IPG>, clocks = <&clks IMX6UL_CLK_CAN1_IPG>,
<&clks IMX6UL_CLK_CAN1_SERIAL>; <&clks IMX6UL_CLK_CAN1_SERIAL>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
fsl,stop-mode = <&gpr 0x10 1 0x10 17>; fsl,stop-mode = <&gpr 0x10 1>;
status = "disabled"; status = "disabled";
}; };
...@@ -441,7 +441,7 @@ can2: flexcan@2094000 { ...@@ -441,7 +441,7 @@ can2: flexcan@2094000 {
clocks = <&clks IMX6UL_CLK_CAN2_IPG>, clocks = <&clks IMX6UL_CLK_CAN2_IPG>,
<&clks IMX6UL_CLK_CAN2_SERIAL>; <&clks IMX6UL_CLK_CAN2_SERIAL>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
fsl,stop-mode = <&gpr 0x10 2 0x10 18>; fsl,stop-mode = <&gpr 0x10 2>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -971,7 +971,7 @@ flexcan1: can@30a00000 { ...@@ -971,7 +971,7 @@ flexcan1: can@30a00000 {
clocks = <&clks IMX7D_CLK_DUMMY>, clocks = <&clks IMX7D_CLK_DUMMY>,
<&clks IMX7D_CAN1_ROOT_CLK>; <&clks IMX7D_CAN1_ROOT_CLK>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
fsl,stop-mode = <&gpr 0x10 1 0x10 17>; fsl,stop-mode = <&gpr 0x10 1>;
status = "disabled"; status = "disabled";
}; };
...@@ -982,7 +982,7 @@ flexcan2: can@30a10000 { ...@@ -982,7 +982,7 @@ flexcan2: can@30a10000 {
clocks = <&clks IMX7D_CLK_DUMMY>, clocks = <&clks IMX7D_CLK_DUMMY>,
<&clks IMX7D_CAN2_ROOT_CLK>; <&clks IMX7D_CAN2_ROOT_CLK>;
clock-names = "ipg", "per"; clock-names = "ipg", "per";
fsl,stop-mode = <&gpr 0x10 2 0x10 18>; fsl,stop-mode = <&gpr 0x10 2>;
status = "disabled"; status = "disabled";
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment