From patchwork Fri Jan 8 12:04:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 12006541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68873C433E0 for ; Fri, 8 Jan 2021 12:16:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B9362388B for ; Fri, 8 Jan 2021 12:16:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B9362388B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1t04fEzHVx2/8ZilQ/soPQleLy065MLOwsir74KFk94=; b=wTMd173kEHuOJDCLgU4IlC+Ob klrYTg8SlfFzfNPcl7BcA1LS2nQLpowbZT5IgK3VRL25PLhqq9293WzIyjeAK2fpt/gBDAh05mVhW 6/weRfqu1SxyFhaTerAJPDzcpw3EKS6tJ04Lik1g/f9mPhOrLoqyf6esXEOPDDtGkBHL80/bam4Pf 9g0RGuPLmlYRZ5/gpx9BDAfWi2z2Oy6IWCJM83gEZgYGyMDioYJXKDNn8iXCFOKT9wtUXG6SPp5e4 vNHmL14OkJ3P7/QCK4LxwfYV1YiEFjnhiM/rpmYJOyxoVZ9rUNItVUB+88myztqhRsYJYIpa/+H2S Ln+vawwgg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxqeC-0005c8-CU; Fri, 08 Jan 2021 12:13:40 +0000 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxqcS-0004pn-4A for linux-arm-kernel@lists.infradead.org; Fri, 08 Jan 2021 12:11:56 +0000 Received: by mail-wr1-x434.google.com with SMTP id r3so8807842wrt.2 for ; Fri, 08 Jan 2021 04:11:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7rVgQIzgBRTIosfiF1p2wFlmLYHzThKp02Co3vN4N1o=; b=rUaPmaD/lopsdO/FAwrVClZBowUhrH7Q3l17m4gsDBAVC0SUDE40tSxHRHd9MLpKSX IFWJ5SKgcp51oF9TmCD2zXKE6hVgQo0sOc04nWnuqdfLtgjC1UH3+1gcGPZ6iYA4Zkf1 ajQwZgswNq3Jkav+qHd3gtr659b58/ebj7XyOQOMeOs+vVQeH/chpX83wZux2idS6S8B eIaVPjp4j2QFCV6Fzg814BNCtMB5OYfpm9NehXf/jhItiKU+dngpzgL09ULxWStCUajG joWjAvdAeeYWJCc9jwGnrCNdtfF4iMdVSDoK4hGf6pqQBbKoWP0n/XAOhiU1Sx3tM68g JEdg== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=7rVgQIzgBRTIosfiF1p2wFlmLYHzThKp02Co3vN4N1o=; b=g8zws1cb6yLHQHBEivW2JGXO2vC4evCcG0ccoFQrWZfjRQReP4N3Vdzs/TY9CAAWtw stitrns8suOBRJBYqt8F9khXoSiafMN3nyF4tWyUf4vuLqCebL1/d9BEN6pyh6rNWsU4 /4OHz7kIxEjy10gdEvYordIv2U5dDIIVE/6jwxjTRAUmqb81sMubCOEGFjqkIoeoqcLv iDM949WRn/IOSVgc2JFn7tFp8QKBoxCjL6+JpD/wvfUROUruLPzuF3AhcNRmlvkTWEts TI0FokPnef25Pt169q/qymtaUKTcgAn63ynv4kXj6tJyzBVulvb/sX98XHzp253zCoZB LIVg== X-Gm-Message-State: AOAM531K2oxJPpSGkATqPN+8ClmAm+DYsneLtpU6mr/QJhtSd1ANHlph WOa/SrvgpeoxIKOeZXhSP4i/HzoiLM1/Aw== X-Google-Smtp-Source: ABdhPJxo7k8VeY3iDaOX3reinXKRWWHwJbzHrszuG8av4s4CmDtv04yeck85djG1XHC0RqEeOuB90Q== X-Received: by 2002:a17:906:7f11:: with SMTP id d17mr2414165ejr.534.1610107520575; Fri, 08 Jan 2021 04:05:20 -0800 (PST) Received: from localhost.localdomain ([2a02:2450:102f:d6a:bb2e:8b50:322a:1b9a]) by smtp.gmail.com with ESMTPSA id i18sm3674498edt.68.2021.01.08.04.05.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Jan 2021 04:05:19 -0800 (PST) From: Robert Foss To: agross@kernel.org, bjorn.andersson@linaro.org, robert.foss@linaro.org, todor.too@gmail.com, mchehab@kernel.org, robh+dt@kernel.org, catalin.marinas@arm.com, will@kernel.org, shawnguo@kernel.org, leoyang.li@nxp.com, geert+renesas@glider.be, arnd@arndb.de, Anson.Huang@nxp.com, michael@walle.cc, agx@sigxcpu.org, max.oss.09@gmail.com, linux-arm-msm@vger.kernel.org, linux-media@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, AngeloGioacchino Del Regno , Andrey Konovalov Subject: [PATCH v1 13/17] media: camss: Enable SDM845 Date: Fri, 8 Jan 2021 13:04:25 +0100 Message-Id: <20210108120429.895046-14-robert.foss@linaro.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210108120429.895046-1-robert.foss@linaro.org> References: <20210108120429.895046-1-robert.foss@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210108_071152_661828_C13A0173 X-CRM114-Status: GOOD ( 18.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Azam Sadiq Pasha Kapatrala Syed , Sarvesh Sridutt , Laurent Pinchart , Tomasz Figa Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Enable support for SDM845 based Titan 170 ISPs. Signed-off-by: Robert Foss --- drivers/media/platform/qcom/camss/camss.c | 17 +++++++++++++++++ drivers/media/platform/qcom/camss/camss.h | 6 ++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c index 259ed094cee4..4dfae29c6327 100644 --- a/drivers/media/platform/qcom/camss/camss.c +++ b/drivers/media/platform/qcom/camss/camss.c @@ -897,6 +897,12 @@ static int camss_init_subdevices(struct camss *camss) csid_res = csid_res_660; ispif_res = &ispif_res_660; vfe_res = vfe_res_660; + } else if (camss->version == CAMSS_845) { + csiphy_res = csiphy_res_845; + csid_res = csid_res_845; + /* Titan VFEs don't have an ISPIF */ + ispif_res = NULL; + vfe_res = vfe_res_845; } else { return -EINVAL; } @@ -1205,6 +1211,8 @@ static int camss_configure_pd(struct camss *camss) if (camss->version == CAMSS_8x96 || camss->version == CAMSS_660) nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT; + else if (camss->version == CAMSS_845) + nbr_pm_domains = PM_DOMAIN_TITAN_COUNT; for (i = 0; i < nbr_pm_domains; i++) { camss->genpd[i] = dev_pm_domain_attach_by_id(camss->dev, i); @@ -1273,6 +1281,12 @@ static int camss_probe(struct platform_device *pdev) camss->csiphy_num = 3; camss->csid_num = 4; camss->vfe_num = 2; + } else if (of_device_is_compatible(dev->of_node, + "qcom,sdm845-camss")) { + camss->version = CAMSS_845; + camss->csiphy_num = 4; + camss->csid_num = 3; + camss->vfe_num = 3; } else { ret = -EINVAL; goto err_free; @@ -1404,6 +1418,8 @@ void camss_delete(struct camss *camss) if (camss->version == CAMSS_8x96 || camss->version == CAMSS_660) nbr_pm_domains = PM_DOMAIN_CAMSS_COUNT; + else if (camss->version == CAMSS_845) + nbr_pm_domains = PM_DOMAIN_TITAN_COUNT; for (i = 0; i < nbr_pm_domains; i++) { device_link_del(camss->genpd_link[i]); @@ -1437,6 +1453,7 @@ static const struct of_device_id camss_dt_match[] = { { .compatible = "qcom,msm8916-camss" }, { .compatible = "qcom,msm8996-camss" }, { .compatible = "qcom,sdm660-camss" }, + { .compatible = "qcom,sdm845-camss" }, { } }; diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h index 7560d85b3352..2f853557ed16 100644 --- a/drivers/media/platform/qcom/camss/camss.h +++ b/drivers/media/platform/qcom/camss/camss.h @@ -60,6 +60,8 @@ enum pm_domain { PM_DOMAIN_VFE0 = 0, PM_DOMAIN_VFE1 = 1, PM_DOMAIN_CAMSS_COUNT = 2, /* CAMSS series of ISPs */ + PM_DOMAIN_VFELITE = 2, /* VFELITE / TOP GDSC */ + PM_DOMAIN_TITAN_COUNT = 3, /* Titan series of ISPs */ }; enum camss_version { @@ -83,8 +85,8 @@ struct camss { int vfe_num; struct vfe_device *vfe; atomic_t ref_count; - struct device *genpd[PM_DOMAIN_CAMSS_COUNT]; - struct device_link *genpd_link[PM_DOMAIN_CAMSS_COUNT]; + struct device *genpd[PM_DOMAIN_TITAN_COUNT]; + struct device_link *genpd_link[PM_DOMAIN_TITAN_COUNT]; }; struct camss_camera_interface {