From patchwork Thu Sep 16 15:57:50 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: 513020 Delivered-To: patch@linaro.org Received: by 2002:a02:c816:0:0:0:0:0 with SMTP id p22csp1420808jao; Thu, 16 Sep 2021 10:16:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVG5DU+2GXKlzNncvLDmAkUQfHVEi/zUxFtVlorl2s0c56/Y/ws4OLlgyyMq3S2a7Sj+MV X-Received: by 2002:a6b:6918:: with SMTP id e24mr5195600ioc.71.1631812568592; Thu, 16 Sep 2021 10:16:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631812568; cv=none; d=google.com; s=arc-20160816; b=nwdVQMp6cIrL+xI9lDKmjoHhlnPnm6Gs+qHrc9380hfWMs+z0Np6WtXGcoSzqBkmsx yjKBeOH96bYi1iFa9SL4mHYY4rhTochJ1PxnvNR6MzdNiIO6RHhBFkqIcNm4jCXZn3/j TX7oYJTfqTnqfcMH58a5kEFTWnx5Wj0h1WdpizKEck3IgdgUe1v/ti8thwojEZkqaMnq E/pswX24c+yADagyStMiNtI9HOj9kU6WiFJz567FnDklisQ8yZQqkDBbHKGQg/ZBekll TaUJRhjCcTV9bg3leW2oAq/ykChfbqzOjSJBHmDdueB8Qzd/1hREx/PjhK+QPlm3AvCR Idcg== 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=Y7KkY73lKnarntFfLgZCwsZx9kO+9lsnGMvMfy0TDtA=; b=zyahrdnUwDL/v/X2lPh3lha1Apcja2NoEqloWHeFWAEEiBnjfYp2ouoK/PF5ogpnTz WohwFGxmuvdUzk6JQGuE8KQ4/aEd6GUkLpPC/zhuoBqPDolk5K3FTfogUh7yVp7xHMOe zxV+fn9Ctm/f6ZArCGvgu0eqnG+zy4BP40QaI18UzARwsjxsmqkIITJIp8RXVoTVrseA D2mwRtuUX/HCbYkiwZDfEymJq8pQ9OLfwBdhk45NJedF3tT1jnX6ib8WDvEe7VKPjFb6 HyHvEjYjLZsvW9Khrd5eK335DYeoJ3YVK1oSbPsrb94QRLJzCf+ZX7B1ju7dVm3HsDfX L2Kw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=iQoojTiG; 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 d6si3373429ios.63.2021.09.16.10.16.08; Thu, 16 Sep 2021 10:16:08 -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=iQoojTiG; 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 S1351473AbhIPRR1 (ORCPT + 11 others); Thu, 16 Sep 2021 13:17:27 -0400 Received: from mail.kernel.org ([198.145.29.99]:41016 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1351291AbhIPRPY (ORCPT ); Thu, 16 Sep 2021 13:15:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6357A61B65; Thu, 16 Sep 2021 16:39:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631810387; bh=zc3aboCk0saY7I/sLex5/I6UwQO7I+Kz3RvTDi6mJTE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iQoojTiGm+4+fsW+2EAJnoquDlWlwiOrMdRMm7dx4sepl4Gs/JNEUkfcGDRGtNU+Z gQD6l7LEWWTtPoKBUkIQa2zVhgwXM7PrYfsrmTwiXVX3NfT47LArdNdo1WLT3q4JN1 2oIWSGC/3OztUPqLnTY/l9u6cpzi45Fx7Y0uVnvQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joel Stanley , Christophe Leroy , Michael Ellerman , Sasha Levin Subject: [PATCH 5.14 121/432] powerpc/config: Renable MTD_PHYSMAP_OF Date: Thu, 16 Sep 2021 17:57:50 +0200 Message-Id: <20210916155814.865924741@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155810.813340753@linuxfoundation.org> References: <20210916155810.813340753@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Joel Stanley [ Upstream commit d0e28a6145c3455b69991245e7f6147eb914b34a ] CONFIG_MTD_PHYSMAP_OF is not longer enabled as it depends on MTD_PHYSMAP which is not enabled. This is a regression from commit 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c"), which added the extra dependency. Add CONFIG_MTD_PHYSMAP=y so this stays in the config, as Christophe said it is useful for build coverage. Fixes: 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c") Signed-off-by: Joel Stanley Acked-by: Christophe Leroy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20210817045407.2445664-3-joel@jms.id.au Signed-off-by: Sasha Levin --- arch/powerpc/configs/mpc885_ads_defconfig | 1 + 1 file changed, 1 insertion(+) -- 2.30.2 diff --git a/arch/powerpc/configs/mpc885_ads_defconfig b/arch/powerpc/configs/mpc885_ads_defconfig index 5cd17adf903f..cd08f9ed2c8d 100644 --- a/arch/powerpc/configs/mpc885_ads_defconfig +++ b/arch/powerpc/configs/mpc885_ads_defconfig @@ -33,6 +33,7 @@ CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_CFI_I2 is not set CONFIG_MTD_CFI_I4=y CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y # CONFIG_BLK_DEV is not set CONFIG_NETDEVICES=y