From patchwork Tue Jul 23 03:31:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Pitre X-Patchwork-Id: 18531 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B4BCF27780 for ; Tue, 23 Jul 2013 03:31:52 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id o19sf2778133qap.7 for ; Mon, 22 Jul 2013 20:31:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe :content-transfer-encoding; bh=cQAAk1Rf8e4TEe5zm+YPkm4fgbyQyRY36J/pD/QbsP0=; b=EQJJuW41GD/LZYwThDk++4HiRYo4xEJWxtSYAGTK9j5ikeNkqmBOZBGMJJQ3U9pO/N 35HexEM0g+PP9lBwvzMJ5/8SewgPZy10j4/zX0f6FZ+3MIcdTNvmnDKcNoQIJLt3BDM6 DigN8szLi6gAbXJa5yL9gZdyPLh8tswdZaggY4ETaFSA6YFI0uVcqXB6T2LehqnWK1BA upIBMmWkkMBI2jvBIxk5SiSNFKG/Sx2yxP2tEYwc6hVdcVbokud2jVTkV2ekUw5R+hEE EaJmbZqF3IRL3TK9zBUX4nWL6iliQ/rq5VQN/iGC4TznBA6zQn8eq1elhIHRs+i0BLaj XA6w== X-Received: by 10.236.54.135 with SMTP id i7mr18224854yhc.33.1374550312511; Mon, 22 Jul 2013 20:31:52 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.146 with SMTP id r18ls2922236qeq.23.gmail; Mon, 22 Jul 2013 20:31:52 -0700 (PDT) X-Received: by 10.220.70.145 with SMTP id d17mr7144419vcj.46.1374550312409; Mon, 22 Jul 2013 20:31:52 -0700 (PDT) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id o7si7820204vet.93.2013.07.22.20.31.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Jul 2013 20:31:52 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.48; Received: by mail-vb0-f48.google.com with SMTP id w15so5192825vbf.35 for ; Mon, 22 Jul 2013 20:31:52 -0700 (PDT) X-Received: by 10.220.17.206 with SMTP id t14mr10261155vca.15.1374550312330; Mon, 22 Jul 2013 20:31:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.165.8 with SMTP id yu8csp84151veb; Mon, 22 Jul 2013 20:31:51 -0700 (PDT) X-Received: by 10.229.205.68 with SMTP id fp4mr8461388qcb.16.1374550306490; Mon, 22 Jul 2013 20:31:46 -0700 (PDT) Received: from relais.videotron.ca (relais.videotron.ca. [24.201.245.36]) by mx.google.com with ESMTP id b11si5234490qcv.81.2013.07.22.20.31.46 for ; Mon, 22 Jul 2013 20:31:46 -0700 (PDT) Received-SPF: neutral (google.com: 24.201.245.36 is neither permitted nor denied by best guess record for domain of nicolas.pitre@linaro.org) client-ip=24.201.245.36; Received: from yoda.home ([70.83.209.44]) by VL-VM-MR004.ip.videotron.ca (Oracle Communications Messaging Exchange Server 7u4-22.01 64bit (built Apr 21 2011)) with ESMTP id <0MQD009EEDSV4940@VL-VM-MR004.ip.videotron.ca>; Mon, 22 Jul 2013 23:31:44 -0400 (EDT) Received: from xanadu.home (xanadu.home [192.168.2.2]) by yoda.home (Postfix) with ESMTP id 1482E2DA0547; Mon, 22 Jul 2013 23:31:44 -0400 (EDT) From: Nicolas Pitre To: linux-arm-kernel@lists.infradead.org Cc: dave.martin@linaro.org, lorenzo.pieralisi@arm.com, patches@linaro.org Subject: [PATCH 10/13] ARM: bL_switcher: add kernel cmdline param to disable the switcher on boot Date: Mon, 22 Jul 2013 23:31:26 -0400 Message-id: <1374550289-25305-11-git-send-email-nicolas.pitre@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-reply-to: <1374550289-25305-1-git-send-email-nicolas.pitre@linaro.org> References: <1374550289-25305-1-git-send-email-nicolas.pitre@linaro.org> X-Gm-Message-State: ALoCoQn4NQ+wHc2smF+WIYjMCs/8Xt4gdhIouoqVRhekUBV3DrdQF7SmsSL9DdVFN8KH7zDB9u9K X-Original-Sender: nicolas.pitre@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.48 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Content-transfer-encoding: 7BIT By adding no_bL_switcher to the kernel cmdline string, the switcher won't be activated automatically at boot time. It is still possible to activate it later with: echo 1 > /sys/kernel/bL_switcher/active Signed-off-by: Nicolas Pitre --- arch/arm/common/bL_switcher.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/arch/arm/common/bL_switcher.c b/arch/arm/common/bL_switcher.c index abeeff5520..704c4b4ef3 100644 --- a/arch/arm/common/bL_switcher.c +++ b/arch/arm/common/bL_switcher.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -527,6 +528,9 @@ static int __init bL_switcher_sysfs_init(void) #endif /* CONFIG_SYSFS */ +static bool no_bL_switcher; +core_param(no_bL_switcher, no_bL_switcher, bool, 0644); + static int __init bL_switcher_init(void) { int ret; @@ -536,9 +540,11 @@ static int __init bL_switcher_init(void) return -EINVAL; } - ret = bL_switcher_enable(); - if (ret) - return ret; + if (!no_bL_switcher) { + ret = bL_switcher_enable(); + if (ret) + return ret; + } #ifdef CONFIG_SYSFS ret = bL_switcher_sysfs_init();