From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2E912C433EF for ; Tue, 9 Nov 2021 16:52:55 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED4D561131 for ; Tue, 9 Nov 2021 16:52:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org ED4D561131 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aKC5YXxe99avcZI888sRr5rS0xvaAuAegYNLQ/nvgXY=; b=ikslcffjUeBH2b rNmJj4Kb7Ymmkk+h0LvzMzLzydn82dY71f0DDrFoSIXyq1YZsKm6oMXCprqRT+QVL8XG4tRBLbFn/ DPsh64dk0rjw290dNxk6sXbOQ/oy9ObF2yc06cmjLFAEwFMg39s5yiBvVCLPGXhr7h0PEIiQ1BL0l YIzCNjC9vVj/PazZ+ezvTMzpWCpywzOhXdj6ZycmZ9/EwsOUKki+JvB52KmFryx8LL3AIKCaCxWaW QIrRNRDPlx8sq7SfeuINyjiNdia+ZFZRm5QFyCvofSK3REZ2Hh3myOe4TXKrfvCi1beNzCN1Ww72O pntI+Y9YdwexUrmPEwTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkULA-002lUp-1U; Tue, 09 Nov 2021 16:51:22 +0000 Received: from mail-ot1-f42.google.com ([209.85.210.42]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mkUGs-002jRt-Hn for linux-arm-kernel@lists.infradead.org; Tue, 09 Nov 2021 16:46:55 +0000 Received: by mail-ot1-f42.google.com with SMTP id z2-20020a9d71c2000000b0055c6a7d08b8so19557458otj.5 for ; Tue, 09 Nov 2021 08:46:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FuoNLU2ihR8xE4baLdLGuDw4e9lBu4yjMMhbdtSzI80=; b=MM4yWCh/jLsyFHtG0A3TMCtpd2AhbPGlkNtb+7K8b6ILxyCUAWNV2nANhsMHhkIUB5 X5NUeXDGNZhJv36lMJ2crPhM0G/289P8GmVtdYdpGSeUMTrikDm0GXLZ7UKJgQ92EgS3 Emu0MO+w3st2BaqoqaRvEQ0EgZBkt19drU+J+lhwEJKu4HSIJXKBIk4DVQKfY64l9lrQ 9ndp2Tv3cHc4OXEYPju79kQkaoi02ABT6NlAqDLrKq0U5TFAHxLEmBISQHxIhx6bB+DR H3s52TYd95i0xEuY6YuXLyq/G7S5gjUn7Y5avDayidDTgvSNIoPjs5LD/fmAkExCJ7z8 n3Dg== X-Gm-Message-State: AOAM5337J7P509n2hcWJQKjFHVLZ+ty3Zvcj5jXHcCF5YB7w/rXkaMdn oQDiHH7vFnAodAyJeIl/kg== X-Google-Smtp-Source: ABdhPJxj8cu03iQliTA8pQk4Vf2vzLvExFYWnjGcmE/j6gl759ekZMmZWg/EJ3bfPdaCi9cn9QLPBQ== X-Received: by 2002:a9d:2923:: with SMTP id d32mr6834589otb.149.1636476413029; Tue, 09 Nov 2021 08:46:53 -0800 (PST) Received: from xps15.herring.priv (66-90-148-213.dyn.grandenetworks.net. [66.90.148.213]) by smtp.googlemail.com with ESMTPSA id w22sm7514338otp.50.2021.11.09.08.46.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Nov 2021 08:46:52 -0800 (PST) From: Rob Herring To: Linus Walleij , Stephen Boyd , Sudeep Holla Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Guenter Roeck , Lorenzo Pieralisi , linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Frank Rowand Subject: [PATCH 1/2] of: Support using 'mask' in making device bus id Date: Tue, 9 Nov 2021 10:46:49 -0600 Message-Id: <20211109164650.2233507-2-robh@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211109164650.2233507-1-robh@kernel.org> References: <20211109164650.2233507-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211109_084654_629968_EEE3DAE2 X-CRM114-Status: GOOD ( 16.57 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 25b892b583cc ("ARM: dts: arm: Update register-bit-led nodes 'reg' and node names") added a 'reg' property to nodes. This change has the side effect of changing how the kernel generates the device name. The assumption was a translatable 'reg' address is unique. However, in the case of the register-bit-led binding (and a few others) that is not the case. The 'mask' property must also be used in this case to make a unique device name. Fixes: 25b892b583cc ("ARM: dts: arm: Update register-bit-led nodes 'reg' and node names") Reported-by: Guenter Roeck Cc: stable@vger.kernel.org Cc: Frank Rowand Cc: Linus Walleij Signed-off-by: Rob Herring --- This should be applied to stable to minimize DT ABI breakage. --- drivers/of/platform.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 07813fb1ef37..b3faf89744aa 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -76,6 +76,7 @@ static void of_device_make_bus_id(struct device *dev) struct device_node *node = dev->of_node; const __be32 *reg; u64 addr; + u32 mask; /* Construct the name, using parent nodes if necessary to ensure uniqueness */ while (node->parent) { @@ -85,8 +86,13 @@ static void of_device_make_bus_id(struct device *dev) */ reg = of_get_property(node, "reg", NULL); if (reg && (addr = of_translate_address(node, reg)) != OF_BAD_ADDR) { - dev_set_name(dev, dev_name(dev) ? "%llx.%pOFn:%s" : "%llx.%pOFn", - addr, node, dev_name(dev)); + if (!of_property_read_u32(node, "mask", &mask)) + dev_set_name(dev, dev_name(dev) ? "%llx.%x.%pOFn:%s" : "%llx.%x.%pOFn", + addr, ffs(mask) - 1, node, dev_name(dev)); + + else + dev_set_name(dev, dev_name(dev) ? "%llx.%pOFn:%s" : "%llx.%pOFn", + addr, node, dev_name(dev)); return; } -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel