From patchwork Mon Jul 10 17:40:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Rob Herring \(Arm\)" X-Patchwork-Id: 701696 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC2AEEB64DC for ; Mon, 10 Jul 2023 17:40:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230399AbjGJRkU (ORCPT ); Mon, 10 Jul 2023 13:40:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53652 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230397AbjGJRkU (ORCPT ); Mon, 10 Jul 2023 13:40:20 -0400 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EBA8135; Mon, 10 Jul 2023 10:40:17 -0700 (PDT) Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-78362f57500so243177639f.3; Mon, 10 Jul 2023 10:40:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689010816; x=1691602816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pJ0X7LH8Y32+25vFKtVfefQZ8VxfYOg+I+aDeHwgaRg=; b=ea8pNLA3H378zc+JylHhCzz6ZFAycmOCxxiA3R46VYh9UVYdBjav9B7keAQbvCsXbK ynSNLKnHOMpgvb429xybA/nVdXVeu79Ok+Ln7iLybDTmtJlYIhZlDGUAl9FawZINC+8u C+lyPZrriz/I1KEKRIkUiYBSFY1D+oZjdhClZBOnD8N+g+IbwoyAcZjl4kwBH0A9QpOV HUIc7clL0+nBdrjGOvEUDx+0V97Z/jluph3uANqCwCs0muSCe6l9u3lwkE2CN0e5bGDN kJQdDrffWnwo2b3XjPfzseM8ruUmxz7WrdYfGyY5B4i+anzA0jBNt04xykLEIbLfzNPd GrlA== X-Gm-Message-State: ABy/qLZIe+XDfVCE/NQLsr9B+A3I03tv38TKIVYSoaQJ38gkSAGpFAa5 tTByAbXOH5x8T2OnZwsETg== X-Google-Smtp-Source: APBJJlE0oA73gYUIwMelcM8z0408U22yjSo8RUGJb2rqGjtGdswxkKCC9nABPtEoktryHkXAAacu7A== X-Received: by 2002:a92:4b08:0:b0:33b:dcbf:e711 with SMTP id m8-20020a924b08000000b0033bdcbfe711mr15060887ilg.8.1689010816389; Mon, 10 Jul 2023 10:40:16 -0700 (PDT) Received: from robh_at_kernel.org ([64.188.179.250]) by smtp.gmail.com with ESMTPSA id w18-20020a029692000000b0042036f06b24sm3449146jai.163.2023.07.10.10.40.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jul 2023 10:40:15 -0700 (PDT) Received: (nullmailer pid 2291150 invoked by uid 1000); Mon, 10 Jul 2023 17:40:13 -0000 From: Rob Herring To: Frank Rowand , Michal Suchanek Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, stable@vger.kernel.org, Cyril Brulebois , Thomas Zimmermann , Helge Deller , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] of: Preserve "of-display" device name for compatibility Date: Mon, 10 Jul 2023 11:40:07 -0600 Message-Id: <20230710174007.2291013-1-robh@kernel.org> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Since commit 241d2fb56a18 ("of: Make OF framebuffer device names unique"), as spotted by Frédéric Bonnard, the historical "of-display" device is gone: the updated logic creates "of-display.0" instead, then as many "of-display.N" as required. This means that offb no longer finds the expected device, which prevents the Debian Installer from setting up its interface, at least on ppc64el. Fix this by keeping "of-display" for the first device and "of-display.N" for subsequent devices. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217328 Link: https://bugs.debian.org/1033058 Fixes: 241d2fb56a18 ("of: Make OF framebuffer device names unique") Cc: stable@vger.kernel.org Cc: Cyril Brulebois Cc: Thomas Zimmermann Cc: Helge Deller Signed-off-by: Rob Herring Acked-by: Thomas Zimmermann Acked-by: Helge Deller --- drivers/of/platform.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 051e29b7ad2b..0c3475e7d2ff 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -552,7 +552,7 @@ static int __init of_platform_default_populate_init(void) if (!of_get_property(node, "linux,opened", NULL) || !of_get_property(node, "linux,boot-display", NULL)) continue; - dev = of_platform_device_create(node, "of-display.0", NULL); + dev = of_platform_device_create(node, "of-display", NULL); of_node_put(node); if (WARN_ON(!dev)) return -ENOMEM;