From patchwork Thu May 20 10:08:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 101175 X-Patchwork-Delegate: tony@atomide.com 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 o4KA9JBj016619 for ; Thu, 20 May 2010 10:09:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755467Ab0ETKJL (ORCPT ); Thu, 20 May 2010 06:09:11 -0400 Received: from ey-out-2122.google.com ([74.125.78.25]:8039 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755460Ab0ETKJK (ORCPT ); Thu, 20 May 2010 06:09:10 -0400 Received: by ey-out-2122.google.com with SMTP id 9so367313eyd.5 for ; Thu, 20 May 2010 03:09:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=YbwQimw/nkBY+1QYD6cDKZtmSL8jNecYBeP76ZBoO1A=; b=fmtKWH3d8SlDQm59vktqdZjSr85cz0UA5kTcQ2j6lNJN6crtnKLuAse8J6sYyHyqtt 7aFwqgD+uP+Gb3IgUe28NOPHG6P1/HqFcE30VhXkZe8tXTnnuZX88i4WN8/xFctCQHox 97bMn5RCDwTYhR1ecCXocCcdnrYytkgXUx79c= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=tCHDogHGGxRW53etlQ4QR+tp8h+SvNIFCyF8o1eHqQLki4QZseZZG5uAmR5fyPYldz cl2cqHTUAB42Dvyc8DE5d66FnH+sagCDdABMzFzTkvCDna2eNVD2oelPAPsjvXdeyzYd q3GTdv8KvY6V1MKOfOszIP0bAPrU8N0uFa3zo= Received: by 10.213.52.6 with SMTP id f6mr3904346ebg.51.1274350148797; Thu, 20 May 2010 03:09:08 -0700 (PDT) Received: from localhost (host-94-101-4-66.igua.fi [94.101.4.66]) by mx.google.com with ESMTPS id 14sm4185580ewy.2.2010.05.20.03.09.07 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 20 May 2010 03:09:08 -0700 (PDT) From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Tony Lindgren , Eduardo Valentin , Jarkko Nikula Subject: [PATCHv2 2/2] omap: rx51: Add supply and data for the tpa6130a2 headphone amplifier Date: Thu, 20 May 2010 13:08:45 +0300 Message-Id: <1274350125-5702-2-git-send-email-jhnikula@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1274350125-5702-1-git-send-email-jhnikula@gmail.com> References: <1274350125-5702-1-git-send-email-jhnikula@gmail.com> 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:09:20 +0000 (UTC) diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index e8ac47c..9e618b6 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c @@ -33,6 +33,8 @@ #include #include +#include + #include "mux.h" #include "hsmmc.h" @@ -285,6 +287,8 @@ static struct regulator_consumer_supply rx51_vmmc2_supplies[] = { /* tlv320aic3x analog supplies */ REGULATOR_SUPPLY("AVDD", "2-0018"), REGULATOR_SUPPLY("DRVDD", "2-0018"), + /* tpa6130a2 */ + REGULATOR_SUPPLY("Vdd", "2-0060"), /* Keep vmmc as last item. It is not iterated for newer boards */ REGULATOR_SUPPLY("vmmc", "mmci-omap-hs.1"), }; @@ -667,10 +671,19 @@ static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_1[] = { }, }; +static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = { + .id = TPA6130A2, + .power_gpio = 98, +}; + static struct i2c_board_info __initdata rx51_peripherals_i2c_board_info_2[] = { { I2C_BOARD_INFO("tlv320aic3x", 0x18), }, + { + I2C_BOARD_INFO("tpa6130a2", 0x60), + .platform_data = &rx51_tpa6130a2_data, + } }; static int __init rx51_i2c_init(void)