From patchwork Tue Jun 15 23:28:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 460559 Delivered-To: patch@linaro.org Received: by 2002:a17:906:71d0:0:0:0:0 with SMTP id i16csp232868ejk; Tue, 15 Jun 2021 16:28:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyH0LOE0Dlw4D0OLn4irR8fI863TMNsYAZOgoW+J9ABzgk3oclQZJZ4xK9rPGLDHNg3UpHQ X-Received: by 2002:a50:bf0f:: with SMTP id f15mr647789edk.205.1623799701517; Tue, 15 Jun 2021 16:28:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623799701; cv=none; d=google.com; s=arc-20160816; b=j6CNn15SNH2aF8ImzZrQwxVZGnDkU5FB+yVFGP4wFGHGjQ+2sCWYny3ZDrv90ezL9e 0Dw77CvnM45jeojhVT2AQan2GHIcxkZpWh2VtdNGye8WKKgz+cJ1hm/8LlhRYj9FFujm EMsjoKNXj6+0q+DAmtFxfcpUPKxfkL4QXr9+87BxfKCcdU5gNu6yRKmJDnviMe28A+RY sa/nyGGbi0I5Ni4EAvVRoulCQAzzlKcyi6FWyVajNaJ00PbmzJk80x9h7Y7ouaCipnlc 5GJECwe+A214ntTMckZXPaorL2uckPhRqlOvA81pJC3OhobfZi849uRT4ADcAdok1HTs otOQ== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=tzSchQZe56MMqq1z2RSbotrCopwwSz+YGTJ5s6h3T1w=; b=asWeLUYgRG5FbUVhlf5uPyjvlREPGONnNFcVPxnlD9BD1MxPotWTmVXTVjbRcnKxjF KHiUGpLgCtfFTRQwmWQ/OZXToHtmCUjkAEKEsNjcYBsLKvu7kXlKCQLCUFfFNms/LFQL q1Nm9QrBoTlgdgjKmEawoycvkv20k6okMScmqVINqu0YVcv0C4k03VFT0aGSsekkx0ZJ AXWxkzW0SsmodjtribYk1DgtIPW/nWRSrux44/93Yl5Xkg0EPco3bjPqSSIdH2FH+iGD hYpOIoFHxvsasBhqnZ4tYAgfDgpJlgXpNUJ5CRgNCczaJIFdE+ehI1v5SOE5Hj9BDpJa RGCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P7gJ+yJc; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s24si426289ejs.124.2021.06.15.16.28.21; Tue, 15 Jun 2021 16:28:21 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=P7gJ+yJc; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-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 S229966AbhFOXaZ (ORCPT + 7 others); Tue, 15 Jun 2021 19:30:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48374 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231169AbhFOXaY (ORCPT ); Tue, 15 Jun 2021 19:30:24 -0400 Received: from mail-oo1-xc2f.google.com (mail-oo1-xc2f.google.com [IPv6:2607:f8b0:4864:20::c2f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AD1E7C061574 for ; Tue, 15 Jun 2021 16:28:18 -0700 (PDT) Received: by mail-oo1-xc2f.google.com with SMTP id k21-20020a4a2a150000b029024955603642so210941oof.8 for ; Tue, 15 Jun 2021 16:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tzSchQZe56MMqq1z2RSbotrCopwwSz+YGTJ5s6h3T1w=; b=P7gJ+yJcok8zyjrDvS5CFSBSmeNfbSk1IpzfHrvvdoRYYTLGsUuELq6pCHSTzt+Ygk mmuKyJ8j2tSDgud2KnpeCcRjTLPRMALdTwtodETeGdylwmZ8uBmA8TlnNJJZdeyeOMqD SZojpi4ngEdVFybx1dZvnZLyQi1WV1HQD56GCkfLxSy/lUbje43nY7u0WwZSd9j5GZDj lOv/M+XJPYFdqmTLnnRDEbHLZx+1tFO/gbS6Ziieqo0yKGmkUiGOabUD2vv65+Jv+cLD d/OL41uF0Z6GOMpbNfelqVGKwo2sWATapabrYLtzMxfjGUoxYvwiMkKycb76Gd4YP3wS qKhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=tzSchQZe56MMqq1z2RSbotrCopwwSz+YGTJ5s6h3T1w=; b=TF0tyOX7pjYAewbU2CFsazPVSIDrZgvwUCQ8TKAw/wf+wdEoNBcY93QaX3SrZYBjpP nJIb3yfM3kRLqohBI+jPwDLPBq+iragpthOz1x8FpFKnLAqWLKgJz0e4/vXojxstqqrh XXBc/fAximOvbRFXAARt6nJIDae6Bv6c0Lm5cmSj2xBswRGqOJeQ4lFjQdTCX74z9+uK J03sZg2wWqV4MIFT2OA5YaHhbr+coPhZNBZ4p3desAgr4/fzTlYUDU5vwZahwDlsV3qD 1V5+HPin0WJ3ODd8pzIJ0/eV+0ZQ+9GgGSY6O1khEnxcrsbQJMaxttEkHK+3huy5SanP rktA== X-Gm-Message-State: AOAM5329qRuOIL88qKMc3jToSDTlvsqHK/n15mg8WbFq4hrc/mOBKghs FOs7S94ktWhyIrN0oODbiAarDe7L76UOvw== X-Received: by 2002:a4a:ea2b:: with SMTP id y11mr1311357ood.77.1623799697973; Tue, 15 Jun 2021 16:28:17 -0700 (PDT) Received: from builder.lan (104-57-184-186.lightspeed.austtx.sbcglobal.net. [104.57.184.186]) by smtp.gmail.com with ESMTPSA id u1sm89926ooo.18.2021.06.15.16.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Jun 2021 16:28:17 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , Bjorn Andersson , Rob Herring , Alex Elder Cc: linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] arm64: dts: qcom: sdm850-yoga: Enable IPA Date: Tue, 15 Jun 2021 18:28:16 -0500 Message-Id: <20210615232816.835325-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.31.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Shuffle memory regions to make firmware loading succeed and then enable the ipa device. Signed-off-by: Bjorn Andersson --- arch/arm64/boot/dts/qcom/sdm845.dtsi | 21 +++++++------------ .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 5 +++++ 2 files changed, 13 insertions(+), 13 deletions(-) -- 2.31.0 Tested-by: Steev Klimaszewski diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi index 1796ae8372be..49624eadce84 100644 --- a/arch/arm64/boot/dts/qcom/sdm845.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi @@ -128,28 +128,23 @@ camera_mem: memory@8bf00000 { no-map; }; - ipa_fw_mem: memory@8c400000 { - reg = <0 0x8c400000 0 0x10000>; + wlan_msa_mem: memory@8c400000 { + reg = <0 0x8c400000 0 0x100000>; no-map; }; - ipa_gsi_mem: memory@8c410000 { - reg = <0 0x8c410000 0 0x5000>; + gpu_mem: memory@8c515000 { + reg = <0 0x8c515000 0 0x2000>; no-map; }; - gpu_mem: memory@8c415000 { - reg = <0 0x8c415000 0 0x2000>; + ipa_fw_mem: memory@8c517000 { + reg = <0 0x8c517000 0 0x5a000>; no-map; }; - adsp_mem: memory@8c500000 { - reg = <0 0x8c500000 0 0x1a00000>; - no-map; - }; - - wlan_msa_mem: memory@8df00000 { - reg = <0 0x8df00000 0 0x100000>; + adsp_mem: memory@8c600000 { + reg = <0 0x8c600000 0 0x1a00000>; no-map; }; diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index c2a709a384e9..3eaa42dc3794 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts @@ -415,6 +415,11 @@ ecsh: hid@5c { }; }; +&ipa { + status = "okay"; + memory-region = <&ipa_fw_mem>; +}; + &mdss { status = "okay"; };