From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754922AbaCPNbS (ORCPT ); Sun, 16 Mar 2014 09:31:18 -0400 Received: from mail-ee0-f43.google.com ([74.125.83.43]:47639 "EHLO mail-ee0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752710AbaCPNaO (ORCPT ); Sun, 16 Mar 2014 09:30:14 -0400 From: Richard Cochran To: Cc: , Ben Hutchings , Christian Riesch , David Miller , =?UTF-8?q?Stefan=20S=C3=B8rensen?= Subject: [PATCH net-next v2 8/9] dp83640: let external input pins from the module parameters be defaults. Date: Sun, 16 Mar 2014 14:29:29 +0100 Message-Id: X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch changes the driver to use the new pin configuration method when programming the external time stamp input signals. Signed-off-by: Richard Cochran --- drivers/net/phy/dp83640.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/phy/dp83640.c b/drivers/net/phy/dp83640.c index 43b583b..93db564 100644 --- a/drivers/net/phy/dp83640.c +++ b/drivers/net/phy/dp83640.c @@ -468,7 +468,10 @@ static int ptp_dp83640_enable(struct ptp_clock_info *ptp, event_num = EXT_EVENT + index; evnt = EVNT_WR | (event_num & EVNT_SEL_MASK) << EVNT_SEL_SHIFT; if (on) { - gpio_num = gpio_tab[EXTTS0_GPIO + index]; + gpio_num = 1 + ptp_find_pin(clock->ptp_clock, + PTP_PF_EXTTS, index); + if (gpio_num < 1) + return -EINVAL; evnt |= (gpio_num & EVNT_GPIO_MASK) << EVNT_GPIO_SHIFT; if (rq->extts.flags & PTP_FALLING_EDGE) evnt |= EVNT_FALL; -- 1.7.10.4