From patchwork Tue Jan 14 12:41:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 23183 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f200.google.com (mail-vc0-f200.google.com [209.85.220.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 5016C20555 for ; Tue, 14 Jan 2014 12:42:16 +0000 (UTC) Received: by mail-vc0-f200.google.com with SMTP id le5sf1035293vcb.11 for ; Tue, 14 Jan 2014 04:42:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:date:from:user-agent :mime-version:to:cc:subject:references:in-reply-to:sender:precedence :list-id:x-original-sender:x-original-authentication-results :mailing-list:list-post:list-help:list-archive:list-unsubscribe :content-type:content-transfer-encoding; bh=VpmfAHfCVGJgJE0xq6rxkdLIJ8UD1aa1e3KqUiMgncU=; b=XWNsW+5Rb1/19U5ckkqTCbl/2TQAC0DjtIHRSmCpYizhBsb0BEUdITx2zC1o8zGEfO HZJ2wybo4RwMVmccReUrZOhOobfzBR2bCbkUH7xVTFZpIP/5cr0ncMGTG+FnnM25X2VK aH7+35NPEMnmmArgdOBwAP72qnXuZ2luyqMv2cBvhqwYjT0/G37rPc5ub1AbLnN8plHZ JqqR76u+epEEIdaGdqw4eXTtsJi+9Fn3nPnL7uqFLgn2eadwcpaROwT1qIN2Bf4G85j2 A2QM/M+lbvKsqYGPHbp8BJHL6W7ZGf2/z43yYZJhUXJRZslkv2S7KGY6ZTf+0MLTjaNO oRWA== X-Gm-Message-State: ALoCoQmwonSIVz1LjSNWlJhSPQNRTc9msxqlQyDyWKHjfWc8NLokBQ+MA3FVC7VLC8bcM3qFp3b0 X-Received: by 10.236.84.239 with SMTP id s75mr10905193yhe.28.1389703335486; Tue, 14 Jan 2014 04:42:15 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.17.33 with SMTP id l1ls95392qed.52.gmail; Tue, 14 Jan 2014 04:42:15 -0800 (PST) X-Received: by 10.221.66.73 with SMTP id xp9mr552252vcb.27.1389703335406; Tue, 14 Jan 2014 04:42:15 -0800 (PST) Received: from mail-vb0-f49.google.com (mail-vb0-f49.google.com [209.85.212.49]) by mx.google.com with ESMTPS id ru2si180442vcb.104.2014.01.14.04.42.15 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 Jan 2014 04:42:15 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.49 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.49; Received: by mail-vb0-f49.google.com with SMTP id x14so198780vbb.36 for ; Tue, 14 Jan 2014 04:42:15 -0800 (PST) X-Received: by 10.220.97.145 with SMTP id l17mr544492vcn.35.1389703335313; Tue, 14 Jan 2014 04:42:15 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp197916ved; Tue, 14 Jan 2014 04:42:14 -0800 (PST) X-Received: by 10.68.197.234 with SMTP id ix10mr1517745pbc.80.1389703334032; Tue, 14 Jan 2014 04:42:14 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id nu8si367694pbb.312.2014.01.14.04.42.13; Tue, 14 Jan 2014 04:42:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of devicetree-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751367AbaANMmM (ORCPT + 9 others); Tue, 14 Jan 2014 07:42:12 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:37522 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751329AbaANMmL (ORCPT ); Tue, 14 Jan 2014 07:42:11 -0500 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id s0ECfiX8003028; Tue, 14 Jan 2014 06:41:44 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s0ECfiRe000908; Tue, 14 Jan 2014 06:41:44 -0600 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Tue, 14 Jan 2014 06:41:43 -0600 Received: from [172.22.232.54] (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s0ECfeRw024527; Tue, 14 Jan 2014 06:41:41 -0600 Message-ID: <52D53084.1070105@ti.com> Date: Tue, 14 Jan 2014 14:41:40 +0200 From: Tero Kristo User-Agent: Mozilla/5.0 (X11; Linux i686; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Tony Lindgren CC: , Nishanth Menon , , , , , , , Subject: Re: [PATCHv13 00/40] ARM: TI SoC clock DT conversion References: <1389276051-1326-1-git-send-email-t-kristo@ti.com> <52CF12FB.6000602@ti.com> <20140109231513.GA11648@saruman.home> <52CFC2F1.706@ti.com> <20140110161352.GG6665@saruman.home> <52D02037.3090705@ti.com> <20140110185110.GM31323@atomide.com> In-Reply-To: <20140110185110.GM31323@atomide.com> Sender: devicetree-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: devicetree@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: t-kristo@ti.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.49 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 Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On 01/10/2014 08:51 PM, Tony Lindgren wrote: > * Tero Kristo [140110 08:32]: >> On 01/10/2014 06:13 PM, Felipe Balbi wrote: >>> On Fri, Jan 10, 2014 at 11:52:49AM +0200, Tero Kristo wrote: >>>> On 01/10/2014 01:15 AM, Felipe Balbi wrote: >>>>> On Thu, Jan 09, 2014 at 03:22:03PM -0600, Nishanth Menon wrote: >>>>>> >>>>>> conflicts with be changes on Tony's be branch. >>>>>> commit 80f304dd2360cf5d50953c4eb4e902536f6a1263 >>>>>> ARM: OMAP2+: raw read and write endian fix >>>>>> >>>>>> Conflict: >>>>>> arch/arm/mach-omap2/clkt_clksel.c >>>>>> arch/arm/mach-omap2/clkt_dpll.c >>>>>> arch/arm/mach-omap2/clkt_iclk.c >>>>>> arch/arm/mach-omap2/clock.c >>>>>> arch/arm/mach-omap2/clock36xx.c >>>>>> arch/arm/mach-omap2/dpll3xxx.c >>>>>> arch/arm/mach-omap2/dpll44xx.c >>>>>> >>>>>> Both change raw_readls -> should now be just clk api instead which >>>>>> already does readl_relaxed etc.. If Tony feels like, then we should >>>>>> probably post a branch based on 'be' branch for easy merge. > > This should be a trivial merge conflict to handle, so let's not base > things on the BE changes. > >>>> I think all of these fails are caused by the initially bugged >>>> Makefile + Kconfig under mach-omap2. Seems like they can be fixed by >>>> the patches I inlined at the end (will also post them as proper >>>> patches to l-o list after this.) The question is, should Mike go >>>> ahead and merge these along with the base clk patches or how should >>>> we handle them? Patch 1 must be merged, patch 2 is a nice to have one >>>> which allows DRA7 only builds (doing DRA7 only build currently seems >>>> not possible.) >>> >>> If it's OK with Tony, I would suggest having a branch with both patches >>> below which both Tony and Mike merge before merging CCF series. That way >>> we avoid bisection problems. > > I can queue those two separately as fixes. > >> That reminds me, I think the baseline branch for the mach-omap2 >> patches is still somewhat unclear to me, what should be used for >> this? And which patches should be put there (the mach-omap2 patches >> depend on the drivers/clk/ti part basically, so I need to put at >> least those there also.) > > I would keep the clock patches against some mainline -rc commit if > possible, and if there are non trivial merge conflicts, the omap > to use as the base is commit adfe9361b236154215d4b0fc8b6d79995394b15c. > > In any case, it's probably best that Mike merges this all via his > clock tree unless there non-trivial merge conflicts. > I just pushed a branch against rc7 with makefile fixes in place to fix omap1 and omap2 only builds for this stuff. Inlined the delta here at the end. Do you want me to repost the series as v14 for this or is the attached delta ok for review purposes? All the changes have been squashed to existing patches (except the 2 patches I posted separately for DRA7xx / AM43xx only builds.) The test branch itself can be found here: tree: https://github.com/t-kristo/linux-pm.git branch: 3.13-rc7-dt-clks-v13-build-fixes Felipe, care to run your randconfig magic for this? -Tero ---------------- Acked-by: Felipe Balbi --- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index dc21df1..e65948a 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -76,6 +76,16 @@ config SOC_AM43XX select ARM_GIC select MACH_OMAP_GENERIC +config SOC_DRA7XX + bool "TI DRA7XX" + depends on ARCH_MULTI_V7 + select ARCH_OMAP2PLUS + select ARM_CPU_SUSPEND if PM + select ARM_GIC + select CPU_V7 + select HAVE_SMP + select HAVE_ARM_ARCH_TIMER + config ARCH_OMAP2PLUS bool select ARCH_HAS_BANDGAP @@ -128,14 +138,6 @@ config SOC_HAS_REALTIME_COUNTER depends on SOC_OMAP5 || SOC_DRA7XX default y -config SOC_DRA7XX - bool "TI DRA7XX" - select ARM_ARCH_TIMER - select CPU_V7 - select ARM_GIC - select HAVE_SMP - select COMMON_CLK - comment "OMAP Core Type" depends on ARCH_OMAP2 diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 088305f..8ebe9f3 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -132,6 +132,7 @@ obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common) obj-$(CONFIG_SOC_AM43XX) += $(voltagedomain-common) obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common) obj-$(CONFIG_SOC_OMAP5) += voltagedomains54xx_data.o +obj-$(CONFIG_SOC_DRA7XX) += $(voltagedomain-common) # OMAP powerdomain framework powerdomain-common += powerdomain.o powerdomain-common.o @@ -191,6 +192,9 @@ obj-$(CONFIG_ARCH_OMAP4) += dpll3xxx.o dpll44xx.o obj-$(CONFIG_SOC_AM33XX) += $(clock-common) dpll3xxx.o obj-$(CONFIG_SOC_OMAP5) += $(clock-common) obj-$(CONFIG_SOC_OMAP5) += dpll3xxx.o dpll44xx.o +obj-$(CONFIG_SOC_DRA7XX) += $(clock-common) +obj-$(CONFIG_SOC_DRA7XX) += dpll3xxx.o dpll44xx.o +obj-$(CONFIG_SOC_AM43XX) += $(clock-common) dpll3xxx.o # OMAP2 clock rate set data (old "OPP" data) obj-$(CONFIG_SOC_OMAP2420) += opp2420_data.o diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index c61f768..41bd909 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -35,7 +35,7 @@ obj-$(CONFIG_ARCH_TEGRA) += tegra/ obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/ -obj-$(CONFIG_ARCH_OMAP) += ti/ +obj-$(CONFIG_ARCH_OMAP2PLUS) += ti/ obj-$(CONFIG_X86) += x86/ diff --git a/drivers/clk/ti/Makefile b/drivers/clk/ti/Makefile index 007c3c2..4319d40 100644 --- a/drivers/clk/ti/Makefile +++ b/drivers/clk/ti/Makefile @@ -1,10 +1,11 @@ ifneq ($(CONFIG_OF),) -obj-y += clk.o dpll.o autoidle.o divider.o \ - fixed-factor.o gate.o clockdomain.o \ - composite.o mux.o apll.o clk-43xx.o -obj-$(CONFIG_SOC_AM33XX) += clk-33xx.o -obj-$(CONFIG_ARCH_OMAP3) += interface.o clk-3xxx.o -obj-$(CONFIG_ARCH_OMAP4) += clk-44xx.o -obj-$(CONFIG_SOC_OMAP5) += clk-54xx.o -obj-$(CONFIG_SOC_DRA7XX) += clk-7xx.o +obj-y += clk.o autoidle.o clockdomain.o +clk-common = dpll.o composite.o divider.o gate.o \ + fixed-factor.o mux.o apll.o +obj-$(CONFIG_SOC_AM33XX) += $(clk-common) clk-33xx.o +obj-$(CONFIG_ARCH_OMAP3) += $(clk-common) interface.o clk-3xxx.o +obj-$(CONFIG_ARCH_OMAP4) += $(clk-common) clk-44xx.o +obj-$(CONFIG_SOC_OMAP5) += $(clk-common) clk-54xx.o +obj-$(CONFIG_SOC_DRA7XX) += $(clk-common) clk-7xx.o +obj-$(CONFIG_SOC_AM43XX) += $(clk-common) clk-43xx.o endif