From patchwork Thu Mar 1 16:43:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 47522 Received: from vger.kernel.org ([209.132.180.67]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from ) id 1erRIx-0001SM-Fg; Thu, 01 Mar 2018 16:43:39 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033033AbeCAQnZ (ORCPT + 1 other); Thu, 1 Mar 2018 11:43:25 -0500 Received: from mail-ot0-f195.google.com ([74.125.82.195]:34944 "EHLO mail-ot0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1032944AbeCAQnX (ORCPT ); Thu, 1 Mar 2018 11:43:23 -0500 Received: by mail-ot0-f195.google.com with SMTP id w2so6152933otg.2; Thu, 01 Mar 2018 08:43:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=YjTj8EOlzi8/2omh98Th0I+6NvYPsVHOrebE2KpIoV0=; b=Ise6A5Esya5HHJoiId+yTIs24LS2dXgGLypkH9CBNrNSiGeFOEhFZgy4+fAJ/+vDUT nIr2xUwLXR+Trf40u0mtot3ZSaGGCLbEiqiokaxIgAbkBBLwJfuI1TikvITnCiwrl26E c3k7gyiXeSM7QH6dIkwoEeOdnI46+xVeLjjcJGFBU7P81gE2uuwJ/GCqkkKl1dKW2t1I otOpnmcYUli43C1vPvrK8JaK1VRxHPFgN2jWtyT2JM5qDG/54YAMR7aBz7HO/ttsWs/+ ctoP4lyYemufedCiPh6txPDxTS++ThsczV3c+2vKhEiCjO64xVKykcHT+OdhRlVbXLqs PKhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=YjTj8EOlzi8/2omh98Th0I+6NvYPsVHOrebE2KpIoV0=; b=UFkQvhD1TT34dKRXoUt9C06/sCIGVKgCvVDdlVwhcvvEqDxPEgnDh4T0U197zqOqBp sdDNHGiqoi4CAa9nXywwr0/AKSNyhfW8AfutBgYUHWRbxyx8JNfpSoaZtbluVF2hb8tX vtZ67LYShnTsUtG2fSniL6yPuC40LLGZg1nG28emMhF6Lz5yKlnl30aEsOw9mLMGGvFz i5sBEX05dcgya8GXWFvFion3DKjmXcdl2W6WCuXvNSh5C1/Oegyg6cAmmig8/eG5Oh14 Dn5P0y9hzIxnRPL/Gx96q/BTgbnou3Bi8oOFqV9TP5fho36jdT5o5JKUfByvpCmPVMEw mURg== X-Gm-Message-State: AElRT7FDarurbg36O1g9hSXQd7+2IVkHxdiC+Ie4AJGHwZh2ijIJFu+M pfOiPCsAPA5baAy6Quh3aSP70WzyTzdHza6byj4= X-Google-Smtp-Source: AG47ELt5aycHu/dbe2Q8IlnWXekuYCE7lJh8jDV+R/6q/paN1qfEG6wy9UOFFhQE/11xAkqruwR7ef0U86+0D3vrt1A= X-Received: by 10.157.62.30 with SMTP id a30mr1852753otd.128.1519922603113; Thu, 01 Mar 2018 08:43:23 -0800 (PST) MIME-Version: 1.0 Received: by 10.157.5.137 with HTTP; Thu, 1 Mar 2018 08:43:22 -0800 (PST) In-Reply-To: <1519921628.3034.5.camel@pengutronix.de> References: <20180301040939.GA13274@embeddedgus> <1519921628.3034.5.camel@pengutronix.de> From: Fabio Estevam Date: Thu, 1 Mar 2018 13:43:22 -0300 Message-ID: Subject: Re: [PATCH] staging/imx: Fix inconsistent IS_ERR and PTR_ERR To: Philipp Zabel Cc: "Gustavo A. R. Silva" , Steve Longerbeam , Mauro Carvalho Chehab , Greg Kroah-Hartman , linux-media , devel@driverdev.osuosl.org, linux-kernel , "Gustavo A. R. Silva" Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Thu, Mar 1, 2018 at 1:27 PM, Philipp Zabel wrote: > Oh, this only works for csi ports that have pinctrl in their csi port > node, like: > > &ipu1_csi0 { > pinctrl-names = "default"; > pinctrl-0 = <&pinctrl_ipu1_csi0>; > }; This is the case for imx6qdl-sabresd.dtsi and even in this case devm_pinctrl_get_select_default() fails > pinctrl would have to be moved out of the csi port nodes, for example > into their parent ipu nodes, or maybe more correctly, into the video mux > nodes in each device tree. Tried it like this: So that the error is ignored and we still can change the pinctrl values via dts. What do you think? --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -154,12 +154,9 @@ }; &ipu1_csi0_mux_from_parallel_sensor { - remote-endpoint = <&ov5642_to_ipu1_csi0_mux>; -}; - -&ipu1_csi0 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_ipu1_csi0>; + remote-endpoint = <&ov5642_to_ipu1_csi0_mux>; }; &mipi_csi { but still get the devm_pinctrl_get_select_default() failure. I was not able to change the dts so that devm_pinctrl_get_select_default() succeeds. If you agree I can send the following change: diff --git a/drivers/staging/media/imx/imx-media-csi.c b/drivers/staging/media/imx/imx-media-csi.c index 5a195f8..c40f786 100644 --- a/drivers/staging/media/imx/imx-media-csi.c +++ b/drivers/staging/media/imx/imx-media-csi.c @@ -1797,11 +1797,8 @@ static int imx_csi_probe(struct platform_device *pdev) */ priv->dev->of_node = pdata->of_node; pinctrl = devm_pinctrl_get_select_default(priv->dev); - if (IS_ERR(pinctrl)) { - ret = PTR_ERR(priv->vdev); - goto free; - } - + if (IS_ERR(pinctrl)) + dev_dbg(priv->dev, "pintrl_get_select_default() failed\n"); ret = v4l2_async_register_subdev(&priv->sd); if (ret) goto free;