From patchwork Fri Jan 23 07:55:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 5691371 X-Patchwork-Delegate: horms@verge.net.au Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 0199AC058D for ; Fri, 23 Jan 2015 07:55:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D0F32028D for ; Fri, 23 Jan 2015 07:55:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 806F4202AE for ; Fri, 23 Jan 2015 07:55:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752409AbbAWHzW (ORCPT ); Fri, 23 Jan 2015 02:55:22 -0500 Received: from relmlor3.renesas.com ([210.160.252.173]:50831 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751849AbbAWHzU (ORCPT ); Fri, 23 Jan 2015 02:55:20 -0500 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 23 Jan 2015 16:55:18 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id D98034AD60; Fri, 23 Jan 2015 16:55:18 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id BD1AE480A4; Fri, 23 Jan 2015 16:55:18 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id B5C8F480A3; Fri, 23 Jan 2015 16:55:18 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id SBM01144; Fri, 23 Jan 2015 16:55:18 +0900 X-IronPort-AV: E=Sophos;i="5.09,453,1418050800"; d="scan'208";a="179437212" Received: from mail-hk1lp0123.outbound.protection.outlook.com (HELO APAC01-HK1-obe.outbound.protection.outlook.com) ([207.46.51.123]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 23 Jan 2015 16:55:18 +0900 Received: from remon.renesas.com (211.11.155.132) by SIXPR06MB174.apcprd06.prod.outlook.com (10.242.151.18) with Microsoft SMTP Server (TLS) id 15.1.65.19; Fri, 23 Jan 2015 07:55:16 +0000 Message-ID: <87fvb2exr7.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Simon , Geert Uytterhoeven CC: Magnus , Linux-SH Subject: [PATCH] ARM: shmobile: salvage lost CONFIG_REGULATOR User-Agent: Wanderlust/2.14.0 Emacs/23.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Date: Fri, 23 Jan 2015 07:55:16 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: HKXPR02CA0049.apcprd02.prod.outlook.com (25.161.48.34) To SIXPR06MB174.apcprd06.prod.outlook.com (10.242.151.18) Authentication-Results: verge.net.au; dkim=none (message not signed) header.d=none; verge.net.au; dmarc=none action=none header.from=renesas.com; X-DmarcAction-Test: None X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:(3005004);SRVR:SIXPR06MB174; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:SIXPR06MB174; X-Forefront-PRVS: 0465429B7F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(46406003)(229853001)(122386002)(77096005)(66066001)(83506001)(50466002)(33646002)(87976001)(47776003)(19580405001)(19580395003)(53416004)(42186005)(54356999)(50986999)(86362001)(62966003)(46102003)(92566002)(77156002)(40100003)(23726002)(36756003); DIR:OUT; SFP:1102; SCL:1; SRVR:SIXPR06MB174; H:remon.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:SIXPR06MB174; X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Jan 2015 07:55:16.3189 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SIXPR06MB174 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto eb4513482d1c4882e3633528ccc48d77581b7bb1 (ARM: shmobile: Enable kzm9g board in multiplatform defconfig) dropped CONFIG_REGULATOR from shmobile_defconfig. So, we lost CONFIG_REGULATOR_GPIO or others REGULATORs Let's salvage these This patch is using "make savedefconfig" Reported-by: Magnus Damm Signed-off-by: Kuninori Morimoto --- Geert, Magnus Can you check this patch ? arch/arm/configs/shmobile_defconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 6512c41..46c6623 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -18,7 +18,6 @@ CONFIG_ARCH_R8A7779=y CONFIG_ARCH_R8A7790=y CONFIG_ARCH_R8A7791=y CONFIG_ARCH_R8A7794=y -CONFIG_ARCH_SH73A0=y CONFIG_MACH_MARZEN=y CONFIG_CPU_BPREDICT_DISABLE=y CONFIG_PL310_ERRATA_588369=y @@ -55,7 +54,6 @@ CONFIG_IP_PNP_DHCP=y CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y -CONFIG_SIMPLE_PM_BUS=y CONFIG_MTD=y CONFIG_MTD_BLOCK=y CONFIG_MTD_M25P80=y @@ -118,6 +116,7 @@ CONFIG_WATCHDOG=y CONFIG_DA9063_WATCHDOG=y CONFIG_MFD_AS3711=y CONFIG_MFD_DA9063=y +CONFIG_REGULATOR=y CONFIG_REGULATOR_AS3711=y CONFIG_REGULATOR_DA9210=y CONFIG_REGULATOR_GPIO=y @@ -170,7 +169,6 @@ CONFIG_RTC_DRV_RS5C372=y CONFIG_RTC_DRV_S35390A=y CONFIG_DMADEVICES=y CONFIG_SH_DMAE=y -CONFIG_RCAR_DMAC=y # CONFIG_IOMMU_SUPPORT is not set CONFIG_IIO=y CONFIG_AK8975=y