From patchwork Fri Jul 10 23:18:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 235269 Delivered-To: patches@linaro.org Received: by 2002:a54:2c11:0:0:0:0:0 with SMTP id g17csp756227ecp; Fri, 10 Jul 2020 16:18:39 -0700 (PDT) X-Received: by 2002:a17:90a:e7cf:: with SMTP id kb15mr8501433pjb.86.1594423119281; Fri, 10 Jul 2020 16:18:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594423119; cv=none; d=google.com; s=arc-20160816; b=L2ljRK+HT1kR+cbGGsKe6iw2Npo0UNUAueATXS/euI3u9yerYksydO7TUWIz7+WqYs FQCuzL/6anr5Ac99qtge7bkTvExHYOWOW4pm3aisNENsGUjBuybFjUUWOqU/ANbBov3h uFVTyX9P8e/iSu4uF/zUNPikbWMlFlWzAaa4kkzRjvE00qQimq+WRBp8VcpbHF8wPDkQ Z696crBofiqDSlhs441+eIQhoyT7pS8nhHpf8zT297xinrEi4Arp+qXNK6Zlfoe4DO8f Ei/vwNzod9z1hZ2x67CrKRaEkmQx+Rg+nzQHGxQxFeuI8gF5uqOyd9PXQeu/3wJdsrPd 7nxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qMRZ0NHrlcURRoHaqKwJd/gScGKjURbuurmLT4oMPDs=; b=TQSlVn+XOX08QhL8UND/vSvI/riv8RTNeu96Ed07rEfhpZC1n/UAD530+6EZE4SeyQ GyC6XxpjNDJFBqsF/Ys4TgS/ZFRBu08fS2Q+4X+NQX1GKVib8LkRR15+ijfOvJm+8FJ4 931NxdC4QHcrUipU5IWBrlRf/fIUhb4xQscDo3BDMRYhB2oh6pwBQ6ZTp8J9FgoCgh0W USqAhzmKPefepDatLrLDO6qjngW40pkxhQS8pqv3FIFJVLZtJD4r60Pduy9YY9OvJMZP eefw00Y6IKU/KcJ7qa/uic64wqippvthjiLnWeCntHOkhygQHQnCD60cOGvf2kuFQWiL tN2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=siq3ZbTA; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id j17sor9705126pjz.17.2020.07.10.16.18.38 for (Google Transport Security); Fri, 10 Jul 2020 16:18:39 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=siq3ZbTA; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=qMRZ0NHrlcURRoHaqKwJd/gScGKjURbuurmLT4oMPDs=; b=siq3ZbTA8BVqEbOmQpqqMzjRPpTkpPlIz/ks6NqaULMEejA4YkYv/HOK6AB6c+Ru+p ckwa3ejAbmLnY6HDT2jT1n3vgy5z0SZ5gwYKdDBCDLbwXFqjP8vpJUm6QCqnF0ADlMxO GGp2Ei5aYGCGgTYSI3DhWhxfJjbcxSCrq0KA11CGIHICNMJVAiJWmBzlP1w8NjNZTQan tB0EzrdMVX7bbGxfULnfdLFA2ZeO6gq5lb7AVAuGBMpXVG8DefbouKG/WLX1Pq6VDCTc yr7XR4303DU9x7jRegGN4vnjs5SN6h2yHTK7gcCMKMWE1D+G7o/sYapLeCwE4Noj7ZsW KH3A== 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=qMRZ0NHrlcURRoHaqKwJd/gScGKjURbuurmLT4oMPDs=; b=IrRsbJPWMQpjMtUUA7lC4eyJ+JzTBQgfBmJuEvs2kDSmfz7KR6+XN8k4RWHw6F35LF 4heX6ftBZZ1BJctdoMfX+OquWdwpSD6yU582+oW+AAQH7PK2CdWjy0HCQsL1Gg60WmcF dun6YMQ4iVAwli+DIi3PZ3vrq6hxHoYvRhc8q6JHlhdgaAXBD+C+tRLvOB+eMXYA2vih strKxNbH9ohP3ShmJWzweyAb7E1CMEL3OAoqsPC4SMspi32lvqqoNQSCFFkzRO6qbjnv N1S/NXD5Q8WV1qX2rlaDLhLpTKqhFoYYNfWaM/LEhm2twS3deLwC3I2m3TFwt0dBYNIJ Lzgg== X-Gm-Message-State: AOAM532dOSitB71c+UVxJLbYQV4GB2nuXtIemKPvZrD99L1AMJbe+6Mm Ngcf5kCHxwMkJAZyoAyiW8BdZO6D X-Google-Smtp-Source: ABdhPJwSbb79kmY7DkCicu1bibjmRmwkDhPsaYe4S7la9jpHz+4d4wDYfZdkm3pwOOLNjGKLc5IpCQ== X-Received: by 2002:a17:90a:b00e:: with SMTP id x14mr8327273pjq.57.1594423118394; Fri, 10 Jul 2020 16:18:38 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id c14sm7296382pfj.82.2020.07.10.16.18.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2020 16:18:37 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Andy Gross , Bjorn Andersson , Joerg Roedel , Thomas Gleixner , Jason Cooper , Marc Zyngier , Linus Walleij , Maulik Shah , Lina Iyer , Saravana Kannan , Todd Kjos , Greg Kroah-Hartman , linux-arm-msm@vger.kernel.org, iommu@lists.linux-foundation.org, linux-gpio@vger.kernel.org Subject: [PATCH v3 3/3] irqchip: Allow QCOM_PDC to be loadable as a permanent module Date: Fri, 10 Jul 2020 23:18:24 +0000 Message-Id: <20200710231824.60699-4-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200710231824.60699-1-john.stultz@linaro.org> References: <20200710231824.60699-1-john.stultz@linaro.org> Allows qcom-pdc driver to be loaded as a permanent module Also, due to the fact that IRQCHIP_DECLARE becomes a no-op when building as a module, we have to replace it with platform driver hooks explicitly. Thanks to Saravana for his help on pointing out the IRQCHIP_DECLARE issue and guidance on a solution. Cc: Andy Gross Cc: Bjorn Andersson Cc: Joerg Roedel Cc: Thomas Gleixner Cc: Jason Cooper Cc: Marc Zyngier Cc: Linus Walleij Cc: Maulik Shah Cc: Lina Iyer Cc: Saravana Kannan Cc: Todd Kjos Cc: Greg Kroah-Hartman Cc: linux-arm-msm@vger.kernel.org Cc: iommu@lists.linux-foundation.org Cc: linux-gpio@vger.kernel.org Signed-off-by: John Stultz --- v2: Fix spelling, include order and set suppress_bind_attrs suggested by Maulik Shah v3: Drop conditional usage of IRQCHIP_DECLARE as suggested by Stephen Boyd and Marc Zyngier --- drivers/irqchip/Kconfig | 2 +- drivers/irqchip/qcom-pdc.c | 28 +++++++++++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 216b3b8392b5..cc285c1a54c1 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -425,7 +425,7 @@ config GOLDFISH_PIC for Goldfish based virtual platforms. config QCOM_PDC - bool "QCOM PDC" + tristate "QCOM PDC" depends on ARCH_QCOM select IRQ_DOMAIN_HIERARCHY help diff --git a/drivers/irqchip/qcom-pdc.c b/drivers/irqchip/qcom-pdc.c index 6ae9e1f0819d..5b624e3295e4 100644 --- a/drivers/irqchip/qcom-pdc.c +++ b/drivers/irqchip/qcom-pdc.c @@ -11,9 +11,11 @@ #include #include #include +#include #include #include #include +#include #include #include #include @@ -430,4 +432,28 @@ static int qcom_pdc_init(struct device_node *node, struct device_node *parent) return ret; } -IRQCHIP_DECLARE(qcom_pdc, "qcom,pdc", qcom_pdc_init); +static int qcom_pdc_probe(struct platform_device *pdev) +{ + struct device_node *np = pdev->dev.of_node; + struct device_node *parent = of_irq_find_parent(np); + + return qcom_pdc_init(np, parent); +} + +static const struct of_device_id qcom_pdc_match_table[] = { + { .compatible = "qcom,pdc" }, + {} +}; +MODULE_DEVICE_TABLE(of, qcom_pdc_match_table); + +static struct platform_driver qcom_pdc_driver = { + .probe = qcom_pdc_probe, + .driver = { + .name = "qcom-pdc", + .of_match_table = qcom_pdc_match_table, + .suppress_bind_attrs = true, + }, +}; +module_platform_driver(qcom_pdc_driver); +MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Power Domain Controller"); +MODULE_LICENSE("GPL v2");