From patchwork Sat Dec 16 16:26:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13495642 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 3FECCC46CA2 for ; Sat, 16 Dec 2023 16:27:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=fRFaAJwVhbOLcT/maWc0BRBAY9A570huLhXkIi8UXCc=; b=OSCC5CtLcS0Grw 6FzkAAIrEW5uIlM0xgOo4MOiZ8EWV5Rlavum8x0C0yddMUop3e1T8vetpWEFA8hIzjeNLSenVqVeP fx7pEYNOVZTRMQ8ZKt/lruL9r2fGNX2KyMqwkQXzqUHsZ2iiTfXE7P/kWCt6JW1pzYB4i9dV9yrwH 1iMdep3t7jcfq23F8lOfi+NgaoDEK4fV7/HEF2IFli5oVG9LEfoDgIsN/S6rLLU/tmpdhbBmWj3kp ljj9L10KrTWoYwvx/WzciJWpZ1nkzgJwFXObomjcy18asdwvCIMEOMrEwuaZkB0y4AA/1rZCaeqSH yDCYdnpxOxQcD11yllZg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rEXVS-006Jr4-2M; Sat, 16 Dec 2023 16:27:14 +0000 Received: from mail-lf1-x133.google.com ([2a00:1450:4864:20::133]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rEXVJ-006Jlm-1y for linux-arm-kernel@lists.infradead.org; Sat, 16 Dec 2023 16:27:07 +0000 Received: by mail-lf1-x133.google.com with SMTP id 2adb3069b0e04-50e18689828so1894601e87.2 for ; Sat, 16 Dec 2023 08:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702744022; x=1703348822; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MXRZlAau+k7NGTbzeyPNFZOgIyK71YnKo+kgg/iWUAM=; b=UlIyPmWMLBNhrlRPXGzKO7Ht14qSL2U/AnYCuL9KSgc/lun6z5rUaD/cHld6hlhmP6 KVb7i4qCagO66tV5N/eja71GiBalABubz7vGsmDZq44+29s82YjDdhcRufnqxwrrkIIu aCZtOsOozFm6EaMrJ1BjhtPY1Iu/tx/u7RSTQPxkf7QAn2cpzJjPjLuOUgkgrptV18D1 KpOot5LB7OsF4FaR2rT+XFK4DqSsyo/Oym6AtUFnULHEuVQ3MMHZOI95z5/T0lbj3mUg WjQwyfXCq+7L2HQuPe9sM2A2N2gr62o9+wUTwX71O7jGA3OHYo+d7gqE36oNb5MUFedv d2pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702744022; x=1703348822; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MXRZlAau+k7NGTbzeyPNFZOgIyK71YnKo+kgg/iWUAM=; b=UIr4UQaGVf1Z0a0YWIUitOxQaw9/r03p8SCmrBH+tuXX7l1zzkinFl09rVkw6TLwxs gouH5h0FI03ZFtfNlLcdp+SxIhBjYfDqGu/8MCOqoz1I33fCQWOVNroZ2XyydNJffqJZ njErG7gCaoT1reTCTyUF5VQzOZ+mknkJn2c5gDavOk7iRonU9VrQzw8mePIAsizHFAdw 3ndxiIH8zJTEPM5VDs/yAyD5mqiMNwm7vREhXm81RBwzpPpt3GZ+ke+pBmDULyFZpKUv AaAqVlUQNrq37cAQj570HCRaNTGAE76nGrR80gkltE4f0N0orf9oZFd2oIKRElAyWmWu ly2Q== X-Gm-Message-State: AOJu0Yx+nlp6WhoxOsT7sVtaXL8QpHxitSO6gAljZlEI/Di43HN9Z3Wk c0V9r+57B9kyf291mtRltQwH+A== X-Google-Smtp-Source: AGHT+IE/jFD3yOHsP0n5a7l283VLf8+ombeu8GqYWfjwZgT22dw0ahGoGVYCJQsfdwyPuBgkZcjp/g== X-Received: by 2002:a19:f70b:0:b0:50c:17d6:fff6 with SMTP id z11-20020a19f70b000000b0050c17d6fff6mr5574410lfe.1.1702744022620; Sat, 16 Dec 2023 08:27:02 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a197913000000b0050e304d437dsm69229lfc.223.2023.12.16.08.27.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 08:27:02 -0800 (PST) From: Dmitry Baryshkov To: Bjorn Andersson , Konrad Dybcio , Joerg Roedel , Will Deacon , Robin Murphy Cc: linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, Russell King Subject: [PATCH v2 2/3] ARM: qcom: drop most of 32-bit ARCH_QCOM subtypes Date: Sat, 16 Dec 2023 18:26:59 +0200 Message-Id: <20231216162700.863456-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231216162700.863456-1-dmitry.baryshkov@linaro.org> References: <20231216162700.863456-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231216_082705_646050_2FF6E773 X-CRM114-Status: GOOD ( 11.41 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Historically we had several subtypes of 32-bit Qualcomm platforms. Nowadays they became just useless symbols in Kconfig. Drop them and pull corresponding clocksource entries towards top-level ARCH_QCOM entry. Note, I've left ARCH_IPQ40XX, ARCH_MSM8x60 and ARCH_MSM8960 in place, since they have special TEXT_OFFSET handling, which can be sorted out separately. Signed-off-by: Dmitry Baryshkov Acked-by: Konrad Dybcio --- arch/arm/mach-qcom/Kconfig | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig index 12a812e61c16..27d5ca0043be 100644 --- a/arch/arm/mach-qcom/Kconfig +++ b/arch/arm/mach-qcom/Kconfig @@ -4,46 +4,24 @@ menuconfig ARCH_QCOM depends on ARCH_MULTI_V7 select ARM_GIC select ARM_AMBA + select CLKSRC_QCOM + select HAVE_ARM_ARCH_TIMER select PINCTRL select QCOM_SCM if SMP help Support for Qualcomm's devicetree based systems. + This includes support for a few devices with ARM64 SoC, that have + ARM32 signed firmware that does not allow booting ARM64 kernels. if ARCH_QCOM config ARCH_IPQ40XX bool "Enable support for IPQ40XX" - select CLKSRC_QCOM - select HAVE_ARM_ARCH_TIMER config ARCH_MSM8X60 bool "Enable support for MSM8X60" - select CLKSRC_QCOM - -config ARCH_MSM8909 - bool "Enable support for MSM8909" - select HAVE_ARM_ARCH_TIMER - -config ARCH_MSM8916 - bool "Enable support for MSM8916" - select HAVE_ARM_ARCH_TIMER - help - Enable support for the Qualcomm Snapdragon 410 (MSM8916/APQ8016). - - Note that ARM64 is the main supported architecture for MSM8916. - The ARM32 option is intended for a few devices with signed firmware - that does not allow booting ARM64 kernels. config ARCH_MSM8960 bool "Enable support for MSM8960" - select CLKSRC_QCOM - -config ARCH_MSM8974 - bool "Enable support for MSM8974" - select HAVE_ARM_ARCH_TIMER - -config ARCH_MDM9615 - bool "Enable support for MDM9615" - select CLKSRC_QCOM endif