From 2b37abe39681a38bbcabcb8d94dd882919f0b3f0 Mon Sep 17 00:00:00 2001 From: David Collins Date: Thu, 19 Nov 2020 13:38:59 -0800 Subject: [PATCH] spmi: spmi-pmic-arb-debug: add support for fuse enable bit Add support for detecting a fuse bit that enables instead of disables SPMI PMIC arbiter debug bus hardware. Change-Id: Ia5190c1cc53a8f65ea83294dafd0ddc8861293ba Signed-off-by: David Collins --- drivers/spmi/spmi-pmic-arb-debug.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/spmi/spmi-pmic-arb-debug.c b/drivers/spmi/spmi-pmic-arb-debug.c index 1c5240a2c0c8..b600b2541b3d 100644 --- a/drivers/spmi/spmi-pmic-arb-debug.c +++ b/drivers/spmi/spmi-pmic-arb-debug.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only -/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved. */ +/* Copyright (c) 2012-2018, 2020, The Linux Foundation. All rights reserved. */ #include #include @@ -248,13 +248,21 @@ static int spmi_pmic_arb_debug_probe(struct platform_device *pdev) int rc; u32 fuse_val, fuse_bit; void __iomem *fuse_addr; + bool is_disable_fuse = true; - /* Check if the debug bus is disabled by a fuse. */ + /* Check if the debug bus is enabled or disabled by a fuse. */ rc = of_property_read_u32(pdev->dev.of_node, "qcom,fuse-disable-bit", &fuse_bit); + if (rc) { + is_disable_fuse = false; + rc = of_property_read_u32(pdev->dev.of_node, + "qcom,fuse-enable-bit", + &fuse_bit); + } if (!rc) { if (fuse_bit > 31) { - dev_err(&pdev->dev, "qcom,fuse-disable-bit supports values 0 to 31, but %u specified\n", + dev_err(&pdev->dev, "qcom,fuse-%s-bit supports values 0 to 31, but %u specified\n", + is_disable_fuse ? "disable" : "enable", fuse_bit); return -EINVAL; } @@ -273,7 +281,7 @@ static int spmi_pmic_arb_debug_probe(struct platform_device *pdev) fuse_val = readl_relaxed(fuse_addr); iounmap(fuse_addr); - if (fuse_val & BIT(fuse_bit)) { + if (!!(fuse_val & BIT(fuse_bit)) == is_disable_fuse) { dev_err(&pdev->dev, "SPMI PMIC arbiter debug bus disabled by fuse\n"); return -ENODEV; }