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: 13307451 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E775EEB64D9 for ; Mon, 10 Jul 2023 17:40:20 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1DAE510E2B9; Mon, 10 Jul 2023 17:40:20 +0000 (UTC) Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0313110E2B9 for ; Mon, 10 Jul 2023 17:40:17 +0000 (UTC) Received: by mail-io1-f47.google.com with SMTP id ca18e2360f4ac-78372b895d6so243423139f.2 for ; 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=UQxQ4h0LaniGa/7PKWWCw/YFj17YERn6y9w2vGMLexy1hRswqvGLInmCv0W8eQo7HW WPdTr3CgB5A/7sVQgLS+q7VMFPbmnTa2m3pKEEla/Qvwy8ZkQLBxQuBiGLu5G+1CUdUq 3drZm/C7/BfmI0IxsQuLjfoF4a16aiYBMHg7/6e+63408h2/gk0H02AwpLBZVj7kE86f Ng/djsvk5y/K4ADLTWKFX8B4HCn7u9zb6JeXw68HszhWHTn/gbd9V5Hfr1mUxQ/wPcNI 4YXmT1i/BSCrbPgT2Jc2Axi+LG/hF80QUbKWc0mMgGFpfz8CDFZ1AqzGHIpsSa5mJaRs wGmA== X-Gm-Message-State: ABy/qLZcca8LI5wDu95QFBJoDSp56JVlc/A2FpzA9BsMwD8r4/PkZT83 AtcY6qI/a8sNW9BfbdI2/w== 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 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 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-fbdev@vger.kernel.org, Helge Deller , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Cyril Brulebois , dri-devel@lists.freedesktop.org, Thomas Zimmermann Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 Reviewed-by: Michal Suchánek 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;