]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
media: i.MX6: Fix MIPI CSI-2 LP-11 check
authorKrzysztof Hałasa <khalasa@piap.pl>
Tue, 17 Oct 2017 06:12:25 +0000 (02:12 -0400)
committerMauro Carvalho Chehab <mchehab@s-opensource.com>
Mon, 11 Dec 2017 18:04:49 +0000 (13:04 -0500)
Bitmask for the MIPI CSI-2 data PHY status doesn't seem to be correct.
Fix it.

Signed-off-by: Krzysztof Ha?asa <khalasa@piap.pl>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Steve Longerbeam <steve_longerbeam@mentor.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
drivers/staging/media/imx/imx6-mipi-csi2.c

index 5061f3f524fd5cde2bab721114ae2d353e4e24e1..477d191c568bd4a1550f8c4d07b998aca02bf4ea 100644 (file)
@@ -252,8 +252,8 @@ static int csi2_dphy_wait_stopstate(struct csi2_dev *csi2)
        u32 mask, reg;
        int ret;
 
-       mask = PHY_STOPSTATECLK |
-               ((csi2->bus.num_data_lanes - 1) << PHY_STOPSTATEDATA_BIT);
+       mask = PHY_STOPSTATECLK | (((1 << csi2->bus.num_data_lanes) - 1) <<
+                                  PHY_STOPSTATEDATA_BIT);
 
        ret = readl_poll_timeout(csi2->base + CSI2_PHY_STATE, reg,
                                 (reg & mask) == mask, 0, 500000);