From patchwork Fri Jun 30 00:54:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 782635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3wzJ3f50L5z9s81 for ; Fri, 30 Jun 2017 10:55:25 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=alliedtelesis.co.nz header.i=@alliedtelesis.co.nz header.b="VF5U9s7g"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752121AbdF3AzK (ORCPT ); Thu, 29 Jun 2017 20:55:10 -0400 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:46166 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751752AbdF3AyW (ORCPT ); Thu, 29 Jun 2017 20:54:22 -0400 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id 150E084484; Fri, 30 Jun 2017 12:54:18 +1200 (NZST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail; t=1498784058; bh=DIOx3Q8xwAqAUJO74oy6NWmKaexB3yrcrKBxT8l3+uc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VF5U9s7g+y6T4dCRQGeiVlfWV8WPqI2sVJqSScB4YIn9HsrNzBuTiDHdYJbuVEAAn vaReWkPUUawI9hkRty/lXUImZ39VUoGYsC8kyF02pDMN/oUGCqlwu1osBI+0Lje9SO IL+4r4+IhU7Ds6lyyTlSdIU5PrEVZuCk8/X+0rx4= Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7, 5, 7, 9061) id ; Fri, 30 Jun 2017 12:54:17 +1200 Received: from chrisp-dl.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id E831A13F113; Fri, 30 Jun 2017 12:54:21 +1200 (NZST) Received: by chrisp-dl.atlnz.lc (Postfix, from userid 1030) id F33D01E1D80; Fri, 30 Jun 2017 12:54:16 +1200 (NZST) From: Chris Packham To: wsa@the-dreams.de, andy.shevchenko@gmail.com, linux-i2c@vger.kernel.org Cc: ysato@users.sourceforge.jp, linux-sh@vger.kernel.org, Chris Packham , Steven Miao , Rich Felker , adi-buildroot-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org Subject: [PATCH 6/6] i2c: pca-platform: drop gpio from platform data Date: Fri, 30 Jun 2017 12:54:08 +1200 Message-Id: <20170630005408.23968-7-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170630005408.23968-1-chris.packham@alliedtelesis.co.nz> References: <20170630005408.23968-1-chris.packham@alliedtelesis.co.nz> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org Now that the i2c-pca-plaform driver is using the device managed API for gpios there is no need for the reset gpio to be specified via i2c_pca9564_pf_platform_data. Signed-off-by: Chris Packham --- arch/blackfin/mach-bf561/boards/acvilon.c | 1 - arch/sh/boards/board-sh7785lcr.c | 1 - include/linux/i2c-pca-platform.h | 3 --- 3 files changed, 5 deletions(-) diff --git a/arch/blackfin/mach-bf561/boards/acvilon.c b/arch/blackfin/mach-bf561/boards/acvilon.c index 37f8f25a1347..192404318a36 100644 --- a/arch/blackfin/mach-bf561/boards/acvilon.c +++ b/arch/blackfin/mach-bf561/boards/acvilon.c @@ -112,7 +112,6 @@ static struct resource bfin_i2c_pca_resources[] = { }; struct i2c_pca9564_pf_platform_data pca9564_platform_data = { - .gpio = -1, .i2c_clock_speed = 330000, .timeout = HZ, }; diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c index 4c321d0da945..1170fc536db7 100644 --- a/arch/sh/boards/board-sh7785lcr.c +++ b/arch/sh/boards/board-sh7785lcr.c @@ -253,7 +253,6 @@ static struct gpiod_lookup_table i2c_gpio_table = { }; static struct i2c_pca9564_pf_platform_data i2c_platform_data = { - .gpio = 0, .i2c_clock_speed = I2C_PCA_CON_330kHz, .timeout = HZ, }; diff --git a/include/linux/i2c-pca-platform.h b/include/linux/i2c-pca-platform.h index aba33759dec4..6331eaef9352 100644 --- a/include/linux/i2c-pca-platform.h +++ b/include/linux/i2c-pca-platform.h @@ -2,9 +2,6 @@ #define I2C_PCA9564_PLATFORM_H struct i2c_pca9564_pf_platform_data { - int gpio; /* pin to reset chip. driver will work when - * not supplied (negative value), but it - * cannot exit some error conditions then */ int i2c_clock_speed; /* values are defined in linux/i2c-algo-pca.h */ int timeout; /* timeout in jiffies */ };