From mboxrd@z Thu Jan 1 00:00:00 1970 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=-14.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=ham 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 3E011C433DF for ; Sun, 11 Oct 2020 17:59:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 08665207EA for ; Sun, 11 Oct 2020 17:59:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="cmVp9TLN"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="9Fda3rJt" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727043AbgJKR7i (ORCPT ); Sun, 11 Oct 2020 13:59:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388478AbgJKR5l (ORCPT ); Sun, 11 Oct 2020 13:57:41 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E502AC0613DC; Sun, 11 Oct 2020 10:57:38 -0700 (PDT) Date: Sun, 11 Oct 2020 17:57:36 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1602439057; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tfpvc+uDRk5yfDkc1+lPh5naYsChNzUBApEMmjftadY=; b=cmVp9TLNNFXpxXuwIHOu1w+iPIOV3A6yZMf3WN68bjRkk1LMKK9CTrLwbmEk0fhgSxKLO7 BuE1lk2ID+7cATX8siQdkTg11lsjlyrk4nawZ1rQ3ozCSigG0PIa46kSi1xvl0Dtn1BFFy 6DmpxqT0AVmyIlMaT+hiStpnbbhtrXiTthU8FSWEDTjapR5IoTfth5CjxtrYcMkxFGC5yq oRFucdBYDiI8Ls5Jc7dUXj+TYfuOB4P2xPSE+4ACxb473Ruyc/7FVyR3DED1GiOux9APcV xLEJkr0CgacRlxFTyhqNK2zKrMfRQoa3kxW59IV7gzCCTGyDgxWMBqHEb4jf9w== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1602439057; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tfpvc+uDRk5yfDkc1+lPh5naYsChNzUBApEMmjftadY=; b=9Fda3rJtUgz86U49NX2Yyputd2aU+oLDNKwF8g1ZBy1+2v0rxlrew0xsecjc7IbEo/oInW 3spXMKd6XtS9N0CA== From: "tip-bot2 for Suman Anna" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] irqchip/irq-pruss-intc: Add support for ICSSG INTC on K3 SoCs Cc: Suman Anna , Grzegorz Jaszczyk , Marc Zyngier , x86 , LKML MIME-Version: 1.0 Message-ID: <160243905657.7002.9340747357886501183.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/core branch of tip: Commit-ID: 7e92dee60cba51f8a5c7637bac815e70c85935f7 Gitweb: https://git.kernel.org/tip/7e92dee60cba51f8a5c7637bac815e70c85935f7 Author: Suman Anna AuthorDate: Wed, 16 Sep 2020 18:36:38 +02:00 Committer: Marc Zyngier CommitterDate: Thu, 17 Sep 2020 12:20:32 +01:00 irqchip/irq-pruss-intc: Add support for ICSSG INTC on K3 SoCs The K3 AM65x and J721E SoCs have the next generation of the PRU-ICSS IP, commonly called ICSSG. The PRUSS INTC present within the ICSSG supports more System Events (160 vs 64), more Interrupt Channels and Host Interrupts (20 vs 10) compared to the previous generation PRUSS INTC instances. The first 2 and the last 10 of these host interrupt lines are used by the PRU and other auxiliary cores and sub-modules within the ICSSG, with 8 host interrupts connected to MPU. The host interrupts 5, 6, 7 are also connected to the other ICSSG instances within the SoC and can be partitioned as per system integration through the board dts files. Enhance the PRUSS INTC driver to add support for this ICSSG INTC instance. Co-developed-by: Grzegorz Jaszczyk Signed-off-by: Suman Anna Signed-off-by: Grzegorz Jaszczyk Signed-off-by: Marc Zyngier --- drivers/irqchip/Kconfig | 2 +- drivers/irqchip/irq-pruss-intc.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 733e59f..25c8944 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -495,7 +495,7 @@ config TI_SCI_INTA_IRQCHIP config TI_PRUSS_INTC tristate "TI PRU-ICSS Interrupt Controller" - depends on ARCH_DAVINCI || SOC_AM33XX || SOC_AM43XX || SOC_DRA7XX || ARCH_KEYSTONE + depends on ARCH_DAVINCI || SOC_AM33XX || SOC_AM43XX || SOC_DRA7XX || ARCH_KEYSTONE || ARCH_K3 select IRQ_DOMAIN help This enables support for the PRU-ICSS Local Interrupt Controller diff --git a/drivers/irqchip/irq-pruss-intc.c b/drivers/irqchip/irq-pruss-intc.c index bfe529a..92fb578 100644 --- a/drivers/irqchip/irq-pruss-intc.c +++ b/drivers/irqchip/irq-pruss-intc.c @@ -628,11 +628,20 @@ static const struct pruss_intc_match_data pruss_intc_data = { .num_host_events = 10, }; +static const struct pruss_intc_match_data icssg_intc_data = { + .num_system_events = 160, + .num_host_events = 20, +}; + static const struct of_device_id pruss_intc_of_match[] = { { .compatible = "ti,pruss-intc", .data = &pruss_intc_data, }, + { + .compatible = "ti,icssg-intc", + .data = &icssg_intc_data, + }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, pruss_intc_of_match);