From patchwork Mon Aug 7 13:39:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 132017 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp1466684vqr; Mon, 7 Aug 2023 06:56:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEe2oltgbjQMdoiSSEwzXuYJYl4Dty5/DT6Rq//vGoIQs6WzUSakDzlruRsXVpi69ZbmYgZ X-Received: by 2002:a17:90a:d0c3:b0:268:5e70:507c with SMTP id y3-20020a17090ad0c300b002685e70507cmr8446333pjw.4.1691416574220; Mon, 07 Aug 2023 06:56:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691416574; cv=none; d=google.com; s=arc-20160816; b=EGN/a02z/+3YGFtMVJ2o9n/sGNWY+xqHe15tdyR3fLjgMwAJA3ciWljyjj6hA2kJi4 CgxxAbxXCyyYue/MpHwCcNo4XibTnA0jnHdFO6ufA8/0rmM6Cn1BmMBem5Jwe8NpRqhg ZpkCLqXkNr73TIM1vZM+ZjpftFgfD77Oky7PS+SZTKEYb3U0+PUQEGLpp6WHhx0pzXo3 1eifxLQlCGV+AA2WX7mfkG7KmphNYzzMeummX/epdu+vTDf6N3J4pv4W4YC8rlImhM4n j0hfpNvvEPeo7V178hNPMqPc+GV9LVfcFKNj5dyCzNr2Dipm/t+2Oxcwsx8hOY7VpwOF 9z6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=RFRFbV5lL179OIfVvsUz5VJdceU+lZY52BT1/9lbZcY=; fh=2WPuH36v6fLbvQ09Qc3ID1VWDkEArO5SlXeP+Svrhdk=; b=IHVbFxBOOnSPNqENWPnjV4yPkwpqxK3RykZ3r6bFl8ZEr63fQE4G+3/CBV1g5ETd7L bE5bVqtuwejYWrprDM8N2jIpdBoHUVdfaZNLfkrbS5SGPJm+ylfat4cAdzZ7EIwTZOQJ 0845AyiTaA3YF7/Ar5VrQYOeuYLVGfldWwMbotUkAQVBI0oDqTttGnD0wu0r3tfGutWG F4/d10/0mAgGaTO/xRJpsNVpw7wcgA2hvNDdIFrBOF9KlGJ9KHrJUJ0NbOdFZmO0DwJk gDsOL1Nwa5mmmKzNV90sL6am1lRAGRKwyXbtSpZS3EgBFPbvRPrtLfbas7UMx5oXlqDr 0pvg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id oc10-20020a17090b1c0a00b002684bc84493si6009468pjb.131.2023.08.07.06.56.01; Mon, 07 Aug 2023 06:56:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234317AbjHGNkM (ORCPT + 99 others); Mon, 7 Aug 2023 09:40:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54952 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234342AbjHGNkB (ORCPT ); Mon, 7 Aug 2023 09:40:01 -0400 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8601D1BCE for ; Mon, 7 Aug 2023 06:39:36 -0700 (PDT) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 606351FB; Mon, 7 Aug 2023 06:40:18 -0700 (PDT) Received: from donnerap.arm.com (donnerap.manchester.arm.com [10.32.100.58]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5CB843F64C; Mon, 7 Aug 2023 06:39:34 -0700 (PDT) From: Andre Przywara To: Lee Jones , Chen-Yu Tsai Cc: linux-kernel@vger.kernel.org, Jernej Skrabec , Shengyu Qu , martin.botka1@gmail.com, Matthew Croughan Subject: [PATCH] mfd: axp20x: Generalise handling without interrupts Date: Mon, 7 Aug 2023 14:39:30 +0100 Message-Id: <20230807133930.94309-1-andre.przywara@arm.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773578825524264603 X-GMAIL-MSGID: 1773578825524264603 At the moment we allow the AXP15060 and the AXP806 PMICs to omit the interrupt line to the SoC, and we skip registering the PEK (power key) driver in this case, since that crashes when no IRQ is described in the DT node. The IRQ pin potentially not being connected to anything does affect more PMICs, though, and the PEK driver is not the only one requiring an interrupt: at least the AC power supply driver crashes in a similar fashion, for instance. Generalise the handling of AXP MFD devices when the platform tables describe no interrupt, by putting devices requiring an IRQ *last* in the MFD cell array. We then can easily cut short the number of devices to be registered in this case. This patch just enables that for three PMIC models for now: the two already handled, plus the AXP313a, for which we now have mulitple examples of boards without the IRQ pin connected. To stay consistent with the current behaviour, we still (try to) register all devices for the other PMICs, even though this will probably crash without an interrupt specified, if those problematic drivers are loaded. But this new approach can now easily be extended to other PMICs with more devices, should the need arise: currently all in-tree users are fine. This fixes operation on the first boards using the AXP313a, which do not bother to connect the PMIC's IRQ pin. Signed-off-by: Andre Przywara Reported-by: Shengyu Qu Reviewed-by: Chen-Yu Tsai --- drivers/mfd/axp20x.c | 48 +++++++++++++++++--------------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c index c03bc5cda080a..c9623604bf6c1 100644 --- a/drivers/mfd/axp20x.c +++ b/drivers/mfd/axp20x.c @@ -1031,12 +1031,12 @@ static const struct mfd_cell axp803_cells[] = { }; static const struct mfd_cell axp806_self_working_cells[] = { + { .name = "axp20x-regulator" }, { .name = "axp221-pek", .num_resources = ARRAY_SIZE(axp806_pek_resources), .resources = axp806_pek_resources, }, - { .name = "axp20x-regulator" }, }; static const struct mfd_cell axp806_cells[] = { @@ -1090,19 +1090,11 @@ static const struct mfd_cell axp813_cells[] = { }; static const struct mfd_cell axp15060_cells[] = { + { .name = "axp20x-regulator", }, { .name = "axp221-pek", .num_resources = ARRAY_SIZE(axp15060_pek_resources), .resources = axp15060_pek_resources, - }, { - .name = "axp20x-regulator", - }, -}; - -/* For boards that don't have IRQ line connected to SOC. */ -static const struct mfd_cell axp_regulator_only_cells[] = { - { - .name = "axp20x-regulator", }, }; @@ -1133,6 +1125,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x) struct device *dev = axp20x->dev; const struct acpi_device_id *acpi_id; const struct of_device_id *of_id; + int nr_cells_no_irq = 0; if (dev->of_node) { of_id = of_match_device(dev->driver->of_match_table, dev); @@ -1191,6 +1184,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x) break; case AXP313A_ID: axp20x->nr_cells = ARRAY_SIZE(axp313a_cells); + nr_cells_no_irq = 1; axp20x->cells = axp313a_cells; axp20x->regmap_cfg = &axp313a_regmap_config; axp20x->regmap_irq_chip = &axp313a_regmap_irq_chip; @@ -1207,14 +1201,14 @@ int axp20x_match_device(struct axp20x_dev *axp20x) * if there is no interrupt line. */ if (of_property_read_bool(axp20x->dev->of_node, - "x-powers,self-working-mode") && - axp20x->irq > 0) { + "x-powers,self-working-mode")) { axp20x->nr_cells = ARRAY_SIZE(axp806_self_working_cells); axp20x->cells = axp806_self_working_cells; } else { axp20x->nr_cells = ARRAY_SIZE(axp806_cells); axp20x->cells = axp806_cells; } + nr_cells_no_irq = 1; axp20x->regmap_cfg = &axp806_regmap_config; axp20x->regmap_irq_chip = &axp806_regmap_irq_chip; break; @@ -1238,24 +1232,9 @@ int axp20x_match_device(struct axp20x_dev *axp20x) axp20x->regmap_irq_chip = &axp803_regmap_irq_chip; break; case AXP15060_ID: - /* - * Don't register the power key part if there is no interrupt - * line. - * - * Since most use cases of AXP PMICs are Allwinner SOCs, board - * designers follow Allwinner's reference design and connects - * IRQ line to SOC, there's no need for those variants to deal - * with cases that IRQ isn't connected. However, AXP15660 is - * used by some other vendors' SOCs that didn't connect IRQ - * line, we need to deal with this case. - */ - if (axp20x->irq > 0) { - axp20x->nr_cells = ARRAY_SIZE(axp15060_cells); - axp20x->cells = axp15060_cells; - } else { - axp20x->nr_cells = ARRAY_SIZE(axp_regulator_only_cells); - axp20x->cells = axp_regulator_only_cells; - } + axp20x->nr_cells = ARRAY_SIZE(axp15060_cells); + nr_cells_no_irq = 1; + axp20x->cells = axp15060_cells; axp20x->regmap_cfg = &axp15060_regmap_config; axp20x->regmap_irq_chip = &axp15060_regmap_irq_chip; break; @@ -1263,6 +1242,15 @@ int axp20x_match_device(struct axp20x_dev *axp20x) dev_err(dev, "unsupported AXP20X ID %lu\n", axp20x->variant); return -EINVAL; } + + /* + * Skip registering some MFD cells if there is no interrupt + * line, as IRQs might be required by some drivers. + * Those components must be the last in the cell array. + */ + if (axp20x->irq <= 0) + axp20x->nr_cells -= nr_cells_no_irq; + dev_info(dev, "AXP20x variant %s found\n", axp20x_model_names[axp20x->variant]);