From patchwork Mon Jan 23 13:19:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manivannan Sadhasivam X-Patchwork-Id: 47141 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1604721wrn; Mon, 23 Jan 2023 05:21:40 -0800 (PST) X-Google-Smtp-Source: AMrXdXvoKtoPXYmQjgwCw55iZ1TfT1dtUPf9BzRiYhvWl6ZisWFYioDter6s2BQVTrarMsmfNZ/a X-Received: by 2002:a17:906:abd8:b0:7b1:316c:38f5 with SMTP id kq24-20020a170906abd800b007b1316c38f5mr26949776ejb.30.1674480100071; Mon, 23 Jan 2023 05:21:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674480100; cv=none; d=google.com; s=arc-20160816; b=xiaaPKIZg6pw5+gndWtBNj85bKMjPwmB/P9g0Kz+m+W4HdNcV8sglX9KbpB6DEnmmg hSXJ3HKYNrnhSBXsKcZaPYu1zQk6+QIhI3pNMc8sOayfaJ/rKs7BRZ48qJ/PQPJuPolC Cbxv++LvVAcB1mekD+ZUIKKrZ30vlC5pTFnaccXeJFu/TgeYBLK6cmR5mQ3+XG1Qp0Jd jcm4x6e7NZzpaIlRGwk5QmyuIHl19yKBL6wc04X/UlQUxU9S+MWsinathT4xpkbGxld4 nzJp3k3ZbXqRm7ZIO2cU8qujBDBMoHl3ti4hcHZNhx0C87UhA8SWwnLel+sd+IRqhNHB 01SA== 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=PZUmagI3SrNjxAIFc/u/7wsXmsBaYydmEOg5h5RQ/H0=; b=wdooUWMH2iymbhgCoy+J/EVuZFLikPe2hd2gvFvxt+n40lSgkO+CCa//uvTOrvONaA nVuc5TkLXEYR6lf1Ffpi4HhpXAo/R5FyNlJloiojkDobD611susq1uBn/MoWjnXGjEtM OAmZ/G4gfwvOf4YUvdQHDEGOHTpG7CgJs9KtLLp4WUQCK2gRTvJEIPDaeZciO+HGiPkj jfywWWUTqdsOueyU73kSycP0dT6SD3643IJXnKshjWKx59ukzsQThFeavynMfqrTyl7w g5Xn7qrlYGhvleTimphvg09Up0Tm0f7v+EBJcy1PQk/msaIi1AruVXMtRQ2cWO+usJsw wGBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jj1AklBZ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l6-20020a170906794600b007c0a4c149bfsi24711760ejo.403.2023.01.23.05.21.16; Mon, 23 Jan 2023 05:21:40 -0800 (PST) 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=@linaro.org header.s=google header.b=Jj1AklBZ; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231565AbjAWNUD (ORCPT + 99 others); Mon, 23 Jan 2023 08:20:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231274AbjAWNUA (ORCPT ); Mon, 23 Jan 2023 08:20:00 -0500 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB5721630C for ; Mon, 23 Jan 2023 05:19:58 -0800 (PST) Received: by mail-pf1-x42d.google.com with SMTP id g205so8732115pfb.6 for ; Mon, 23 Jan 2023 05:19:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; 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=PZUmagI3SrNjxAIFc/u/7wsXmsBaYydmEOg5h5RQ/H0=; b=Jj1AklBZUZFUxAjbjJiLjE+yWzx1KppOmQDis8z3iqM0Y3GqnU8mbwcEnsy5+6IhLp 2wBbJSoTv41v5b1JeUYAxT0fZMamcfDnGtgpamzJDCZtLrB47hJd/hCxBMCbIisemiyA mN4cMjAVMveLN+zqmfgeFUiYQ2lOK8q/aJeUTa3/YNFzKyKhHshohHx7onSH+Bk7cHys IOM1UTRh9hjblpZfCgjIi+srvkZLknFIM3IHnXW8ga0jcUxKT6QYcoRuPYshDoBTNcyF JYZ1bzoaNlBMjZvL1Ec6aPR541ysPlz+voy9bV0xLim4UZ/cl87/SeTgEtjn9LZh1ecD Uwow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=PZUmagI3SrNjxAIFc/u/7wsXmsBaYydmEOg5h5RQ/H0=; b=1VSCcQxgZAYiOX3hYzNFznlFxo1QECYXGVl4VSqSOAGT+YpFWiddRRKNjIDOBGgp42 /m95NbCHCzEVGtuCKOHlLfdADC4wfx+X3PVZEp+xOL5K1UdkKkeLfpvPZlfGXXUbU4a5 MjPqHS3Yim5mg+up1lh24s5je3m3bFeQTndp56yFqWmps6aEYD6iJM9/bte7252PSrSi 6QWb0Yy0TbcM3hXqYcKbATHX/sojZVM+j+PfoDTWBu1jD7YzYKl22cx3XkQfFduynRXf 7XJWOOeNEj5CNULbGdNwDCbTk5b8gL1DAKgWQuXN9Gwr2RN89UcFKNzxBnwCEJ24cP9c vmbQ== X-Gm-Message-State: AFqh2krRlfRVRco/+gvn6cLKwmUIVxfvcUbqBApVQB7yzZYlnP+lCD07 dMU3YP5HrcB/M45STr/vSV7+ X-Received: by 2002:aa7:8283:0:b0:588:9c15:65c4 with SMTP id s3-20020aa78283000000b005889c1565c4mr24088303pfm.3.1674479998226; Mon, 23 Jan 2023 05:19:58 -0800 (PST) Received: from localhost.localdomain ([117.193.209.165]) by smtp.gmail.com with ESMTPSA id q20-20020aa79834000000b0058134d2df41sm30818783pfl.146.2023.01.23.05.19.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 05:19:57 -0800 (PST) From: Manivannan Sadhasivam To: andersson@kernel.org, will@kernel.org, joro@8bytes.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org Cc: konrad.dybcio@linaro.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, iommu@lists.linux.dev, dmitry.baryshkov@linaro.org, Manivannan Sadhasivam , stable@vger.kernel.org Subject: [PATCH 2/3] ARM: dts: qcom: sdx55: Add Qcom SMMU-500 as the fallback for IOMMU node Date: Mon, 23 Jan 2023 18:49:30 +0530 Message-Id: <20230123131931.263024-3-manivannan.sadhasivam@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230123131931.263024-1-manivannan.sadhasivam@linaro.org> References: <20230123131931.263024-1-manivannan.sadhasivam@linaro.org> 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 autolearn=unavailable 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?1755819645606981910?= X-GMAIL-MSGID: =?utf-8?q?1755819645606981910?= SDX55 uses the Qcom version of the SMMU-500 IP. So use "qcom,smmu-500" compatible as the fallback to the SoC specific compatible. Cc: # 5.12 Fixes: a2bdfdfba2af ("ARM: dts: qcom: sdx55: Enable ARM SMMU") Signed-off-by: Manivannan Sadhasivam Reviewed-by: Konrad Dybcio --- arch/arm/boot/dts/qcom-sdx55.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-sdx55.dtsi b/arch/arm/boot/dts/qcom-sdx55.dtsi index f1c0dab40992..93d71aff3fab 100644 --- a/arch/arm/boot/dts/qcom-sdx55.dtsi +++ b/arch/arm/boot/dts/qcom-sdx55.dtsi @@ -578,7 +578,7 @@ pil-reloc@94c { }; apps_smmu: iommu@15000000 { - compatible = "qcom,sdx55-smmu-500", "arm,mmu-500"; + compatible = "qcom,sdx55-smmu-500", "qcom,smmu-500", "arm,mmu-500"; reg = <0x15000000 0x20000>; #iommu-cells = <2>; #global-interrupts = <1>;