From patchwork Fri May 11 15:21:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sekhar Nori X-Patchwork-Id: 10394599 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B3F1601A0 for ; Fri, 11 May 2018 15:22:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F62928EB7 for ; Fri, 11 May 2018 15:22:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6321A28F39; Fri, 11 May 2018 15:22:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B199828EB7 for ; Fri, 11 May 2018 15:22:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/mgvkmwulmWIYU/CS66KzvaC8Jpv4yJX3+6gThmM+zI=; b=uOHIQrAhSxnc1v +v2plMlf7QNLEUlx4m+Zq0LKx+JwaZipDgoZAFatxNzi9N9nSyhtLj1h65CRmGD1tS0KUBgovB2z7 q3aXE7UG2JL4FNY9+yPwpKftAsxLp3SijisnDp3Qks8suvspXb8ISwF833119HVEUdrJhSloeiVx2 CNW116IUhY3GDVrPUZQ4pkXUGqjBDwzweXVJlKo4z9H6lYDqTZgjhyWAaCFgidrmPQkOHQrgBj5im l/Fa2qkzWBMnPwvJ9UYuoiy6LdqHVt0yAcldIsxs0bfQTK86wGbo4jHVbRdTaA5zDOXkbT7WJYqOp JNHzb7Eq8yQU6OEyv5Rw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fH9sT-0005xn-1J; Fri, 11 May 2018 15:22:37 +0000 Received: from fllnx209.ext.ti.com ([198.47.19.16]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fH9rj-0005Za-Vu for linux-arm-kernel@lists.infradead.org; Fri, 11 May 2018 15:21:53 +0000 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx209.ext.ti.com (8.15.1/8.15.1) with ESMTP id w4BFLhSa011575; Fri, 11 May 2018 10:21:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1526052103; bh=JkPUfvG5V/EiiFWledGkIHgF1ydHmJEObnB6GL3Li58=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=rJEoNeKfegoxEKYXrz0NIH+m7B70d6h2zC4Gkoljmyq0e4iW5UbH6gqF/KVhzFnDo 4gN5NgB2xYuZEwd7qx5soB8gAIbAJuM3zuOxm2S/0+0SgE+TmERlOUhqcptsFixcSH YfjDkEpWX3iL8Czo9ZvtT/nuuxttVPeMG7NN5TkM= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w4BFLhPp000921; Fri, 11 May 2018 10:21:43 -0500 Received: from DFLE104.ent.ti.com (10.64.6.25) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Fri, 11 May 2018 10:21:42 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE104.ent.ti.com (10.64.6.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Fri, 11 May 2018 10:21:42 -0500 Received: from psplinux063.india.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id w4BFLaAh029058; Fri, 11 May 2018 10:21:41 -0500 From: Sekhar Nori To: Sekhar Nori Subject: [PATCH 3/3] ARM: davinci: board-dm646x-evm: set VPIF capture card name Date: Fri, 11 May 2018 20:51:36 +0530 Message-ID: <20180511152136.29515-4-nsekhar@ti.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180511152136.29515-1-nsekhar@ti.com> References: <20180511152136.29515-1-nsekhar@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180511_082152_168780_E0486774 X-CRM114-Status: GOOD ( 15.03 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linux ARM Mailing List , Kevin Hilman Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP VPIF capture driver expects card name to be set since it uses it without checking for NULL. The commit which introduced VPIF display and capture support added card name only for display, not for capture. Set it in platform data to probe driver successfully. While at it, also fix the display card name to something more appropriate. Fixes: 85609c1ccda6 ("DaVinci: DM646x - platform changes for vpif capture and display drivers") Signed-off-by: Sekhar Nori --- arch/arm/mach-davinci/board-dm646x-evm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index bf6f85048d17..867ab2fa6cfd 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -538,7 +538,7 @@ static struct vpif_display_config dm646x_vpif_display_config = { .outputs = dm6467_ch0_outputs, .output_count = ARRAY_SIZE(dm6467_ch0_outputs), }, - .card_name = "DM646x EVM", + .card_name = "DM646x EVM Video Display", }; /** @@ -697,6 +697,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { .fid_pol = 0, }, }, + .card_name = "DM646x EVM Video Capture", }; static void __init evm_init_video(void)