On Wed, Jun 12, 2019 at 11:45:18AM +0000, Horia Geanta wrote: > On 6/12/2019 1:40 PM, Shawn Guo wrote: > > On Thu, Jun 06, 2019 at 11:02:55AM +0300, Horia Geantă wrote: > >> From: Iuliana Prodan <iuliana.prodan@xxxxxxx> > >> > >> Add crypto node in device tree for CAAM support. > >> > >> Noteworthy is that on 7ulp the interrupt line is shared > >> between the two job rings. > >> > >> Signed-off-by: Iuliana Prodan <iuliana.prodan@xxxxxxx> > >> Signed-off-by: Franck LENORMAND <franck.lenormand@xxxxxxx> > >> Signed-off-by: Horia Geantă <horia.geanta@xxxxxxx> > >> --- > >> > >> I've just realized that this patch should be merged through the crypto tree, > >> else bisectability could be affected due to cryptodev-2.6 > >> commit 385cfc84a5a8 ("crypto: caam - disable some clock checks for iMX7ULP") > >> ( https://patchwork.kernel.org/patch/10970017/ ) > >> which should come first. > > > > I'm not sure I follow it. This is a new device added to imx7ulp DT. > > It's never worked before on imx7ulp. How would it affect git bisect? > > > Driver corresponding to this device (drivers/crypto/caam) has to be updated > before adding the node in DT. > Is there any guarantee wrt. merge order of the crypto and DT trees? Do not merge DT changes until driver part hits mainline. Shawn