From patchwork Thu Dec 7 12:54: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: 13483267 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 E4C5BC4167B for ; Thu, 7 Dec 2023 12:55:46 +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=Ukv357X/v9zFtK wj5kEN30y4TW9pVIJ6FaMK91pySVr3xmtXP26vdM0yGzqprYcpSlOXaohQj6EWpAKC0+/kSC/JHVQ pDzFMV1Sd+0fseNasnt6SkHVAhVDt9i2JQfu6NY0esjDu68vKqXoNkZmL60EWTpwFyr8yweDyo5Qo jzpTgCvRzwp5FYCb9bDRUyLRLs5tc2RBqOQFfdjE6h17EEM9fe47QO+uPFJdItu+SVxp+xuP2asL7 mreeEl11Hd+kLjPPV9xYh+t5ffDxzZk/vYZn8bF/kATssKXOiDl7BmQI1F6r205xryNNuRRYl4paj PdftYd+IdjGg9mFkzEFA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rBDuK-00Cque-1g; Thu, 07 Dec 2023 12:55:12 +0000 Received: from mail-lf1-x130.google.com ([2a00:1450:4864:20::130]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rBDuF-00Cqrb-3D for linux-arm-kernel@lists.infradead.org; Thu, 07 Dec 2023 12:55:09 +0000 Received: by mail-lf1-x130.google.com with SMTP id 2adb3069b0e04-50c05ea5805so771563e87.0 for ; Thu, 07 Dec 2023 04:55:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1701953703; x=1702558503; 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=uNCYcD43S1kRGQ69YXKiBOfN5rBjZepIyiar20M3hlvAXKAPrFvujjbWHUArnKSBYK /ntNaGYi1Wjn0QeDAWfJEca3pDZFPl0I4acpkAMgmFtdyxDz1udUhrMVd/Swf7JZDAiU WSPU3oQohlc7rzD6ZECZ7jkkeU1/I+F7oau5v61ulY0OLAG1PQ8AQzPdqYnzM0RGbTbE kPhLfU4Bli5nFMrpeEUYASp7A6HIfpp1AsCExwxeAKbFXpTVrj3uK4Dc/jbOmm/7IFc/ CXOV9Ruw4r+rsVdd24AaYNFylC8fnDgvR4+n5oIhGZASr2PUJlnT4OxrqwUZvDhdpJiT KS6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701953703; x=1702558503; 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=ZJqpNWuNHwXKF/xdstDpaBPilBtCKfR0h4Tz4a2oIzoqgwpdL43//JR6OHekkiqLN5 di3uEkMC7LOSFTLyXH3ZcZXSAaBAfVmhAvlqscRBVv3Nhm3sgoKW9kYSV3djrVwGchoe BPEal+e7qc2fjkREv0UeiIPm1Sia0Q+g1qJvZIDBaaswtrjLWfUIeOQKK5vJFZ8uJRNK 7ou+/j8uBh2yH++uk//IjUB+tIrU+pbnuCUNaYDqSCAvsdovSSF2yIlma6Kp7B3JvI+d CEEF5JpcIzYRgLIC4xnzCef1ye6ucVdAxGn2iWWFPR8xGD4OwEH245JlwT6fRY4n72Om kXEQ== X-Gm-Message-State: AOJu0YzGKXmoKKnKmR/VPr3opJ1/MTTnhYA/Wfs/EfJKcRzTCGbBG5fO +O0QdeSMgpwE7E4H/5zKh0WeTg== X-Google-Smtp-Source: AGHT+IH8ass7HzS6uZLXeKJmVhmIziNGBwk8jv4tdxJanOaneYQPNZLBKTC6kWejFA4F6qBuDA1Nrg== X-Received: by 2002:a19:9102:0:b0:50b:ee85:ef5e with SMTP id t2-20020a199102000000b0050bee85ef5emr1247967lfd.119.1701953703035; Thu, 07 Dec 2023 04:55:03 -0800 (PST) Received: from umbar.unikie.fi ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id cf30-20020a056512281e00b0050bfc6dbb8asm163659lfb.302.2023.12.07.04.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 04:55:02 -0800 (PST) From: Dmitry Baryshkov To: Will Deacon , Robin Murphy , Joerg Roedel , Rob Herring , Krzysztof Kozlowski , Bjorn Andersson , Konrad Dybcio , Rob Clark Cc: Vinod Koul , Sai Prakash Ranjan , linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, iommu@lists.linux.dev, devicetree@vger.kernel.org, freedreno@lists.freedesktop.org Subject: [PATCH 2/3] ARM: qcom: drop most of 32-bit ARCH_QCOM subtypes Date: Thu, 7 Dec 2023 15:54:59 +0300 Message-Id: <20231207125500.3322229-3-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207125500.3322229-1-dmitry.baryshkov@linaro.org> References: <20231207125500.3322229-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-20231207_045508_040261_0414E1CB X-CRM114-Status: GOOD ( 11.77 ) 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 --- 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