From patchwork Fri Apr 19 14:34:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 10908919 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 55F74922 for ; Fri, 19 Apr 2019 14:36:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 43301289F7 for ; Fri, 19 Apr 2019 14:36:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3778728A56; Fri, 19 Apr 2019 14:36:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DD2FB289F7 for ; Fri, 19 Apr 2019 14:36:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=8T+/PgrMnsr0T5oMwWZlST7RI+uqH2B38eddD8+g9L8=; b=TsDZUIcGF32uNrbLt87NaJ/x12 fY0KQRkxjPFAYNkuIkvrSZPZlLo457R+fqO3P4gUodzZDQVvlWbDrXGDvO4hlHx9gOYyOrhiFPVJ2 CiH6dqEjhP+BV7JnySI7UpUTcWZl281MOlQx1EpgBxwOo2ecrp8YS68uoySHI1HqMPuiR1VuB12uV lEZDb6yXJABgByTvrVXLvUnsPy21nMpqCtO2STNaAFCD9atEbB/fG1bkvUODXwkRbfb8VToD4qywL LqdDlEm4loKA2LBRhpQTmLQ656VFInngooJC26BmouWXsv2bGk7iDKK22ZWTWqLBXT3ewMR+psIu4 lNcSy3zw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hHUcW-0000ki-SY; Fri, 19 Apr 2019 14:36:04 +0000 Received: from kirsty.vergenet.net ([202.4.237.240]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hHUbG-0006Mz-IC for linux-arm-kernel@lists.infradead.org; Fri, 19 Apr 2019 14:35:00 +0000 Received: from penelope.horms.nl (unknown [62.153.215.140]) by kirsty.vergenet.net (Postfix) with ESMTPA id D143825BDA6; Sat, 20 Apr 2019 00:34:22 +1000 (AEST) Received: by penelope.horms.nl (Postfix, from userid 7100) id C91BDE21AF8; Fri, 19 Apr 2019 16:34:20 +0200 (CEST) From: Simon Horman To: linux-renesas-soc@vger.kernel.org Subject: [PATCH 1/5] ARM: shmobile: defconfig: Refresh for v5.1-rc1 Date: Fri, 19 Apr 2019 16:34:16 +0200 Message-Id: <80acbaee26b5a6842ec64fb7efb2d7af68921060.1555654474.git.horms+renesas@verge.net.au> X-Mailer: git-send-email 2.11.0 In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190419_073447_225634_1DD054DA X-CRM114-Status: GOOD ( 10.43 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Simon Horman , Magnus Damm , Geert Uytterhoeven , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Geert Uytterhoeven Update the defconfig for Renesas ARM boards: - Move CMA-related config options (moved in commit ddb26d8e1e97af23 ("dma-mapping: move CONFIG_DMA_CMA to kernel/dma/Kconfig"), - Drop CONFIG_DRM_RCAR_LVDS=y (auto-enabled since commit 02f2b30032c12b1b ("drm: rcar-du: lvds: Add API to enable/disable clock output")), - Drop CONFIG_SND_SIMPLE_SCU_CARD=y (removed in commit c8ed6aca6b824018 ("ASoC: simple-scu-card: remove simple-scu-card")). Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/configs/shmobile_defconfig | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 9b0efac101ab..41e773619c51 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -43,8 +43,6 @@ CONFIG_PCI_RCAR_GEN2=y CONFIG_PCIE_RCAR=y CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_DMA_CMA=y -CONFIG_CMA_SIZE_MBYTES=64 CONFIG_SIMPLE_PM_BUS=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y @@ -123,7 +121,6 @@ CONFIG_VIDEO_ADV7604=y CONFIG_VIDEO_ML86V7667=y CONFIG_DRM=y CONFIG_DRM_RCAR_DU=y -CONFIG_DRM_RCAR_LVDS=y CONFIG_DRM_DUMB_VGA_DAC=y CONFIG_DRM_SII902X=y CONFIG_DRM_I2C_ADV7511=y @@ -141,7 +138,6 @@ CONFIG_SND_SOC_RCAR=y CONFIG_SND_SOC_AK4642=y CONFIG_SND_SOC_SGTL5000=y CONFIG_SND_SOC_WM8978=y -CONFIG_SND_SIMPLE_SCU_CARD=y CONFIG_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_PLATFORM=y @@ -209,6 +205,8 @@ CONFIG_NFS_V4_1=y CONFIG_ROOT_NFS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y +CONFIG_DMA_CMA=y +CONFIG_CMA_SIZE_MBYTES=64 CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_DEBUG_KERNEL=y