From patchwork Tue Oct 2 02:43:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 1535521 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id EAC51DFE80 for ; Tue, 2 Oct 2012 02:44:45 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TIsRk-0006OK-4O; Tue, 02 Oct 2012 02:42:56 +0000 Received: from mail-da0-f49.google.com ([209.85.210.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TIsRg-0006Nz-Sd for linux-arm-kernel@lists.infradead.org; Tue, 02 Oct 2012 02:42:53 +0000 Received: by dajq27 with SMTP id q27so1877851daj.36 for ; Mon, 01 Oct 2012 19:42:51 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=NblyQ7flwfGv7xpqit59B3myPmYyP84VCgycvM3hCCg=; b=iUTOsjsoLCq17RAdyG4kaD7/kCfQ1G2vrmb1V8vEldeyJ4FibQInJgK1ePE4wUwRv9 EuQW3C10I+YLs0SSea4HTe1bD6+/Mwe3xp+cFcIXi4h/QmI2ynY4ixp46BSXV4CrdMpE B3qfUYpDUvSgmt8SUnST/OTOgoAGBXzw3INJkAYWGB7XBH2KSlQkSmp1zM9u6ZpUYc+n RrBhGTsHp2YlPmnJkNQ9rby7hsSzSV6SPpEb41m9zadBYGoJXa2Z6Y7djMUb4ZLbJw31 v5+21K5ZjhRoc2Pcg+1d7FUIMmfAwY2rPnmuNI6rYrj32gGKl2V4A2Nkatr7vZ7+P3Me GV9Q== Received: by 10.68.189.65 with SMTP id gg1mr603812pbc.106.1349145770877; Mon, 01 Oct 2012 19:42:50 -0700 (PDT) Received: from localhost ([2001:470:1f05:1640:553f:613c:bcba:695a]) by mx.google.com with ESMTPS id qf4sm143626pbc.1.2012.10.01.19.42.48 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 01 Oct 2012 19:42:49 -0700 (PDT) Date: Mon, 1 Oct 2012 19:43:06 -0700 From: Olof Johansson To: Linus Torvalds Subject: Re: [GIT PULL 0/12] ARM: soc: updates for 3.7, first batch Message-ID: <20121002024306.GA1327@quad.lixom.net> References: <1349135827-24790-1-git-send-email-olof@lixom.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQnMw2Mvf+2teov+C3xZr5zSQx9HwOcgvBWiLrBrhzkR7m9NZI0yrna6jCYfINGBgB5em3Zv X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.210.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: tony@atomide.com, arm@kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Mon, Oct 01, 2012 at 07:26:26PM -0700, Linus Torvalds wrote: > On Mon, Oct 1, 2012 at 7:22 PM, Linus Torvalds > wrote: > > > > Ok, I've merged them all. As usual, my end result is slightly > > different from yours, although the differences are pretty small. > > Oh, one more thing: I suspect the OMAP_OCP2SCP config option should > depend on CONFIG_ARM or something. Just based on the name, I assume it > doesn't actually work on x86-64, but I see the question.. Ah, yes. It should build fine and not cause breakage, but it's largely pointless to offer the option. Patch below. -Olof From 5ae0b658cc10af29d7a0a66f2a412a754011ca0e Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Mon, 1 Oct 2012 19:39:33 -0700 Subject: [PATCH] drivers/bus: make ocp2scp depend on OMAP2+ No use in enabling the driver on platforms where it won't be useful. Signed-off-by: Olof Johansson Cc: Tony Lindgren --- drivers/bus/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index bbec35d..0f51ed6 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -6,6 +6,7 @@ menu "Bus devices" config OMAP_OCP2SCP tristate "OMAP OCP2SCP DRIVER" + depends on ARCH_OMAP2PLUS help Driver to enable ocp2scp module which transforms ocp interface protocol to scp protocol. In OMAP4, USB PHY is connected via