From patchwork Mon Oct 11 13:46:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 515621 Delivered-To: patch@linaro.org Received: by 2002:ac0:b5cc:0:0:0:0:0 with SMTP id x12csp4476418ime; Mon, 11 Oct 2021 07:07:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPAAatBvpCp9Y/9wX3LelkLQu1yyzdiUIBAFaopWW3fT2WsjWHT3aIO2Rpwc6TSJwSGNZr X-Received: by 2002:a17:906:69d6:: with SMTP id g22mr25332993ejs.429.1633961275962; Mon, 11 Oct 2021 07:07:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1633961275; cv=none; d=google.com; s=arc-20160816; b=MuHpiFV7eXiQJUUCkz1Z5tnlejLc4zV7BW6xFh4PqAu0JR/JDvIxWmCfQvE732OEOd 2r5FDV5Fl0v6WDR/AFbd4WwbQSc+cqY8J3O8zfHbTXZHRTZUj5Iv0Z00uHMr3CSYlak/ 10XMxb7K33w7H0zwt2cyhblCiNIakUsfhY4Bs2zHIG+NfKkEJdWYzU9QE5BdvMEMAzz6 dKOa/gc1q2ofofTBNjnfZNF/JlUSPOeNjtGuq3cinVe7RhIFbZjTjuWhe+OoLsAQB7s2 zD0aoy5JBmHyiPN4CkgjPYpG4NCsxC6Aw3KaMj93mHIfCBoAGBRx09kog29bhxxk5fnm oucg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hrRyqQ36goLHljdszl9oONWK7/vxmsqBlLqrlhRoA5o=; b=JT/iZwqb/VZWp2BldlnE3etpnfANoNmCO5y6TR8S6yzUFVcTDPRIPGTrlFL1pSu2+6 e8iLaXKjHr+6ON/xYK4us4uPYb7577ZJc4ErigzOblQVR7HFlQfYvTsFH0tr5tIF3f81 5sW66Ht7qnqIsGnPgXJo7OYfTw3LEm6QGdsRXtOouq2PhAovSZ/ssXc2ki0VLeV74yvO zK37Z+iUQ9gznpk7GKxCv8EiPGlSAvVpvFsJVdqn3IW58UiD0bwz5zzSLkuFYm/bulRg KnQX7Ewnh6iLHOu5QZpZ+ZFA8Pu2MwVqt18ammUP4TYEiXkYwmrNzchSSGZRT9dEX7Vy iLcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yJnoLOUh; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q26si9624396edi.67.2021.10.11.07.07.55; Mon, 11 Oct 2021 07:07:55 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yJnoLOUh; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239749AbhJKOJu (ORCPT + 11 others); Mon, 11 Oct 2021 10:09:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:56458 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238508AbhJKOHi (ORCPT ); Mon, 11 Oct 2021 10:07:38 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6665F61208; Mon, 11 Oct 2021 14:00:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1633960854; bh=EGHYuQ7iTgfF1v16raV76dUZqXn7lsF3sBDsTlOfT8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yJnoLOUhtlSmoCUuO+m0LzGv9vMWlfS7OMNaXCGoaRSDWIxr9XFmDhgn3yb3PHdI1 IAC+zOruKnKxqIvK1FRsrQqt8yRvY6VcHC5GTIt5W/r30qgMA45d8sL5KG0htCtaf0 x+PK8X4MGyoR1IXCDEfEqQL8nJdriyzNqV5cAlnw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Linus Walleij , Kees Cook , Arnd Bergmann , Sasha Levin Subject: [PATCH 5.14 094/151] ARM: defconfig: gemini: Restore framebuffer Date: Mon, 11 Oct 2021 15:46:06 +0200 Message-Id: <20211011134520.866697589@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211011134517.833565002@linuxfoundation.org> References: <20211011134517.833565002@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Linus Walleij [ Upstream commit a6949059318a064880050c76a9d8fb070156385f ] The framebuffer is gone on the D-Link DIR-685, restore it. Fixes: f611b1e7624c ("drm: Avoid circular dependencies for CONFIG_FB") Signed-off-by: Linus Walleij Cc: Kees Cook Link: https://lore.kernel.org/r/20210922200933.1825752-1-linus.walleij@linaro.org' Signed-off-by: Arnd Bergmann Signed-off-by: Sasha Levin --- arch/arm/configs/gemini_defconfig | 1 + 1 file changed, 1 insertion(+) -- 2.33.0 diff --git a/arch/arm/configs/gemini_defconfig b/arch/arm/configs/gemini_defconfig index d2d5f1cf815f..e6ff844821cf 100644 --- a/arch/arm/configs/gemini_defconfig +++ b/arch/arm/configs/gemini_defconfig @@ -76,6 +76,7 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_DRM=y CONFIG_DRM_PANEL_ILITEK_IL9322=y CONFIG_DRM_TVE200=y +CONFIG_FB=y CONFIG_LOGO=y CONFIG_USB=y CONFIG_USB_MON=y