Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp2782707ybc; Wed, 20 Nov 2019 21:06:54 -0800 (PST) X-Google-Smtp-Source: APXvYqwdh/ZZ9d0+2reg4oaNBgSBvBkOQNYx21oV31fwVgFnCqbUYdFnhRzk4CJ0DEqaT45ICCzJ X-Received: by 2002:a17:906:5c4d:: with SMTP id c13mr10752051ejr.80.1574312814545; Wed, 20 Nov 2019 21:06:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574312814; cv=none; d=google.com; s=arc-20160816; b=jr8ElMZ6ORiVQ1T7VMvW7pBoIfgVjzPSUx0b/JNhzM0rsjOrDYQ/AiPfXn7sZ+fRev KJMn65Dut4visbn2BDWIdGZ2YcxqI7m3rnCCkDPif/HXHsPCGJiQCTfmyDb88rFoXnZd +bvkPI0l67oRBvWL5e754RmhpOWGz7WDqJTYTklrPloldY6TTac9HLwDOO/HVnCd9V9v z31ffc9TfyUJkoWONT+MAlZrnfmWfol0UlX8lvc1dgCPb8xknkBDuJDeImiqpG8+Wtm1 eMVKkd7mWHk98y2U/T4jwj9lIPemSD0XwrM3EGK4qzBboaYzxcwoM+c8tUq4IkFIMs2W QUiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=NzjmkiZyGUYHWVA692PcCaVgof5no1lUVQvv6VnkckA=; b=i4BXIhQtnXX/+xKU9KPIoajfcfhpXrpgCJZzZE8p9ePaQcLAJHegLSbAhVVa32p2Ej WjuJLReCHsFG5Tbk6L99xViDNCJA1yLUBV3wMrfclu6cUJW+y6zcAlFKczdSlM/HOjmj C8RwOZMzS6mL7ajPKv4qusFgshuLswVKwUgqMcXilmN/5VZaCYcv8Hl90/0Mp6b+lluI bXUVSDtDMePstEjcLSqm+3AzcsdIlEwu5SzCqU/1RCH6gKbeWovXBEibawoO2ipoJuQW yQG0L0xBNiFdFtVRw0ZLUxUzShTuaVedcqW4PtLNR6d+wFNdYhVkw2Q94TwB0LyNxj+R 8+TA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ce3si1400605edb.441.2019.11.20.21.06.29; Wed, 20 Nov 2019 21:06:54 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726927AbfKUFCm (ORCPT + 99 others); Thu, 21 Nov 2019 00:02:42 -0500 Received: from mx2.suse.de ([195.135.220.15]:36480 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1725956AbfKUFCX (ORCPT ); Thu, 21 Nov 2019 00:02:23 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5B27CB15E; Thu, 21 Nov 2019 05:02:21 +0000 (UTC) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: linux-realtek-soc@lists.infradead.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH v5 8/9] irqchip: rtd1195-mux: Add RTD1395 definitions Date: Thu, 21 Nov 2019 06:02:07 +0100 Message-Id: <20191121050208.11324-9-afaerber@suse.de> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20191121050208.11324-1-afaerber@suse.de> References: <20191121050208.11324-1-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add compatible strings and bit mappings for Realtek RTD1395 SoC. Based on BPI-M4-bsp linux-rtk/drivers/irqchip/irq-rtd139x.h. Signed-off-by: Andreas Färber --- @Realtek: Does RTD1395 still have the WDOG_NMI misc interrupt at bit 2? v4 -> v5: * Renamed misc bits from MISC_ to MIS_ for consistency * Filled in irq_chip names v4: New drivers/irqchip/irq-rtd1195-mux.c | 85 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-rtd1195-mux.c b/drivers/irqchip/irq-rtd1195-mux.c index e3e2e42d9df2..e0264759c0a8 100644 --- a/drivers/irqchip/irq-rtd1195-mux.c +++ b/drivers/irqchip/irq-rtd1195-mux.c @@ -1,7 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Realtek RTD1195/RTD1295 IRQ mux + * Realtek RTD1195/RTD1295/RTD1395 IRQ mux * + * Copyright (C) 2017 Realtek Semiconductor Corporation * Copyright (c) 2017-2019 Andreas Färber */ @@ -314,6 +315,62 @@ static const u32 rtd1295_misc_isr_to_scpu_int_en_mask[32] = { [RTD1295_MIS_ISR_WDOG_NMI_SHIFT] = SCPU_INT_EN_NMI_MASK, }; +enum rtd1395_iso_isr_bits { + RTD1395_ISO_ISR_UR0_SHIFT = 2, + RTD1395_ISO_ISR_IRDA_SHIFT = 5, + RTD1395_ISO_ISR_I2C0_SHIFT = 8, + RTD1395_ISO_ISR_I2C1_SHIFT = 11, + RTD1395_ISO_ISR_RTC_HSEC_SHIFT = 12, + RTD1395_ISO_ISR_RTC_ALARM_SHIFT = 13, + RTD1395_ISO_ISR_LSADC0_SHIFT = 16, + RTD1395_ISO_ISR_LSADC1_SHIFT = 17, + RTD1395_ISO_ISR_GPIOA_SHIFT = 19, + RTD1395_ISO_ISR_GPIODA_SHIFT = 20, + RTD1395_ISO_ISR_GPHY_HV_SHIFT = 28, + RTD1395_ISO_ISR_GPHY_DV_SHIFT = 29, + RTD1395_ISO_ISR_GPHY_AV_SHIFT = 30, + RTD1395_ISO_ISR_I2C1_REQ_SHIFT = 31, +}; + +static const u32 rtd1395_iso_isr_to_scpu_int_en_mask[32] = { + [RTD1395_ISO_ISR_UR0_SHIFT] = BIT(2), + [RTD1395_ISO_ISR_IRDA_SHIFT] = BIT(5), + [RTD1395_ISO_ISR_I2C0_SHIFT] = BIT(8), + [RTD1395_ISO_ISR_I2C1_SHIFT] = BIT(11), + [RTD1395_ISO_ISR_RTC_HSEC_SHIFT] = BIT(12), + [RTD1395_ISO_ISR_RTC_ALARM_SHIFT] = BIT(13), + [RTD1395_ISO_ISR_LSADC0_SHIFT] = BIT(16), + [RTD1395_ISO_ISR_LSADC1_SHIFT] = BIT(17), + [RTD1395_ISO_ISR_GPIOA_SHIFT] = BIT(19), + [RTD1395_ISO_ISR_GPIODA_SHIFT] = BIT(20), + [RTD1395_ISO_ISR_GPHY_HV_SHIFT] = BIT(28), + [RTD1395_ISO_ISR_GPHY_DV_SHIFT] = BIT(29), + [RTD1395_ISO_ISR_GPHY_AV_SHIFT] = BIT(30), + [RTD1395_ISO_ISR_I2C1_REQ_SHIFT] = BIT(31), +}; + +enum rtd1395_misc_isr_bits { + RTD1395_MIS_ISR_UR1_SHIFT = 3, + RTD1395_MIS_ISR_UR1_TO_SHIFT = 5, + RTD1395_MIS_ISR_UR2_SHIFT = 8, + RTD1395_MIS_ISR_UR2_TO_SHIFT = 13, + RTD1395_MIS_ISR_I2C5_SHIFT = 14, + RTD1395_MIS_ISR_SC0_SHIFT = 24, + RTD1395_MIS_ISR_SPI_SHIFT = 27, + RTD1395_MIS_ISR_FAN_SHIFT = 29, +}; + +static const u32 rtd1395_misc_isr_to_scpu_int_en_mask[32] = { + [RTD1395_MIS_ISR_UR1_SHIFT] = BIT(3), + [RTD1395_MIS_ISR_UR1_TO_SHIFT] = BIT(5), + [RTD1395_MIS_ISR_UR2_TO_SHIFT] = BIT(6), + [RTD1395_MIS_ISR_UR2_SHIFT] = BIT(7), + [RTD1395_MIS_ISR_I2C5_SHIFT] = BIT(14), + [RTD1395_MIS_ISR_SC0_SHIFT] = BIT(24), + [RTD1395_MIS_ISR_SPI_SHIFT] = BIT(27), + [RTD1395_MIS_ISR_FAN_SHIFT] = BIT(29), +}; + static const struct rtd1195_irq_mux_info rtd1195_iso_irq_mux_info = { .name = "iso", .isr_offset = 0x0, @@ -330,6 +387,14 @@ static const struct rtd1195_irq_mux_info rtd1295_iso_irq_mux_info = { .isr_to_int_en_mask = rtd1295_iso_isr_to_scpu_int_en_mask, }; +static const struct rtd1195_irq_mux_info rtd1395_iso_irq_mux_info = { + .name = "iso", + .isr_offset = 0x0, + .umsk_isr_offset = 0x4, + .scpu_int_en_offset = 0x40, + .isr_to_int_en_mask = rtd1395_iso_isr_to_scpu_int_en_mask, +}; + static const struct rtd1195_irq_mux_info rtd1195_misc_irq_mux_info = { .name = "misc", .umsk_isr_offset = 0x8, @@ -346,6 +411,14 @@ static const struct rtd1195_irq_mux_info rtd1295_misc_irq_mux_info = { .isr_to_int_en_mask = rtd1295_misc_isr_to_scpu_int_en_mask, }; +static const struct rtd1195_irq_mux_info rtd1395_misc_irq_mux_info = { + .name = "misc", + .umsk_isr_offset = 0x8, + .isr_offset = 0xc, + .scpu_int_en_offset = 0x80, + .isr_to_int_en_mask = rtd1395_misc_isr_to_scpu_int_en_mask, +}; + static const struct of_device_id rtd1295_irq_mux_dt_matches[] = { { .compatible = "realtek,rtd1195-iso-irq-mux", @@ -355,6 +428,10 @@ static const struct of_device_id rtd1295_irq_mux_dt_matches[] = { .compatible = "realtek,rtd1295-iso-irq-mux", .data = &rtd1295_iso_irq_mux_info, }, + { + .compatible = "realtek,rtd1395-iso-irq-mux", + .data = &rtd1395_iso_irq_mux_info, + }, { .compatible = "realtek,rtd1195-misc-irq-mux", .data = &rtd1195_misc_irq_mux_info, @@ -363,6 +440,10 @@ static const struct of_device_id rtd1295_irq_mux_dt_matches[] = { .compatible = "realtek,rtd1295-misc-irq-mux", .data = &rtd1295_misc_irq_mux_info, }, + { + .compatible = "realtek,rtd1395-misc-irq-mux", + .data = &rtd1395_misc_irq_mux_info, + }, { } }; @@ -425,5 +506,7 @@ static int __init rtd1195_irq_mux_init(struct device_node *node, } IRQCHIP_DECLARE(rtd1195_iso_mux, "realtek,rtd1195-iso-irq-mux", rtd1195_irq_mux_init); IRQCHIP_DECLARE(rtd1295_iso_mux, "realtek,rtd1295-iso-irq-mux", rtd1195_irq_mux_init); +IRQCHIP_DECLARE(rtd1395_iso_mux, "realtek,rtd1395-iso-irq-mux", rtd1195_irq_mux_init); IRQCHIP_DECLARE(rtd1195_misc_mux, "realtek,rtd1195-misc-irq-mux", rtd1195_irq_mux_init); IRQCHIP_DECLARE(rtd1295_misc_mux, "realtek,rtd1295-misc-irq-mux", rtd1195_irq_mux_init); +IRQCHIP_DECLARE(rtd1395_misc_mux, "realtek,rtd1395-misc-irq-mux", rtd1195_irq_mux_init); -- 2.16.4