From patchwork Tue Oct 17 12:47:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 116084 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp4849527qgn; Tue, 17 Oct 2017 05:48:12 -0700 (PDT) X-Google-Smtp-Source: AOwi7QBTdltnq59RpKZObNbjHPOLwKLEI8JOTXlRAc2nQewUG050GOOlQsayL3U1b5PGYmhnZCcl X-Received: by 10.101.83.70 with SMTP id w6mr10739431pgr.361.1508244492893; Tue, 17 Oct 2017 05:48:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508244492; cv=none; d=google.com; s=arc-20160816; b=LlkU8/yZBiYCVICBdZk/44YY7tyLxRlpl3iQwNvsYHJ27P6k3QIiawQBDjJcCJFe7e tBoK9VakKED/Uu7UvZMeLxv4j4d7w1rsNeJ/kaCIDki7olR6l6oYgjW4AzrOe0aFmV5H DOlQINac1mPISawpQkmhNoLSsDWn5QvjVZgKuhZdnmmRDBnSo1xLukOWq3C4KsnXzN0E s06+8E50loW3UF/mU73K+S0etdOrfJL+mbMuF29jcO1L/WEPwtF/47c4tLbVcpLtPm4b tIHWm0DknQwppICYVoZcgoAGyO0ayYUIpMGc917eEnBw4RK6Oo0IDHzPRyAC5Je/BahB s+VA== 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 :arc-authentication-results; bh=tYr91NkHUV4sAoJ6I8aqEG91xS7ixBJlsOOgR0j4504=; b=vWQbU7S8ttP/X2H03LWuTnOlxnDbqduvBjkDw5bSJA4iVlV2GET0V0vyxerAI+x6cW hEdAuazXE5TlymjzawaLaXnTLZ5tz8yj2rRSuus1sOVf2l2ds8iNEAtpe6S4csMYV0na 61RfF6wAUKTJeGqBkCzl6JfRjPbxchglvIcvhGiMZbYJ9ovSXopq4N8sGqMnbsUQH2TL wOj5Q5o7A4u4xaCv6wqqB+PT2qAfvGEG9XbhwrQPTcC1xZ+d5kbIiDLf/kMY2Htstpeo oODRyQe9B4JAI++vKMlHhWXo5ux02j2CxMotFY1uNHO7COiFXgw3LO5Ex2nCzzv6F1/F S7Bg== 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 i71si5845227pfd.67.2017.10.17.05.48.12; Tue, 17 Oct 2017 05:48:12 -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; 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 S1761948AbdJQMsL (ORCPT + 27 others); Tue, 17 Oct 2017 08:48:11 -0400 Received: from mx2.suse.de ([195.135.220.15]:34064 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761883AbdJQMrX (ORCPT ); Tue, 17 Oct 2017 08:47:23 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B71F2ACFF; Tue, 17 Oct 2017 12:47:20 +0000 (UTC) From: =?utf-8?q?Andreas_F=C3=A4rber?= To: Thomas Gleixner , Jason Cooper , Marc Zyngier , linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org, Bizon , Roc He , =?utf-8?b?6JKL5Li955C0?= , =?utf-8?q?Andreas_F=C3=A4rber?= Subject: [PATCH v3 5/5] irqchip: rtd119x: Add RTD1195 definitions Date: Tue, 17 Oct 2017 14:47:07 +0200 Message-Id: <20171017124708.6242-6-afaerber@suse.de> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171017124708.6242-1-afaerber@suse.de> References: <20171017124708.6242-1-afaerber@suse.de> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add compatible strings and bit definitions for Realtek RTD1195 SoC. Signed-off-by: Andreas Färber --- v3: New drivers/irqchip/irq-rtd119x-mux.c | 99 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 1 deletion(-) -- 2.13.6 diff --git a/drivers/irqchip/irq-rtd119x-mux.c b/drivers/irqchip/irq-rtd119x-mux.c index ad6e2093fcd3..84c592ad7421 100644 --- a/drivers/irqchip/irq-rtd119x-mux.c +++ b/drivers/irqchip/irq-rtd119x-mux.c @@ -1,5 +1,5 @@ /* - * Realtek RTD129x IRQ mux + * Realtek RTD119x/RTD129x IRQ mux * * Copyright (c) 2017 Andreas Färber * @@ -144,6 +144,81 @@ static struct irq_domain_ops rtd119x_mux_irq_domain_ops = { .map = rtd119x_mux_irq_domain_map, }; +enum rtd119x_iso_isr_bits { + RTD119X_ISO_ISR_TC3_SHIFT = 1, + RTD119X_ISO_ISR_UR0_SHIFT = 2, + RTD119X_ISO_ISR_IRDA_SHIFT = 5, + RTD119X_ISO_ISR_WDOG_NMI_SHIFT = 7, + RTD119X_ISO_ISR_I2C0_SHIFT = 8, + RTD119X_ISO_ISR_TC4_SHIFT = 9, + RTD119X_ISO_ISR_I2C6_SHIFT = 10, + RTD119X_ISO_ISR_RTC_HSEC_SHIFT = 12, + RTD119X_ISO_ISR_RTC_ALARM_SHIFT = 13, + RTD119X_ISO_ISR_VFD_WDONE_SHIFT = 14, + RTD119X_ISO_ISR_VFD_ARDKPADA_SHIFT = 15, + RTD119X_ISO_ISR_VFD_ARDKPADDA_SHIFT = 16, + RTD119X_ISO_ISR_VFD_ARDSWA_SHIFT = 17, + RTD119X_ISO_ISR_VFD_ARDSWDA_SHIFT = 18, + RTD119X_ISO_ISR_GPIOA_SHIFT = 19, + RTD119X_ISO_ISR_GPIODA_SHIFT = 20, + RTD119X_ISO_ISR_CEC_SHIFT = 22, +}; + +static const u32 rtd119x_iso_isr_to_scpu_int_en_mask[32] = { + [RTD119X_ISO_ISR_UR0_SHIFT] = BIT(2), + [RTD119X_ISO_ISR_IRDA_SHIFT] = BIT(5), + [RTD119X_ISO_ISR_I2C0_SHIFT] = BIT(8), + [RTD119X_ISO_ISR_I2C6_SHIFT] = BIT(10), + [RTD119X_ISO_ISR_RTC_HSEC_SHIFT] = BIT(12), + [RTD119X_ISO_ISR_RTC_ALARM_SHIFT] = BIT(13), + [RTD119X_ISO_ISR_VFD_WDONE_SHIFT] = BIT(14), + [RTD119X_ISO_ISR_VFD_ARDKPADA_SHIFT] = BIT(15), + [RTD119X_ISO_ISR_VFD_ARDKPADDA_SHIFT] = BIT(16), + [RTD119X_ISO_ISR_VFD_ARDSWA_SHIFT] = BIT(17), + [RTD119X_ISO_ISR_VFD_ARDSWDA_SHIFT] = BIT(18), + [RTD119X_ISO_ISR_GPIOA_SHIFT] = BIT(19), + [RTD119X_ISO_ISR_GPIODA_SHIFT] = BIT(20), + [RTD119X_ISO_ISR_CEC_SHIFT] = BIT(22), +}; + +enum rtd119x_misc_isr_bits { + RTD119X_MIS_ISR_WDOG_NMI_SHIFT = 2, + RTD119X_MIS_ISR_UR1_SHIFT, + RTD119X_MIS_ISR_I2C1_SHIFT, + RTD119X_MIS_ISR_UR1_TO_SHIFT, + RTD119X_MIS_ISR_TC0_SHIFT, + RTD119X_MIS_ISR_TC1_SHIFT, + RTD119X_MIS_ISR_RTC_HSEC_SHIFT = 9, + RTD119X_MIS_ISR_RTC_MIN_SHIFT, + RTD119X_MIS_ISR_RTC_HOUR_SHIFT, + RTD119X_MIS_ISR_RTC_DATE_SHIFT, + RTD119X_MIS_ISR_I2C5_SHIFT = 14, + RTD119X_MIS_ISR_I2C4_SHIFT, + RTD119X_MIS_ISR_GPIOA_SHIFT = 19, + RTD119X_MIS_ISR_GPIODA_SHIFT, + RTD119X_MIS_ISR_LSADC_SHIFT, + RTD119X_MIS_ISR_I2C3_SHIFT = 23, + RTD119X_MIS_ISR_I2C2_SHIFT = 26, + RTD119X_MIS_ISR_GSPI_SHIFT, +}; + +static const u32 rtd119x_misc_isr_to_scpu_int_en_mask[32] = { + [RTD119X_MIS_ISR_UR1_SHIFT] = BIT(3), + [RTD119X_MIS_ISR_I2C1_SHIFT] = BIT(4), + [RTD119X_MIS_ISR_UR1_TO_SHIFT] = BIT(5), + [RTD119X_MIS_ISR_RTC_MIN_SHIFT] = BIT(10), + [RTD119X_MIS_ISR_RTC_HOUR_SHIFT] = BIT(11), + [RTD119X_MIS_ISR_RTC_DATE_SHIFT] = BIT(12), + [RTD119X_MIS_ISR_I2C5_SHIFT] = BIT(14), + [RTD119X_MIS_ISR_I2C4_SHIFT] = BIT(15), + [RTD119X_MIS_ISR_GPIOA_SHIFT] = BIT(19), + [RTD119X_MIS_ISR_GPIODA_SHIFT] = BIT(20), + [RTD119X_MIS_ISR_LSADC_SHIFT] = BIT(21), + [RTD119X_MIS_ISR_I2C2_SHIFT] = BIT(26), + [RTD119X_MIS_ISR_GSPI_SHIFT] = BIT(27), + [RTD119X_MIS_ISR_I2C3_SHIFT] = BIT(28), +}; + enum rtd129x_iso_isr_bits { RTD1295_ISO_ISR_UR0_SHIFT = 2, RTD1295_ISO_ISR_IRDA_SHIFT = 5, @@ -214,6 +289,13 @@ static const u32 rtd129x_misc_isr_to_scpu_int_en_mask[32] = { [RTD1295_ISR_FAN_SHIFT] = BIT(29), }; +static const struct rtd119x_irq_mux_info rtd119x_iso_irq_mux_info = { + .isr_offset = 0x0, + .umsk_isr_offset = 0x4, + .scpu_int_en_offset = 0x40, + .isr_to_scpu_int_en_mask = rtd119x_iso_isr_to_scpu_int_en_mask, +}; + static const struct rtd119x_irq_mux_info rtd129x_iso_irq_mux_info = { .isr_offset = 0x0, .umsk_isr_offset = 0x4, @@ -221,6 +303,13 @@ static const struct rtd119x_irq_mux_info rtd129x_iso_irq_mux_info = { .isr_to_scpu_int_en_mask = rtd129x_iso_isr_to_scpu_int_en_mask, }; +static const struct rtd119x_irq_mux_info rtd119x_misc_irq_mux_info = { + .umsk_isr_offset = 0x8, + .isr_offset = 0xc, + .scpu_int_en_offset = 0x80, + .isr_to_scpu_int_en_mask = rtd119x_misc_isr_to_scpu_int_en_mask, +}; + static const struct rtd119x_irq_mux_info rtd129x_misc_irq_mux_info = { .umsk_isr_offset = 0x8, .isr_offset = 0xc, @@ -230,9 +319,15 @@ static const struct rtd119x_irq_mux_info rtd129x_misc_irq_mux_info = { static const struct of_device_id rtd1295_irq_mux_dt_matches[] = { { + .compatible = "realtek,rtd1195-iso-irq-mux", + .data = &rtd119x_iso_irq_mux_info, + }, { .compatible = "realtek,rtd1295-iso-irq-mux", .data = &rtd129x_iso_irq_mux_info, }, { + .compatible = "realtek,rtd1195-misc-irq-mux", + .data = &rtd119x_misc_irq_mux_info, + }, { .compatible = "realtek,rtd1295-misc-irq-mux", .data = &rtd129x_misc_irq_mux_info, }, { @@ -287,5 +382,7 @@ static int __init rtd119x_irq_mux_init(struct device_node *node, return 0; } +IRQCHIP_DECLARE(rtd1195_iso_mux, "realtek,rtd1195-iso-irq-mux", rtd119x_irq_mux_init); IRQCHIP_DECLARE(rtd1295_iso_mux, "realtek,rtd1295-iso-irq-mux", rtd119x_irq_mux_init); +IRQCHIP_DECLARE(rtd1195_misc_mux, "realtek,rtd1195-misc-irq-mux", rtd119x_irq_mux_init); IRQCHIP_DECLARE(rtd1295_misc_mux, "realtek,rtd1295-misc-irq-mux", rtd119x_irq_mux_init);