The IMX355 sensor driver currently supports having 4 data lanes. There can't be more or less, so check if the firmware specifies 4 lanes.
Suggested-by: Sakari Ailus <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Richard Acayan <[email protected]> --- Changes since v9 (https://lore.kernel.org/r/[email protected]): - reject zero data-lanes - split patch 4/7 from main series Changes since v8 (https://lore.kernel.org/r/[email protected]): - allow clock-lanes, but make it optional (1/7) Changes since v7 (https://lore.kernel.org/r/[email protected]): - restrict data-lanes to 4 (4/7) - include first patch (1/7) - add back optional data-lanes in bindings (2/7) - remove assert low on power on again (Bryan's review retained) (3/7) - use dev_err_probe in power on (3/7) - remove second error on probe power on (3/7) - add review tags (2/7, 3/7, 7/7) Changes since v6 (https://lore.kernel.org/r/[email protected]): - remove NAK from Krzysztof (3/6) - assert reset GPIO on probe (3/6) - change delays in reset sequence (3/6) - remove __maybe_unused from OF match table (3/6) - fix alignment for arguments to devm_regulator_bulk_get_const (3/6) - remove front camera pin configuration (6/6) - remove clock-lanes from camss endpoint (1/6, 6/6) - remove data-lanes from camera sensor endpoint (2/6, 6/6) - remove blank line at top of binding (2/6) - add review tags (2/6, 3/6, 5/6, 6/6) Changes since v5 (https://lore.kernel.org/r/[email protected]): - add Bryan to CC who added a Reviewed-by Changes since v4 (https://lore.kernel.org/r/[email protected]): - add NAK from Krzysztof (2/5) - label the camss ports (3/5, 5/5) - define endpoint properties correctly (1/5) - use devm_regulator_bulk_get_const (2/5) - remove clock-names (1/5, 5/5) - set reset GPIO as active low (1/5, 2/5, 5/5) - explicitly drive reset low at start of sequence (2/5) - make data-lanes in endpoint optional and start at 1 (1/5, 5/5) - add mclk3 pin (4/5) - add Reviewed-by's (4/5) Changes since v3 (https://lore.kernel.org/r/[email protected]): - separate camera mclk pins and move to different patch (4/5, 5/5) - remove polarity from rear camera pin (5/5) - remove output-low from front camera pins (5/5) - mention effects of dcf6fb89e6f7 ("media: qcom: camss: remove a check for unavailable CAMSS endpoint") (3/5) - specify single clock-name without items nesting (1/5) - rebase on 49c6ac166cf7 ("media: i2c: imx355: Replace client->dev usage") and eaa7d46d9654 ("media: i2c: imx335: Use V4L2 sensor clock helper") (2/5) - do not use of_match_ptr for OF match table (2/5) - remove redundant GPIO validity checks (2/5) - describe endpoint data-lanes (1/5) Changes since v2 (https://lore.kernel.org/r/[email protected]): - use devm_v4l2_sensor_clk_get (2/4) - require supplies and clock-names (1/4) - move unevaluatedProperties down (1/4) - disable clocks as last power-off action (2/4) - use 0 in gpio pin power-supply (4/4) Changes since v1 (https://lore.kernel.org/r/[email protected]): - too much to have a complete list (1-4/4) - squash camera orientation patch (4/4, previously 5/5) - squash driver changes (2/4, previously 3/5) - remove labelled endpoint node in sdm670.dtsi (3/4, 4/4) - change init sequence to match other similar drivers (2/4) - retrieve clock frequency from devicetree-defined clock (4/4) - remove clock-frequency from dt-bindings (1/4) - remove redundant descriptions of child nodes (1/4) - switch initial drive of the reset GPIO to low (2/4) - set mclk frequency to 19.2 MHz (4/4) - add vdda-pll supply for camss (4/4) - use common power on and off functions (2/4) - use devm_clk_get_optional (2/4) - remove extra layer when describing mclk pin (4/4) - rename regulators (1/4, 2/4, 4/4) drivers/media/i2c/imx355.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/media/i2c/imx355.c b/drivers/media/i2c/imx355.c index 9ca87488c933..27a5c212a527 100644 --- a/drivers/media/i2c/imx355.c +++ b/drivers/media/i2c/imx355.c @@ -66,6 +66,9 @@ #define IMX355_EXT_CLK 19200000 #define IMX355_LINK_FREQ_INDEX 0 +/* number of data lanes */ +#define IMX355_DATA_LANES 4 + struct imx355_reg { u16 address; u8 val; @@ -1705,6 +1708,9 @@ static struct imx355_hwcfg *imx355_get_hwcfg(struct device *dev) if (!cfg) goto out_err; + if (bus_cfg.bus.mipi_csi2.num_data_lanes != IMX355_DATA_LANES) + goto out_err; + ret = v4l2_link_freq_to_bitmap(dev, bus_cfg.link_frequencies, bus_cfg.nr_of_link_frequencies, link_freq_menu_items, -- 2.53.0
