From patchwork Mon Apr 24 12:34:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 86934 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2623425vqo; Mon, 24 Apr 2023 02:55:27 -0700 (PDT) X-Google-Smtp-Source: AKy350bLh66qhoXzuFZAUpSQdIYywjOC1ys6w/6/cTJ+FIY+lXfCsaFIDZy5PYDPzxw+bH49ghmC X-Received: by 2002:a05:6a20:7485:b0:f4:c0d6:87e with SMTP id p5-20020a056a20748500b000f4c0d6087emr4683230pzd.1.1682330127122; Mon, 24 Apr 2023 02:55:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682330127; cv=none; d=google.com; s=arc-20160816; b=NraI/lmHhO/IwUuLIGymTPXlDBfXaDCUIQ8GZxB5vQDaNmHQCtkrLpS+RaVkRof794 wDvINbQHa35C9ecuHfXyG2Oxa/af0XyIqC29uFqKnSmpMge5646GBfBx6po3gT/OVTqf Cxw48rBYhyHNxfKqr/MP/MR/0pl9lYy7vp3u14si7zGZ32YeoBPckePAnQero1ssRB1a xNJAaCDxY4Rki3wqrWI4jFcIPusA2p1q1AgMFaaa2UX+M4c8acyMBmPBjCJ6okZScuJP XlFUOmVDagAT0ycmaaybapOjhOj4P469YWRA6cHONJHhKqUXwj/mxFltfo3qNEKqBMY0 YQqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=K0s3KX6GF6McSsZMczUuy8UP6UIYgxJXDX0bg9N6kp0=; b=bNBJn7WM9kS2VBy3/lCPPghH6AhJMKSqIvVO8BmtrG9bABXP/82PH0awOOoJDvhzBH /7Sl9ArpGXbMadzNkvlmNsdemjPuB1CWbY340rs0vXMiw3mokVTVJ7blpw/q3gIrUsj1 PstNvxZOMa7OoOIOwevKPTwHMadGUqpu0PaZ5weH8R4328Lu5F9VSuLmVfk8RPhb5NBO YrwkPpjGmkslOK8CeKer9iZAnMSDVhi01m25kGPi+4/qeEekoi/20ijCDcRlYY414Vvv IBL8ty2r/0vrlScqwBsFFokPkTTFV9ylryE8Nyw6clz1nCK99o2FLaykY4gLSW2DA6+h QS/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@maquefel.me header.s=mail header.b=dupjRkbZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c6-20020a6566c6000000b00523eac95880si10781621pgw.503.2023.04.24.02.55.13; Mon, 24 Apr 2023 02:55:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail header.i=@maquefel.me header.s=mail header.b=dupjRkbZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231523AbjDXJvm (ORCPT + 99 others); Mon, 24 Apr 2023 05:51:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49700 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231156AbjDXJvj (ORCPT ); Mon, 24 Apr 2023 05:51:39 -0400 Received: from forward501b.mail.yandex.net (forward501b.mail.yandex.net [178.154.239.145]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A562B30F4 for ; Mon, 24 Apr 2023 02:51:32 -0700 (PDT) Received: from mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net [IPv6:2a02:6b8:c12:261e:0:640:2e3d:0]) by forward501b.mail.yandex.net (Yandex) with ESMTP id E94C85EB39; Mon, 24 Apr 2023 12:36:08 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id JZBb1pbWwKo0-7EvCIZZi; Mon, 24 Apr 2023 12:36:08 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1682328968; bh=K0s3KX6GF6McSsZMczUuy8UP6UIYgxJXDX0bg9N6kp0=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=dupjRkbZ0vNSlMnwgp9Div0rlFnF/JtZmoUZp22nuI0n/s1QpK9kUuJsnB+7Nl1pS izTx810GWSRVg2aUJXiKnXr8GGeWXrx/pZv36sxy2VRBiiCwW90ZdjTkyExsexXOvZ mNA0wUpaI3r5I3/zcjWVQvQ/pqlA8kjDO/NowDfM= Authentication-Results: mail-nwsmtp-smtp-production-main-39.myt.yp-c.yandex.net; dkim=pass header.i=@maquefel.me From: Nikita Shubin Cc: Arnd Bergmann , Linus Walleij , Alexander Sverdlin , Russell King , Hartley Sweeten , Arnd Bergmann , "Russell King (Oracle)" , Nick Desaulniers , Nathan Chancellor , Masahiro Yamada , Nick Hawkins , Nicolas Saenz Julienne , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 35/43] ARM: ep93xx: DT for the Cirrus ep93xx SoC platforms Date: Mon, 24 Apr 2023 15:34:51 +0300 Message-Id: <20230424123522.18302-36-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230424123522.18302-1-nikita.shubin@maquefel.me> References: <20230424123522.18302-1-nikita.shubin@maquefel.me> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764050995128420295?= X-GMAIL-MSGID: =?utf-8?q?1764050995128420295?= This adds compulsory device tree support to the Cirrus ep93xx ARMv4 platform. - We select PINCTRL_EP93xx - We select COMMON_CLK_EP93XX, as clock driver moved out of platform code - We select ARCH_HAS_RESET_CONTROLLER And also we need ARM_ATAG_DTB_COMPAT to update device tree with information about memory passed from bootloader. We have to leave all MACH options as they are used for board checking before decomp, to turn off watchdog and ethernet DMA. Signed-off-by: Nikita Shubin --- Notes: rfc->v0 - fixed typo - removed board-dt.c completely Alexander Sverdlin: - platfrom -> platform arch/arm/Makefile | 1 - arch/arm/mach-ep93xx/Kconfig | 20 ++++++++++---------- arch/arm/mach-ep93xx/Makefile | 11 ----------- 3 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 arch/arm/mach-ep93xx/Makefile diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 485a439e22ca..8ad844ba777e 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -179,7 +179,6 @@ machine-$(CONFIG_ARCH_CLPS711X) += clps711x machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_DIGICOLOR) += digicolor machine-$(CONFIG_ARCH_DOVE) += dove -machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_EXYNOS) += exynos machine-$(CONFIG_ARCH_FOOTBRIDGE) += footbridge machine-$(CONFIG_ARCH_GEMINI) += gemini diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig index 703f3d232a60..812b71dcf60e 100644 --- a/arch/arm/mach-ep93xx/Kconfig +++ b/arch/arm/mach-ep93xx/Kconfig @@ -3,27 +3,27 @@ menuconfig ARCH_EP93XX bool "EP93xx-based" depends on ATAGS depends on ARCH_MULTI_V4T + # CONFIG_ARCH_MULTI_V7 is not set depends on CPU_LITTLE_ENDIAN + select ARCH_HAS_RESET_CONTROLLER select ARCH_SPARSEMEM_ENABLE select ARM_AMBA select ARM_VIC + select ARM_APPENDED_DTB # Old Redboot bootloaders deployed + select ARM_ATAG_DTB_COMPAT # we need this to update dt memory node + select COMMON_CLK_EP93XX + select EP93XX_TIMER select CLKSRC_MMIO select CPU_ARM920T select GPIOLIB + select PINCTRL + select PINCTRL_EP93XX help This enables support for the Cirrus EP93xx series of CPUs. if ARCH_EP93XX -menu "Cirrus EP93xx Implementation Options" - -config EP93XX_SOC_COMMON - bool - default y - select SOC_BUS - select LEDS_GPIO_REGISTER - -comment "EP93xx Platforms" +# menu "EP93xx Platforms" config MACH_BK3 bool "Support Liebherr BK3.1" @@ -103,6 +103,6 @@ config MACH_VISION_EP9307 Say 'Y' here if you want your kernel to support the Vision Engraving Systems EP9307 SoM. -endmenu +# endmenu endif diff --git a/arch/arm/mach-ep93xx/Makefile b/arch/arm/mach-ep93xx/Makefile deleted file mode 100644 index 62e37403df14..000000000000 --- a/arch/arm/mach-ep93xx/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0 -# -# Makefile for the linux kernel. -# -obj-y := core.o clock.o timer-ep93xx.o - -obj-$(CONFIG_EP93XX_DMA) += dma.o - -obj-$(CONFIG_MACH_EDB93XX) += edb93xx.o -obj-$(CONFIG_MACH_TS72XX) += ts72xx.o -obj-$(CONFIG_MACH_VISION_EP9307)+= vision_ep9307.o