diff mbox series

[v1,2/2] caam: imx8m: change to use of_match_node in run_descriptor_deco0

Message ID 20210429140250.2321-2-alice.guo@oss.nxp.com (mailing list archive)
State Not Applicable
Delegated to: Herbert Xu
Headers show
Series [v1,1/2] caam: imx8m: fix the built-in caam driver cannot match soc_id | expand

Commit Message

Alice Guo (OSS) April 29, 2021, 2:02 p.m. UTC 
From: Alice Guo <alice.guo@nxp.com>

Patch "fix the built-in caam driver cannot match soc_id" provides
imx8m_machine_match to match i.MX8M{Q,M,N,P}, so change to use to
of_match_node which can simplify the code.

Signed-off-by: Alice Guo <alice.guo@nxp.com>
---
 drivers/crypto/caam/ctrl.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

--
2.17.1

Comments

Fabio Estevam April 29, 2021, 2:04 p.m. UTC | #1 
Hi Alice

On Thu, Apr 29, 2021 at 11:02 AM Alice Guo (OSS) <alice.guo@oss.nxp.com> wrote:
>
> From: Alice Guo <alice.guo@nxp.com>
>
> Patch "fix the built-in caam driver cannot match soc_id" provides
> imx8m_machine_match to match i.MX8M{Q,M,N,P}, so change to use to
> of_match_node which can simplify the code.

Shouldn't these patches be squashed?
Alice Guo (OSS) April 29, 2021, 3:22 p.m. UTC | #2 
> -----Original Message-----
> From: Fabio Estevam <festevam@gmail.com>
> Sent: 2021年4月29日 22:05
> Subject: Re: [PATCH v1 2/2] caam: imx8m: change to use of_match_node in
> run_descriptor_deco0
> 
> Hi Alice
> 
> On Thu, Apr 29, 2021 at 11:02 AM Alice Guo (OSS) <alice.guo@oss.nxp.com>
> wrote:
> >
> > From: Alice Guo <alice.guo@nxp.com>
> >
> > Patch "fix the built-in caam driver cannot match soc_id" provides
> > imx8m_machine_match to match i.MX8M{Q,M,N,P}, so change to use to
> > of_match_node which can simplify the code.
> 
> Shouldn't these patches be squashed?

These patches should not be squashed because "fix the built-in caam driver cannot match soc_id"
is mainly used to provide defer probe when soc device has not been probed yet, and is only for
i.MX8M. "change to use of_match_node in run_descriptor_deco0" is just to simplify code.

Best Regards,
Alice Guo
diff mbox series

Patch

diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c
index 9bba3b93cf35..7e6a525e0c11 100644
--- a/drivers/crypto/caam/ctrl.c
+++ b/drivers/crypto/caam/ctrl.c
@@ -113,10 +113,7 @@  static inline int run_descriptor_deco0(struct device *ctrldev, u32 *desc,
 	     * Apparently on i.MX8M{Q,M,N,P} it doesn't matter if virt_en == 1
 	     * and the following steps should be performed regardless
 	     */
-	    of_machine_is_compatible("fsl,imx8mq") ||
-	    of_machine_is_compatible("fsl,imx8mm") ||
-	    of_machine_is_compatible("fsl,imx8mn") ||
-	    of_machine_is_compatible("fsl,imx8mp")) {
+	    of_match_node(imx8m_machine_match, of_root)) {
 		clrsetbits_32(&ctrl->deco_rsr, 0, DECORSR_JR0);

 		while (!(rd_reg32(&ctrl->deco_rsr) & DECORSR_VALID) &&