From patchwork Wed Aug 10 08:52:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9272829 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3804960231 for ; Wed, 10 Aug 2016 08:54:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2580827F80 for ; Wed, 10 Aug 2016 08:54:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17F1C2833F; Wed, 10 Aug 2016 08:54:11 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UPPERCASE_50_75 autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1A22927F80 for ; Wed, 10 Aug 2016 08:54:10 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXPFp-00077s-CT; Wed, 10 Aug 2016 08:52:49 +0000 Received: from mail-wm0-x229.google.com ([2a00:1450:400c:c09::229]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bXPFi-00070W-MB for linux-arm-kernel@lists.infradead.org; Wed, 10 Aug 2016 08:52:44 +0000 Received: by mail-wm0-x229.google.com with SMTP id o80so88131864wme.1 for ; Wed, 10 Aug 2016 01:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=88tNhmPCB+2HQeU2MxtVqFPNSBeDkZEQe89tBmYdRFk=; b=MZTflhFTAiZeQvfxoxvtjTSdr+fkL9Uj0wE+t/uc9+Ft9tOYBsCh4JFWKBqBNlBQY/ wTxIHWUbzAC4lPccRYpadavVpLD2vPDeN4Tpo4e7oA4QK9JkPrYBzkFYjd3uEnsOSCoI Cr1uxeGZ9YohH9UnfYoxVFxITsHm+341WTzz8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=88tNhmPCB+2HQeU2MxtVqFPNSBeDkZEQe89tBmYdRFk=; b=DKh/06LpxLCPSx32Jlll8Uf8VevAFanFSsedmkb83ci4sBRdPsaGZ00jg/auo+Mse3 fSPSRRe9ScU4KRrwanc8E/eLr/cyXg5Pfi/ssJw6d0uXuZjlxP7pYcqXOZQJui8CVxqF 0QI8A7cn1nUFm2U2in11zZv5fFwmWZX89NfVjYt7+K2zkLPLxHi/UpZQrrl1bPJ0F7/t KBWZ0fC6Gwyy1+zbV70+2Bz5YyYXC6Vf9VF5bonmK/Ec5ckTynH51PXU67G3x+GCPWUN U9rIDaMKjfK8S6xo8p6d3BMWt9cyIU5fyfl29tzUwtJPw4CLPz0/q8hDwRnXF/X1tuRp 1b0w== X-Gm-Message-State: AEkooutIf4W99c26fHXlLMjgBY+YJb3n10+7SJlORs9A7peBXg8o1PJyz8tZ12za2zWkRZP6 X-Received: by 10.25.217.151 with SMTP id s23mr497534lfi.16.1470819140764; Wed, 10 Aug 2016 01:52:20 -0700 (PDT) Received: from linuslaptop.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id e22sm7299154lji.1.2016.08.10.01.52.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Aug 2016 01:52:19 -0700 (PDT) From: Linus Walleij To: arm@kernel.org Subject: [PATCH] ARM: defconfig: update the Integrator defconfig Date: Wed, 10 Aug 2016 10:52:12 +0200 Message-Id: <1470819132-27804-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160810_015243_178741_139A0463 X-CRM114-Status: GOOD ( 10.44 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij , 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 The Integrators defconfig have changed due to changes in Kconfig for the CPU types, they use the physmap OF NOR driver and syscon for LEDs. Signed-off-by: Linus Walleij --- ARM SoC folks: please apply this directly to wherever defconfig updates go. --- arch/arm/configs/integrator_defconfig | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig index 71f14675d009..869faae67201 100644 --- a/arch/arm/configs/integrator_defconfig +++ b/arch/arm/configs/integrator_defconfig @@ -13,15 +13,8 @@ CONFIG_ARCH_MULTI_V5=y # CONFIG_ARCH_MULTI_V7 is not set CONFIG_ARCH_INTEGRATOR=y CONFIG_ARCH_INTEGRATOR_AP=y -CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_INTEGRATOR_IMPD1=y -CONFIG_CPU_ARM720T=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_ARM922T=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_ARM1020=y -CONFIG_CPU_ARM1022=y -CONFIG_CPU_ARM1026=y +CONFIG_ARCH_INTEGRATOR_CP=y CONFIG_PCI=y CONFIG_PREEMPT=y CONFIG_AEABI=y @@ -33,7 +26,6 @@ CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_USERSPACE=y CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_FPE_NWFPE=y CONFIG_NET=y CONFIG_PACKET=y CONFIG_UNIX=y @@ -51,7 +43,7 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_PHYSMAP=y -CONFIG_PROC_DEVICETREE=y +CONFIG_MTD_PHYSMAP_OF=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 @@ -71,6 +63,7 @@ CONFIG_MMC=y CONFIG_MMC_ARMMMCI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y +CONFIG_LEDS_SYSCON=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_CPU=y