From patchwork Thu May 20 10:04:20 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilkka Koskinen X-Patchwork-Id: 101173 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4KA4vX3014425 for ; Thu, 20 May 2010 10:04:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755402Ab0ETKEb (ORCPT ); Thu, 20 May 2010 06:04:31 -0400 Received: from smtp.nokia.com ([192.100.122.230]:39123 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753035Ab0ETKEa (ORCPT ); Thu, 20 May 2010 06:04:30 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4KA4MNi010785; Thu, 20 May 2010 13:04:24 +0300 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 20 May 2010 13:04:11 +0300 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Thu, 20 May 2010 13:04:10 +0300 Received: from localhost.localdomain (tumpelo.nmp.nokia.com [172.22.211.13]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id o4KA45AX007695; Thu, 20 May 2010 13:04:05 +0300 From: Ilkka Koskinen To: linux-kernel@vger.kernel.org, sameo@linux.intel.com Cc: linux-omap@vger.kernel.org, ilkka.koskinen@nokia.com Subject: [PATCH] mfd: twl5031: Rename sih modules Date: Thu, 20 May 2010 13:04:20 +0300 Message-Id: <1274349860-1736-1-git-send-email-ilkka.koskinen@nokia.com> X-Mailer: git-send-email 1.6.0.4 X-OriginalArrivalTime: 20 May 2010 10:04:10.0924 (UTC) FILETIME=[CB1546C0:01CAF803] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 20 May 2010 10:04:58 +0000 (UTC) diff --git a/drivers/mfd/twl4030-irq.c b/drivers/mfd/twl4030-irq.c index 202bdd5..097f24d 100644 --- a/drivers/mfd/twl4030-irq.c +++ b/drivers/mfd/twl4030-irq.c @@ -232,10 +232,11 @@ static const struct sih sih_modules_twl5031[8] = { }, [6] = { /* - * ACI doesn't use the same SIH organization. - * For example, it supports only one interrupt line + * ECI/DBI doesn't use the same SIH organization. + * For example, it supports only one interrupt output line. + * That is, the interrupts are seen on both INT1 and INT2 lines. */ - .name = "aci", + .name = "eci_dbi", .module = TWL5031_MODULE_ACCESSORY, .bits = 9, .bytes_ixr = 2, @@ -247,8 +248,8 @@ static const struct sih sih_modules_twl5031[8] = { }, [7] = { - /* Accessory */ - .name = "acc", + /* Audio accessory */ + .name = "audio", .module = TWL5031_MODULE_ACCESSORY, .control_offset = TWL5031_ACCSIHCTRL, .bits = 2,