From patchwork Thu May 2 16:54:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 163276 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp5963358ill; Thu, 2 May 2019 09:54:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqwjylZPrbQvgsxwUk5tD74cq5MTS/04Ij0XMm+Em3mh7QE9vTN6r8RMLMnu7OdyzWgrUh5d X-Received: by 2002:a65:638f:: with SMTP id h15mr5048601pgv.147.1556816071902; Thu, 02 May 2019 09:54:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556816071; cv=none; d=google.com; s=arc-20160816; b=V0AWbeSdEWh5HD0cQhkFYiZvkv6ENENgfRlcUm3JCvd1wFPtUR1FMdVbbSTz2RPXB1 m8OGSE5OG/x9ugHsrkeo2BUAlNifQsjX2GrODjKxdxPx2PTIlDJY1dQSbM/lzZaMAMys CMkUFkXGWL5oOpnz59/MHX1xme59cQiI4LSLWgS9io3VEO4y3acJ5xu9st6yplZJZdOv NyjPFPVuar5iM4cwsatD7gLS4+oI1oKLD3thbJPM8Cgx8hga20xgYroFVF+MGx1N3X6n 5zcDejJo2wRyf5sCUZBCmkSxEYlrHUG+sUNUyRfwDtzTjj0AJYTJjxhByoVV9WQmSl35 hUlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=Akvar0z3H2C4Po+4q/PqqG5fzv7JGnOTC1Q3ZfsqLhU=; b=D/uQWJ4v064fMfmHk0i3HS7USTnI7E0bHHbDamsH3QOU7YMuvzGKrGKSINC3C4Uw9i gXcuQyEZnchoHfouuM1m6xAipbgQMbuHr4mYPGzIGuUn7pNwg7hM6AsrNL2PgM4mvsBE 8JzkZFKmmoeuws3R2Pe6iix2bgKOWtp95RCLj8AZbq93EnuT+0ydEhAvd6KYqKON2hNO F6o25AJxMyoGu16XHUJ+MTSYfsw09MzIdEqXyiw5fBg2ziowcJnH1dzw/ciKpGEdNbwR 3iu5hXjJYugosFZwkEUyGC6VeAnIT3jDMoK3D/m1jTQzEek+Qje/xlMF4yvauasUobdV Omsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fC1fKb4U; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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. [209.132.180.67]) by mx.google.com with ESMTP id s4si37262945pgp.158.2019.05.02.09.54.31; Thu, 02 May 2019 09:54:31 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fC1fKb4U; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726831AbfEBQya (ORCPT + 30 others); Thu, 2 May 2019 12:54:30 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:38287 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726595AbfEBQyJ (ORCPT ); Thu, 2 May 2019 12:54:09 -0400 Received: by mail-pf1-f195.google.com with SMTP id 10so1418830pfo.5 for ; Thu, 02 May 2019 09:54:08 -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:in-reply-to:references; bh=Akvar0z3H2C4Po+4q/PqqG5fzv7JGnOTC1Q3ZfsqLhU=; b=fC1fKb4UtdDJy+EmO1Gym1hhgWjGO3rGFwZni5C2m9o/yy56e4k/VuEbNtE5wdlYbT 9t9fkXDGp9Hf38G7rtbxc7AZxJ82RLFxjeG3VNayNl/PJnrJVxHerN59gizF8GK2sBB/ 0Jd8Eabzc3vaCa6Y8CqD6KjcuEx3vyJzECm9Uz6d8p3fkVRdQTygykJKdyZa0BsE0jvc S0eGFoEFF1lyCtMPM4QsGU6xBZiCfFOM9q59zFqkZV63H7HLzt1WV+J11lgNzezF5ATf HGzR9JN/MAKLXOa1sSBWRrnpp5Pndhp1QULWXHvTn0ddGIXoHceAgemoViMFxkFetEEj CKjA== 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; bh=Akvar0z3H2C4Po+4q/PqqG5fzv7JGnOTC1Q3ZfsqLhU=; b=o48TX2yLudwAp9hucjhmd8FnHTWVBK3huQ9qKUHduCjVP8DObeollh/YYCW4HzwruS kD+P/FmsLYyu02+YZXr0v3ccw7hhRaBZ0plLZl/jKtJDM0cgs2J9KBeQGSx8QHdN6xOQ o19cU53rPTeCX+SHPDJmoF1pyYF2hK4a0L8xzzC//HvlM3lalCk1zT2uxtLZeVnUjT/W xFR5yhbN/wWKt+IT883ofz3ZycjXVjPCvzsAlXOmk9h7JfUQsUGZ62oF66zBP/sEANJA 8VXbhGQANOFx6Kd5xMmMsYE+1pNqdqc3urzkKT9OP5PwT2JnJKZRziP5J6zRHEsG5K8G vlNQ== X-Gm-Message-State: APjAAAVlQ6sZ4zZQL0fODK9pjilduajGn/E/NMlamX8fAVV/5rTAZdi/ C6pcIE4H69BoSn00AB5n6/iWkiKruV8= X-Received: by 2002:a63:8b4b:: with SMTP id j72mr5048125pge.318.1556816048509; Thu, 02 May 2019 09:54:08 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id j2sm69949pff.77.2019.05.02.09.54.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 09:54:07 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/4] dt-bindings: arm: coresight: Add new compatible for static replicator Date: Thu, 2 May 2019 10:54:02 -0600 Message-Id: <20190502165405.31573-2-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502165405.31573-1-mathieu.poirier@linaro.org> References: <20190502165405.31573-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan CoreSight uses below bindings for replicator: Dynamic replicator, aka. configurable replicator: "arm,coresight-dynamic-replicator", "arm,primecell"; Static replicator, aka. non-configurable replicator: "arm,coresight-replicator"; The compatible string "arm,coresight-replicator" is not an explicit naming to express the replicator is 'static'. To unify the naming convention, this patch introduces a new compatible string "arm,coresight-static-replicator" for the static replicator; the compatible string "arm,coresight-replicator" is kept for backward compatibility, but tag it as obsolete and suggest to use the new compatible string. As result CoreSight replicator have below bindings: Dynamic replicator: "arm,coresight-dynamic-replicator", "arm,primecell"; Static replicator: "arm,coresight-static-replicator"; "arm,coresight-replicator"; (obsolete) Signed-off-by: Leo Yan Reviewed-by: Suzuki K Poulose Reviewed-by: Rob Herring Signed-off-by: Mathieu Poirier --- Documentation/devicetree/bindings/arm/coresight.txt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt index f8aff65ab921..d02d160fa8ac 100644 --- a/Documentation/devicetree/bindings/arm/coresight.txt +++ b/Documentation/devicetree/bindings/arm/coresight.txt @@ -69,7 +69,10 @@ its hardware characteristcs. * compatible: Currently supported value is (note the absence of the AMBA markee): - - "arm,coresight-replicator" + - Coresight Non-configurable Replicator: + "arm,coresight-static-replicator"; + "arm,coresight-replicator"; (OBSOLETE. For backward + compatibility and will be removed) * port or ports: see "Graph bindings for Coresight" below. @@ -169,7 +172,7 @@ Example: /* non-configurable replicators don't show up on the * AMBA bus. As such no need to add "arm,primecell". */ - compatible = "arm,coresight-replicator"; + compatible = "arm,coresight-static-replicator"; out-ports { #address-cells = <1>; From patchwork Thu May 2 16:54:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 163275 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp5963266ill; Thu, 2 May 2019 09:54:25 -0700 (PDT) X-Google-Smtp-Source: APXvYqyZBC3HFTf/P/qwu7AEHhPaGXO+1kayULPMQLbyMBr9pNkpG17duZEM6x22YMnoqvXRbpr8 X-Received: by 2002:a17:902:6b:: with SMTP id 98mr4843064pla.271.1556816065302; Thu, 02 May 2019 09:54:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556816065; cv=none; d=google.com; s=arc-20160816; b=VxKDAjK7Q9E9x7mJjCZJ/3ZRjafPcE2zrH09kaADqFjvrK+dQeZ+GOyr437rc/nBzH JlWKS2aLCLAFjEn5T5QfXGIz/gC4SsuKWniZ8kEy+x86zVQHMuTF22Wq3g/MbNd/eVwk +wropSUK1Yw48IQt2E70QH+1tXH87aXX3J02+JYKCiUtXW5qtLUHFESGIb7MemuaHG3f fofXIhY03IF/cN2j8uGwZ2bDd3LJI1hIuhe/a6RrZBe5hfismzIPkrHKYjpdfMESysmq 3fUXfSpeEwo82kk6EktZrZZyHWVSR+Tz0D1cipUoNbo/nPcblaUy9L+kLoNZMs3z9cPg X7GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=vRavtCuEgDmIK+L0LjCzpchEvsYFUuSGMHsKbPl1OXo=; b=czXN5w50mSghbK/MgJOjGYz8oEo66V5+GWHAIGtff/TN8/XIfG2WSDaQmeFe50UUmY 0+BcP8hF9W6KXrQPqH8/qgtzGkHVCiYdofklyRqngR31qta9lQ0GJrG3zNxffLjvwJR0 PoaoqnEWktP9SSoAaeB1DXGBAyJfHL2Db1nQ8XC7NTIcYnQdmPzTpO2nSu0w70dpPW7d ijOn1nyaWSKfVqOTHLV+iLsvY9xSgLNwrbcyfr7Q6mFUVov2NJY4PndmasnjJrxM0hHB +30hwC9zhyDmjlPCf3P/TvlxxOvfDw4z04gwKmM0puf5iGcseT4lDNMxqzGSr1K2ixDC NOiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p1iuQ8jp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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. [209.132.180.67]) by mx.google.com with ESMTP id s4si37262945pgp.158.2019.05.02.09.54.24; Thu, 02 May 2019 09:54:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=p1iuQ8jp; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726781AbfEBQyO (ORCPT + 30 others); Thu, 2 May 2019 12:54:14 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:45256 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726742AbfEBQyK (ORCPT ); Thu, 2 May 2019 12:54:10 -0400 Received: by mail-pg1-f195.google.com with SMTP id i21so1311104pgi.12 for ; Thu, 02 May 2019 09:54:10 -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:in-reply-to:references; bh=vRavtCuEgDmIK+L0LjCzpchEvsYFUuSGMHsKbPl1OXo=; b=p1iuQ8jp93efREIh6tYMi7eudLPjh6BqGeUJEt+25legIa8wXytBuW36/RYS3b9GRD zhPlnLD9gMJp4+rT1NG5f9R7MUbqdBxDKnkIXc/nYmYox4ISoh9TrNuLHPtoH+9CwvYT ysz8ess489SK5iVoYQViyDaSkP5qFfOkTqolR+qOUit3Z2XakRcEFTJPGT6FPJFOC0Rc g2eDFre6sXVSAvBL7dFH1aesDippUpYcqi6PBM4umc8pEHTI82Zxm8O0TO9JCwPK3n4u wP8GJzCCarOZWhrzPbwBTNcgjqM8b+bQs8q8EHs9nvrQPOG2VmRiqru+PsGr7vYrNVeR Aw3Q== 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; bh=vRavtCuEgDmIK+L0LjCzpchEvsYFUuSGMHsKbPl1OXo=; b=dvsbW3He6i8v4BxMqADzsBPy2J5OQ/0EKxclMfughEaB7cfe1O560vMvBubofDkHFg KNjpEmORor92nrKjkTsiUhTPspi4XWhgPDeXGU5B/qQdqIS7eTUcsw35vJ+p69LZ0qqo CDqIbL1SoCc/XoPEcJpIoszKlLa/LnbcOzLox+R5CSi2SvmuJ+eC4BYRAfnWHR0esBZ3 cz0jaFwUEuzmHXnfVFSCGrl2VIBkMcKnbBB72ujO516s3CAmaYnF8FG6CVX5mS+jHsoY fYMOsxWgekX8ltUFtxPNMD+sXEPqfmDAcCvgMQGaLO8CGMmRcm6IBl10s0z0tM8SVAUk Vl/Q== X-Gm-Message-State: APjAAAXZ96NcQrJd4GmbVcNWnQ6VMiKOxF/JrWU015Ao8QL0OCF5DVu4 Z959dL7sOPec43Kw+DQBtrCfFg== X-Received: by 2002:a63:ef46:: with SMTP id c6mr5003771pgk.392.1556816049674; Thu, 02 May 2019 09:54:09 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id j2sm69949pff.77.2019.05.02.09.54.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 09:54:08 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/4] coresight: replicator: Add new device id for static replicator Date: Thu, 2 May 2019 10:54:03 -0600 Message-Id: <20190502165405.31573-3-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502165405.31573-1-mathieu.poirier@linaro.org> References: <20190502165405.31573-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan This patch adds a device id for the new static replicator compatible string; it changes the driver name from "coresight-replicator" to "coresight-static-replicator" as well. This patch also gives warning when use the replicator obsolete DT binding. Signed-off-by: Leo Yan Reviewed-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-replicator.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.17.1 diff --git a/drivers/hwtracing/coresight/coresight-replicator.c b/drivers/hwtracing/coresight/coresight-replicator.c index 4e0da85efd2d..8c9ce74498e1 100644 --- a/drivers/hwtracing/coresight/coresight-replicator.c +++ b/drivers/hwtracing/coresight/coresight-replicator.c @@ -189,6 +189,9 @@ static int replicator_probe(struct device *dev, struct resource *res) dev->platform_data = pdata; } + if (of_device_is_compatible(np, "arm,coresight-replicator")) + pr_warn_once("Uses OBSOLETE CoreSight replicator binding\n"); + drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; @@ -285,13 +288,14 @@ static const struct dev_pm_ops replicator_dev_pm_ops = { static const struct of_device_id static_replicator_match[] = { {.compatible = "arm,coresight-replicator"}, + {.compatible = "arm,coresight-static-replicator"}, {} }; static struct platform_driver static_replicator_driver = { .probe = static_replicator_probe, .driver = { - .name = "coresight-replicator", + .name = "coresight-static-replicator", .of_match_table = static_replicator_match, .pm = &replicator_dev_pm_ops, .suppress_bind_attrs = true, From patchwork Thu May 2 16:54:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 163274 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp5963209ill; Thu, 2 May 2019 09:54:21 -0700 (PDT) X-Google-Smtp-Source: APXvYqwtrABBuUP8LD+aRElmorH8ttjUVJHWQVQ0SBH0PXBJc5KGEW2Efoqpzqlm0K9R7drxH+51 X-Received: by 2002:aa7:9095:: with SMTP id i21mr5500939pfa.134.1556816061171; Thu, 02 May 2019 09:54:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556816061; cv=none; d=google.com; s=arc-20160816; b=LWq0U61giyaA/gduWMT2oDY0+vWNGlMlU+rcu8QALb19arPw3bx6CC/S6hNyibVq3c +Xt87n13Z8T8YXHVdtGzruqbbqzJA7zZ5Hz/WK8y8Sf1mQYx9UtfeQi1RcW+bNhZTw6t qPk98TT02E+HAUZPPiMNj9obao9x+g6EGBRMpkS/iV8IHTZhq3Y3xA254yL2uKD5TBuS ewdh2pH5I5PSq25xRBP/srqE120mdKll4sVF3rtgGA7uXl7k8sn7/HOxoXnVcG5WuLXm 5YG+SEPWdkGEW+oF56nAskDZYL4YMFSwKYjWTtRATi0sw9R46i90Xk5VVmgh6F0U8VoO 4Olg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=tTIyE5NXuHrlOq5gllPk+Q5yU0dC0cT6YPpzWkGZKrk=; b=wwfOxr6hCtFKC0ND/V7AQs9881L6zdIFSe0RkSSZQeRQawu6KTHkpfa+KUgkgYrwdx ZahPrXmYj5hgfRsptnkeBMnKFw9f0EVV1CXeLnLsUVOuMQ7q/lILaRM8GWxrbFxjuh1e RRWYRcjUnUD+XWnRU92JyhMv9HPNJXr7x8RutZtlWUPVHp+z6ZIqBNv+PtrnZn8iHwZs 7b5P52t1tsNyrTeP6+Dv4LglUibVNJBJ5XdlvMGOuE8NfhaiYp3B/kigd/HxHxCpF6t3 l4mwrv49uHI9i3oZTUYt4vuzx3JHIEuO69y76ZdtFVNh9Vqw07sEKaHAhreGAOXCp9yQ Bs9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DfJSJp1E; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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. [209.132.180.67]) by mx.google.com with ESMTP id s4si37262945pgp.158.2019.05.02.09.54.20; Thu, 02 May 2019 09:54:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=DfJSJp1E; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726755AbfEBQyP (ORCPT + 30 others); Thu, 2 May 2019 12:54:15 -0400 Received: from mail-pg1-f195.google.com ([209.85.215.195]:42563 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726114AbfEBQyM (ORCPT ); Thu, 2 May 2019 12:54:12 -0400 Received: by mail-pg1-f195.google.com with SMTP id p6so1320503pgh.9 for ; Thu, 02 May 2019 09:54:11 -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:in-reply-to:references; bh=tTIyE5NXuHrlOq5gllPk+Q5yU0dC0cT6YPpzWkGZKrk=; b=DfJSJp1E5/kYZAponh3b9l8qSiRbPxtIfigHy3nbt5ALTcLcgaq3O7Mf70m0HnH6gv dwMR/dRP5XZEE8vludrAZSeMdmUESQGZof734kmI3kTI+ZAFc+GRoVBos6FcRPjbAXRa HGTkFPehBpHI2uZJcRITrTaLsrG6K5BUlWGlSaTTKXYFUjnIoaqw2CBHJ4H7k8oO27C6 c7A+t/XB616J4l4XUFHcCJr5ufa6AHFXYto320cCRRTP8CpcdCsL4qQgymWg9Ksfi9Ap TavCrit12Yk8ETY8NTwpFfFkgI8zX+K6NGQlhTxDigh75NS1ZvxrPaZ9Nd16SQlkHjX+ BA0g== 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; bh=tTIyE5NXuHrlOq5gllPk+Q5yU0dC0cT6YPpzWkGZKrk=; b=fytbJ2g4aHakhWkaalbCLiN+FZgcQKMzhLSXVH/p5XTbzSAd1GGOgnkbLJ4mQjfFb4 29VD3wmv56s35G1h+IG/RFJoGWsq1z3TBOFXJ110aPWx5YRlIzZ3Z8v7E6/URE3dFnVt s6bupQFBkqp99ax3Fa9Tp4rJ5QWnGqEvLBLlVvmKRvTus2iB355W17XXcuYlPceHwo2c Cc7R24DFkazW5zr/VkX2vjCATZ+LrKDqFlbJii8ITLyzF3owS6Fmp69oWvWCkj3P4e+J aXWBwD9QvzYAS5LuauRMvvcaLxXadn3e6k1a+rNsgI8J1On9pziBZdCw/7Z4zqaSSSSU WnSw== X-Gm-Message-State: APjAAAXTGA14AxNP3fFJDIgouN0YjXxW0MoCBd4H6uRu/Nca3CXjNKgr YWkTrIj9se74GcKYZoOZynmM4A== X-Received: by 2002:a63:20f:: with SMTP id 15mr4899953pgc.90.1556816051299; Thu, 02 May 2019 09:54:11 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id j2sm69949pff.77.2019.05.02.09.54.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 09:54:10 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/4] dt-bindings: arm: coresight: Unify funnel DT binding Date: Thu, 2 May 2019 10:54:04 -0600 Message-Id: <20190502165405.31573-4-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502165405.31573-1-mathieu.poirier@linaro.org> References: <20190502165405.31573-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan Following the same fashion with replicator DT binding, this patch is to unify the DT binding for funnel to support static and dynamic modes; finally we get the funnel DT binding as below: Before patch: Static funnel, aka. non-configurable funnel: Not supported; Dynamic funnel, aka. configurable funnel: "arm,coresight-funnel", "arm,primecell"; After patch: Static funnel: "arm,coresight-static-funnel"; Dynamic funnel: "arm,coresight-dynamic-funnel", "arm,primecell"; "arm,coresight-funnel", "arm,primecell"; (obsolete) At the end of this patch, it gives an example for static funnel DT binding, and updates the dynamic funnel example. Cc: Mathieu Poirier Cc: Suzuki K Poulose Cc: Wanglai Shi Signed-off-by: Leo Yan Reviewed-by: Suzuki K Poulose Reviewed-by: Rob Herring Signed-off-by: Mathieu Poirier --- .../devicetree/bindings/arm/coresight.txt | 53 +++++++++++++++++-- 1 file changed, 48 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/Documentation/devicetree/bindings/arm/coresight.txt b/Documentation/devicetree/bindings/arm/coresight.txt index d02d160fa8ac..8a88ddebc1a2 100644 --- a/Documentation/devicetree/bindings/arm/coresight.txt +++ b/Documentation/devicetree/bindings/arm/coresight.txt @@ -8,7 +8,8 @@ through the intermediate links connecting the source to the currently selected sink. Each CoreSight component device should use these properties to describe its hardware characteristcs. -* Required properties for all components *except* non-configurable replicators: +* Required properties for all components *except* non-configurable replicators + and non-configurable funnels: * compatible: These have to be supplemented with "arm,primecell" as drivers are using the AMBA bus interface. Possible values include: @@ -24,8 +25,10 @@ its hardware characteristcs. discovered at boot time when the device is probed. "arm,coresight-tmc", "arm,primecell"; - - Trace Funnel: - "arm,coresight-funnel", "arm,primecell"; + - Trace Programmable Funnel: + "arm,coresight-dynamic-funnel", "arm,primecell"; + "arm,coresight-funnel", "arm,primecell"; (OBSOLETE. For + backward compatibility and will be removed) - Embedded Trace Macrocell (version 3.x) and Program Flow Trace Macrocell: @@ -65,7 +68,7 @@ its hardware characteristcs. "stm-stimulus-base", each corresponding to the areas defined in "reg". * Required properties for devices that don't show up on the AMBA bus, such as - non-configurable replicators: + non-configurable replicators and non-configurable funnels: * compatible: Currently supported value is (note the absence of the AMBA markee): @@ -74,6 +77,9 @@ its hardware characteristcs. "arm,coresight-replicator"; (OBSOLETE. For backward compatibility and will be removed) + - Coresight Non-configurable Funnel: + "arm,coresight-static-funnel"; + * port or ports: see "Graph bindings for Coresight" below. * Optional properties for ETM/PTMs: @@ -203,8 +209,45 @@ Example: }; }; + funnel { + /* + * non-configurable funnel don't show up on the AMBA + * bus. As such no need to add "arm,primecell". + */ + compatible = "arm,coresight-static-funnel"; + clocks = <&crg_ctrl HI3660_PCLK>; + clock-names = "apb_pclk"; + + out-ports { + port { + combo_funnel_out: endpoint { + remote-endpoint = <&top_funnel_in>; + }; + }; + }; + + in-ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + combo_funnel_in0: endpoint { + remote-endpoint = <&cluster0_etf_out>; + }; + }; + + port@1 { + reg = <1>; + combo_funnel_in1: endpoint { + remote-endpoint = <&cluster1_etf_out>; + }; + }; + }; + }; + funnel@20040000 { - compatible = "arm,coresight-funnel", "arm,primecell"; + compatible = "arm,coresight-dynamic-funnel", "arm,primecell"; reg = <0 0x20040000 0 0x1000>; clocks = <&oscclk6a>; From patchwork Thu May 2 16:54:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 163273 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp5963143ill; Thu, 2 May 2019 09:54:17 -0700 (PDT) X-Google-Smtp-Source: APXvYqyEy+6UvD0jEPwTEawgMV+5PmKyuxhyp07U8m2UxjrPED1fnPvqHbJsTPx6GbH4ozjWs34X X-Received: by 2002:a17:902:581:: with SMTP id f1mr4881451plf.304.1556816057095; Thu, 02 May 2019 09:54:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556816057; cv=none; d=google.com; s=arc-20160816; b=bBKSirIVvpLfxTkWRiaIv10PqccyNUnVOsK4tFhir2XYiwNH9P5Rn7Rrr2AsPeSP2n q9c9+9X1oAePLN3Wn6LZMK3PHsWhwoGB29qTpZYoQ1bK9CDSF6oOB1+zsjAbwGMH7QUr 8s7PTN+wezndBbuwNsNx8MdMHwUdFfTjAmHGANYB0bJvrwS2CKrj5OeZWqAXz/bd2mdf 1XlE1hOu5XXyCIZGC2YzgHLWvOxJuf8NudbuSZEXO30VpKlult3FMv7DDPDBVrf6hq70 SDu6C0QhWhHi9wpyJ84Ry0MzjQTVj0j/teMc53BUwD25RkpOFRo8iuVjlDNd4Y9gRsfX ca6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=QrkjN2tlb0+q0lMYNdu1T28xei8lTxBSs279cdRR46c=; b=vsDwrq3irfE1uiNJPwyuJDkxxXNMeCgSjOxcPRKd4HX+xVBoDqAmd1iNsPPAd6TARE UfyZ4ajr3ovLpFQOezxbQIsnHgiOpjQhuZg19Vud8sBsHLeyp8ce/A7Lwd9NTZ7GfgZO DTH3s9tfZduNdWqeF5GCfq6kB7pjWotgHOQCRA5b3ltPUoiXTHoyk0AIOK5PqqpQYPUc 6uAlg4k99x3nbwKkSw/zbhdLY7y1sMaIb55pJw4MrIW8N+K0qBdgxMOdkW54x+uhhCkH Zg8ODyJ4W+qJHH820pF/Tx4ko/V66rj7aBLHbUxojIc7EcRAoPwZHg3fOTWLClSEDzFR /TNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hQ2/20Wl"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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. [209.132.180.67]) by mx.google.com with ESMTP id k4si24151037pgs.232.2019.05.02.09.54.16; Thu, 02 May 2019 09:54:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="hQ2/20Wl"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1726814AbfEBQyP (ORCPT + 30 others); Thu, 2 May 2019 12:54:15 -0400 Received: from mail-pg1-f194.google.com ([209.85.215.194]:34804 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726579AbfEBQyN (ORCPT ); Thu, 2 May 2019 12:54:13 -0400 Received: by mail-pg1-f194.google.com with SMTP id c13so1339254pgt.1 for ; Thu, 02 May 2019 09:54:12 -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:in-reply-to:references; bh=QrkjN2tlb0+q0lMYNdu1T28xei8lTxBSs279cdRR46c=; b=hQ2/20WlvXmaLiPR466EjcP4wNnUJnwClir6hGSLn1LeC8HAFfuFsavJQtf1F3Xc9Q fAF6HkANU6E7+6D5+4JNnY1cguq1/FZVZC891QzNIZTF71IWWfuditDUronyL+fyb6bt M8VJwMnEgzi9h1jYS4xtZ+spLnZRRVWReimQwrR5NNWLtAygSBxM6i4prhZEkJ6dm0Mo sMhzWFknNuEs/f8ETF3Ce2LJ1cqp5RxzHilUdGgxHSbVQi9nf32nWNdmE1gWQ3A8wqyQ b49s/InI9jSlOB6xAbbvUtkZ4VhaL/JfjW+o/rH8+n21rPaqnBe80Puq4rOlvoa1bZx8 ZVtw== 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; bh=QrkjN2tlb0+q0lMYNdu1T28xei8lTxBSs279cdRR46c=; b=aB/0CPSBLWzDzRiNUW+xd5WQvrDimSy5hU8QAGQCuz4ZXRSQPv76Ngv59rPoFSsrU4 AQJEFGuuanIzD6Fc+5pdDYFqodapIc90ek0sug7TY3JTvr6CiCAoeQHvHP8HwmD5UlQk wSx6PUe0BVlwN4CQziNua3/+X0jhDhQx4XfhSo5dYbSMVAphuQaZeT42Uu6mPTBNqr+l AFBTkInv+ziHbc7aiLSwS2MJ3XDuJgI0grVIULIunETtPe94VZHF3JhAlYI460VF04oX FeMakb/5/R4/RDjxxL5zsKBkPYF3xB96eyM0OCkBYiXr/X73WhNIdHBJsArnfyaHB+zb ex9Q== X-Gm-Message-State: APjAAAUC+KmX+Qi+ezzdrdMJ+PZGbC06F3TsqkegoVVshcxht0ii46ZF ZTlqRXpoIvKFG5tqkBR+QDUFz4vWjdg= X-Received: by 2002:a63:8dc9:: with SMTP id z192mr5007952pgd.6.1556816052459; Thu, 02 May 2019 09:54:12 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id j2sm69949pff.77.2019.05.02.09.54.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 May 2019 09:54:11 -0700 (PDT) From: Mathieu Poirier To: gregkh@linuxfoundation.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/4] coresight: funnel: Support static funnel Date: Thu, 2 May 2019 10:54:05 -0600 Message-Id: <20190502165405.31573-5-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190502165405.31573-1-mathieu.poirier@linaro.org> References: <20190502165405.31573-1-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leo Yan Since CoreSight hardware topology can use a 'hidden' funnel in the trace data path, this kind funnel doesn't have register for accessing and is used by default from hardware design perspective. Below is an example for related hardware topology: +------+ +------+ | cpu0 |->| ETM |-\ +------+ +------+ \-> +--------+ +-----+ ...... | Funnel |->| ETF |-\ Hidden funnel +------+ +------+ /-> +--------+ +-----+ \ | | cpu3 |->| ETM |-/ \ V +------+ +------+ \-> +--------+ | Funnel |-> ... +------+ +------+ /-> +--------+ | cpu4 |->| ETM |-\ / +------+ +------+ \-> +--------+ +-----+ / ...... | Funnel |->| ETF |-/ +------+ +------+ /-> +--------+ +-----+ | cpu7 |->| ETM |-/ +------+ +------+ The CoreSight funnel driver only supports dynamic funnel with registration register resource, thus it cannot support for the static funnel case and it's impossible to create trace data path for this case. This patch is to extend CoreSight funnel driver to support both for static funnel and dynamic funnel. For the dynamic funnel it reuses the code existed in the driver, for static funnel the driver will support device probe if without providing register resource and the driver skips registers accessing when detect the register base is NULL. Cc: Mathieu Poirier Cc: Suzuki K Poulose Cc: Wanglai Shi Suggested-by: Suzuki K Poulose Signed-off-by: Leo Yan Reviewed-by: Suzuki K Poulose Signed-off-by: Mathieu Poirier --- .../hwtracing/coresight/coresight-funnel.c | 116 ++++++++++++++---- 1 file changed, 89 insertions(+), 27 deletions(-) -- 2.17.1 diff --git a/drivers/hwtracing/coresight/coresight-funnel.c b/drivers/hwtracing/coresight/coresight-funnel.c index 927925151509..16b0c0e1e43a 100644 --- a/drivers/hwtracing/coresight/coresight-funnel.c +++ b/drivers/hwtracing/coresight/coresight-funnel.c @@ -12,6 +12,8 @@ #include #include #include +#include +#include #include #include #include @@ -43,7 +45,7 @@ struct funnel_drvdata { unsigned long priority; }; -static int funnel_enable_hw(struct funnel_drvdata *drvdata, int port) +static int dynamic_funnel_enable_hw(struct funnel_drvdata *drvdata, int port) { u32 functl; int rc = 0; @@ -71,17 +73,19 @@ static int funnel_enable_hw(struct funnel_drvdata *drvdata, int port) static int funnel_enable(struct coresight_device *csdev, int inport, int outport) { - int rc; + int rc = 0; struct funnel_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); - rc = funnel_enable_hw(drvdata, inport); + if (drvdata->base) + rc = dynamic_funnel_enable_hw(drvdata, inport); if (!rc) dev_dbg(drvdata->dev, "FUNNEL inport %d enabled\n", inport); return rc; } -static void funnel_disable_hw(struct funnel_drvdata *drvdata, int inport) +static void dynamic_funnel_disable_hw(struct funnel_drvdata *drvdata, + int inport) { u32 functl; @@ -103,7 +107,8 @@ static void funnel_disable(struct coresight_device *csdev, int inport, { struct funnel_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent); - funnel_disable_hw(drvdata, inport); + if (drvdata->base) + dynamic_funnel_disable_hw(drvdata, inport); dev_dbg(drvdata->dev, "FUNNEL inport %d disabled\n", inport); } @@ -177,54 +182,70 @@ static struct attribute *coresight_funnel_attrs[] = { }; ATTRIBUTE_GROUPS(coresight_funnel); -static int funnel_probe(struct amba_device *adev, const struct amba_id *id) +static int funnel_probe(struct device *dev, struct resource *res) { int ret; void __iomem *base; - struct device *dev = &adev->dev; struct coresight_platform_data *pdata = NULL; struct funnel_drvdata *drvdata; - struct resource *res = &adev->res; struct coresight_desc desc = { 0 }; - struct device_node *np = adev->dev.of_node; + struct device_node *np = dev->of_node; if (np) { pdata = of_get_coresight_platform_data(dev, np); if (IS_ERR(pdata)) return PTR_ERR(pdata); - adev->dev.platform_data = pdata; + dev->platform_data = pdata; } + if (of_device_is_compatible(np, "arm,coresight-funnel")) + pr_warn_once("Uses OBSOLETE CoreSight funnel binding\n"); + drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); if (!drvdata) return -ENOMEM; - drvdata->dev = &adev->dev; - drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */ + drvdata->dev = dev; + drvdata->atclk = devm_clk_get(dev, "atclk"); /* optional */ if (!IS_ERR(drvdata->atclk)) { ret = clk_prepare_enable(drvdata->atclk); if (ret) return ret; } - dev_set_drvdata(dev, drvdata); - /* Validity for the resource is already checked by the AMBA core */ - base = devm_ioremap_resource(dev, res); - if (IS_ERR(base)) - return PTR_ERR(base); + /* + * Map the device base for dynamic-funnel, which has been + * validated by AMBA core. + */ + if (res) { + base = devm_ioremap_resource(dev, res); + if (IS_ERR(base)) { + ret = PTR_ERR(base); + goto out_disable_clk; + } + drvdata->base = base; + desc.groups = coresight_funnel_groups; + } - drvdata->base = base; - pm_runtime_put(&adev->dev); + dev_set_drvdata(dev, drvdata); desc.type = CORESIGHT_DEV_TYPE_LINK; desc.subtype.link_subtype = CORESIGHT_DEV_SUBTYPE_LINK_MERG; desc.ops = &funnel_cs_ops; desc.pdata = pdata; desc.dev = dev; - desc.groups = coresight_funnel_groups; drvdata->csdev = coresight_register(&desc); + if (IS_ERR(drvdata->csdev)) { + ret = PTR_ERR(drvdata->csdev); + goto out_disable_clk; + } + + pm_runtime_put(dev); - return PTR_ERR_OR_ZERO(drvdata->csdev); +out_disable_clk: + if (ret && !IS_ERR_OR_NULL(drvdata->atclk)) + clk_disable_unprepare(drvdata->atclk); + return ret; } #ifdef CONFIG_PM @@ -253,7 +274,48 @@ static const struct dev_pm_ops funnel_dev_pm_ops = { SET_RUNTIME_PM_OPS(funnel_runtime_suspend, funnel_runtime_resume, NULL) }; -static const struct amba_id funnel_ids[] = { +static int static_funnel_probe(struct platform_device *pdev) +{ + int ret; + + pm_runtime_get_noresume(&pdev->dev); + pm_runtime_set_active(&pdev->dev); + pm_runtime_enable(&pdev->dev); + + /* Static funnel do not have programming base */ + ret = funnel_probe(&pdev->dev, NULL); + + if (ret) { + pm_runtime_put_noidle(&pdev->dev); + pm_runtime_disable(&pdev->dev); + } + + return ret; +} + +static const struct of_device_id static_funnel_match[] = { + {.compatible = "arm,coresight-static-funnel"}, + {} +}; + +static struct platform_driver static_funnel_driver = { + .probe = static_funnel_probe, + .driver = { + .name = "coresight-static-funnel", + .of_match_table = static_funnel_match, + .pm = &funnel_dev_pm_ops, + .suppress_bind_attrs = true, + }, +}; +builtin_platform_driver(static_funnel_driver); + +static int dynamic_funnel_probe(struct amba_device *adev, + const struct amba_id *id) +{ + return funnel_probe(&adev->dev, &adev->res); +} + +static const struct amba_id dynamic_funnel_ids[] = { { .id = 0x000bb908, .mask = 0x000fffff, @@ -266,14 +328,14 @@ static const struct amba_id funnel_ids[] = { { 0, 0}, }; -static struct amba_driver funnel_driver = { +static struct amba_driver dynamic_funnel_driver = { .drv = { - .name = "coresight-funnel", + .name = "coresight-dynamic-funnel", .owner = THIS_MODULE, .pm = &funnel_dev_pm_ops, .suppress_bind_attrs = true, }, - .probe = funnel_probe, - .id_table = funnel_ids, + .probe = dynamic_funnel_probe, + .id_table = dynamic_funnel_ids, }; -builtin_amba_driver(funnel_driver); +builtin_amba_driver(dynamic_funnel_driver);