From patchwork Tue Feb 7 16:41:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bartosz Golaszewski X-Patchwork-Id: 9560715 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 120BA6047A for ; Tue, 7 Feb 2017 17:19:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 041B6223C7 for ; Tue, 7 Feb 2017 17:19:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED0752654B; Tue, 7 Feb 2017 17:19:27 +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=-1.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_SORBS_SPAM,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 728AA27FC0 for ; Tue, 7 Feb 2017 17:19:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cb9QI-0008Dr-5u; Tue, 07 Feb 2017 17:19:23 +0000 Received: from mail-wm0-f52.google.com ([74.125.82.52]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cb8z5-0007Cj-F8 for linux-arm-kernel@lists.infradead.org; Tue, 07 Feb 2017 16:51:19 +0000 Received: by mail-wm0-f52.google.com with SMTP id v186so19169886wmd.0 for ; Tue, 07 Feb 2017 08:50:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mFnZxn5h9uxIX92fDyQw5euPQLiqMjB8G9mvPlV0W+k=; b=JXTeTcJPlHqI5glDeCsH5YGhfwlmxnBw9t/mIl+3AexVqg1cABHcarE1koJZOqSO+L bAZn6ppa3cLvnjuRQ8IODhcOWOAwjx3uzuktUVaAom6A6ktl2Q3YkM26ev0DJOUMxYAn MWB+YaxV205Mp4FAGB4C9UGSR8mDAaq7La0VApIPyq881iOJ2iBhAQGdREnO7it7fTAg NuBky8w8/A1BVOi6yxF8jeoM0QhTDEi4UV481e0fRTRvhAHP0+aBTW5PWjpCovFy8g/5 hCEqkR9YHrkofda8jkz7wQFRq3V2zZOuBf6FHqA0fOddRrlslSc5Oq+gM8IUrY8SLFO3 LiEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mFnZxn5h9uxIX92fDyQw5euPQLiqMjB8G9mvPlV0W+k=; b=afkCLLxgjxnBEsJ2nq7jTyxn1NhRRZj3ojqoY9aZ/zxbfxSy35QqDWpNdtuWRxT+cV LHzA7Wec/5lfR8Gp/3DTvWvZGprcJTqzAK+1jZAikqGYXW9IGi/RNOas18ivFASVIhOJ DdMWLZ5cMd6bziPXfhkPjUhHOfCUwjQYLIIx3kOy2lBfUdxHpCL5mgIV7+2gwEnPsZmL GlaZ2x2ZxcnuO9fJ0chdyGTppdlX4zrtTR4fVLej1NoCTuklN07BkuxiZJ8xkPhrcTBm D7vhu6unC+8jVyPJiGsC1G5irghtm7OLBodyKhX2Q84/kuPGCuQ1KLAWaouWc4GhmPzg hnRw== X-Gm-Message-State: AIkVDXJscGZfQ9QoXW21N/R2CmWsqwd1/vRmfIwn7Fiwi717gDKGnXxi6LpM2f5qNJVGy2UR X-Received: by 10.223.135.69 with SMTP id 5mr16633238wrz.174.1486485715213; Tue, 07 Feb 2017 08:41:55 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 8sm3958185wmg.1.2017.02.07.08.41.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Feb 2017 08:41:54 -0800 (PST) From: Bartosz Golaszewski To: Kevin Hilman , Sekhar Nori , Patrick Titiano , Michael Turquette , Rob Herring , Mark Rutland , Russell King , Alexandre Bailon , David Lechner , Laurent Pinchart , Mauro Carvalho Chehab , Lad Prabhakar Subject: [PATCH 08/10] ARM: davinci: fix the DT boot on da850-evm Date: Tue, 7 Feb 2017 17:41:21 +0100 Message-Id: <1486485683-11427-9-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> References: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170207_085116_015525_4CFCF381 X-CRM114-Status: GOOD ( 11.51 ) 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: devicetree@vger.kernel.org, Bartosz Golaszewski , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org MIME-Version: 1.0 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 When we enable vpif capture on the da850-evm we hit a BUG_ON() because the i2c adapter can't be found. The board file boot uses i2c adapter 1 but in the DT mode it's actually adapter 0. Drop the problematic lines. Signed-off-by: Bartosz Golaszewski Acked-by: Kevin Hilman --- arch/arm/mach-davinci/pdata-quirks.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c index 94948c1..09f62ac 100644 --- a/arch/arm/mach-davinci/pdata-quirks.c +++ b/arch/arm/mach-davinci/pdata-quirks.c @@ -116,10 +116,6 @@ static void __init da850_vpif_legacy_init(void) if (of_machine_is_compatible("ti,da850-lcdk")) da850_vpif_capture_config.subdev_count = 1; - /* EVM (UI card) uses i2c adapter 1 (not default: zero) */ - if (of_machine_is_compatible("ti,da850-evm")) - da850_vpif_capture_config.i2c_adapter_id = 1; - ret = da850_register_vpif_capture(&da850_vpif_capture_config); if (ret) pr_warn("%s: VPIF capture setup failed: %d\n",