Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp2222317rwb; Thu, 19 Jan 2023 23:19:42 -0800 (PST) X-Google-Smtp-Source: AMrXdXtE2EiRPW5ASTnVRWMvntjUxD2odNGC714BD8hvIu+91bHyPW3vVoHAfRKWxUeumPsFkx7d X-Received: by 2002:a17:903:32cb:b0:194:dd83:613d with SMTP id i11-20020a17090332cb00b00194dd83613dmr4159656plr.21.1674199182263; Thu, 19 Jan 2023 23:19:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674199182; cv=none; d=google.com; s=arc-20160816; b=lqycJOC9gYA1Wzik/tRNF8Ujh016tTvOeL+XoEeWJhM3zKSlYVpA7Y1TcjKbmCt6UG VIwxZuQ7DMzIKv+2BusSlVCVSNL83ON7Rr5fQb6nD8biRVlrka6LTUoYicS0Wbm7nwCv 0DaSb2s/RxkFJIB6eejC3HoU+Te2qfZvot/OTi/kVby0xGdVMg43QesTJRsJYxeMq/Bj Pzhn6Rsf1Gd7H/Fto0CS4n3n4h9WjOv5s8Pl+06gow2ouWiuc0IgnT4riJw3pkDCs6l8 stUm9H+AtNU9O1GZFWwp2DVU/vzwVcUcF/CXMNvkOTThq4pPS9hjKLYp8aBuTZSm1YKx Ss4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:in-reply-to:from :references:cc:to:content-language:subject:user-agent:mime-version :date:message-id:dkim-signature; bh=QEcigFhUAF5igZj+PXdsmiVOA6RCgFWeRZyHa9qAY+c=; b=X8PFWRMlq9Z3HUwWivsTDamEm1yqVmLsNs1eJ4Pvq1CWcmau44gWJBY1TV7GOcura0 kDG4Vy8s0mpHF808yh/tqsfA2GKFWzbqLlIE6ovbrVMsidSeV2dXAB+dPDmw4oCsGbhP mMD/OXkK2Rth5afDnaEZbrxvYoZ5b1ZlexXCI5QQUz/ENb5ieP6InFNv94w8n9NRnHsp 5zkgDkgiExkTYzxbbnzrE5zTvXRJFe1plr0F4mUOJTijTww/h8BMIgetK2HL27d9YD2G 2t1EyxSVwgDUu2ui6ozlyU3maY4MfRJkj8qijHKLBjpqyNkExqrgmE8bScyfHwuq0gzt H4ow== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=rVw4Fnm3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a170902e88400b00188c7b09446si44760742plg.44.2023.01.19.23.19.35; Thu, 19 Jan 2023 23:19:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@ideasonboard.com header.s=mail header.b=rVw4Fnm3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229875AbjATHEu (ORCPT + 49 others); Fri, 20 Jan 2023 02:04:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48420 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229571AbjATHEs (ORCPT ); Fri, 20 Jan 2023 02:04:48 -0500 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A448340FB; Thu, 19 Jan 2023 23:04:45 -0800 (PST) Received: from [192.168.1.15] (91-154-32-225.elisa-laajakaista.fi [91.154.32.225]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id D02ED514; Fri, 20 Jan 2023 08:04:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1674198283; bh=WemZ0iAxhXDrZU3BuSUYmtpVH3IgHVEdu8KawIxgtQ8=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=rVw4Fnm3lkjrIPl3i34nMqOzdFnXW9hQe3tracfFJz9NO7tdIezBoqmtxhsJutbSM ir6603eYjeSPoQQ/vHNpRW5DMe3Eai2VrXm05nIffFsAqNFkc/vf+pMkY4xTJTDvd5 Zl/xgDTj3UF+jxDkk11iFZfaEznz4KFGAs7cwEYE= Message-ID: <076ede2c-f682-54cd-95bf-60170e2444a2@ideasonboard.com> Date: Fri, 20 Jan 2023 09:04:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Subject: Re: [PATCH v7 6/7] media: i2c: add DS90UB913 driver Content-Language: en-US To: Laurent Pinchart Cc: linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-i2c@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , Wolfram Sang , Luca Ceresoli , Andy Shevchenko , Matti Vaittinen , Mauro Carvalho Chehab , Peter Rosin , Liam Girdwood , Mark Brown , Sakari Ailus , Michael Tretter , Shawn Tu , Hans Verkuil , Mike Pagano , =?UTF-8?Q?Krzysztof_Ha=c5=82asa?= , Marek Vasut References: <20230118124031.788940-1-tomi.valkeinen@ideasonboard.com> <20230118124031.788940-7-tomi.valkeinen@ideasonboard.com> From: Tomi Valkeinen In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,SPF_HELO_PASS, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 20/01/2023 02:03, Laurent Pinchart wrote: > Hi Tomi, > > Thank you for the patch. > > On Wed, Jan 18, 2023 at 02:40:30PM +0200, Tomi Valkeinen wrote: >> Add driver for TI DS90UB913 FPD-Link III Serializer. >> >> Signed-off-by: Tomi Valkeinen >> --- >> drivers/media/i2c/Kconfig | 13 + >> drivers/media/i2c/Makefile | 1 + >> drivers/media/i2c/ds90ub913.c | 848 ++++++++++++++++++++++++++++++++++ >> 3 files changed, 862 insertions(+) >> create mode 100644 drivers/media/i2c/ds90ub913.c >> >> diff --git a/drivers/media/i2c/Kconfig b/drivers/media/i2c/Kconfig >> index dc1c7c80dc1c..e0a1c2a5f3bf 100644 >> --- a/drivers/media/i2c/Kconfig >> +++ b/drivers/media/i2c/Kconfig >> @@ -1601,6 +1601,19 @@ endmenu >> >> menu "Video serializers and deserializers" >> >> +config VIDEO_DS90UB913 >> + tristate "TI DS90UB913 FPD-Link III Serializer" >> + depends on OF && I2C && VIDEO_DEV >> + select I2C_ATR >> + select MEDIA_CONTROLLER >> + select OF_GPIO >> + select REGMAP_I2C >> + select V4L2_FWNODE >> + select VIDEO_V4L2_SUBDEV_API >> + help >> + Device driver for the Texas Instruments DS90UB913 >> + FPD-Link III Serializer. >> + >> config VIDEO_DS90UB960 >> tristate "TI FPD-Link III/IV Deserializers" >> depends on OF && I2C && VIDEO_DEV >> diff --git a/drivers/media/i2c/Makefile b/drivers/media/i2c/Makefile >> index 4cd680f3b953..c4875ec8c3b9 100644 >> --- a/drivers/media/i2c/Makefile >> +++ b/drivers/media/i2c/Makefile >> @@ -142,4 +142,5 @@ obj-$(CONFIG_VIDEO_VPX3220) += vpx3220.o >> obj-$(CONFIG_VIDEO_VS6624) += vs6624.o >> obj-$(CONFIG_VIDEO_WM8739) += wm8739.o >> obj-$(CONFIG_VIDEO_WM8775) += wm8775.o >> +obj-$(CONFIG_VIDEO_DS90UB913) += ds90ub913.o >> obj-$(CONFIG_VIDEO_DS90UB960) += ds90ub960.o >> diff --git a/drivers/media/i2c/ds90ub913.c b/drivers/media/i2c/ds90ub913.c >> new file mode 100644 >> index 000000000000..befa78128a9a >> --- /dev/null >> +++ b/drivers/media/i2c/ds90ub913.c >> @@ -0,0 +1,848 @@ >> +// SPDX-License-Identifier: GPL-2.0 >> +/* >> + * Driver for the Texas Instruments DS90UB913 video serializer >> + * >> + * Based on a driver from Luca Ceresoli >> + * >> + * Copyright (c) 2019 Luca Ceresoli >> + * Copyright (c) 2023 Tomi Valkeinen >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> +#include >> + >> +#define UB913_PAD_SINK 0 >> +#define UB913_PAD_SOURCE 1 >> + >> +/* >> + * UB913 has 4 gpios, but gpios 3 and 4 are reserved for external oscillator >> + * mode. Thus we only support 2 gpios for now. >> + */ >> +#define UB913_NUM_GPIOS 2 >> + >> +#define UB913_REG_RESET_CTL 0x01 >> +#define UB913_REG_RESET_CTL_DIGITAL_RESET_1 BIT(1) >> +#define UB913_REG_RESET_CTL_DIGITAL_RESET_0 BIT(0) >> + >> +#define UB913_REG_GENERAL_CFG 0x03 >> +#define UB913_REG_GENERAL_CFG_CRC_ERR_RESET BIT(5) >> +#define UB913_REG_GENERAL_CFG_PCLK_RISING BIT(0) >> + >> +#define UB913_REG_MODE_SEL 0x05 >> +#define UB913_REG_MODE_SEL_MODE_OVERRIDE BIT(5) >> +#define UB913_REG_MODE_SEL_MODE_UP_TO_DATE BIT(4) >> +#define UB913_REG_MODE_SEL_MODE_MASK GENMASK(3, 0) >> + >> +#define UB913_REG_CRC_ERRORS_LSB 0x0a >> +#define UB913_REG_CRC_ERRORS_MSB 0x0b >> + >> +#define UB913_REG_GENERAL_STATUS 0x0c >> + >> +#define UB913_REG_GPIO_CFG(n) (0x0d + (n)) >> +#define UB913_REG_GPIO_CFG_ENABLE(n) BIT(0 + (n) * 4) >> +#define UB913_REG_GPIO_CFG_DIR_INPUT(n) BIT(1 + (n) * 4) >> +#define UB913_REG_GPIO_CFG_REMOTE_EN(n) BIT(2 + (n) * 4) >> +#define UB913_REG_GPIO_CFG_OUT_VAL(n) BIT(3 + (n) * 4) >> +#define UB913_REG_GPIO_CFG_MASK(n) (0xf << ((n) * 4)) >> + >> +#define UB913_REG_SCL_HIGH_TIME 0x11 >> +#define UB913_REG_SCL_LOW_TIME 0x12 >> + >> +#define UB913_REG_PLL_OVR 0x35 >> + >> +struct ub913_data { >> + struct i2c_client *client; >> + struct regmap *regmap; >> + struct clk *clkin; >> + >> + struct gpio_chip gpio_chip; >> + >> + struct v4l2_subdev sd; >> + struct media_pad pads[2]; >> + >> + struct v4l2_async_notifier notifier; >> + >> + struct v4l2_subdev *source_sd; >> + u16 source_sd_pad; >> + >> + u64 enabled_source_streams; >> + >> + struct clk_hw *clkout_clk_hw; >> + >> + struct ds90ub9xx_platform_data *plat_data; >> + >> + u32 pclk_polarity; >> +}; >> + >> +static inline struct ub913_data *sd_to_ub913(struct v4l2_subdev *sd) >> +{ >> + return container_of(sd, struct ub913_data, sd); >> +} >> + >> +static int ub913_read(const struct ub913_data *priv, u8 reg, u8 *val) >> +{ >> + unsigned int v; >> + int ret; >> + >> + ret = regmap_read(priv->regmap, reg, &v); >> + if (ret < 0) { >> + dev_err(&priv->client->dev, >> + "Cannot read register 0x%02x: %d!\n", reg, ret); >> + return ret; >> + } >> + >> + *val = v; >> + return 0; >> +} >> + >> +static int ub913_write(const struct ub913_data *priv, u8 reg, u8 val) >> +{ >> + int ret; >> + >> + ret = regmap_write(priv->regmap, reg, val); >> + if (ret < 0) >> + dev_err(&priv->client->dev, >> + "Cannot write register 0x%02x: %d!\n", reg, ret); >> + >> + return ret; >> +} >> + >> +/* >> + * GPIO chip >> + */ >> +static int ub913_gpio_get_direction(struct gpio_chip *gc, unsigned int offset) >> +{ >> + return GPIO_LINE_DIRECTION_OUT; >> +} >> + >> +static int ub913_gpio_direction_out(struct gpio_chip *gc, unsigned int offset, >> + int value) >> +{ >> + struct ub913_data *priv = gpiochip_get_data(gc); >> + unsigned int reg_idx = offset / 2; >> + unsigned int field_idx = offset % 2; >> + >> + return regmap_update_bits(priv->regmap, UB913_REG_GPIO_CFG(reg_idx), >> + UB913_REG_GPIO_CFG_MASK(field_idx), >> + UB913_REG_GPIO_CFG_ENABLE(field_idx) | >> + (value ? UB913_REG_GPIO_CFG_OUT_VAL(field_idx) : >> + 0)); > > I find the indentation weird, I would have written > > return regmap_update_bits(priv->regmap, UB913_REG_GPIO_CFG(reg_idx), > UB913_REG_GPIO_CFG_MASK(field_idx), > UB913_REG_GPIO_CFG_ENABLE(field_idx) | > (value ? UB913_REG_GPIO_CFG_OUT_VAL(field_idx) : 0)); > > Your call. It's clang-format. I still haven't found out how to make it indent as I'd like. Actually, with kernel's clang-format settings this ends up as: return regmap_update_bits( priv->regmap, UB913_REG_GPIO_CFG(reg_idx), UB913_REG_GPIO_CFG_MASK(field_idx), UB913_REG_GPIO_CFG_ENABLE(field_idx) | (value ? UB913_REG_GPIO_CFG_OUT_VAL(field_idx) : 0)); But checkpatch complains about line ending with (. Adjusting the settings a bit I got it to indent as it is currently. The indent after the line ending with | make sense, I think, but I don't mind your formatting either. >> +} >> + >> +static void ub913_gpio_set(struct gpio_chip *gc, unsigned int offset, int value) >> +{ >> + ub913_gpio_direction_out(gc, offset, value); >> +} >> + >> +static int ub913_gpio_of_xlate(struct gpio_chip *gc, >> + const struct of_phandle_args *gpiospec, >> + u32 *flags) >> +{ >> + if (flags) >> + *flags = gpiospec->args[1]; >> + >> + return gpiospec->args[0]; >> +} >> + >> +static int ub913_gpiochip_probe(struct ub913_data *priv) >> +{ >> + struct device *dev = &priv->client->dev; >> + struct gpio_chip *gc = &priv->gpio_chip; >> + int ret; >> + >> + /* Initialize GPIOs 0 and 1 to local control, tri-state */ >> + ub913_write(priv, UB913_REG_GPIO_CFG(0), 0); >> + >> + gc->label = dev_name(dev); >> + gc->parent = dev; >> + gc->owner = THIS_MODULE; >> + gc->base = -1; >> + gc->can_sleep = true; >> + gc->ngpio = UB913_NUM_GPIOS; >> + gc->get_direction = ub913_gpio_get_direction; >> + gc->direction_output = ub913_gpio_direction_out; >> + gc->set = ub913_gpio_set; >> + gc->of_xlate = ub913_gpio_of_xlate; >> + gc->of_gpio_n_cells = 2; >> + >> + ret = gpiochip_add_data(gc, priv); >> + if (ret) { >> + dev_err(dev, "Failed to add GPIOs: %d\n", ret); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static void ub913_gpiochip_remove(struct ub913_data *priv) >> +{ >> + gpiochip_remove(&priv->gpio_chip); >> +} >> + >> +static const struct regmap_config ub913_regmap_config = { >> + .name = "ds90ub913", >> + .reg_bits = 8, >> + .val_bits = 8, >> + .reg_format_endian = REGMAP_ENDIAN_DEFAULT, >> + .val_format_endian = REGMAP_ENDIAN_DEFAULT, >> +}; >> + >> +/* >> + * V4L2 >> + */ >> + >> +static int ub913_enable_streams(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, u32 pad, >> + u64 streams_mask) >> +{ >> + struct ub913_data *priv = sd_to_ub913(sd); >> + u64 sink_streams; >> + int ret; >> + >> + sink_streams = v4l2_subdev_state_xlate_streams(state, UB913_PAD_SOURCE, >> + UB913_PAD_SINK, >> + &streams_mask); >> + >> + ret = v4l2_subdev_enable_streams(priv->source_sd, priv->source_sd_pad, >> + sink_streams); >> + if (ret) >> + return ret; >> + >> + priv->enabled_source_streams |= streams_mask; >> + >> + return 0; >> +} >> + >> +static int ub913_disable_streams(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, u32 pad, >> + u64 streams_mask) >> +{ >> + struct ub913_data *priv = sd_to_ub913(sd); >> + u64 sink_streams; >> + int ret; >> + >> + sink_streams = v4l2_subdev_state_xlate_streams(state, UB913_PAD_SOURCE, >> + UB913_PAD_SINK, >> + &streams_mask); >> + >> + ret = v4l2_subdev_disable_streams(priv->source_sd, priv->source_sd_pad, >> + sink_streams); >> + if (ret) >> + return ret; >> + >> + priv->enabled_source_streams &= ~streams_mask; >> + >> + return 0; >> +} >> + >> +static int _ub913_set_routing(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, >> + struct v4l2_subdev_krouting *routing) >> +{ >> + static const struct v4l2_mbus_framefmt format = { >> + .width = 640, >> + .height = 480, >> + .code = MEDIA_BUS_FMT_UYVY8_2X8, >> + .field = V4L2_FIELD_NONE, >> + .colorspace = V4L2_COLORSPACE_SRGB, >> + .ycbcr_enc = V4L2_YCBCR_ENC_601, >> + .quantization = V4L2_QUANTIZATION_LIM_RANGE, >> + .xfer_func = V4L2_XFER_FUNC_SRGB, >> + }; >> + int ret; >> + >> + /* >> + * Note: we can only support up to V4L2_FRAME_DESC_ENTRY_MAX, until >> + * frame desc is made dynamically allocated. >> + */ >> + >> + if (routing->num_routes > V4L2_FRAME_DESC_ENTRY_MAX) >> + return -EINVAL; >> + >> + ret = v4l2_subdev_routing_validate(sd, routing, >> + V4L2_SUBDEV_ROUTING_ONLY_1_TO_1); >> + if (ret) >> + return ret; >> + >> + ret = v4l2_subdev_set_routing_with_fmt(sd, state, routing, &format); >> + if (ret) >> + return ret; >> + >> + return 0; >> +} >> + >> +static int ub913_set_routing(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, >> + enum v4l2_subdev_format_whence which, >> + struct v4l2_subdev_krouting *routing) >> +{ >> + struct ub913_data *priv = sd_to_ub913(sd); >> + >> + if (which == V4L2_SUBDEV_FORMAT_ACTIVE && priv->enabled_source_streams) >> + return -EBUSY; >> + >> + return _ub913_set_routing(sd, state, routing); >> +} >> + >> +static int ub913_get_frame_desc(struct v4l2_subdev *sd, unsigned int pad, >> + struct v4l2_mbus_frame_desc *fd) >> +{ >> + struct ub913_data *priv = sd_to_ub913(sd); >> + const struct v4l2_subdev_krouting *routing; >> + struct v4l2_mbus_frame_desc source_fd; >> + struct v4l2_subdev_route *route; >> + struct v4l2_subdev_state *state; >> + int ret; >> + >> + if (pad != UB913_PAD_SOURCE) >> + return -EINVAL; >> + >> + ret = v4l2_subdev_call(priv->source_sd, pad, get_frame_desc, >> + priv->source_sd_pad, &source_fd); >> + if (ret) >> + return ret; >> + >> + memset(fd, 0, sizeof(*fd)); >> + >> + fd->type = V4L2_MBUS_FRAME_DESC_TYPE_PARALLEL; >> + >> + state = v4l2_subdev_lock_and_get_active_state(sd); >> + >> + routing = &state->routing; >> + >> + for_each_active_route(routing, route) { >> + unsigned int i; >> + >> + if (route->source_pad != pad) >> + continue; >> + >> + for (i = 0; i < source_fd.num_entries; ++i) { >> + if (source_fd.entry[i].stream == route->sink_stream) >> + break; >> + } >> + >> + if (i == source_fd.num_entries) { >> + dev_err(&priv->client->dev, >> + "Failed to find stream from source frame desc\n"); >> + ret = -EPIPE; >> + goto out; >> + } >> + >> + fd->entry[fd->num_entries].stream = route->source_stream; >> + fd->entry[fd->num_entries].flags = source_fd.entry[i].flags; >> + fd->entry[fd->num_entries].length = source_fd.entry[i].length; >> + fd->entry[fd->num_entries].pixelcode = >> + source_fd.entry[i].pixelcode; >> + >> + fd->num_entries++; >> + } >> + >> +out: >> + v4l2_subdev_unlock_state(state); >> + >> + return ret; >> +} >> + >> +static int ub913_set_fmt(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state, >> + struct v4l2_subdev_format *format) >> +{ >> + struct ub913_data *priv = sd_to_ub913(sd); >> + struct v4l2_mbus_framefmt *fmt; >> + >> + if (format->which == V4L2_SUBDEV_FORMAT_ACTIVE && >> + priv->enabled_source_streams) >> + return -EBUSY; >> + >> + /* No transcoding, source and sink formats must match. */ >> + if (format->pad == UB913_PAD_SOURCE) >> + return v4l2_subdev_get_fmt(sd, state, format); >> + >> + /* Set sink format */ >> + fmt = v4l2_subdev_state_get_stream_format(state, format->pad, >> + format->stream); >> + if (!fmt) >> + return -EINVAL; >> + >> + *fmt = format->format; >> + >> + /* Propagate to source format */ >> + fmt = v4l2_subdev_state_get_opposite_stream_format(state, format->pad, >> + format->stream); >> + if (!fmt) >> + return -EINVAL; >> + >> + *fmt = format->format; >> + >> + return 0; >> +} >> + >> +static int ub913_init_cfg(struct v4l2_subdev *sd, >> + struct v4l2_subdev_state *state) >> +{ >> + struct v4l2_subdev_route routes[] = { >> + { >> + .sink_pad = UB913_PAD_SINK, >> + .sink_stream = 0, >> + .source_pad = UB913_PAD_SOURCE, >> + .source_stream = 0, >> + .flags = V4L2_SUBDEV_ROUTE_FL_ACTIVE, >> + }, >> + }; >> + >> + struct v4l2_subdev_krouting routing = { >> + .num_routes = ARRAY_SIZE(routes), >> + .routes = routes, >> + }; >> + >> + return _ub913_set_routing(sd, state, &routing); >> +} >> + >> +static int ub913_log_status(struct v4l2_subdev *sd) >> +{ >> + struct ub913_data *priv = sd_to_ub913(sd); >> + struct device *dev = &priv->client->dev; >> + u8 v, v1, v2; >> + >> + ub913_read(priv, UB913_REG_MODE_SEL, &v); >> + dev_info(dev, "MODE_SEL %#02x\n", v); >> + >> + ub913_read(priv, UB913_REG_CRC_ERRORS_LSB, &v1); >> + ub913_read(priv, UB913_REG_CRC_ERRORS_MSB, &v2); >> + dev_info(dev, "CRC errors %u\n", v1 | (v2 << 8)); >> + >> + /* clear CRC errors */ >> + ub913_read(priv, UB913_REG_GENERAL_CFG, &v); >> + ub913_write(priv, UB913_REG_GENERAL_CFG, >> + v | UB913_REG_GENERAL_CFG_CRC_ERR_RESET); >> + ub913_write(priv, UB913_REG_GENERAL_CFG, v); >> + >> + ub913_read(priv, UB913_REG_GENERAL_STATUS, &v); >> + dev_info(dev, "GENERAL_STATUS %#02x\n", v); >> + >> + ub913_read(priv, UB913_REG_PLL_OVR, &v); >> + dev_info(dev, "PLL_OVR %#02x\n", v); >> + >> + return 0; >> +} >> + >> +static const struct v4l2_subdev_core_ops ub913_subdev_core_ops = { >> + .log_status = ub913_log_status, >> +}; >> + >> +static const struct v4l2_subdev_pad_ops ub913_pad_ops = { >> + .enable_streams = ub913_enable_streams, >> + .disable_streams = ub913_disable_streams, >> + .set_routing = ub913_set_routing, >> + .get_frame_desc = ub913_get_frame_desc, >> + .get_fmt = v4l2_subdev_get_fmt, >> + .set_fmt = ub913_set_fmt, >> + .init_cfg = ub913_init_cfg, >> +}; >> + >> +static const struct v4l2_subdev_ops ub913_subdev_ops = { >> + .core = &ub913_subdev_core_ops, >> + .pad = &ub913_pad_ops, >> +}; >> + >> +static const struct media_entity_operations ub913_entity_ops = { >> + .link_validate = v4l2_subdev_link_validate, >> +}; >> + >> +static int ub913_notify_bound(struct v4l2_async_notifier *notifier, >> + struct v4l2_subdev *source_subdev, >> + struct v4l2_async_subdev *asd) >> +{ >> + struct ub913_data *priv = sd_to_ub913(notifier->sd); >> + struct device *dev = &priv->client->dev; >> + int ret; >> + >> + ret = media_entity_get_fwnode_pad(&source_subdev->entity, >> + source_subdev->fwnode, >> + MEDIA_PAD_FL_SOURCE); >> + if (ret < 0) { >> + dev_err(dev, "Failed to find pad for %s\n", >> + source_subdev->name); >> + return ret; >> + } >> + >> + priv->source_sd = source_subdev; >> + priv->source_sd_pad = ret; >> + >> + ret = media_create_pad_link(&source_subdev->entity, priv->source_sd_pad, >> + &priv->sd.entity, UB913_PAD_SINK, >> + MEDIA_LNK_FL_ENABLED | >> + MEDIA_LNK_FL_IMMUTABLE); > > Weird indentation again. It was fine in the previous version :-) > >> + if (ret) { >> + dev_err(dev, "Unable to link %s:%u -> %s:0\n", >> + source_subdev->name, priv->source_sd_pad, >> + priv->sd.name); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static const struct v4l2_async_notifier_operations ub913_notify_ops = { >> + .bound = ub913_notify_bound, >> +}; >> + >> +static int ub913_v4l2_notifier_register(struct ub913_data *priv) >> +{ >> + struct device *dev = &priv->client->dev; >> + struct v4l2_async_subdev *asd; >> + struct fwnode_handle *ep_fwnode; >> + int ret; >> + >> + ep_fwnode = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), >> + UB913_PAD_SINK, 0, 0); >> + if (!ep_fwnode) { >> + dev_err(dev, "No graph endpoint\n"); >> + return -ENODEV; >> + } >> + >> + v4l2_async_nf_init(&priv->notifier); >> + >> + asd = v4l2_async_nf_add_fwnode_remote(&priv->notifier, ep_fwnode, >> + struct v4l2_async_subdev); >> + >> + fwnode_handle_put(ep_fwnode); >> + >> + if (IS_ERR(asd)) { >> + dev_err(dev, "Failed to add subdev: %ld", PTR_ERR(asd)); >> + v4l2_async_nf_cleanup(&priv->notifier); >> + return PTR_ERR(asd); >> + } >> + >> + priv->notifier.ops = &ub913_notify_ops; >> + >> + ret = v4l2_async_subdev_nf_register(&priv->sd, &priv->notifier); >> + if (ret) { >> + dev_err(dev, "Failed to register subdev_notifier"); >> + v4l2_async_nf_cleanup(&priv->notifier); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static void ub913_v4l2_nf_unregister(struct ub913_data *priv) >> +{ >> + v4l2_async_nf_unregister(&priv->notifier); >> + v4l2_async_nf_cleanup(&priv->notifier); >> +} >> + >> +static int ub913_register_clkout(struct ub913_data *priv) >> +{ >> + struct device *dev = &priv->client->dev; >> + const char *name; >> + int ret; >> + >> + name = kasprintf(GFP_KERNEL, "ds90ub913.%s.clk_out", dev_name(dev)); >> + if (!name) >> + return -ENOMEM; >> + >> + priv->clkout_clk_hw = devm_clk_hw_register_fixed_factor(dev, name, >> + __clk_get_name(priv->clkin), 0, 1, 2); >> + >> + kfree(name); >> + >> + if (IS_ERR(priv->clkout_clk_hw)) >> + return dev_err_probe(dev, PTR_ERR(priv->clkout_clk_hw), >> + "Cannot register clkout hw\n"); >> + >> + ret = devm_of_clk_add_hw_provider(dev, of_clk_hw_simple_get, >> + priv->clkout_clk_hw); >> + if (ret) >> + return dev_err_probe(dev, ret, >> + "Cannot add OF clock provider\n"); >> + >> + return 0; >> +} >> + >> +static int ub913_i2c_master_init(struct ub913_data *priv) >> +{ >> + /* i2c fast mode */ >> + u32 scl_high = 600 + 300; /* high period + rise time, ns */ >> + u32 scl_low = 1300 + 300; /* low period + fall time, ns */ >> + unsigned long ref; >> + int ret; >> + >> + ref = clk_get_rate(priv->clkin) / 2; >> + >> + scl_high = div64_u64((u64)scl_high * ref, 1000000000); >> + scl_low = div64_u64((u64)scl_low * ref, 1000000000); >> + >> + ret = ub913_write(priv, UB913_REG_SCL_HIGH_TIME, scl_high); >> + if (ret) >> + return ret; >> + >> + ret = ub913_write(priv, UB913_REG_SCL_LOW_TIME, scl_low); >> + if (ret) >> + return ret; >> + >> + return 0; >> +} >> + >> +static int ub913_add_i2c_adapter(struct ub913_data *priv) >> +{ >> + struct device *dev = &priv->client->dev; >> + struct fwnode_handle *i2c_handle; >> + int ret; >> + >> + i2c_handle = device_get_named_child_node(dev, "i2c"); >> + if (!i2c_handle) >> + return 0; >> + >> + ret = i2c_atr_add_adapter(priv->plat_data->atr, priv->plat_data->port, >> + i2c_handle); >> + >> + fwnode_handle_put(i2c_handle); >> + >> + if (ret) >> + return ret; >> + >> + return 0; >> +} >> + >> +static int ub913_parse_dt(struct ub913_data *priv) >> +{ >> + struct device *dev = &priv->client->dev; >> + struct fwnode_handle *ep_fwnode; >> + int ret; >> + >> + ep_fwnode = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), >> + UB913_PAD_SINK, 0, 0); >> + if (!ep_fwnode) { >> + dev_err(dev, "No sink endpoint\n"); >> + return -ENOENT; >> + } >> + >> + ret = fwnode_property_read_u32(ep_fwnode, "pclk-sample", >> + &priv->pclk_polarity); >> + >> + fwnode_handle_put(ep_fwnode); >> + >> + if (ret) { >> + dev_err(dev, "OF: failed to parse pclk-sample: %d\n", ret); >> + return ret; >> + } >> + >> + return 0; >> +} >> + >> +static int ub913_hw_init(struct ub913_data *priv) >> +{ >> + struct device *dev = &priv->client->dev; >> + bool mode_override; >> + u8 mode; >> + int ret; >> + u8 v; >> + >> + ret = ub913_read(priv, UB913_REG_MODE_SEL, &v); >> + if (ret) >> + return ret; >> + >> + if (!(v & UB913_REG_MODE_SEL_MODE_UP_TO_DATE)) >> + return dev_err_probe(dev, -ENODEV, >> + "Mode value not stabilized\n"); >> + >> + mode_override = v & UB913_REG_MODE_SEL_MODE_OVERRIDE; >> + mode = v & UB913_REG_MODE_SEL_MODE_MASK; >> + >> + dev_dbg(dev, "mode from %s: %#x\n", >> + mode_override ? "reg" : "deserializer", mode); >> + >> + ret = ub913_i2c_master_init(priv); >> + if (ret) >> + return dev_err_probe(dev, ret, "i2c master init failed\n"); >> + >> + ub913_read(priv, UB913_REG_GENERAL_CFG, &v); >> + v &= ~UB913_REG_GENERAL_CFG_PCLK_RISING; >> + v |= priv->pclk_polarity ? UB913_REG_GENERAL_CFG_PCLK_RISING : 0; >> + ub913_write(priv, UB913_REG_GENERAL_CFG, v); >> + >> + return 0; >> +} >> + >> +static int ub913_subdev_init(struct ub913_data *priv) >> +{ >> + struct device *dev = &priv->client->dev; >> + int ret; >> + >> + v4l2_i2c_subdev_init(&priv->sd, priv->client, &ub913_subdev_ops); >> + priv->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE | V4L2_SUBDEV_FL_STREAMS; >> + priv->sd.entity.function = MEDIA_ENT_F_VID_IF_BRIDGE; >> + priv->sd.entity.ops = &ub913_entity_ops; >> + >> + priv->pads[0].flags = MEDIA_PAD_FL_SINK; >> + priv->pads[1].flags = MEDIA_PAD_FL_SOURCE; >> + >> + ret = media_entity_pads_init(&priv->sd.entity, 2, priv->pads); >> + if (ret) >> + return dev_err_probe(dev, ret, "Failed to init pads\n"); >> + >> + priv->sd.fwnode = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), >> + UB913_PAD_SOURCE, 0, >> + 0); >> + >> + if (!priv->sd.fwnode) { >> + ret = -ENODEV; >> + dev_err_probe(dev, ret, "Missing TX endpoint\n"); >> + goto err_entity_cleanup; >> + } >> + >> + ret = v4l2_subdev_init_finalize(&priv->sd); >> + if (ret) >> + goto err_entity_cleanup; > > You're leaking priv->sd.fwnode here, you need to call > fwnode_handle_put() in the error path. Ok. >> + >> + ret = ub913_v4l2_notifier_register(priv); >> + if (ret) { >> + dev_err_probe(dev, ret, >> + "v4l2 subdev notifier register failed\n"); >> + goto err_subdev_cleanup; >> + } >> + >> + ret = v4l2_async_register_subdev(&priv->sd); >> + if (ret) { >> + dev_err_probe(dev, ret, "v4l2_async_register_subdev error\n"); >> + goto err_unreg_notif; >> + } >> + >> + return 0; >> + >> +err_unreg_notif: >> + ub913_v4l2_nf_unregister(priv); >> +err_subdev_cleanup: >> + v4l2_subdev_cleanup(&priv->sd); >> +err_entity_cleanup: >> + media_entity_cleanup(&priv->sd.entity); >> + >> + return ret; >> +} >> + >> +static void ub913_subdev_uninit(struct ub913_data *priv) >> +{ >> + v4l2_async_unregister_subdev(&priv->sd); >> + ub913_v4l2_nf_unregister(priv); >> + v4l2_subdev_cleanup(&priv->sd); >> + media_entity_cleanup(&priv->sd.entity); > > Missing fwnode_handle_put() here too. Yep. >> +} >> + >> +static int ub913_probe(struct i2c_client *client) >> +{ >> + struct device *dev = &client->dev; >> + struct ub913_data *priv; >> + int ret; >> + >> + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); >> + if (!priv) >> + return -ENOMEM; >> + >> + priv->client = client; >> + >> + priv->plat_data = dev_get_platdata(&client->dev); >> + if (!priv->plat_data) >> + return dev_err_probe(dev, -ENODEV, "Platform data missing\n"); >> + >> + priv->regmap = devm_regmap_init_i2c(client, &ub913_regmap_config); >> + if (IS_ERR(priv->regmap)) >> + return dev_err_probe(dev, PTR_ERR(priv->regmap), >> + "Failed to init regmap\n"); >> + >> + /* >> + * ub913 can also work without ext clock, but that is not supported by >> + * the driver yet > > s/yet/yet./ > > Reviewed-by: Laurent Pinchart Thanks! Tomi