From patchwork Mon Jun 9 20:43:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Helgaas X-Patchwork-Id: 4323641 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 067969F3BC for ; Mon, 9 Jun 2014 20:46:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 37B3A201BB for ; Mon, 9 Jun 2014 20:46:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6226920149 for ; Mon, 9 Jun 2014 20:46:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wu6Qa-0005rW-ST; Mon, 09 Jun 2014 20:44:24 +0000 Received: from mail-ig0-x22f.google.com ([2607:f8b0:4001:c05::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wu6QX-0005od-Jr for linux-arm-kernel@lists.infradead.org; Mon, 09 Jun 2014 20:44:22 +0000 Received: by mail-ig0-f175.google.com with SMTP id uq10so4329863igb.14 for ; Mon, 09 Jun 2014 13:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=subject:to:from:cc:date:message-id:user-agent:mime-version :content-type:content-transfer-encoding; bh=56W8y9MYaWj/4Gpojys8dqYuMIp1cw/Hc61ImF8PAY0=; b=nM1B2ZWLCaPybAEuStfNj/TKtY3gdGq/MHv/vPUFUGEc0lm32o14un0efXo5RASIaO LWMwmiZj2dwKuXmwSxGuVUtq6Owwf2L4dNYw/COn2L2kMxAwjkVqxifO+PrOXDNqeseh 2M1awxItAIJfGyU0E/Vzx9EsuBZB/oEGQe9ogAMZwIMc4vUt/d99kO7nyILIlTnac2p1 YvPd0809KqblWJ3pcOO5W8akp3XTfGCjqvPGzXqTi2T/s2p2nb9uPzo58pOFg1NP5J2+ g4oCr4MKK/lA+bnlX1alB9qF9UihKK1pVbRIeCtCqGFepHy3vd3N+6xfkTaS9odylTYc dVvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:from:cc:date:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=56W8y9MYaWj/4Gpojys8dqYuMIp1cw/Hc61ImF8PAY0=; b=gnOYMtvRdmQLCqCcVo5n0UUeJfwn0wmerpvc3OSv2XDFcAE5wE+Aj4OppaFq9Ze9yc /jzpQK5/KvZAdlNGOqGmUj66o2/M0Ca4LNA0ozuayePnQHyz9h2QGZNygLG6J7nIvs0e FxCz3GmqhphGQjRFFwTodRUgV2D0nGq6I4ziyp1V6Jd2/FVKWO1ec05LJKfksKyKvXpr XBL34OOzh6nk0bYVqyHgKW1McbdWVTPgiXJu2qBBeHk7mdO6i4iTK1vVm0Wl7EaXmHMS KH4PVxRVmJ/oMeC7K4BzfOvsapXjHbGRiueO0d1gTHRZ5Wx/oXIV2HeuM5djFXM8fwie FDEA== X-Gm-Message-State: ALoCoQlYcNkQhj7UEiCwp6Fm9dF+hnh4vdyV4g2rdNPq0CrYrCtg4PIYB/PuxqXG/nsGMFdcxlr4 X-Received: by 10.43.69.147 with SMTP id yc19mr18594332icb.52.1402346639780; Mon, 09 Jun 2014 13:43:59 -0700 (PDT) Received: from localhost ([172.16.51.80]) by mx.google.com with ESMTPSA id g2sm93669024igc.12.2014.06.09.13.43.58 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 09 Jun 2014 13:43:58 -0700 (PDT) Subject: [PATCH] clk: Remove X-Gene "default y" from Kconfig To: Mike Turquette From: Bjorn Helgaas Date: Mon, 09 Jun 2014 14:43:57 -0600 Message-ID: <20140609204357.920.35231.stgit@bhelgaas-glaptop.roam.corp.google.com> User-Agent: StGit/0.16 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140609_134421_700872_4131145D X-CRM114-Status: GOOD ( 12.77 ) X-Spam-Score: -0.8 (/) Cc: Catalin Marinas , Will Deacon , Loc Ho , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 Not all arm64 systems will have APM X-Gene clocks, so don't enable the driver by default in the Kconfig file. There's only one arm64 defconfig, so I turned on CONFIG_COMMON_CLK_XGENE there to preserve the previous behavior of building the X-Gene driver by default. Signed-off-by: Bjorn Helgaas Acked-by: Catalin Marinas --- arch/arm64/configs/defconfig | 1 + drivers/clk/Kconfig | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 157e1d8d9a47..59ddc931836b 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -113,3 +113,4 @@ CONFIG_CRYPTO_AES_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y +CONFIG_COMMON_CLK_XGENE=y diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index 9f9c5ae5359b..52f11f8a0301 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig @@ -90,7 +90,6 @@ config CLK_PPC_CORENET config COMMON_CLK_XGENE bool "Clock driver for APM XGene SoC" - default y depends on ARM64 ---help--- Sypport for the APM X-Gene SoC reference, PLL, and device clocks.