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 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C8A19C00140 for ; Wed, 24 Aug 2022 12:24:20 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 244C681727; Wed, 24 Aug 2022 14:24:19 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=softathome1.onmicrosoft.com header.i=@softathome1.onmicrosoft.com header.b="i6XJezJM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4376984806; Wed, 24 Aug 2022 14:24:18 +0200 (CEST) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-eopbgr90042.outbound.protection.outlook.com [40.107.9.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id B697D81F4E for ; Wed, 24 Aug 2022 14:24:14 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=softathome.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=philippe.reynes@softathome.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KK74GhptCqx0DDLjHkN8RPOdY8qErAzxOirHGD+OhYRXwdn0/wwPq9iCmpKZZGGrvZUQekLnZDOLopHda4ORCAW6+FSZoDa4LE4B41WB6GN8Irj+09B2XlFt1512mnDzlU7OGM/qGi9ljfOrFOn2GLSmP+YGasUC3mRgFaAvCTsLJepic4iWYj9pEGuAZp4xf3elsDBUPFNPMUOkzhAFzB7q/P9WTWsiUUaP23tJLKBY0zqRXKkR46PqPywcejn/KhxO7WBAU6rairV+P7CugyjLZX7hs5If5S+898nHPFrKAWoNS9H4ZWOx9XdEPJHRdrUiFofK3BgAjo9+WM+RGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/NiblxVrYPKt7stXY7yDwlhhzQLhcEIURDi+4Rjb8yM=; b=O/ZtsDE4dYnkBo1Oa//LifBiB8jGgkoCi3mL9dl49JmLwOYdqwdnAaKr65O5Oz5rtr/k4nfnIWtvVJMNxELiE2+jUIeoWw0eNclE3w7Gzd+2seFBwb3OUfTvE/ZxKjQ8oEBH7JVvjzBgR4OA+mH6Q7Ub7lkBwM1wpXIxuf3bKERiuSUPbnw2++31r7KNlZMV6bPAc/PMWNDUD0Xgka5g1ff+E8rl3gjzs8DvPFcomyKKIxMW+648YcvjOMV0Oaha/pbrxhm6nA/cwvhKyWpWcMtwU2LGZglK1t+XAohxg8lxq1CtdJXJVfnYF5PjuXDcQJ3nHAN/L/H+Dj+sxohuWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=softathome.com; dmarc=pass action=none header.from=softathome.com; dkim=pass header.d=softathome.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=softathome1.onmicrosoft.com; s=selector1-softathome1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/NiblxVrYPKt7stXY7yDwlhhzQLhcEIURDi+4Rjb8yM=; b=i6XJezJMO4NDAWkuPr7yv7a67+7mAuJlyD8Z6F8Qb26soZBqu9vHpG5V7mn/hZPj8bT1x6uCKCMg6IfpcjiSO4aHITomB/PcpG8kn+XqisOvDovI26C7tkyEifJ49MOf0y4cnpox//5y4FM+/0LiqGx4YXW0NJXVB8LQ9l9aDkVJ4LxSNeURmWj+ztZ8EJ2yOuNS2YZZbvRtURcS8kqGTlEOOj5xAWFKlv4aG8sr4pAJZTliAWGfDxqOxXADWGEjo+yGpklXkfikbjxhrWy0sKZH44WOBwA/g+Lms4/iWT8HmGvnjLIfgtHx+Gpk6mI6APlMv8aUNiFQdUyyYPtodQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=softathome.com; Received: from PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1d0::9) by MR1P264MB2580.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:35::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5546.19; Wed, 24 Aug 2022 12:24:13 +0000 Received: from PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM ([fe80::fc9c:2a8f:2e0:e88d]) by PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM ([fe80::fc9c:2a8f:2e0:e88d%9]) with mapi id 15.20.5566.015; Wed, 24 Aug 2022 12:24:12 +0000 Message-ID: <43c8f018-71b8-ec53-2044-d6fdd7eab0c7@softathome.com> Date: Wed, 24 Aug 2022 14:24:12 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH v2 2/3] arm: bcmbca: remove bcm68360 support under CONFIG_ARCH_BCM68360 Content-Language: en-US To: William Zhang , U-Boot Mailing List Cc: anand.gore@broadcom.com, rafal@milecki.pl, f.fainelli@gmail.com, kursad.oney@broadcom.com, dan.beygelman@broadcom.com, joel.peshkin@broadcom.com, Andre Przywara , Christian Hewitt , Fabio Estevam , Rayagonda Kokatanur , Rick Chen , Samuel Holland , Sean Anderson , Simon Glass , Tom Rini , Tomer Yacoby , "Ying-Chun Liu (PaulLiu)" References: <20220815185512.22582-1-william.zhang@broadcom.com> <20220815113359.v2.2.I9cd0b0ceeab53022b26d3085e205c64aa091ad5c@changeid> From: Philippe REYNES In-Reply-To: <20220815113359.v2.2.I9cd0b0ceeab53022b26d3085e205c64aa091ad5c@changeid> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: PAZP264CA0050.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1fc::10) To PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:1d0::9) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2796e531-87a7-47ad-2732-08da85cb8d91 X-MS-TrafficTypeDiagnostic: MR1P264MB2580:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zWLO7bv/eXprxVqx/FgiPC2G9U2yBSChdkmT+RzalGej4C4yqObTOn4dVu2dp1tfjMlB6JDsTSRhYMk7lFqhxCpOnj51eFTkyeM2YmVKYAFiIQsk/D9imFWJg0CjjN2Tvfpibbe+humFYBQoRVGJt92gG/l+JWMwELv5mLaXEDdvmHuvKNrIPrJ5TK1Wx9RNmlUQ3iX2QRzyljkFi0GokpfEWiTuOh1eXu17xdnqUBaSGHaHkJnVDTQdltlPiJhkFvj4LilF22pZEzBUDRi8YQ8UPh4JdRvEAWRWeY8UKqzhNalV4rK2NFPA9F4yTVPoWW158gds9FVj/Qwz0wtY6J+GuykKvVLPyfPzDVef9EMZrD/6uMoJ1SrLLUoXMWN3/rqHbljrC6J7LkXYDNaOF3UoFt9SgOfuKRqbd3bnZMW/2hORsGkipfP2ZTwio+aFG1onOEB40m37Iy7wNUGGnPMqO5Kf5xQtNKWk3J/dFOQmylhZRWcA5rhNUROa6krJAA7HdMErvkEhWEx+5RExs4lnh0rHn8QjQVXwd3E5C+N557FJhhn2Z7kgPSHXOjq5TlkQdDMiHAfOIhAgUqSNevgcLN8aYazSCZAUz4+1mgcpetrYGmXm5/UC8vauznAotXrSSPfxTv42+PTKXrZpGPnDV81yZZnI9qOD6MBug3qqKQK5Lu0+kPgCenWYzcoQt8J0NM1EEw+gZ9ed7nndwdmCbuRbvPtZvanZjZPjEWMNPzmMLe+WLHtaKfpqhm1AOnpmvbkOZh8jvpbpUQmH9WwkYaTGmrd+w0n6GQfTybM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230016)(4636009)(346002)(39850400004)(366004)(136003)(396003)(376002)(86362001)(4326008)(66946007)(8676002)(66476007)(30864003)(38100700002)(110136005)(66556008)(54906003)(36756003)(82960400001)(31686004)(31696002)(66574015)(186003)(6506007)(26005)(6512007)(41300700001)(478600001)(2616005)(7416002)(316002)(2906002)(5660300002)(6486002)(8936002)(83380400001)(43740500002)(45980500001); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?N2NqUk1sUWN6SjBMVTZOa0J4RXFOU0RxaW5HYUVnczV2SzdpZXRHNlRBNGpS?= =?utf-8?B?a2Fhajc1SURtUEM4d3lGZlZMaUxsdUxFOTRaSUhKUTJnUlpYVmI0SXVKOXBN?= =?utf-8?B?czBzZlY3ek1Qc05oejlXY0RKMUhrY0ExNjJUanM5Ukd3NkhCbDV1TjQxTkh1?= =?utf-8?B?MDFMNm4xRW1vV1B1VGdMOVM2Q2g5RTFFU0l2ODdJOVBOaGZJbVBwMVdIbDVC?= =?utf-8?B?eDBjMG83OUx2WXJZVHFvZHVWd2NxMTN5R01jTDROK2UvVVplVk9BNnA5SEJh?= =?utf-8?B?czUrVUtlOU9kci9pUlFXQTJwT25xZ0tONCt5ZEwxbHNpM21pcnNLbkhnbGZv?= =?utf-8?B?cGZyYXkvUWg1Q0NKeE5iOXBUZWxrdVdibWFsVXdiekRvUGlIQkJlaGE2NTc1?= =?utf-8?B?WkNOaW1PcnNGTzZWa0o3NVg2NzZLam56OUQ4elhxcUo1Vm9Lb2hDTlkvQ1k2?= =?utf-8?B?Y3BZK3BkbTVQRmRrNzRMZXVISkdnQ3VYazg1NVVtTWRLSGlCWGZyd2JpQ0V5?= =?utf-8?B?citpQ04vM0JwRnh1ZHZyZHh5dXBNdlgzdlJReUZJY3hjREZxS3lGMGFkL1dY?= =?utf-8?B?UWZGZGxKcjhPRGlWZ1A3UmIxTktzMWVWT0Izbi9HOWc3MlpyOHd3ekVVMGJy?= =?utf-8?B?WlVSSHNwaUl4RHkraG5PcFJEL3ZWSERCdEpiQmh1Q1Z0ZzZhcnFxNW9DcXVR?= =?utf-8?B?QW1pUkVOYy9xOXF0VmtiZkUzTXovSHlOTjBMM1h5T09helVNWXFSV1ZRQ0lM?= =?utf-8?B?VkJ6bVo3dEtpaTJrT05IRlo0cGNxc2FhTFlqKzNia1poc21hZ3BaN1pEQlZr?= =?utf-8?B?L1lXSlFBSXhNbERuNzEyRkRGWlZudnVQdmZ1TFFvazR6cXV6UEw2MDZITlo5?= =?utf-8?B?REpJMUFxd0x4aGs4QTV6ZjJzVmNMcitLQmZjVXAwMUhneW5UTUlWV3diMjZZ?= =?utf-8?B?SVNnc3lZUE4rK0JaenBMc2F5WE9FOTB4eGc0T0xhYVA5c2IvOTBURGlSNFM0?= =?utf-8?B?R0VhVkxDck1HQmt3aGlpZ1lCOXpGQXd0VkZaQnJBU0pUK3VzZ1dYRWVhd0pR?= =?utf-8?B?SXVjZzMvalN2NU82N2tCRk02NnNyUlhvMU1LUWdsd0t3WVRxa05yb2FMcjJN?= =?utf-8?B?cExRSFhzQWwwWWY5UVZVL282L1FHWWt6T0VsVXU2N1BDNTE2dWt6M1VTWDZo?= =?utf-8?B?a3FUWnE3bUpVOEtEc1hNK1AwUGZpRU9WSTBPUjlmN1lmeDYvbFV3aTFvMFBR?= =?utf-8?B?YUtTZURjNzBBWk9XTzlPdVczOTZ6Mk1oekY0WUpHTUVvQmd6M3pYdTRod2l3?= =?utf-8?B?dHhndFhxR0RnYjZUbGxMaU1DQkpjRnpQUlZUZWNvYkM5bGQ5bTgra0lacTlW?= =?utf-8?B?Q0NnOXVkNDFxZG5OZEZXTjBWcE10Slg0REIyYitsOWg4dy9hcFN1dFY1REJy?= =?utf-8?B?VnpNUlNyNGZzN1Rpci9wRmducEZBTGFVWFd0bms4ZU1KOTVGVVl6YksvK2Nj?= =?utf-8?B?b0hCazcwSkRma0MwUlJCOXZONEtZSkdsVkNHYldrL0Zjdnk5Y0tkR29kT1Qy?= =?utf-8?B?QjNuTFRJc2JWMVQ0cVNZZ2VZMmJiOVVOL1hUdndlTjhZSE4wR2ZEUWtIYklR?= =?utf-8?B?bC91MGlscVZYeXZiYVA1VElFSmpYNjJ6c0RoSVRsY1NsVmNyODN3OFFmT3RU?= =?utf-8?B?NkFMWUwxOWhlR3ZsQ2F6YU91R3RvY09aZ25DVEQ0QnNMY2x5c0Y5SHh1UHE3?= =?utf-8?B?SXBQWWpoeWdxWWRGclByZTBUMG51QSs2MWV1YThzekpDSUFZaTVYekRrNGRE?= =?utf-8?B?cS9PTWZFWXhxZzVBTUpzSlA4OHdnTytvWG5tYVVOc0JyM3lZNTRpaDY2MjRa?= =?utf-8?B?Rkl2czRUd1kyTjhlTGRwaE4zcXVqWU5BZlBCOVlaTUZUZVRrWEdvdnByN3Va?= =?utf-8?B?a3plOXZ2ak1CaDJnZHRJMXF2RTFYQ2ZwSFphcHpXUWJBV3VuMDEyUllxTURw?= =?utf-8?B?dG9ESDV4OC84Y2VKSUtyVzRmY3J6RG1NOUUxRkpRa3RneTNud0oxMk1McTdD?= =?utf-8?B?ZGNPNUxxc0Y2UnY2dWF0RVowS0hveXhicVJrWVNJWFp3ZUpzaUtKMXJHU0Jl?= =?utf-8?B?d2x1OW9NS3Y3Znd0Sk5WTXNWN2FET0MyMmdiS251dkRlbU5sQkw4VzJ3ODdh?= =?utf-8?B?MkE9PQ==?= X-OriginatorOrg: softathome.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2796e531-87a7-47ad-2732-08da85cb8d91 X-MS-Exchange-CrossTenant-AuthSource: PR0P264MB2741.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Aug 2022 12:24:12.8957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: aa10e044-e405-4c10-8353-36b4d0cce511 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: IL3NyThpo3BDWu+cu/OSOp/sBMg9RRY/+7yEB75AJwSrw2U+mTCGVZWOcAXZq483bn9lJh1KD+WTHycL9DlodM4IPcXDS/36PT3jpRun5Qg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB2580 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Hi William, Le 15/08/2022 à 20:55, William Zhang a écrit : > BCM68360 is a variant within the BCM6856 chip family. Now that BCM6856 > is supported under CONFIG_ARCH_BCMBCA and CONFIG_BCM6856, remove the > original ARCH_BCM68360 support and migrate its configuration and dts > settings. This includes: > - Remove the bcm968360bg board folder. It is replaced by the generic > bcmbca board folder. > - Merge the 68360.dtsi setting to the new 6856.dtsi file. Update board > dts with the new compatible string. > - Merge broadcom_bcm968360bg.h setting to the new bcm96856.h file. > > Signed-off-by: William Zhang Reviewed-by: Philippe Reynes > > --- > > Changes in v2: > - Bring Philippe Reynes copyright tag from 68360 dts to 6856 dts > > arch/arm/Kconfig | 7 - > arch/arm/dts/Makefile | 6 +- > arch/arm/dts/bcm68360.dtsi | 217 ----------------------- > arch/arm/dts/bcm6856.dtsi | 150 ++++++++++++++++ > arch/arm/dts/bcm968360bg.dts | 6 +- > board/broadcom/bcm968360bg/Kconfig | 17 -- > board/broadcom/bcm968360bg/MAINTAINERS | 6 - > board/broadcom/bcm968360bg/Makefile | 3 - > board/broadcom/bcm968360bg/bcm968360bg.c | 62 ------- > configs/bcm968360bg_ram_defconfig | 10 +- > include/configs/bcm96856.h | 4 + > include/configs/broadcom_bcm968360bg.h | 32 ---- > 12 files changed, 164 insertions(+), 356 deletions(-) > delete mode 100644 arch/arm/dts/bcm68360.dtsi > delete mode 100644 board/broadcom/bcm968360bg/Kconfig > delete mode 100644 board/broadcom/bcm968360bg/MAINTAINERS > delete mode 100644 board/broadcom/bcm968360bg/Makefile > delete mode 100644 board/broadcom/bcm968360bg/bcm968360bg.c > delete mode 100644 include/configs/broadcom_bcm968360bg.h > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index da4defa08466..3f124ab0ce85 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -672,12 +672,6 @@ config ARCH_BCM6753 > select OF_CONTROL > imply CMD_DM > > -config ARCH_BCM68360 > - bool "Broadcom BCM68360 family" > - select DM > - select OF_CONTROL > - imply CMD_DM > - > config ARCH_BCM6858 > bool "Broadcom BCM6858 family" > select DM > @@ -2280,7 +2274,6 @@ source "board/armltd/vexpress/Kconfig" > source "board/armltd/vexpress64/Kconfig" > source "board/cortina/presidio-asic/Kconfig" > source "board/broadcom/bcm96753ref/Kconfig" > -source "board/broadcom/bcm968360bg/Kconfig" > source "board/broadcom/bcm968580xref/Kconfig" > source "board/broadcom/bcmns3/Kconfig" > source "board/cavium/thunderx/Kconfig" > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index a32bdf8c9f17..a0ea9fa6029d 100644 > --- a/arch/arm/dts/Makefile > +++ b/arch/arm/dts/Makefile > @@ -1147,9 +1147,6 @@ dtb-$(CONFIG_ARCH_BCM283X) += \ > bcm2837-rpi-cm3-io3.dtb \ > bcm2711-rpi-4-b.dtb > > -dtb-$(CONFIG_ARCH_BCM68360) += \ > - bcm968360bg.dtb > - > dtb-$(CONFIG_ARCH_BCM6753) += \ > bcm96753ref.dtb > > @@ -1183,7 +1180,8 @@ dtb-$(CONFIG_BCM6813) += \ > dtb-$(CONFIG_BCM6846) += \ > bcm96846.dtb > dtb-$(CONFIG_BCM6856) += \ > - bcm96856.dtb > + bcm96856.dtb \ > + bcm968360bg.dtb > dtb-$(CONFIG_BCM6878) += \ > bcm96878.dtb > > diff --git a/arch/arm/dts/bcm68360.dtsi b/arch/arm/dts/bcm68360.dtsi > deleted file mode 100644 > index 7bbe207794eb..000000000000 > --- a/arch/arm/dts/bcm68360.dtsi > +++ /dev/null > @@ -1,217 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright (C) 2020 Philippe Reynes > - */ > - > -#include "skeleton64.dtsi" > - > -/ { > - compatible = "brcm,bcm68360"; > - #address-cells = <2>; > - #size-cells = <2>; > - > - aliases { > - spi0 = &hsspi; > - }; > - > - cpus { > - #address-cells = <2>; > - #size-cells = <0>; > - u-boot,dm-pre-reloc; > - > - cpu0: cpu@0 { > - compatible = "arm,cortex-a53", "arm,armv8"; > - device_type = "cpu"; > - reg = <0x0 0x0>; > - next-level-cache = <&l2>; > - u-boot,dm-pre-reloc; > - }; > - > - cpu1: cpu@1 { > - compatible = "arm,cortex-a53", "arm,armv8"; > - device_type = "cpu"; > - reg = <0x0 0x1>; > - next-level-cache = <&l2>; > - u-boot,dm-pre-reloc; > - }; > - > - l2: l2-cache0 { > - compatible = "cache"; > - u-boot,dm-pre-reloc; > - }; > - }; > - > - clocks { > - compatible = "simple-bus"; > - #address-cells = <2>; > - #size-cells = <2>; > - ranges; > - u-boot,dm-pre-reloc; > - > - periph_osc: periph-osc { > - compatible = "fixed-clock"; > - #clock-cells = <0>; > - clock-frequency = <200000000>; > - u-boot,dm-pre-reloc; > - }; > - > - hsspi_pll: hsspi-pll { > - compatible = "fixed-factor-clock"; > - #clock-cells = <0>; > - clocks = <&periph_osc>; > - clock-mult = <2>; > - clock-div = <1>; > - }; > - > - refclk50mhz: refclk50mhz { > - compatible = "fixed-clock"; > - #clock-cells = <0>; > - clock-frequency = <50000000>; > - }; > - }; > - > - ubus { > - compatible = "simple-bus"; > - #address-cells = <2>; > - #size-cells = <2>; > - u-boot,dm-pre-reloc; > - > - wdt1: watchdog@ff800480 { > - compatible = "brcm,bcm6345-wdt"; > - reg = <0x0 0xff800480 0x0 0x14>; > - clocks = <&refclk50mhz>; > - }; > - > - wdt2: watchdog@ff8004c0 { > - compatible = "brcm,bcm6345-wdt"; > - reg = <0x0 0xff8004c0 0x0 0x14>; > - clocks = <&refclk50mhz>; > - }; > - > - wdt-reboot { > - compatible = "wdt-reboot"; > - wdt = <&wdt1>; > - }; > - > - uart0: serial@ff800640 { > - compatible = "brcm,bcm6345-uart"; > - reg = <0x0 0xff800640 0x0 0x18>; > - clocks = <&periph_osc>; > - > - status = "disabled"; > - }; > - > - leds: led-controller@ff800800 { > - compatible = "brcm,bcm6858-leds"; > - reg = <0x0 0xff800800 0x0 0xe4>; > - > - status = "disabled"; > - }; > - > - gpio0: gpio-controller@0xff800500 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0x0 0xff800500 0x0 0x4>, > - <0x0 0xff800520 0x0 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio1: gpio-controller@0xff800504 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0x0 0xff800504 0x0 0x4>, > - <0x0 0xff800524 0x0 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio2: gpio-controller@0xff800508 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0x0 0xff800508 0x0 0x4>, > - <0x0 0xff800528 0x0 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio3: gpio-controller@0xff80050c { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0x0 0xff80050c 0x0 0x4>, > - <0x0 0xff80052c 0x0 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio4: gpio-controller@0xff800510 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0x0 0xff800510 0x0 0x4>, > - <0x0 0xff800530 0x0 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio5: gpio-controller@0xff800514 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0x0 0xff800514 0x0 0x4>, > - <0x0 0xff800534 0x0 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio6: gpio-controller@0xff800518 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0x0 0xff800518 0x0 0x4>, > - <0x0 0xff800538 0x0 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio7: gpio-controller@0xff80051c { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0x0 0xff80051c 0x0 0x4>, > - <0x0 0xff80053c 0x0 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - hsspi: spi-controller@ff801000 { > - compatible = "brcm,bcm6328-hsspi"; > - #address-cells = <1>; > - #size-cells = <0>; > - reg = <0x0 0xff801000 0x0 0x600>; > - clocks = <&hsspi_pll>, <&hsspi_pll>; > - clock-names = "hsspi", "pll"; > - spi-max-frequency = <100000000>; > - num-cs = <8>; > - > - status = "disabled"; > - }; > - > - nand: nand-controller@ff801800 { > - compatible = "brcm,nand-bcm68360", > - "brcm,brcmnand-v5.0", > - "brcm,brcmnand"; > - reg-names = "nand", "nand-int-base", "nand-cache"; > - reg = <0x0 0xff801800 0x0 0x180>, > - <0x0 0xff802000 0x0 0x10>, > - <0x0 0xff801c00 0x0 0x200>; > - parameter-page-big-endian = <0>; > - > - status = "disabled"; > - }; > - }; > -}; > diff --git a/arch/arm/dts/bcm6856.dtsi b/arch/arm/dts/bcm6856.dtsi > index 0bce6497219f..99185ab0bcaf 100644 > --- a/arch/arm/dts/bcm6856.dtsi > +++ b/arch/arm/dts/bcm6856.dtsi > @@ -1,5 +1,6 @@ > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > + * Copyright (C) 2020 Philippe Reynes > * Copyright 2022 Broadcom Ltd. > */ > > @@ -54,11 +55,29 @@ > }; > > clocks: clocks { > + u-boot,dm-pre-reloc; > + > periph_clk:periph-clk { > compatible = "fixed-clock"; > #clock-cells = <0>; > clock-frequency = <200000000>; > }; > + > + hsspi_pll: hsspi-pll { > + compatible = "fixed-factor-clock"; > + #clock-cells = <0>; > + clocks = <&periph_clk>; > + clock-mult = <2>; > + clock-div = <1>; > + }; > + > + wdt_clk: wdt-clk { > + compatible = "fixed-factor-clock"; > + #clock-cells = <0>; > + clocks = <&periph_clk>; > + clock-div = <4>; > + clock-mult = <1>; > + }; > }; > > psci { > @@ -90,6 +109,7 @@ > #address-cells = <1>; > #size-cells = <1>; > ranges = <0x0 0x0 0xff800000 0x800000>; > + u-boot,dm-pre-reloc; > > uart0: serial@640 { > compatible = "brcm,bcm6345-uart"; > @@ -99,5 +119,135 @@ > clock-names = "refclk"; > status = "disabled"; > }; > + > + wdt1: watchdog@480 { > + compatible = "brcm,bcm6345-wdt"; > + reg = <0x480 0x14>; > + clocks = <&wdt_clk>; > + }; > + > + wdt2: watchdog@4c0 { > + compatible = "brcm,bcm6345-wdt"; > + reg = <0x4c0 0x14>; > + clocks = <&wdt_clk>; > + }; > + > + wdt-reboot { > + compatible = "wdt-reboot"; > + wdt = <&wdt1>; > + }; > + > + leds: led-controller@800 { > + compatible = "brcm,bcm6858-leds"; > + reg = <0x800 0xe4>; > + > + status = "disabled"; > + }; > + > + gpio0: gpio-controller@500 { > + compatible = "brcm,bcm6345-gpio"; > + reg = <0x500 0x4>, > + <0x520 0x4>; > + gpio-controller; > + #gpio-cells = <2>; > + > + status = "disabled"; > + }; > + > + gpio1: gpio-controller@504 { > + compatible = "brcm,bcm6345-gpio"; > + reg = <0x504 0x4>, > + <0x524 0x4>; > + gpio-controller; > + #gpio-cells = <2>; > + > + status = "disabled"; > + }; > + > + gpio2: gpio-controller@508 { > + compatible = "brcm,bcm6345-gpio"; > + reg = <0x508 0x4>, > + <0x528 0x4>; > + gpio-controller; > + #gpio-cells = <2>; > + > + status = "disabled"; > + }; > + > + gpio3: gpio-controller@50c { > + compatible = "brcm,bcm6345-gpio"; > + reg = <0x50c 0x4>, > + <0x52c 0x4>; > + gpio-controller; > + #gpio-cells = <2>; > + > + status = "disabled"; > + }; > + > + gpio4: gpio-controller@510 { > + compatible = "brcm,bcm6345-gpio"; > + reg = <0x510 0x4>, > + <0x530 0x4>; > + gpio-controller; > + #gpio-cells = <2>; > + > + status = "disabled"; > + }; > + > + gpio5: gpio-controller@514 { > + compatible = "brcm,bcm6345-gpio"; > + reg = <0x514 0x4>, > + <0x534 0x4>; > + gpio-controller; > + #gpio-cells = <2>; > + > + status = "disabled"; > + }; > + > + gpio6: gpio-controller@518 { > + compatible = "brcm,bcm6345-gpio"; > + reg = <0x518 0x4>, > + <0x538 0x4>; > + gpio-controller; > + #gpio-cells = <2>; > + > + status = "disabled"; > + }; > + > + gpio7: gpio-controller@51c { > + compatible = "brcm,bcm6345-gpio"; > + reg = <0x51c 0x4>, > + <0x53c 0x4>; > + gpio-controller; > + #gpio-cells = <2>; > + > + status = "disabled"; > + }; > + > + hsspi: spi-controller@1000 { > + compatible = "brcm,bcm6328-hsspi"; > + #address-cells = <1>; > + #size-cells = <0>; > + reg = <0x1000 0x600>; > + clocks = <&hsspi_pll>, <&hsspi_pll>; > + clock-names = "hsspi", "pll"; > + spi-max-frequency = <100000000>; > + num-cs = <8>; > + > + status = "disabled"; > + }; > + > + nand: nand-controller@1800 { > + compatible = "brcm,nand-bcm68360", > + "brcm,brcmnand-v5.0", > + "brcm,brcmnand"; > + reg-names = "nand", "nand-int-base", "nand-cache"; > + reg = <0x1800 0x180>, > + <0x2000 0x10>, > + <0x1c00 0x200>; > + parameter-page-big-endian = <0>; > + > + status = "disabled"; > + }; > }; > }; > diff --git a/arch/arm/dts/bcm968360bg.dts b/arch/arm/dts/bcm968360bg.dts > index c060294cc925..6f1090aa8eee 100644 > --- a/arch/arm/dts/bcm968360bg.dts > +++ b/arch/arm/dts/bcm968360bg.dts > @@ -5,11 +5,11 @@ > > /dts-v1/; > > -#include "bcm68360.dtsi" > +#include "bcm6856.dtsi" > > / { > - model = "Broadcom bcm68360bg"; > - compatible = "broadcom,bcm68360bg", "brcm,bcm68360"; > + model = "Broadcom BCM968360BG Reference Board"; > + compatible = "brcm,bcm968360bg", "brcm,bcm6856", "brcm,bcmbca"; > > aliases { > serial0 = &uart0; > diff --git a/board/broadcom/bcm968360bg/Kconfig b/board/broadcom/bcm968360bg/Kconfig > deleted file mode 100644 > index dd372f126aef..000000000000 > --- a/board/broadcom/bcm968360bg/Kconfig > +++ /dev/null > @@ -1,17 +0,0 @@ > -if ARCH_BCM68360 > - > -config SYS_VENDOR > - default "broadcom" > - > -config SYS_BOARD > - default "bcm968360bg" > - > -config SYS_CONFIG_NAME > - default "broadcom_bcm968360bg" > - > -endif > - > -config TARGET_BCM968360BG > - bool "Support Broadcom bcm968360bg" > - depends on ARCH_BCM68360 > - select ARM64 > diff --git a/board/broadcom/bcm968360bg/MAINTAINERS b/board/broadcom/bcm968360bg/MAINTAINERS > deleted file mode 100644 > index cfcbbc51f8e6..000000000000 > --- a/board/broadcom/bcm968360bg/MAINTAINERS > +++ /dev/null > @@ -1,6 +0,0 @@ > -BCM968360BG BOARD > -M: Philippe Reynes > -S: Maintained > -F: board/broadcom/bcm968360bg > -F: include/configs/broadcom_bcm968360bg.h > -F: configs/bcm968360bg_ram_defconfig > diff --git a/board/broadcom/bcm968360bg/Makefile b/board/broadcom/bcm968360bg/Makefile > deleted file mode 100644 > index d099c1cf3569..000000000000 > --- a/board/broadcom/bcm968360bg/Makefile > +++ /dev/null > @@ -1,3 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > - > -obj-y += bcm968360bg.o > diff --git a/board/broadcom/bcm968360bg/bcm968360bg.c b/board/broadcom/bcm968360bg/bcm968360bg.c > deleted file mode 100644 > index 90af6b88bd47..000000000000 > --- a/board/broadcom/bcm968360bg/bcm968360bg.c > +++ /dev/null > @@ -1,62 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright (C) 2020 Philippe Reynes > - */ > - > -#include > -#include > -#include > -#include > - > -#ifdef CONFIG_ARM64 > -#include > - > -static struct mm_region broadcom_bcm968360bg_mem_map[] = { > - { > - /* RAM */ > - .virt = 0x00000000UL, > - .phys = 0x00000000UL, > - .size = 8UL * SZ_1G, > - .attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) | > - PTE_BLOCK_INNER_SHARE > - }, { > - /* SoC */ > - .virt = 0x80000000UL, > - .phys = 0x80000000UL, > - .size = 0xff80000000UL, > - .attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | > - PTE_BLOCK_NON_SHARE | > - PTE_BLOCK_PXN | PTE_BLOCK_UXN > - }, { > - /* List terminator */ > - 0, > - } > -}; > - > -struct mm_region *mem_map = broadcom_bcm968360bg_mem_map; > -#endif > - > -int board_init(void) > -{ > - return 0; > -} > - > -int dram_init(void) > -{ > - if (fdtdec_setup_mem_size_base() != 0) > - printf("fdtdec_setup_mem_size_base() has failed\n"); > - > - return 0; > -} > - > -int dram_init_banksize(void) > -{ > - fdtdec_setup_memory_banksize(); > - > - return 0; > -} > - > -int print_cpuinfo(void) > -{ > - return 0; > -} > diff --git a/configs/bcm968360bg_ram_defconfig b/configs/bcm968360bg_ram_defconfig > index 7f9093c6f6d3..c10e15e04fe8 100644 > --- a/configs/bcm968360bg_ram_defconfig > +++ b/configs/bcm968360bg_ram_defconfig > @@ -1,15 +1,17 @@ > CONFIG_ARM=y > CONFIG_SKIP_LOWLEVEL_INIT=y > -CONFIG_ARCH_BCM68360=y > +CONFIG_COUNTER_FREQUENCY=50000000 > +CONFIG_ARCH_BCMBCA=y > CONFIG_SYS_TEXT_BASE=0x10000000 > CONFIG_SYS_MALLOC_LEN=0x100000 > CONFIG_SYS_MALLOC_F_LEN=0x8000 > -CONFIG_NR_DRAM_BANKS=1 > +CONFIG_BCM6856=y > +CONFIG_TARGET_BCM96856=y > +CONFIG_NR_DRAM_BANKS=2 > CONFIG_ENV_SIZE=0x2000 > CONFIG_DM_GPIO=y > CONFIG_DEFAULT_DEVICE_TREE="bcm968360bg" > CONFIG_SYS_LOAD_ADDR=0x10000000 > -CONFIG_TARGET_BCM968360BG=y > CONFIG_ENV_VARS_UBOOT_CONFIG=y > CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x11000000 > @@ -52,9 +54,7 @@ CONFIG_SPI_FLASH_SFDP_SUPPORT=y > CONFIG_SPI_FLASH_MACRONIX=y > CONFIG_SPECIFY_CONSOLE_INDEX=y > CONFIG_CONS_INDEX=0 > -CONFIG_DM_SERIAL=y > CONFIG_SERIAL_SEARCH_ALL=y > -CONFIG_BCM6345_SERIAL=y > CONFIG_SPI=y > CONFIG_DM_SPI=y > CONFIG_BCM63XX_HSSPI=y > diff --git a/include/configs/bcm96856.h b/include/configs/bcm96856.h > index a7ae71eeaafe..3050cf337229 100644 > --- a/include/configs/bcm96856.h > +++ b/include/configs/bcm96856.h > @@ -8,4 +8,8 @@ > > #define CONFIG_SYS_SDRAM_BASE 0x00000000 > > +#ifdef CONFIG_MTD_RAW_NAND > +#define CONFIG_SYS_MAX_NAND_DEVICE 1 > +#endif /* CONFIG_MTD_RAW_NAND */ > + > #endif > diff --git a/include/configs/broadcom_bcm968360bg.h b/include/configs/broadcom_bcm968360bg.h > deleted file mode 100644 > index 8a8023571236..000000000000 > --- a/include/configs/broadcom_bcm968360bg.h > +++ /dev/null > @@ -1,32 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * Copyright (C) 2020 Philippe Reynes > - */ > - > -#include > - > -/* > - * common > - */ > - > -/* UART */ > -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \ > - 230400, 500000, 1500000 } > -/* Memory usage */ > - > -/* > - * 6858 > - */ > - > -/* RAM */ > -#define CONFIG_SYS_SDRAM_BASE 0x00000000 > - > -/* U-Boot */ > - > -#ifdef CONFIG_MTD_RAW_NAND > -#define CONFIG_SYS_MAX_NAND_DEVICE 1 > -#endif /* CONFIG_MTD_RAW_NAND */ > - > -/* > - * 968360bg > - */