From patchwork Thu Oct 28 14:19:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukas Bulwahn X-Patchwork-Id: 12590331 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CF712C433F5 for ; Thu, 28 Oct 2021 14:23:03 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 95DB861108 for ; Thu, 28 Oct 2021 14:23:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 95DB861108 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/y2sMk1m7Kx+4OimIcuU15/uapbkhW0cccnb8G2E1Ww=; b=IoAHnXXfa7pde4 dPETfP7q8K3uMd+HA8FUQ3W2rGFk9q8EAj8C7rcKhmzEr1+U2deZasj01RaoT3h0u/FbESCLghY4V CYuNpcD7DsEnFspuRgPiq0mR5B50hS9cOI6j6d1JlQy4JgDoUe92zCrZfQ/Ycwah4bPIirC/KnpCI Dbz899+2weJ4ge55VyfYeCUBEjEb0iQddxGTvuddT33E2B9f1J59WICub8856Buqrz7ILEkPEbC6o t5JCG8GXBowDsgmY9Lo7iXODnzShJlYS2wYf/v2+oLF1mUYIBBh/XBSQEopLPo6mYxqRbVyxW7VFr WubZ4qvcZs1oZzQZU9CA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mg6HZ-0086nM-1Y; Thu, 28 Oct 2021 14:21:29 +0000 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mg6GC-0086HA-NS for linux-arm-kernel@lists.infradead.org; Thu, 28 Oct 2021 14:20:06 +0000 Received: by mail-wm1-x32c.google.com with SMTP id o4-20020a1c7504000000b0032cab7473caso4779615wmc.1 for ; Thu, 28 Oct 2021 07:20:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=TQff7+i6dxs5PfhTnnbZH3nPeykRVJI64ISY+jsjutU=; b=Vv/9qsMlGnB5JIv0T0bguI2eXKZZglN8vGu/a/Wi14UHFC0DGYOe02c4xk/bnwoGoN dMZ4KkpWjBfYiBx8ubbcr30vjuQgLNbriVJXgIvFZSZUjtn/kdZR3MdN6xyPZ3n2fFAk gEtQqS4k7BKSydKweSEzGIGdyC5vXQesJVhjSQXhqD2jP4iTgnAYmDOCAEsEjJlk872Y 43xQFIBGQjEPEzd2p6VNPkc3BFthNPM6tmoSvIEEHxS/rqlFU3L3K3aZmP9kS0HoaorD KxhxzfjAGk0jg+k9Q2IzkaO9FNyj945peXcoFyHCDtCJx3qLPzcfsvEtpgV5iudiOHRs wg6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=TQff7+i6dxs5PfhTnnbZH3nPeykRVJI64ISY+jsjutU=; b=dsZJggcxNDAeC7+hLdgDHKkODntAB5aqyKDyt0aO9vrE6WDKc2lqo5qrZm6IXIGMDH Ptbn9705Ar/hFP7unCVUQL7Pcxf8vwglK1hJPOcwGJQbYIDhIHCTUvekfn8fg+lEH9D7 xfd0SncfSG5dPIkZHp5v+/5ztMJlKFL+ywBzEVo+YF8SNDay+m08h06lMfzAgGpBsLtw AJMsGMr8n+01MWG2UPLydrKT8VcMNlQAGCEqMjTat2FZdXKVDwP1pYu/ly+eCGFeenE7 PnY3vOZXyHzESHSoKXwyaJgfLtkmXfBvbLDlnQzXm9c4pYCF8KzMHhSaUycGIFughR7W EtRQ== X-Gm-Message-State: AOAM533WS4uZJlgkLBVZvSHZMCOhkazGAgyyXoAh5Xom8DpdcDNC0poj YNA6H7YaTr8tKt4x9skh5QlTE7pUTrfviA== X-Google-Smtp-Source: ABdhPJwnM173mMYgr46CHrhZ8lGPRb0soVkFAU/YtafftscaPvvp7hPJclRSsKpcCdMWgvZ4cK6y4A== X-Received: by 2002:a05:600c:24d:: with SMTP id 13mr9732659wmj.64.1635430803441; Thu, 28 Oct 2021 07:20:03 -0700 (PDT) Received: from localhost.localdomain (i5C74E249.versanet.de. [92.116.226.73]) by smtp.gmail.com with ESMTPSA id m2sm6284546wml.15.2021.10.28.07.20.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Oct 2021 07:20:03 -0700 (PDT) From: Lukas Bulwahn To: Russell King , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Sekhar Nori , Bartosz Golaszewski , Linus Walleij , Imre Kaloz , Krzysztof Halasa , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Dinh Nguyen , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, openbmc@lists.ozlabs.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org, Lukas Bulwahn Subject: [PATCH 05/13] arm: davinci: remove reference to obsolete BLK_DEV_PALMCHIP_BK3710 Date: Thu, 28 Oct 2021 16:19:30 +0200 Message-Id: <20211028141938.3530-6-lukas.bulwahn@gmail.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20211028141938.3530-1-lukas.bulwahn@gmail.com> References: <20211028141938.3530-1-lukas.bulwahn@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211028_072004_798768_E19E514C X-CRM114-Status: GOOD ( 15.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit b7fb14d3ac63 ("ide: remove the legacy ide driver") removes the definition of the config BLK_DEV_PALMCHIP_BK3710. So, remove the obsolete references in the mach-davinci architecture. Signed-off-by: Lukas Bulwahn Reviewed-by: Arnd Bergmann --- arch/arm/mach-davinci/board-dm644x-evm.c | 3 +-- arch/arm/mach-davinci/board-dm646x-evm.c | 3 +-- arch/arm/mach-davinci/board-neuros-osd2.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index cce3a621eb20..df6dbb3f0faf 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c @@ -834,8 +834,7 @@ static int davinci_phy_fixup(struct phy_device *phydev) return 0; } -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #define HAS_NOR IS_ENABLED(CONFIG_MTD_PHYSMAP) diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c index ee91d81ebbfd..744ece6b6b9a 100644 --- a/arch/arm/mach-davinci/board-dm646x-evm.c +++ b/arch/arm/mach-davinci/board-dm646x-evm.c @@ -151,8 +151,7 @@ static struct platform_device davinci_aemif_device = { .num_resources = ARRAY_SIZE(davinci_aemif_resources), }; -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #ifdef CONFIG_I2C /* CPLD Register 0 bits to control ATA */ diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c index b4843f68bb57..81c21fe5748a 100644 --- a/arch/arm/mach-davinci/board-neuros-osd2.c +++ b/arch/arm/mach-davinci/board-neuros-osd2.c @@ -164,8 +164,7 @@ static struct davinci_mmc_config davinci_ntosd2_mmc_config = { .wires = 4, }; -#define HAS_ATA (IS_ENABLED(CONFIG_BLK_DEV_PALMCHIP_BK3710) || \ - IS_ENABLED(CONFIG_PATA_BK3710)) +#define HAS_ATA IS_ENABLED(CONFIG_PATA_BK3710) #define HAS_NAND IS_ENABLED(CONFIG_MTD_NAND_DAVINCI)