imx: Fix typo in iMQ8MQ reset names
cover imx: Fix typo in iMQ8MQ reset names
Some of the mipi dsi resets were called
IMX8MQ_RESET_MIPI_DIS_
instead of
IMX8MQ_RESET_MIPI_DSI_
Since they're DSI related this looks like a typo.
Guido Günther (2):
dt-bindings: reset: Fix typo in imx8mq resets
reset: imx7: Fix IMX8MQ_RESET_MIPI_DSI_ defines
drivers/reset/reset-imx7.c | 12 ++++++------ include/dt-bindings/reset/imx8mq-reset.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-)
Signature · 1 line
2.20.1
PATCH 1/2 dt-bindings: reset: Fix typo in imx8mq resets
Some of the mipi dsi resets were called
IMX8MQ_RESET_MIPI_DIS__
instead of
IMX8MQ_RESET_MIPI_DSI__
Since they're DSI related this looks like a typo.
--- include/dt-bindings/reset/imx8mq-reset.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/dt-bindings/reset/imx8mq-reset.h +3 -3
@@ -31,9 +31,9 @@#define IMX8MQ_RESET_OTG2_PHY_RESET 20#define IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N 21#define IMX8MQ_RESET_MIPI_DSI_RESET_N 22 -#define IMX8MQ_RESET_MIPI_DIS_DPI_RESET_N 23 -#define IMX8MQ_RESET_MIPI_DIS_ESC_RESET_N 24 -#define IMX8MQ_RESET_MIPI_DIS_PCLK_RESET_N 25 +#define IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N 23 +#define IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N 24 +#define IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N 25#define IMX8MQ_RESET_PCIEPHY 26#define IMX8MQ_RESET_PCIEPHY_PERST 27#define IMX8MQ_RESET_PCIE_CTRL_APPS_EN 28
Signature · 1 line
2.20.1
PATCH 2/2 reset: imx7: Fix IMX8MQ_RESET_MIPI_DSI_ defines
In reply to Guido GüntherSome of the mipi dsi resets were called
IMX8MQ_RESET_MIPI_DIS_
instead of
IMX8MQ_RESET_MIPI_DSI_
Since they're DSI related this looks like a typo.
I wasn't sure if this should be a single patch since it otherwise breaks bisectability. I couldn't find any device trees using this yet.
--- drivers/reset/reset-imx7.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/reset/reset-imx7.c +6 -6
@@ -169,9 +169,9 @@ static const struct imx7_src_signal imx8mq_src_signals[IMX8MQ_RESET_NUM] = { [IMX8MQ_RESET_OTG2_PHY_RESET] = { SRC_USBOPHY2_RCR, BIT(0) }, [IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N] = { SRC_MIPIPHY_RCR, BIT(1) }, [IMX8MQ_RESET_MIPI_DSI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(2) }, - [IMX8MQ_RESET_MIPI_DIS_DPI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(3) }, - [IMX8MQ_RESET_MIPI_DIS_ESC_RESET_N] = { SRC_MIPIPHY_RCR, BIT(4) }, - [IMX8MQ_RESET_MIPI_DIS_PCLK_RESET_N] = { SRC_MIPIPHY_RCR, BIT(5) }, + [IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(3) }, + [IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N] = { SRC_MIPIPHY_RCR, BIT(4) }, + [IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N] = { SRC_MIPIPHY_RCR, BIT(5) }, [IMX8MQ_RESET_PCIEPHY] = { SRC_PCIEPHY_RCR, BIT(2) | BIT(1) }, [IMX8MQ_RESET_PCIEPHY_PERST] = { SRC_PCIEPHY_RCR, BIT(3) },
@@ -220,9 +220,9 @@ static int imx8mq_reset_set(struct reset_controller_dev *rcdev,case IMX8MQ_RESET_PCIE_CTRL_APPS_EN :case IMX8MQ_RESET_PCIE2_CTRL_APPS_EN :/* fallthrough */ -case IMX8MQ_RESET_MIPI_DIS_PCLK_RESET_N :/* fallthrough */ -case IMX8MQ_RESET_MIPI_DIS_ESC_RESET_N :/* fallthrough */ -case IMX8MQ_RESET_MIPI_DIS_DPI_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N :/* fallthrough */ case IMX8MQ_RESET_MIPI_DSI_RESET_N :/* fallthrough */ case IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N :/* fallthrough */ value = assert ?0 : bit;
Signature · 1 line
2.20.1
Re: [PATCH 2/2] reset: imx7: Fix IMX8MQ_RESET_MIPI_DSI_ defines
Am Mittwoch, den 31.07.2019, 18:43 +0200 schrieb Guido Günther:
Quoted 4 lines
Some of the mipi dsi resets were called
IMX8MQ_RESET_MIPI_DIS_
Quoted 8 lines
instead of
IMX8MQ_RESET_MIPI_DSI_Since they're DSI related this looks like a typo.
I wasn't sure if this should be a single patch since it otherwise breaks bisectability. I couldn't find any device trees using this yet.
Yes, I think this should be squashed into a single commit. Other than that, the change looks correct.
Regards,
Lucas
Quoted 35 lines
Signed-off-by Guido Günther <[email protected]>---
drivers/reset/reset-imx7.c | 12 ++++++------1 file changed, 6 insertions(+), 6 deletions(-)drivers/reset/reset-imx7.c +0
-0@@ -169,9 +169,9 @@ static const struct imx7_src_signal imx8mq_src_signals[IMX8MQ_RESET_NUM] = { > > [IMX8MQ_RESET_OTG2_PHY_RESET] = { SRC_USBOPHY2_RCR, BIT(0) }, > > [IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N] = { SRC_MIPIPHY_RCR, BIT(1) }, > > [IMX8MQ_RESET_MIPI_DSI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(2) }, > > - [IMX8MQ_RESET_MIPI_DIS_DPI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(3) }, > > - [IMX8MQ_RESET_MIPI_DIS_ESC_RESET_N] = { SRC_MIPIPHY_RCR, BIT(4) }, > > - [IMX8MQ_RESET_MIPI_DIS_PCLK_RESET_N] = { SRC_MIPIPHY_RCR, BIT(5) }, > > + [IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(3) }, > > + [IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N] = { SRC_MIPIPHY_RCR, BIT(4) }, > > + [IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N] = { SRC_MIPIPHY_RCR, BIT(5) },Quoted 3 lines
Quoted 1 line
[
IMX8MQ_RESET_PCIEPHY] = {SRC_PCIEPHY_RCR,BIT(2) | BIT(1) },
Quoted 1 line
[
IMX8MQ_RESET_PCIEPHY_PERST] = {SRC_PCIEPHY_RCR, BIT(3) },drivers/reset/reset-imx7.c +0
-0@@ -220,9 +220,9 @@ static int imx8mq_reset_set(struct reset_controller_dev *rcdev,Quoted 11 lines
case
IMX8MQ_RESET_PCIE_CTRL_APPS_EN:Quoted 9 lines
case
IMX8MQ_RESET_PCIE2_CTRL_APPS_EN: /* fallthrough */drivers/reset/reset-imx7.c +3
-3-case IMX8MQ_RESET_MIPI_DIS_PCLK_RESET_N :/* fallthrough */ -case IMX8MQ_RESET_MIPI_DIS_ESC_RESET_N :/* fallthrough */ -case IMX8MQ_RESET_MIPI_DIS_DPI_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N :/* fallthrough */ case
IMX8MQ_RESET_MIPI_DSI_RESET_N: /* fallthrough */
caseIMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N: /* fallthrough */value = assert ? 0 : bit;
Re: [PATCH 2/2] reset: imx7: Fix IMX8MQ_RESET_MIPI_DSI_ defines
Hi Lucas,
Quoted 9 lines · Lucas Stach
Am Mittwoch, den 31.07.2019, 18:43 +0200 schrieb Guido Günther:
Quoted 8 lines
Some of the mipi dsi resets were called
IMX8MQ_RESET_MIPI_DIS_instead of
IMX8MQ_RESET_MIPI_DSI_
Quoted 7 lines
Quoted 4 lines
Since they're DSI related this looks like a typo.
I wasn't sure if this should be a single patch since it otherwise breaks bisectability. I couldn't find any device trees using this yet.
Yes, I think this should be squashed into a single commit. Other than that, the change looks correct.
Thanks for having a look. Sent out v2 as a single patch. Cheers,
-- Guido
Quoted 40 lines
Regards,
LucasQuoted 35 lines
Signed-off-by Guido Günther <[email protected]>---
drivers/reset/reset-imx7.c | 12 ++++++------1 file changed, 6 insertions(+), 6 deletions(-)drivers/reset/reset-imx7.c +0
-0@@ -169,9 +169,9 @@ static const struct imx7_src_signal imx8mq_src_signals[IMX8MQ_RESET_NUM] = { > > [IMX8MQ_RESET_OTG2_PHY_RESET] = { SRC_USBOPHY2_RCR, BIT(0) }, > > [IMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N] = { SRC_MIPIPHY_RCR, BIT(1) }, > > [IMX8MQ_RESET_MIPI_DSI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(2) }, > > - [IMX8MQ_RESET_MIPI_DIS_DPI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(3) }, > > - [IMX8MQ_RESET_MIPI_DIS_ESC_RESET_N] = { SRC_MIPIPHY_RCR, BIT(4) }, > > - [IMX8MQ_RESET_MIPI_DIS_PCLK_RESET_N] = { SRC_MIPIPHY_RCR, BIT(5) }, > > + [IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N] = { SRC_MIPIPHY_RCR, BIT(3) }, > > + [IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N] = { SRC_MIPIPHY_RCR, BIT(4) }, > > + [IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N] = { SRC_MIPIPHY_RCR, BIT(5) },Quoted 3 lines
Quoted 1 line
[
IMX8MQ_RESET_PCIEPHY] = {SRC_PCIEPHY_RCR,BIT(2) | BIT(1) },
Quoted 1 line
[
IMX8MQ_RESET_PCIEPHY_PERST] = {SRC_PCIEPHY_RCR, BIT(3) },drivers/reset/reset-imx7.c +0
-0@@ -220,9 +220,9 @@ static int imx8mq_reset_set(struct reset_controller_dev *rcdev,Quoted 11 lines
case
IMX8MQ_RESET_PCIE_CTRL_APPS_EN:Quoted 9 lines
case
IMX8MQ_RESET_PCIE2_CTRL_APPS_EN: /* fallthrough */drivers/reset/reset-imx7.c +3
-3-case IMX8MQ_RESET_MIPI_DIS_PCLK_RESET_N :/* fallthrough */ -case IMX8MQ_RESET_MIPI_DIS_ESC_RESET_N :/* fallthrough */ -case IMX8MQ_RESET_MIPI_DIS_DPI_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_PCLK_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_ESC_RESET_N :/* fallthrough */ +case IMX8MQ_RESET_MIPI_DSI_DPI_RESET_N :/* fallthrough */ case
IMX8MQ_RESET_MIPI_DSI_RESET_N: /* fallthrough */
caseIMX8MQ_RESET_MIPI_DSI_RESET_BYTE_N: /* fallthrough */value = assert ? 0 : bit;