From patchwork Fri Jan 17 20:25: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: 23357 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f72.google.com (mail-vb0-f72.google.com [209.85.212.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 00EFF202DA for ; Fri, 17 Jan 2014 20:27:12 +0000 (UTC) Received: by mail-vb0-f72.google.com with SMTP id w20sf2816711vbb.7 for ; Fri, 17 Jan 2014 12:27:12 -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:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=f/A9LW6NY2vHGgT92EHewInXWGww5R1J6eZZ2Gxs1BY=; b=JsD82yokR0TOKXX/hTyPNg0/w5iSFXVa8UcY76P+hxQjvdIev0qUy8h8lD76bQAZit iUBfkLWQC6Hh0HgDoZtCMP8xzpio/T432fnOOQdiPkeogKJoIPVOqZCNTIZCVkHBuEXB /Avd9FDbwVH9Lvhw0yj6Erthb2aLn8VsfktSja0XzWUO3IVm6fbgnlMzztzwf3xEG+k1 vV/YXfkPLJp4C0hWKqXOjSdsy12y5MIHuGAW/GduanJ/znyB3SkZ5vMuxp0wTd/r9uCK LU4TivHUqxmr39lKmP8lKh4iFYOzAzFrVBkqczo4hkz54lO0ZptlgB9IiE5anGBE/CUE 8K3Q== X-Gm-Message-State: ALoCoQlPDu6lTRghGec4FZMTLohznTzC0Nx1qD3WTGEGRDypnVirkLF/7oa3BlREp10+DdQMsJDE X-Received: by 10.236.13.36 with SMTP id a24mr1384245yha.50.1389990432144; Fri, 17 Jan 2014 12:27:12 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.171 with SMTP id s40ls537396qga.17.gmail; Fri, 17 Jan 2014 12:27:12 -0800 (PST) X-Received: by 10.58.90.1 with SMTP id bs1mr8077veb.29.1389990431956; Fri, 17 Jan 2014 12:27:11 -0800 (PST) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id cz20si5312964veb.129.2014.01.17.12.27.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 17 Jan 2014 12:27:11 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id pa12so1776285veb.8 for ; Fri, 17 Jan 2014 12:27:11 -0800 (PST) X-Received: by 10.58.235.129 with SMTP id um1mr1947419vec.17.1389990431873; Fri, 17 Jan 2014 12:27:11 -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 ey3csp46780ved; Fri, 17 Jan 2014 12:27:11 -0800 (PST) X-Received: by 10.66.232.129 with SMTP id to1mr4378646pac.29.1389990430831; Fri, 17 Jan 2014 12:27:10 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gx4si11114299pbc.51.2014.01.17.12.27.10; Fri, 17 Jan 2014 12:27:10 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-omap-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 S1753461AbaAQU0Y (ORCPT + 5 others); Fri, 17 Jan 2014 15:26:24 -0500 Received: from comal.ext.ti.com ([198.47.26.152]:44047 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753427AbaAQU0X (ORCPT ); Fri, 17 Jan 2014 15:26:23 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s0HKPwUH012833; Fri, 17 Jan 2014 14:25:58 -0600 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s0HKPwUm024083; Fri, 17 Jan 2014 14:25:58 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.2.342.3; Fri, 17 Jan 2014 14:25:58 -0600 Received: from localhost.localdomain (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s0HKPn6A009756; Fri, 17 Jan 2014 14:25:56 -0600 From: Tero Kristo To: , , , CC: Subject: [PATCH 3/3] clk: ti: OMAP build fixes Date: Fri, 17 Jan 2014 22:25:40 +0200 Message-ID: <1389990340-23358-4-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1389990340-23358-1-git-send-email-t-kristo@ti.com> References: <1389990340-23358-1-git-send-email-t-kristo@ti.com> MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@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.128.177 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: , Improper merge of TI clock driver resulted in build breakage for OMAP1 build, and various other TI single SoC builds. This patch fixes those by adding the missed Makefile tweaks. Signed-off-by: Tero Kristo --- drivers/clk/Makefile | 2 +- drivers/clk/ti/Makefile | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 1f3143f..13c1e91 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -38,7 +38,7 @@ obj-$(CONFIG_PLAT_SAMSUNG) += samsung/ obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o obj-$(CONFIG_COMMON_CLK_KEYSTONE) += keystone/ obj-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile/ -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