From patchwork Thu Jun 1 05:45:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Shubin X-Patchwork-Id: 101738 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp75584vqr; Wed, 31 May 2023 23:00:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ60jTIKHev8xa0hEem7AWkLxP8lvuDYOaMU3Kf7PVbNxty9gtvsHMRH/cr1AGE3vusG4erd X-Received: by 2002:a05:620a:8ec5:b0:75b:23a0:de90 with SMTP id rg5-20020a05620a8ec500b0075b23a0de90mr6979582qkn.14.1685599218216; Wed, 31 May 2023 23:00:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685599218; cv=none; d=google.com; s=arc-20160816; b=B095X40MHKFhUdCogzWETYRizM6pGESMSMAN2eS4TYEqQ6S5dQmVnqHpJEaT+BuXsB eNye0RbvYdpTWhhIFNqT206MDzDfeCp1D19bdNiZPuLI3XS0Tp8O+vXc5pXvc5k+rWW0 q+ySOdygt0FTMdFzUvPNf514TkIe8XrzGIzpqrP5PmFhO5TGUuO5/oVXCjh2Mx7A7oAZ 528cPfVgMt6F9q7CzCTbNLoEQcmDdjn6baMVx+WRD7t6G7mG3m/EDribdKEb+7oSLlZZ hlcS0M0p+vFrBKSsEqWjaCFVrhqYQ8KtWzzMe5VTBENhsHr3r/e26G5fRcC3SJdQ+T3S 2xhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cfidUNhLl2ben6D10QceNGfJXqqis/yhEUlfiH2umJA=; b=Z6IuxTq+aSKovpnieVKgRTDnFGxLw9pgce/iN6ywpMzlVVtUh9NzevYTCgwi3vcREq UYgEQ0sOWEELs7aSsT2K4XP12SMhaazdCAD54w8Vmw3MFcq4uC1hGTmIdW/ZoMMj7RBS dFlNHkAbfkNAjJJxdAwEvtI+rJx/VlH1ODJ/CrQPmWIgH3lot3X4+vF9Kr/SxkP1k/Mi 9ulBgNvQvWPCObhUrgeoRAXYcWXVFr2U2zymYmAuhYrQAJDRi7vwMhy+5xQisjwYwuY7 zjIVtZcuJvg2Sy95Vgp+1XETdgbZt8Y04ABV+6MUcGo5u2GjC9oH00nRheD2TXPqfefX RTmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@maquefel.me header.s=mail header.b=PttJ9OBE; 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 a1-20020a17090ad80100b002569147d64asi568685pjv.114.2023.05.31.23.00.03; Wed, 31 May 2023 23:00:18 -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=pass header.i=@maquefel.me header.s=mail header.b=PttJ9OBE; 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 S231500AbjFAFr5 (ORCPT + 99 others); Thu, 1 Jun 2023 01:47:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53790 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231410AbjFAFrD (ORCPT ); Thu, 1 Jun 2023 01:47:03 -0400 Received: from forward100a.mail.yandex.net (forward100a.mail.yandex.net [IPv6:2a02:6b8:c0e:500:1:45:d181:d100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9CA001AB for ; Wed, 31 May 2023 22:46:30 -0700 (PDT) Received: from mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net [IPv6:2a02:6b8:c1f:5e51:0:640:23ee:0]) by forward100a.mail.yandex.net (Yandex) with ESMTP id 4991E46CD6; Thu, 1 Jun 2023 08:46:28 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id pjGDMhnDduQ0-AwSLvKHg; Thu, 01 Jun 2023 08:46:28 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=maquefel.me; s=mail; t=1685598388; bh=cfidUNhLl2ben6D10QceNGfJXqqis/yhEUlfiH2umJA=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=PttJ9OBEfFdKwvbjEM1czzrbr0lztNbJWlD8+v0b+E01iXu6iHwTVQqR3LHrFdtaC Szu+6P7ynK9fjBfOWy2pZl/4WQHpyKlDXMUALI4/y/dCYv2xiYzLFQARFkXP7HAeev F4tuJjp+TX0KVZiGQrEQRA6nwSLmO7E6SEV80z3Y= Authentication-Results: mail-nwsmtp-smtp-production-main-51.vla.yp-c.yandex.net; dkim=pass header.i=@maquefel.me From: Nikita Shubin To: Alexander Sverdlin , Arnd Bergmann , Linus Walleij , Russell King , Hartley Sweeten , "Russell King (Oracle)" , Nathan Chancellor , Nick Desaulniers , Masahiro Yamada , Nicolas Saenz Julienne Cc: Nikita Shubin , Michael Peters , Kris Bahnsen , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v1 36/43] ARM: ep93xx: DT for the Cirrus ep93xx SoC platforms Date: Thu, 1 Jun 2023 08:45:41 +0300 Message-Id: <20230601054549.10843-18-nikita.shubin@maquefel.me> X-Mailer: git-send-email 2.37.4 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,RCVD_IN_DNSWL_NONE, 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 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?1767478885648775193?= 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 --- 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 547e5856eaa0..0e3d637cae6c 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