From patchwork Tue Feb 13 01:32:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 128183 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3763789ljc; Mon, 12 Feb 2018 17:33:09 -0800 (PST) X-Google-Smtp-Source: AH8x227+ouuGuCgqGd8Xn1hD4nhhYb0mSixhU5joh1+vBwNd9Tz3P0/3XsKnuwxc84V5Vrw2Jv+N X-Received: by 2002:a17:902:be09:: with SMTP id r9-v6mr12414184pls.234.1518485589432; Mon, 12 Feb 2018 17:33:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518485589; cv=none; d=google.com; s=arc-20160816; b=klOtwo9gcDVKs2/iQBFgBVTzX+vP6E3ji+WRxRRaMPzBzS6HuFPo6/EaF8GCYkE1EU /PleVr6uGUEBtQGfdyoSAl+NgUzbps0IpBH+ye6SpOYzbG/PH56WEAfQiOlr9VOgKiKG yLGx/PcbruWyziSYkRR0PPFVWv/XuYyZjnlLbP6leQMTDPkOcN7ErwD6FLHFFHkaJk0m 4GafLg/Nig8Da+V8dvtlAa0b6Y48nBE78EYecVrOmLsreiO1YOy+/Kszals3yGg7iTUX W0Sueq5cjL4BibxjX0vgtwQUdb+N8xjTXSF2X4LV87iWSB2+GOqH3nxSXmp6hnGgKUvw EQTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=F8dmsxanPBz4i9AG/w/90ft9o6TqjZX8e+ORbsFaOj4=; b=0z3zXNuyGHswpbK9st+BfOdZgh3dbl3/l8NSWreU0r72UkEEo29t5yJIr8GMtKyCok FYUqwXt0FcXzsI60rJTXZLYH8fs6TfDAmNFImmEYQm4e0A2o0xACO12radSOw8fax910 DFAgYDfltzziq0VXsFei8f7e9oPTFCvsru9UBSKZt9OxdJX5cDyOwbwvweiTnYpUzMJ1 Rmr9QTHfDckP1/vaunnMLXr3ulEr7mQje2CEZpfvIYoIY0F8ezw3mT5FzH+on4z+p+4y CPJRxAKzD0CwR94TEGReGLofYUD8y2+cxN+YD/M5+Q9W74+6MoYAhXzw56Sh28Hdeytj 9BEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=lttk80Pt; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m10-v6si343954plt.185.2018.02.12.17.33.09; Mon, 12 Feb 2018 17:33:09 -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; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@ti.com header.s=ti-com-17Q1 header.b=lttk80Pt; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933132AbeBMBdF (ORCPT + 5 others); Mon, 12 Feb 2018 20:33:05 -0500 Received: from fllnx210.ext.ti.com ([198.47.19.17]:13602 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933047AbeBMBdE (ORCPT ); Mon, 12 Feb 2018 20:33:04 -0500 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by fllnx210.ext.ti.com (8.15.1/8.15.1) with ESMTP id w1D1WlfU003168; Mon, 12 Feb 2018 19:32:47 -0600 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ti.com; s=ti-com-17Q1; t=1518485567; bh=jfSGaIgLmXwn53cXb2KzHbkUzIyeS+pjE6Yfe3pMWqk=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=lttk80Pt1EkESJQVVa1PTwmqToXJ48z7Vy3JCK2MoAzCYj0XQT9Qp19E8ZXYQVyLT uD7Z3zQ1YlMZUfP90K18x9/y6qGRdVsWZ6GXuP3S/V2XLxm2RKjfN4kpddltrq7dlt /gOhUYalVsbsSwNkTX2UeW7SGL4/D23OsGAGBp6o= Received: from DFLE108.ent.ti.com (dfle108.ent.ti.com [10.64.6.29]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1D1WlJW005732; Mon, 12 Feb 2018 19:32:47 -0600 Received: from DFLE115.ent.ti.com (10.64.6.36) by DFLE108.ent.ti.com (10.64.6.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1261.35; Mon, 12 Feb 2018 19:32:47 -0600 Received: from dflp32.itg.ti.com (10.64.6.15) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1261.35 via Frontend Transport; Mon, 12 Feb 2018 19:32:47 -0600 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dflp32.itg.ti.com (8.14.3/8.13.8) with ESMTP id w1D1Wljq031669; Mon, 12 Feb 2018 19:32:47 -0600 Received: from localhost (irmo.dhcp.ti.com [128.247.58.153]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id w1D1Wlx01791; Mon, 12 Feb 2018 19:32:47 -0600 (CST) From: Suman Anna To: Tony Lindgren CC: , , Tero Kristo , Keerthy , Suman Anna Subject: [PATCH 8/9] ARM: OMAP: Move plat/i2c.h into mach-omap1 folder Date: Mon, 12 Feb 2018 19:32:42 -0600 Message-ID: <20180213013243.8378-9-s-anna@ti.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180213013243.8378-1-s-anna@ti.com> References: <20180213013243.8378-1-s-anna@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The current contents of plat/i2c.h are only relevant for OMAP1 platforms, as all the equivalent functions for OMAP2 has been dropped in commit 65fa3e719f36 ("ARM: OMAP2+: Remove legacy i2c.c platform init code"), and which has also moved the left-over code from plat-omap into mach-omap1. The hwmod is a concept only applicable for OMAP2 platforms, and the omap_i2c_reset() is already declared in mach-omap2/i2c.h. So, move the current plat/i2c.h header file into the mach-omap1 folder, and adjust the header usage accordingly. Signed-off-by: Suman Anna --- arch/arm/mach-omap1/common.h | 3 +-- arch/arm/mach-omap1/i2c.c | 2 -- arch/arm/{plat-omap/include/plat => mach-omap1}/i2c.h | 9 +++------ arch/arm/mach-omap2/i2c.h | 4 ++-- 4 files changed, 6 insertions(+), 12 deletions(-) rename arch/arm/{plat-omap/include/plat => mach-omap1}/i2c.h (90%) -- 2.15.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" 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-omap1/common.h b/arch/arm/mach-omap1/common.h index 65bb6e8085de..d83ff257eaa8 100644 --- a/arch/arm/mach-omap1/common.h +++ b/arch/arm/mach-omap1/common.h @@ -32,11 +32,10 @@ #include -#include - #include #include "soc.h" +#include "i2c.h" #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) void omap7xx_map_io(void); diff --git a/arch/arm/mach-omap1/i2c.c b/arch/arm/mach-omap1/i2c.c index 32f6c53367bf..5bdf3c4190f9 100644 --- a/arch/arm/mach-omap1/i2c.c +++ b/arch/arm/mach-omap1/i2c.c @@ -24,8 +24,6 @@ #include #include "soc.h" -#include - #define OMAP_I2C_SIZE 0x3f #define OMAP1_I2C_BASE 0xfffb3800 diff --git a/arch/arm/plat-omap/include/plat/i2c.h b/arch/arm/mach-omap1/i2c.h similarity index 90% rename from arch/arm/plat-omap/include/plat/i2c.h rename to arch/arm/mach-omap1/i2c.h index 810629d79668..54a2bce7879e 100644 --- a/arch/arm/plat-omap/include/plat/i2c.h +++ b/arch/arm/mach-omap1/i2c.h @@ -19,8 +19,8 @@ * */ -#ifndef __PLAT_OMAP_I2C_H -#define __PLAT_OMAP_I2C_H +#ifndef __ARCH_ARM_MACH_OMAP1_I2C_H +#define __ARCH_ARM_MACH_OMAP1_I2C_H struct i2c_board_info; struct omap_i2c_bus_platform_data; @@ -47,7 +47,4 @@ static inline int omap_register_i2c_bus_cmdline(void) } #endif -struct omap_hwmod; -int omap_i2c_reset(struct omap_hwmod *oh); - -#endif /* __PLAT_OMAP_I2C_H */ +#endif /* __ARCH_ARM_MACH_OMAP1_I2C_H */ diff --git a/arch/arm/mach-omap2/i2c.h b/arch/arm/mach-omap2/i2c.h index f76ff790b435..4d085c7ad425 100644 --- a/arch/arm/mach-omap2/i2c.h +++ b/arch/arm/mach-omap2/i2c.h @@ -19,11 +19,11 @@ * */ -#include - #ifndef __MACH_OMAP2_I2C_H #define __MACH_OMAP2_I2C_H +struct omap_hwmod; + int omap_i2c_reset(struct omap_hwmod *oh); #endif /* __MACH_OMAP2_I2C_H */