From patchwork Wed Jan 8 04:59:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Sangorrin X-Patchwork-Id: 3451541 Return-Path: X-Original-To: patchwork-ltsi-dev@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DF7BF9F1C4 for ; Wed, 8 Jan 2014 05:00:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C3E1720109 for ; Wed, 8 Jan 2014 05:00:08 +0000 (UTC) Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) by mail.kernel.org (Postfix) with ESMTP id 56EBB200D5 for ; Wed, 8 Jan 2014 05:00:07 +0000 (UTC) Received: from mail.linux-foundation.org (localhost [IPv6:::1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 20506936; Wed, 8 Jan 2014 05:00:07 +0000 (UTC) X-Original-To: ltsi-dev@lists.linuxfoundation.org Delivered-To: ltsi-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTP id BE9D38DE for ; Wed, 8 Jan 2014 05:00:05 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from imx2.toshiba.co.jp (inet-tsb5.toshiba.co.jp [202.33.96.24]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id BFDA21FB22 for ; Wed, 8 Jan 2014 05:00:04 +0000 (UTC) Received: from tsbmgw-mgw02.tsbmgw-mgw02.toshiba.co.jp ([133.199.200.50]) by imx2.toshiba.co.jp with ESMTP id s08500au013525 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 8 Jan 2014 14:00:00 +0900 (JST) Received: from tsbmgw-mgw02 (localhost [127.0.0.1]) by tsbmgw-mgw02.tsbmgw-mgw02.toshiba.co.jp (8.13.8/8.14.5) with ESMTP id s085002g022357; Wed, 8 Jan 2014 14:00:00 +0900 Received: from localhost ([127.0.0.1]) by tsbmgw-mgw02 (JAMES SMTP Server 2.3.1) with SMTP ID 741; Wed, 8 Jan 2014 14:00:00 +0900 (JST) Received: from arc1.toshiba.co.jp ([133.199.194.235]) by tsbmgw-mgw02.tsbmgw-mgw02.toshiba.co.jp (8.13.8/8.14.5) with ESMTP id s08500QK022352; Wed, 8 Jan 2014 14:00:00 +0900 Received: (from root@localhost) by arc1.toshiba.co.jp id s08500SE010024; Wed, 8 Jan 2014 14:00:00 +0900 (JST) Received: from unknown [133.199.192.144] by arc1.toshiba.co.jp with ESMTP id QAA10023; Wed, 8 Jan 2014 14:00:00 +0900 Received: from mx11.toshiba.co.jp (localhost [127.0.0.1]) by ovp2.toshiba.co.jp with ESMTP id s085007k017231; Wed, 8 Jan 2014 14:00:00 +0900 (JST) Received: from BK2211.rdc.toshiba.co.jp by toshiba.co.jp id s084xxL2021569; Wed, 8 Jan 2014 13:59:59 +0900 (JST) Received: from island.swc.toshiba.co.jp (localhost [127.0.0.1]) by BK2211.rdc.toshiba.co.jp (8.13.8+Sun/8.13.8) with ESMTP id s084xwZv001050; Wed, 8 Jan 2014 13:59:58 +0900 (JST) Received: from ubuntu.swc.toshiba.co.jp (unknown [133.196.174.184]) by island.swc.toshiba.co.jp (Postfix) with ESMTP id 25FA540003; Wed, 8 Jan 2014 13:59:05 +0900 (JST) From: Daniel Sangorrin To: ltsi-dev@lists.linuxfoundation.org Date: Wed, 8 Jan 2014 13:59:55 +0900 Message-Id: <1389157195-20236-2-git-send-email-daniel.sangorrin@toshiba.co.jp> X-Mailer: git-send-email 1.8.5 In-Reply-To: <1389157195-20236-1-git-send-email-daniel.sangorrin@toshiba.co.jp> References: <1389157195-20236-1-git-send-email-daniel.sangorrin@toshiba.co.jp> X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org Cc: michal.simek@xilinx.com Subject: [LTSI-dev] [PATCH] i2c: xilinx: fix i2c driver build X-BeenThere: ltsi-dev@lists.linuxfoundation.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: "A list to discuss patches, development, and other things related to the LTSI project" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ltsi-dev-bounces@lists.linuxfoundation.org Errors-To: ltsi-dev-bounces@lists.linuxfoundation.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes the xilinx i2c build problem on LTSI 3.10. The Makefile line dissapeared from the original patch during the merge. Also the i2c-xilinx_ps.c references a header that was removed by other backported patches. Signed-off-by: Daniel Sangorrin Signed-off-by: Yoshitake Kobayashi --- drivers/i2c/busses/Makefile | 1 + drivers/i2c/busses/i2c-xilinx_ps.c | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile index 3ba94a9..f35b079 100644 --- a/drivers/i2c/busses/Makefile +++ b/drivers/i2c/busses/Makefile @@ -72,6 +72,7 @@ obj-$(CONFIG_I2C_STU300) += i2c-stu300.o obj-$(CONFIG_I2C_TEGRA) += i2c-tegra.o obj-$(CONFIG_I2C_VERSATILE) += i2c-versatile.o obj-$(CONFIG_I2C_WMT) += i2c-wmt.o +obj-$(CONFIG_I2C_XILINX_PS) += i2c-xilinx_ps.o obj-$(CONFIG_I2C_OCTEON) += i2c-octeon.o obj-$(CONFIG_I2C_XILINX) += i2c-xiic.o obj-$(CONFIG_I2C_XLR) += i2c-xlr.o diff --git a/drivers/i2c/busses/i2c-xilinx_ps.c b/drivers/i2c/busses/i2c-xilinx_ps.c index 67a1001..3b98c32 100644 --- a/drivers/i2c/busses/i2c-xilinx_ps.c +++ b/drivers/i2c/busses/i2c-xilinx_ps.c @@ -40,7 +40,6 @@ #include #include #include -#include #include #include @@ -909,8 +908,6 @@ static int xi2cps_probe(struct platform_device *pdev) goto err_clk_dis; } - of_i2c_register_devices(&id->adap); - dev_info(&pdev->dev, "%d kHz mmio %08lx irq %d\n", id->i2c_clk/1000, (unsigned long)r_mem->start, id->irq);