From patchwork Sun May 20 17:23:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 10413573 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 5C88F60365 for ; Sun, 20 May 2018 17:24:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B3EE2872F for ; Sun, 20 May 2018 17:24:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F1F828733; Sun, 20 May 2018 17:24: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=-2.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, 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 BFB3C2872F for ; Sun, 20 May 2018 17:24:26 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=CSWpLrr/Sgr2JkNL21wGO2gx9oIp3MNu1YPLzgfbHow=; b=u8OKOiBnwxaJCuaYxr8P30W0bU vd6zSwPTM7P4ZdY6BBEblFc+tRpYboWz3u0DFUS5/vUKxHCFIwydKjn8lUBeP1L+VoOThp3cNkM91 O5GL9VSGwkXs1AZpL7qqqaUs05A6yJwb8QkmjQjMSRA5ArDbWLmS1oGKo2xzL50A1n938fwn/otMS PMQMWqhFa2cImzOisxAEPwnbtasa7E5D6d8LAEhk8ZhlUi7ttSDJbwW00f5Uiw23CjUu/LZ1fi5Mt Zs037QpJic0n6QDlX0m+tn5bk9Rn63xEu4ezStiXZToOj4W0MXGzkt41l7sTTV0ah4KtKTcRuR4VU YQ1tURCg==; 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 1fKS4H-0006Xd-I9; Sun, 20 May 2018 17:24:25 +0000 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fKS4E-0006Vu-O3; Sun, 20 May 2018 17:24:24 +0000 Received: by mail-wm0-x243.google.com with SMTP id o78-v6so22914676wmg.0; Sun, 20 May 2018 10:24:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XJnbJ5o/PUtz25QjXSq61K8TSCmaP4ExHI46yUg3N4Q=; b=EwBp9t+wXVgqXTb8gDzolMwnPVMZF/3VbixB2vTJWhw1HK4GxtcTJh2YZwwkUWOf+o Jh5ts7rN/vySmp1qPalUloCUwXHgcLP8LVCQZGfWF/J6gOWMwQY0K7uJqkQTztYpAWXf 9KE8htxvWukebFpHsruAwDhRwv6yRb/FoMNZ70aE1j1+js4pw/pNEUxHjdjGytIcyWKh o9mGvvFt9L7rpvjPqLftHRjfrO7YVxMZJ/PGMatN41Ludb1zujo0GGXLwLAzASJWxDDY KixFNfloaUT9pU+H0f2PjIASsRLv6tQQanAo0QT+HNH7riY1Ogd5IloMBgqcjmrJmCs5 wZPw== 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=XJnbJ5o/PUtz25QjXSq61K8TSCmaP4ExHI46yUg3N4Q=; b=pcCtnvxP9ehyrlyWkO1Bcx+ow1vOF8wRSxMO75gnAiEhmQf6Hz0QqxVs+4jhgS6kqv YwVCxWVxWDz3fobRRQU44r+5hGa/QzjJ6cvKWu34d9H64pWxa2FqNb7CxhtRMHzf+G7l zVLqTLJIwfgQ10RZnukEAzR/nQ4buTgl/vx+XwBSmbXFb7iLQIInZ3bKXp/MDTKxJ+rB +QMMHgs5uuGC4+2390hA2I2yfGc2naazG9Cvi6Q1AP+kFKqG+2bo8ikdHoEmGOEgXU3d eKcD/x7ysAD2MWG9WSa+3rQm7SVpaQy7uawgeqMrfjNHZ5zUB8bLvQ8Z5L+YxdcyNJf8 PkWQ== X-Gm-Message-State: ALKqPwdYUsDR+K/LzUQm9NKW153VpyTtQldr4tuTAuzHh3TV1tmPogyV kgcy3y/9AjLkOnBiCpkY/dDKwBLN X-Google-Smtp-Source: AB8JxZrXi8mP7dRK1Zyh0o3PSdRLp1/rvqVDoDwg6Pck983dsqo9nt1uSWlcs29m+MxtXX80SsXi1g== X-Received: by 2002:a1c:fc3:: with SMTP id 186-v6mr9740147wmp.113.1526837052849; Sun, 20 May 2018 10:24:12 -0700 (PDT) Received: from blackbox.darklights.net (p5DD9B53E.dip0.t-ipconnect.de. [93.217.181.62]) by smtp.googlemail.com with ESMTPSA id 75-v6sm16216493wmw.37.2018.05.20.10.24.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 20 May 2018 10:24:12 -0700 (PDT) From: Martin Blumenstingl To: linux-amlogic@lists.infradead.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH 2/2] ARM: meson: merge Kconfig symbol MACH_MESON8B into MACH_MESON8 Date: Sun, 20 May 2018 19:23:53 +0200 Message-Id: <20180520172353.19256-3-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180520172353.19256-1-martin.blumenstingl@googlemail.com> References: <20180520172353.19256-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180520_102422_781214_4F78CD21 X-CRM114-Status: GOOD ( 10.45 ) X-BeenThere: linux-amlogic@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-amlogic" Errors-To: linux-amlogic-bounces+patchwork-linux-amlogic=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Currently there are no differences between the MACH_MESON8 and MACH_MESON8B Kconfig symbols (except the help text). Since both platforms are very similar (Meson8b being a slightly updated, cost-reduced version of Meson8 which even shares some peripherals with Meson8m2) no notable differences are expected in the future either. Suggested-by: Kevin Hilman Signed-off-by: Martin Blumenstingl --- arch/arm/mach-meson/Kconfig | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 2bc630471beb..d51cfda953d4 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -19,14 +19,7 @@ config MACH_MESON6 select MESON6_TIMER config MACH_MESON8 - bool "Amlogic Meson8 and Meson8m2 SoCs support" - default ARCH_MESON - select MESON6_TIMER - select COMMON_CLK_MESON8B - select MESON_IRQ_GPIO - -config MACH_MESON8B - bool "Amlogic Meson8b SoCs support" + bool "Amlogic Meson8, Meson8b and Meson8m2 SoCs support" default ARCH_MESON select MESON6_TIMER select COMMON_CLK_MESON8B