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 F12CEC32796 for ; Wed, 24 Aug 2022 12:42:10 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D891E833B3; Wed, 24 Aug 2022 14:42:08 +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="HUlnnZE7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A0EAE81727; Wed, 24 Aug 2022 14:42:07 +0200 (CEST) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-eopbgr90070.outbound.protection.outlook.com [40.107.9.70]) (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 DE3FB84806 for ; Wed, 24 Aug 2022 14:42:03 +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=a53VAzFUZWo5QlB8oTUEjgp9sK2k3XrqKtXo3FCiscmPfhWsQN0dqMeiwLo1JZQ1QecO0+Sl5qx56i7MUNuyqktGAAP2FPPDclUDBFchExDM3Xkxr8llF9V68P4F+K6dcfGn42dJQu01iMgjgOhX6Tnq2a+FDrLSKZcjl4syKt3wr2/Is9H6pQ0pK2w1Scl9pdI5dtURY2XTxoDnjHgQ+82vm5zKzGbgyZtykjO9tnjeFhlitqH390ad3AJfyWoU30RBrzmfRBTEPNW5QU2CAayOr50PDF8uh1z8mVgOqfQthIojwhIJoMZMvEm/yduI/9BrtxW+VhYNoY57IryPaA== 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=TUTftCZGSHZP7jmz6Q8B9j1Vws7ku/44NkWwJeXfJrY=; b=NqC5ZT8YTUlZc6or7Erh0uQcL38qsuCBCQHS+BMb0bEMVR+VjmH/Bq2pF9qkx2isPvVS3u8JsVzf+UNUMKn4YQAH9SZK0rXZpi6GaptGkqPWHcgxnAnEp2D3j8NvD5nnI46nKh95xFTU+6MexyHSRPxtip5zOiD6A23CBkD6vzlRVr4icnry4UuH75LKyMMI1QqZ/MxZ/Ud4Oo3BoQTpuStQ7JJ9zddL6E06GrD+ovx5ddwqLa/9NzUyIeaboqP2dTnnUc/kh0Ci+xQW8lAT7Wgys2uDAeEXqBVIAPaX8aBnHR/VsLMhcYVU1d86X0R8JpH7rrwJRK1Vub2ujh1xPw== 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=TUTftCZGSHZP7jmz6Q8B9j1Vws7ku/44NkWwJeXfJrY=; b=HUlnnZE7zT6KedcDYROqB8uR6QQVWsM0Z+fZcMMUbybhNDouHVtOv3yewn60evgWYxD2moCGp+CCg9DsT/vpA+WuhPpu4mkeges4lm14dQBFXeR+OPEDo6UL7Adj+K+rkSrrR7CJrE4vbnOTk/10Ei/0EhZWhFEG8EKs9Ol/dWfD6L9Nn5wxmcY5VhC31XmmvtnUQIm98c9whv2OGmLivR0dddQZrB4T0mgeVwQrTDkVDeUdfy0VjQhs+DyzuIysaU2NUtM6ahAYx9HLRl9DZuqq8kjy/Sa7C2vE2yaYxXrXrAAzF/EuebVuL5Y0nwmXT2LIMzh1XNfhJFlNu2tXIA== 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 PAYP264MB3352.FRAP264.PROD.OUTLOOK.COM (2603:10a6:102:124::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5566.15; Wed, 24 Aug 2022 12:42:02 +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:42:02 +0000 Message-ID: <152d8bc1-4ba7-0d7b-bc0e-e71bb5e988a1@softathome.com> Date: Wed, 24 Aug 2022 14:42:01 +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 bcm6753 support under CONFIG_ARCH_BCM6753 Content-Language: en-US To: William Zhang , U-Boot Mailing List Cc: f.fainelli@gmail.com, anand.gore@broadcom.com, rafal@milecki.pl, dan.beygelman@broadcom.com, kursad.oney@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: <20220822184908.23121-1-william.zhang@broadcom.com> <20220822114410.v2.2.Ie2b7550f9e0a8de6b575ce18c0ddfd5208d79d5d@changeid> From: Philippe REYNES In-Reply-To: <20220822114410.v2.2.Ie2b7550f9e0a8de6b575ce18c0ddfd5208d79d5d@changeid> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ClientProxiedBy: PR0P264CA0222.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1e::18) 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: 7926864d-8af9-4169-77a5-08da85ce0b16 X-MS-TrafficTypeDiagnostic: PAYP264MB3352:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VAFAFYbAELVAIsalQx1j7tqhU5J1r7R0rsWVh+ZUiHjKbbY/zSzQpoY0DJwsCBUtZYraOq6J1GJDLUnnOXVh5f7spe9tVpzqOjY0A5+/QQsGnwMI4j9h/ErW2q9yp2eeLsifFszjzob7pfStOLPA8pTCg0DfhwODIJxkymimQYfhcXMuKZMHwP2jtmujzkuI6ykc+LZ/JN0UJwbGMGYC25XDHm8tkEyhbF2zJCOR5A56nQPrg9CWMKICXS1faMz40npb+gsIfX+2kOXQrlbziK+USk0XFvxC7dGNN2WALhfChj8JckRuBVexu+AyihId5M0TgUIdbbypH0iVkUPlStuxfTlCCJqIgCkoxicaU8/ZcTyoVomhQ2U89NyNEEEziHJMww3HybnoCHLToNYhAXywWSUhGLw3uOBaAel0dPEKCFUgvi4nvFM94Vo8BgJ8kfb7Ig72sbwSELufCz8nYuziEwolLn1iBTitc56cbG0t+MQ3YT9l7xwqKWVQ0xWA0lG7UNptD38nXR2lJPlCgo3Rzpl+slSXNSJsH5YrBRG5HOr6G9ibL4o2nf3Hj6ZIz/+nG49IHXo1CZYAJujeNrEiOlZvFgih+n8BU3Jn5auHzkU9CNY5sYtq36KN3N4Bu8thvqBnnA+Y3O0P+Eu9E71PpWmbT4yXOeygGMwk9nGeB2kXjM7gVnAzsyHJb3idZ4Z3xVFLK4fYa5iiYg3rRPd+YkdIpg/rvqTOvbnxM3tO1vvx6+g28CrqGyCcy3PYbt7OZ7zNTMUFsl3cfnE+2kv7oGMWkYqYu+VBYoWoSdU= 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)(396003)(366004)(136003)(376002)(39850400004)(346002)(66946007)(66476007)(66556008)(38100700002)(2616005)(8676002)(186003)(31686004)(66574015)(30864003)(83380400001)(2906002)(7416002)(5660300002)(4326008)(41300700001)(6512007)(6506007)(26005)(82960400001)(8936002)(316002)(478600001)(36756003)(110136005)(54906003)(31696002)(86362001)(6486002)(45980500001)(43740500002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S1RUYUNGNlNWeVBRaWRzQmhVcjArallvQmZKdnVYRDlvZVlvN05zSnRoNHhZ?= =?utf-8?B?TlhmYVJ1U1RIcUxWeGtXV3NzdEpEWWxMUFJnUWNxdWlvRWpiaTQrUkl2YU9C?= =?utf-8?B?TEdyZzhzVlRMMWF6ZHp0WHpoQW5lYTVlemJoc1VwRURCZDBFSXduR21zbXhr?= =?utf-8?B?TlBkOVBMaTlocEFoTkJTSjNRb1U0d2ZVSTZ1VzluMHlEaTlaUGJkYjhCdHBq?= =?utf-8?B?cHZCT29FVmpHKysybTg3T2o2WFkwbTQ0ZithWkNmNldRandpaEVmYkc0d1Ex?= =?utf-8?B?UUZhcXJNeDZwdDJjT2Z1cTdXSTJSSlphYzREdEJvelU4ZWlsd09acDIwNWdQ?= =?utf-8?B?c0Z5MThzaXk1dlN1TkJrMWtsR3pvakJYNzMwbWdLZ3EvemM0eFR2NjhER0la?= =?utf-8?B?WllReE8wUCtZY0xJdEUxRlMzOXV2dlIxTDBsNzVHa1VjY3RNRThaVXJHemNH?= =?utf-8?B?Q0pycCtCVkNaNVlVWWhodVQ5anBxRGM3SHZ1L3hxQmxzZnZiT3pPOWsydGRB?= =?utf-8?B?Y04wOGNIdWRlZ0V4NjkyS3QvekpaNUFLdzRUY0R6NmJMOWJyMGlzc2xndUFT?= =?utf-8?B?bFVES3ZwYjBsaW5PakphOU5OL1V1UVpxdHY0OG1OcXhxSFBHRGoxYjh2V2hq?= =?utf-8?B?empVdDB2Wngzbjd0L0ZHSFZadGxvNTMvOVQ4SU9FWDlwQmdKUlVjeElMVjBt?= =?utf-8?B?UjRndXVJeUd4MDFnc0R3RDNVSTVvcThiTnU0VFZsSktHSXlyMHJMSStoTFlS?= =?utf-8?B?Wnh1WitoR3VzNVhRSlRCdS93bVhiMXE1U0VLZXVEM0IxUXFWYmZOcW9MVXJl?= =?utf-8?B?aFZhdmpkU3VyY29sU0p6bldMdkNHNHNUZjl1elhMK2hUNWVaeERhMlhnd2xl?= =?utf-8?B?RjJYVzMxV0ZxS1FpeFVSOHA0UXdEd3VqZloxc2thOERGdUxvdjFNZXpmYmtD?= =?utf-8?B?WW5tdVJtOU5LOTJRYUNVbVRPWDZEQWdZdlQ4YmJYMFkyYlhmK2ZCbFJVQ0JH?= =?utf-8?B?cFQ2dDdiaC9LdlgyRWJQSnBxcTVBanlyQUVZa1ZoVnQrSEdZTDNwTnJGS25U?= =?utf-8?B?K1hqUW1wcnowZVFtOHJKT3ZVS1JDSHBRUm16YlVEeUwzMEIxSU5haVN2T1Qx?= =?utf-8?B?U3ZJWjBKa1g0L1NSaWpaNGVpYzBDWVltVWJHaDgycmwzVTdhRzdYd1d5VUFt?= =?utf-8?B?d0VaT3VyUlFPR08rZ0QyaFJVL0hRY3NoWTZKbTZuL0ZKamhtRm9aS2pENzNs?= =?utf-8?B?U0l3WWcyMmxMT3RJUUhCaXdoUXMrOTY3b1phamtDSGU2ZGZHaCs4bG5xRVJX?= =?utf-8?B?NFR1R0h1TzFieHZMbVBEYnpJYlNBbHhMck1vNXY5a3ZsMUJGdzJGK21vc3BY?= =?utf-8?B?Umt5SHdlMEZuUTVFZjlkb24rMjVjb01TRkIxSzJZdkYxUDl3QXJsUElUL0Rx?= =?utf-8?B?M2FBNVFvdjNObWl0Yit1bGVMM0ZXYnhjWmloMGlobUo2ek5IL0J0QzFXSUZL?= =?utf-8?B?bWNZd1RyMUVLbmJQRmhzQVcxWWRLOFU5RnNVTk05dnVqZ1BmZUpuMDE5SGpX?= =?utf-8?B?UjBoUUExSEp5UmwybzRvQnF5SHZLeWpPVTRpUTRRRDNsemt6V1BxbFQreHZJ?= =?utf-8?B?bFlJc256cGc2UHlFRjYxWTNCMEgyck9HK3BEYkJVOExtQUJxMmM2Zk05cXRD?= =?utf-8?B?YitjemNXNW1VZTQ5TVgvYkVMaGN0QTFSK1FtOWNTdkRic1lCbklzMWJVTGZk?= =?utf-8?B?RnRVQ2xQTUhmbE1BbFhZbE1neFZ2Qk0rRnhhUFMyQ05ZVk5saTlrTnhxMFkx?= =?utf-8?B?MklGb2tvZmQ2WUZJMk1iclFqa0RUTndhQzBrWTdZTElDSlEyeEVJdWhnWnBS?= =?utf-8?B?MVZGWnlEZzBhZFJiUmpaaHZZQ3ZlOTltek1YS0FQSGFmTkhTQzIxZmhYZHE5?= =?utf-8?B?Q3N1TUhHaGFOSnpYZXhHYUVveTBsLzlRb2ZGRm5RSkpwYnNJNXVEUURVaTFl?= =?utf-8?B?bEJSVHpBUjRSUkdzbUN1NG0zZmw2akFtYU9yalRYMmRtQ25vMCtjUDU2SlJn?= =?utf-8?B?RmJGZTJ2aVB4d3pvU3BKbjc0TW1Cci9MdHJ2T2VZR1VzTDFYUWhCeHd5TDcz?= =?utf-8?B?elYvNENpdkRQZkM5bUU3VSt2U1VOWGdRNHB5dmlUeDJYQzg1ZE4yOHl1OHFX?= =?utf-8?Q?clGiAwW1nTRfMSYgXLVl4x4=3D?= X-OriginatorOrg: softathome.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7926864d-8af9-4169-77a5-08da85ce0b16 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:42:02.4781 (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: OCWhtACWGVeBBc2mQT4oDBsaMNncHiq8Nc1b2qGTq+ZIV4JKpsqQQyg8RQxa8f5lArzl8FNm5ajxhl0dwkRWvKmc4bKpVoAvW+vqUdqSfkM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAYP264MB3352 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 22/08/2022 à 20:49, William Zhang a écrit : > BCM6753 is essentially same as the main chip BCM6855 but with different > SKU number. Now that BCM6855 is supported under CONFIG_ARCH_BCMBCA and > CONFIG_BCM6855, remove the original ARCH_BCM6753 support and migrate its > configuration and dts settings. This includes: > - Remove the bcm96753ref board folder. It is replaced by the > generic bcmbca board folder. > - Merge the 6753.dtsi setting to the new 6855.dtsi file. Update > 96753ref board dts with the new compatible string. > - Delete broadcom_bcm96763ref.h and merge its setting to the new > bcm96855.h file. > - Delete bcm96753ref_ram_defconfig and use a basic config version of > bcm96855_defconfig > > Signed-off-by: William Zhang Reviewed-by: Philippe Reynes > --- > > (no changes since v1) > > arch/arm/Kconfig | 8 - > arch/arm/dts/Makefile | 6 +- > arch/arm/dts/bcm6753.dtsi | 208 ----------------------- > arch/arm/dts/bcm6855.dtsi | 137 +++++++++++++++ > arch/arm/dts/bcm96753ref.dts | 6 +- > board/broadcom/bcm96753ref/Kconfig | 16 -- > board/broadcom/bcm96753ref/MAINTAINERS | 6 - > board/broadcom/bcm96753ref/Makefile | 3 - > board/broadcom/bcm96753ref/bcm96753ref.c | 40 ----- > configs/bcm96753ref_ram_defconfig | 87 ---------- > include/configs/bcm96855.h | 4 + > include/configs/broadcom_bcm96753ref.h | 32 ---- > 12 files changed, 146 insertions(+), 407 deletions(-) > delete mode 100644 arch/arm/dts/bcm6753.dtsi > delete mode 100644 board/broadcom/bcm96753ref/Kconfig > delete mode 100644 board/broadcom/bcm96753ref/MAINTAINERS > delete mode 100644 board/broadcom/bcm96753ref/Makefile > delete mode 100644 board/broadcom/bcm96753ref/bcm96753ref.c > delete mode 100644 configs/bcm96753ref_ram_defconfig > delete mode 100644 include/configs/broadcom_bcm96753ref.h > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 063616ff8d0b..c1f195e9d106 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -665,13 +665,6 @@ config ARCH_BCM283X > imply CMD_DM > imply FAT_WRITE > > -config ARCH_BCM6753 > - bool "Broadcom BCM6753 family" > - select CPU_V7A > - select DM > - select OF_CONTROL > - imply CMD_DM > - > config ARCH_BCMSTB > bool "Broadcom BCM7XXX family" > select CPU_V7A > @@ -2267,7 +2260,6 @@ source "board/Marvell/octeontx2/Kconfig" > source "board/armltd/vexpress/Kconfig" > source "board/armltd/vexpress64/Kconfig" > source "board/cortina/presidio-asic/Kconfig" > -source "board/broadcom/bcm96753ref/Kconfig" > source "board/broadcom/bcmns3/Kconfig" > source "board/cavium/thunderx/Kconfig" > source "board/eets/pdu001/Kconfig" > diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile > index 5fd38cc63b63..8fba735cc8ab 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_BCM6753) += \ > - bcm96753ref.dtb > - > dtb-$(CONFIG_TARGET_BCMNS3) += ns3-board.dtb > > dtb-$(CONFIG_ARCH_BCMSTB) += bcm7xxx.dtb > @@ -1177,7 +1174,8 @@ dtb-$(CONFIG_BCM6813) += \ > dtb-$(CONFIG_BCM6846) += \ > bcm96846.dtb > dtb-$(CONFIG_BCM6855) += \ > - bcm96855.dtb > + bcm96855.dtb \ > + bcm96753ref.dtb > dtb-$(CONFIG_BCM6856) += \ > bcm96856.dtb \ > bcm968360bg.dtb > diff --git a/arch/arm/dts/bcm6753.dtsi b/arch/arm/dts/bcm6753.dtsi > deleted file mode 100644 > index e88ab095c290..000000000000 > --- a/arch/arm/dts/bcm6753.dtsi > +++ /dev/null > @@ -1,208 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright (C) 2022 Philippe Reynes > - */ > - > -#include "skeleton.dtsi" > - > -/ { > - compatible = "brcm,bcm6753"; > - #address-cells = <1>; > - #size-cells = <1>; > - > - cpus { > - #address-cells = <1>; > - #size-cells = <0>; > - u-boot,dm-pre-reloc; > - > - cpu0: cpu@0 { > - compatible = "arm,cortex-a7"; > - device_type = "cpu"; > - reg = <0x0>; > - next-level-cache = <&l2>; > - u-boot,dm-pre-reloc; > - }; > - > - cpu1: cpu@1 { > - compatible = "arm,cortex-a7"; > - device_type = "cpu"; > - reg = <0x1>; > - next-level-cache = <&l2>; > - u-boot,dm-pre-reloc; > - }; > - > - cpu2: cpu@2 { > - compatible = "arm,cortex-a7"; > - device_type = "cpu"; > - reg = <0x2>; > - 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 = <1>; > - #size-cells = <1>; > - 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 = <1>; > - #size-cells = <1>; > - u-boot,dm-pre-reloc; > - > - uart0: serial@ff812000 { > - compatible = "arm,pl011", "arm,primecell"; > - reg = <0xff812000 0x1000>; > - clock = <50000000>; > - > - status = "disabled"; > - }; > - > - wdt1: watchdog@ff800480 { > - compatible = "brcm,bcm6345-wdt"; > - reg = <0xff800480 0x14>; > - clocks = <&refclk50mhz>; > - }; > - > - wdt2: watchdog@ff8004c0 { > - compatible = "brcm,bcm6345-wdt"; > - reg = <0xff8004c0 0x14>; > - clocks = <&refclk50mhz>; > - }; > - > - wdt-reboot { > - compatible = "wdt-reboot"; > - wdt = <&wdt1>; > - }; > - > - gpio0: gpio-controller@0xff800500 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0xff800500 0x4>, > - <0xff800520 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio1: gpio-controller@0xff800504 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0xff800504 0x4>, > - <0xff800524 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio2: gpio-controller@0xff800508 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0xff800508 0x4>, > - <0xff800528 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio3: gpio-controller@0xff80050c { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0xff80050c 0x4>, > - <0xff80052c 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio4: gpio-controller@0xff800510 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0xff800510 0x4>, > - <0xff800530 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio5: gpio-controller@0xff800514 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0xff800514 0x4>, > - <0xff800534 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio6: gpio-controller@0xff800518 { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0xff800518 0x4>, > - <0xff800538 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - gpio7: gpio-controller@0xff80051c { > - compatible = "brcm,bcm6345-gpio"; > - reg = <0xff80051c 0x4>, > - <0xff80053c 0x4>; > - gpio-controller; > - #gpio-cells = <2>; > - > - status = "disabled"; > - }; > - > - nand: nand-controller@ff801800 { > - compatible = "brcm,nand-bcm6753", > - "brcm,brcmnand-v5.0", > - "brcm,brcmnand"; > - reg-names = "nand", "nand-int-base", "nand-cache"; > - reg = <0xff801800 0x180>, > - <0xff802000 0x10>, > - <0xff801c00 0x200>; > - parameter-page-big-endian = <0>; > - > - status = "disabled"; > - }; > - > - leds: led-controller@ff803000 { > - compatible = "brcm,bcm6753-leds"; > - reg = <0xff803000 0x3480>; > - > - status = "disabled"; > - }; > - }; > -}; > diff --git a/arch/arm/dts/bcm6855.dtsi b/arch/arm/dts/bcm6855.dtsi > index 620f51aee1a2..05e0a4e0da7c 100644 > --- a/arch/arm/dts/bcm6855.dtsi > +++ b/arch/arm/dts/bcm6855.dtsi > @@ -1,5 +1,6 @@ > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* > + * Copyright (C) 2022 Philippe Reynes > * Copyright 2022 Broadcom Ltd. > */ > > @@ -64,6 +65,8 @@ > }; > > clocks: clocks { > + u-boot,dm-pre-reloc; > + > periph_clk: periph-clk { > compatible = "fixed-clock"; > #clock-cells = <0>; > @@ -77,6 +80,22 @@ > clock-div = <4>; > clock-mult = <1>; > }; > + > + 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 { > @@ -107,6 +126,7 @@ > #address-cells = <1>; > #size-cells = <1>; > ranges = <0 0xff800000 0x800000>; > + u-boot,dm-pre-reloc; > > uart0: serial@12000 { > compatible = "arm,pl011", "arm,primecell"; > @@ -116,5 +136,122 @@ > clock-names = "uartclk", "apb_pclk"; > 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>; > + }; > + > + 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"; > + }; > + > + nand: nand-controller@1800 { > + compatible = "brcm,nand-bcm6753", > + "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"; > + }; > + > + leds: led-controller@3000 { > + compatible = "brcm,bcm6753-leds"; > + reg = <0x3000 0x3480>; > + > + status = "disabled"; > + }; > }; > }; > diff --git a/arch/arm/dts/bcm96753ref.dts b/arch/arm/dts/bcm96753ref.dts > index ca15ca5f108d..f74137f18f46 100644 > --- a/arch/arm/dts/bcm96753ref.dts > +++ b/arch/arm/dts/bcm96753ref.dts > @@ -5,13 +5,13 @@ > > /dts-v1/; > > -#include "bcm6753.dtsi" > +#include "bcm6855.dtsi" > > #include > > / { > - model = "Broadcom bcm6753ref"; > - compatible = "broadcom,bcm6753ref", "brcm,bcm6753"; > + model = "Broadcom BCM96753REF Reference Board"; > + compatible = "brcm,bcm96753ref", "brcm,bcm6855", "brcm,bcmbca"; > > aliases { > serial0 = &uart0; > diff --git a/board/broadcom/bcm96753ref/Kconfig b/board/broadcom/bcm96753ref/Kconfig > deleted file mode 100644 > index 479e7905787b..000000000000 > --- a/board/broadcom/bcm96753ref/Kconfig > +++ /dev/null > @@ -1,16 +0,0 @@ > -if TARGET_BCM96753REF > - > -config SYS_VENDOR > - default "broadcom" > - > -config SYS_BOARD > - default "bcm96753ref" > - > -config SYS_CONFIG_NAME > - default "broadcom_bcm96753ref" > - > -endif > - > -config TARGET_BCM96753REF > - bool "Support Broadcom bcm96753ref" > - depends on ARCH_BCM6753 > diff --git a/board/broadcom/bcm96753ref/MAINTAINERS b/board/broadcom/bcm96753ref/MAINTAINERS > deleted file mode 100644 > index be060f5a709c..000000000000 > --- a/board/broadcom/bcm96753ref/MAINTAINERS > +++ /dev/null > @@ -1,6 +0,0 @@ > -BROADCOM BCM96753REF > -M: Philippe Reynes > -S: Maintained > -F: board/broadcom/bcm96753ref > -F: include/configs/broadcom_bcm96753ref.h > -F: configs/bcm96753ref_ram_defconfig > diff --git a/board/broadcom/bcm96753ref/Makefile b/board/broadcom/bcm96753ref/Makefile > deleted file mode 100644 > index a1fa2bff8670..000000000000 > --- a/board/broadcom/bcm96753ref/Makefile > +++ /dev/null > @@ -1,3 +0,0 @@ > -# SPDX-License-Identifier: GPL-2.0+ > - > -obj-y += bcm96753ref.o > diff --git a/board/broadcom/bcm96753ref/bcm96753ref.c b/board/broadcom/bcm96753ref/bcm96753ref.c > deleted file mode 100644 > index bf78d843aa57..000000000000 > --- a/board/broadcom/bcm96753ref/bcm96753ref.c > +++ /dev/null > @@ -1,40 +0,0 @@ > -// SPDX-License-Identifier: GPL-2.0+ > -/* > - * Copyright (C) 2022 Philippe Reynes > - */ > - > -#include > -#include > -#include > -#include > - > -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; > -} > - > -void enable_caches(void) > -{ > - icache_enable(); > - dcache_enable(); > -} > diff --git a/configs/bcm96753ref_ram_defconfig b/configs/bcm96753ref_ram_defconfig > deleted file mode 100644 > index 59ac1cdf7e1e..000000000000 > --- a/configs/bcm96753ref_ram_defconfig > +++ /dev/null > @@ -1,87 +0,0 @@ > -CONFIG_ARM=y > -CONFIG_SKIP_LOWLEVEL_INIT=y > -CONFIG_SKIP_LOWLEVEL_INIT_ONLY=y > -CONFIG_SYS_ARCH_TIMER=y > -CONFIG_ARCH_BCM6753=y > -CONFIG_SYS_TEXT_BASE=0x1000000 > -CONFIG_SYS_MALLOC_F_LEN=0x1000 > -CONFIG_NR_DRAM_BANKS=1 > -CONFIG_ENV_SIZE=0x20000 > -CONFIG_DM_GPIO=y > -CONFIG_DEFAULT_DEVICE_TREE="bcm96753ref" > -CONFIG_ARMV7_LPAE=y > -CONFIG_SYS_LOAD_ADDR=0x1000000 > -CONFIG_TARGET_BCM96753REF=y > -CONFIG_ENV_VARS_UBOOT_CONFIG=y > -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y > -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x2000000 > -CONFIG_FIT=y > -CONFIG_FIT_SIGNATURE=y > -CONFIG_FIT_CIPHER=y > -CONFIG_FIT_VERBOSE=y > -CONFIG_LEGACY_IMAGE_FORMAT=y > -CONFIG_SUPPORT_RAW_INITRD=y > -CONFIG_OF_STDOUT_VIA_ALIAS=y > -# CONFIG_AUTOBOOT is not set > -CONFIG_SYS_CONSOLE_IS_IN_ENV=y > -CONFIG_HUSH_PARSER=y > -CONFIG_SYS_MAXARGS=24 > -CONFIG_SYS_CBSIZE=256 > -CONFIG_SYS_PBSIZE=276 > -# CONFIG_CMD_BOOTD is not set > -# CONFIG_BOOTM_NETBSD is not set > -# CONFIG_BOOTM_PLAN9 is not set > -# CONFIG_BOOTM_RTEMS is not set > -# CONFIG_BOOTM_VXWORKS is not set > -# CONFIG_CMD_ELF is not set > -# CONFIG_CMD_XIMG is not set > -# CONFIG_CMD_EXPORTENV is not set > -# CONFIG_CMD_IMPORTENV is not set > -# CONFIG_CMD_EDITENV is not set > -# CONFIG_CMD_SAVEENV is not set > -# CONFIG_CMD_ENV_EXISTS is not set > -# CONFIG_CMD_CRC32 is not set > -CONFIG_CMD_MEMINFO=y > -CONFIG_CMD_CLK=y > -CONFIG_CMD_GPIO=y > -# CONFIG_CMD_LOADS is not set > -CONFIG_CMD_MTD=y > -CONFIG_CMD_NAND=y > -CONFIG_CMD_SPI=y > -CONFIG_CMD_WDT=y > -# CONFIG_CMD_SETEXPR is not set > -CONFIG_CMD_CACHE=y > -CONFIG_CMD_MTDPARTS=y > -CONFIG_CMD_UBI=y > -# CONFIG_CMD_UBIFS is not set > -# CONFIG_NET is not set > -CONFIG_REGMAP=y > -CONFIG_SYSCON=y > -CONFIG_BUTTON=y > -CONFIG_BUTTON_GPIO=y > -CONFIG_CLK=y > -CONFIG_BCM6345_GPIO=y > -# CONFIG_INPUT is not set > -CONFIG_LED=y > -CONFIG_LED_BCM6753=y > -CONFIG_LED_BLINK=y > -CONFIG_LED_GPIO=y > -CONFIG_MISC=y > -# CONFIG_MMC is not set > -CONFIG_MTD=y > -CONFIG_DM_MTD=y > -CONFIG_MTD_RAW_NAND=y > -CONFIG_NAND_BRCMNAND=y > -CONFIG_NAND_BRCMNAND_6753=y > -CONFIG_PINCTRL=y > -CONFIG_PINCONF=y > -CONFIG_SPECIFY_CONSOLE_INDEX=y > -CONFIG_DM_SERIAL=y > -CONFIG_PL01X_SERIAL=y > -CONFIG_SPI=y > -CONFIG_DM_SPI=y > -CONFIG_SPI_MEM=y > -CONFIG_SYSRESET=y > -CONFIG_SYSRESET_WATCHDOG=y > -CONFIG_WDT_BCM6345=y > -CONFIG_REGEX=y > diff --git a/include/configs/bcm96855.h b/include/configs/bcm96855.h > index 6e420f2c66fb..ba2d8a317d25 100644 > --- a/include/configs/bcm96855.h > +++ b/include/configs/bcm96855.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_bcm96753ref.h b/include/configs/broadcom_bcm96753ref.h > deleted file mode 100644 > index 33c70c73c1fc..000000000000 > --- a/include/configs/broadcom_bcm96753ref.h > +++ /dev/null > @@ -1,32 +0,0 @@ > -/* SPDX-License-Identifier: GPL-2.0+ */ > -/* > - * Copyright (C) 2022 Philippe Reynes > - */ > - > -#include > - > -/* > - * common > - */ > - > -/* UART */ > -#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, \ > - 230400, 500000, 1500000 } > -/* Memory usage */ > - > -/* > - * 6853 > - */ > - > -/* 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 */ > - > -/* > - * 96753ref > - */