From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63864C4360C for ; Sat, 28 Sep 2019 19:16:37 +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 3838320863 for ; Sat, 28 Sep 2019 19:16:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ooj8Ld+8"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lExVhAQf" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3838320863 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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:In-Reply-To:MIME-Version:Date: Message-ID:From:References:To:Subject:Reply-To:Content-ID:Content-Description :Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=g0nw/gi9c9E/iMj12IvHGb3iB+JNNCYHv4cfuHR3usc=; b=ooj8Ld+8Nop6U6 QCGIWdymZ4Yc1UZyUdrfXacLRAau3Aisri3J2RWhXhh3wd33GSHpDRSpuj4pksrQvi9dJEs4I52GS ADL18IR6ApJ0gysOeH04F0+4vxsroUirCWlcdUTqt0nP5DwH826ze+oI8LyPCdjytXIgjVQ+Dn27H IKCtJI+qNNHMx3AckaAY2kHNsXNpP8fpZZ7vTWxkd2VkDC/ZZR7y8SyVI8/wqI1BowEaMFJYR9OU3 dDl+KFMXgAy7Lb6b6TFd8Y5ahe7Fo16IMxvN7AaGEzdx2WNiI0D5Lqu8/wojaPB8n3NJCFuYg3rwn /0wDwfzaSHG9rbB6WQbg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEICq-0006A0-Hq; Sat, 28 Sep 2019 19:16:36 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.92.2 #3 (Red Hat Linux)) id 1iEICm-00069U-NC for linux-arm-kernel@lists.infradead.org; Sat, 28 Sep 2019 19:16:34 +0000 Received: by mail-pl1-x642.google.com with SMTP id d22so2339298pls.0 for ; Sat, 28 Sep 2019 12:16:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=2tFPX7ab9aePgUICX8itdJOBDm+2TtdwJ9e0G0bDfOI=; b=lExVhAQfrfbxN4TiiOJIkOifjrRVbTkIz5Z4/QOsu1d+cPIs+wHZzQ5mf41TNJfwe+ CFBo+i+DHaa3BPSN7aSk3LYdyslqYVF59lJiCcvahacd3UDPrvmqhSTMqq3RX/6cOiA3 K5Bc/EFlXwm6/2pNmwPzpscz6nZ5E+Z3qobZXnmViLCHgEJkZjlmy6XTQ3bq38RkDyf/ 36NgM+l94bR+nKKaq7dmvZKLz1mAvc2Rsoxr/NvNrqlA16IjZdReCgB+bAkiWdoziApz PL4aaIcKSC9FKHYilniJlnetB7vNWybtMuI9KLaEriNS07+Ketc8Rl7Pt8KyA54MlnRP 2LGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=2tFPX7ab9aePgUICX8itdJOBDm+2TtdwJ9e0G0bDfOI=; b=DkVkiY89iKjRLCSgITSdx0W8INqogPqplgILpzzmn9zdNdD8lIa/Nq58EEoFVo1S3g 3Gf7brEfHMPbLr4xbUUxBzR6/W5cDGHAdTiDfwrNWt3esNbMCwgkJ2aonUemtl3MMX31 ELaA5COdUsqzk7Iqes6B+NrmPWgq9/iTASG8M2IdwFwCwTExsUBKDuqTZ/cBwW6CsUWr FcrwhfaYNuK9cFw7MhozP/8YTT4WXNTvOt9lPGp1SDM73F/erQL+bJmwK5X31vL3Vj5a juYPKLVW/IRYPFWTHdk2sL7pK7nBKnoRftzCCXnUamA0bZ8qPlvk7UoC+5/qJcml1OM4 7Lkg== X-Gm-Message-State: APjAAAUU8beosiA4gg4UdbhADaqSTdSdnJDZIdt+wOFrvD2hcw9rZBV2 Ko8vHeUFW9B0VKiTTKkCjXw= X-Google-Smtp-Source: APXvYqxgzL22KQbEoe9qW0EWcVQ9p9su62xeNj5ctYD+Dfj9NIFCLxnRyrTl/+FRFb/WbHixDb/PCA== X-Received: by 2002:a17:902:6c:: with SMTP id 99mr11948901pla.89.1569698191772; Sat, 28 Sep 2019 12:16:31 -0700 (PDT) Received: from [10.230.28.130] ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id z20sm7737390pfj.156.2019.09.28.12.16.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 28 Sep 2019 12:16:30 -0700 (PDT) Subject: Re: [PATCH V3 6/8] ARM: bcm: Add support for BCM2711 SoC To: Stefan Wahren , Rob Herring , Mark Rutland , Eric Anholt , Florian Fainelli , Ray Jui , Scott Branden References: <1569672435-19823-1-git-send-email-wahrenst@gmx.net> <1569672435-19823-7-git-send-email-wahrenst@gmx.net> From: Florian Fainelli Message-ID: <6b251871-59ae-6040-cbbc-74207b2169f3@gmail.com> Date: Sat, 28 Sep 2019 12:16:30 -0700 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.1.1 MIME-Version: 1.0 In-Reply-To: <1569672435-19823-7-git-send-email-wahrenst@gmx.net> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190928_121632_782447_92010464 X-CRM114-Status: GOOD ( 23.51 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , devicetree@vger.kernel.org, Will Deacon , linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 9/28/2019 5:07 AM, Stefan Wahren wrote: > Add the BCM2711 to ARCH_BCM2835, but use new machine board code > because of the differences. > > Signed-off-by: Stefan Wahren > Reviewed-by: Eric Anholt > --- > arch/arm/mach-bcm/Kconfig | 3 ++- > arch/arm/mach-bcm/Makefile | 3 ++- > arch/arm/mach-bcm/bcm2711.c | 24 ++++++++++++++++++++++++ > arch/arm64/Kconfig.platforms | 5 +++-- > 4 files changed, 31 insertions(+), 4 deletions(-) > create mode 100644 arch/arm/mach-bcm/bcm2711.c > > diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig > index 5e5f1fa..39bcbea 100644 > --- a/arch/arm/mach-bcm/Kconfig > +++ b/arch/arm/mach-bcm/Kconfig > @@ -161,6 +161,7 @@ config ARCH_BCM2835 > select GPIOLIB > select ARM_AMBA > select ARM_ERRATA_411920 if ARCH_MULTI_V6 > + select ARM_GIC if ARCH_MULTI_V7 > select ARM_TIMER_SP804 > select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7 > select TIMER_OF Are not we missing a select ZONE_DMA here? > @@ -169,7 +170,7 @@ config ARCH_BCM2835 > select PINCTRL_BCM2835 > select MFD_CORE > help > - This enables support for the Broadcom BCM2835 and BCM2836 SoCs. > + This enables support for the Broadcom BCM2711 and BCM283x SoCs. > This SoC is used in the Raspberry Pi and Roku 2 devices. > > config ARCH_BCM_53573 > diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile > index b59c813..7baa8c9 100644 > --- a/arch/arm/mach-bcm/Makefile > +++ b/arch/arm/mach-bcm/Makefile > @@ -42,8 +42,9 @@ obj-$(CONFIG_ARCH_BCM_MOBILE_L2_CACHE) += kona_l2_cache.o > obj-$(CONFIG_ARCH_BCM_MOBILE_SMC) += bcm_kona_smc.o > > # BCM2835 > -obj-$(CONFIG_ARCH_BCM2835) += board_bcm2835.o > ifeq ($(CONFIG_ARCH_BCM2835),y) > +obj-y += board_bcm2835.o > +obj-y += bcm2711.o > ifeq ($(CONFIG_ARM),y) > obj-$(CONFIG_SMP) += platsmp.o > endif > diff --git a/arch/arm/mach-bcm/bcm2711.c b/arch/arm/mach-bcm/bcm2711.c > new file mode 100644 > index 0000000..dbe2967 > --- /dev/null > +++ b/arch/arm/mach-bcm/bcm2711.c > @@ -0,0 +1,24 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Stefan Wahren > + */ > + > +#include > + > +#include > + > +#include "platsmp.h" > + > +static const char * const bcm2711_compat[] = { > +#ifdef CONFIG_ARCH_MULTI_V7 > + "brcm,bcm2711", > +#endif > +}; > + > +DT_MACHINE_START(BCM2711, "BCM2711") > +#ifdef CONFIG_ZONE_DMA > + .dma_zone_size = SZ_1G, > +#endif > + .dt_compat = bcm2711_compat, > + .smp = smp_ops(bcm2836_smp_ops), > +MACHINE_END > diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms > index 16d7614..b5d31dc 100644 > --- a/arch/arm64/Kconfig.platforms > +++ b/arch/arm64/Kconfig.platforms > @@ -37,11 +37,12 @@ config ARCH_BCM2835 > select PINCTRL > select PINCTRL_BCM2835 > select ARM_AMBA > + select ARM_GIC > select ARM_TIMER_SP804 > select HAVE_ARM_ARCH_TIMER > help > - This enables support for the Broadcom BCM2837 SoC. > - This SoC is used in the Raspberry Pi 3 device. > + This enables support for the Broadcom BCM2837 and BCM2711 SoC. > + This SoC is used in the Raspberry Pi 3 and 4 device. Nit: These SoCs are used in the Raspberry Pi 3 and 4 devices. With that: Acked-by: Florian Fainelli -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel