aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobby Cai <r63905@freescale.com>2014-06-26 01:51:07 -0400
committerRobby Cai <r63905@freescale.com>2014-06-28 19:45:41 -0400
commitb234473839a1b96856f8e54ba06d7b8e73509cca (patch)
tree5eebb6ad0d95331aadcb031fa86a8b15a0b4428c
parent7550e961e94cc862bef951213d6835dce72a1e3e (diff)
ENGR00320056-2 vadc: imx6sx: assign the csi id in slave data struct
Assign csi id in struct sensor_data of the slave, which will be used to judge if it need to be attached to the master. Signed-off-by: Robby Cai <r63905@freescale.com> (cherry picked from commit 7b5e2d4a158356e4290dcea3215b4a2438d0df6e)
-rw-r--r--drivers/media/platform/mxc/capture/mxc_vadc.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/media/platform/mxc/capture/mxc_vadc.c b/drivers/media/platform/mxc/capture/mxc_vadc.c
index bb114e1f9994..a5aa3f128268 100644
--- a/drivers/media/platform/mxc/capture/mxc_vadc.c
+++ b/drivers/media/platform/mxc/capture/mxc_vadc.c
@@ -885,6 +885,8 @@ static int vadc_probe(struct platform_device *pdev)
885 return ret; 885 return ret;
886 } 886 }
887 887
888 vadc->sen.csi = csi_id;
889
888 /* remap GPR register */ 890 /* remap GPR register */
889 vadc->gpr = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, 891 vadc->gpr = syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
890 "gpr"); 892 "gpr");