From patchwork Thu Aug 9 15:47:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10641 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 871E823E02 for ; Thu, 9 Aug 2012 15:48:46 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 57174A18A46 for ; Thu, 9 Aug 2012 15:48:46 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so583860yhp.11 for ; Thu, 09 Aug 2012 08:48:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=uRHE23TUtJc5LOHRWvpG3CuC8eywz4GG06sSyrz/8kk=; b=eUDRxDHV/DvhG3uSTxK0Sa9WAgPO/0rhtIyHMMO2fbMNmTPCyIZaQoYZErC3OaHC/P R17j13hO4qCvXGWmFOrnkLVwOi6Vk4UGqmIzRDUH6jKl2TH9HtsMsGvtwhQ+fcZTYTzB dnv1w8r9HzQsYxC01uD4og5jN+6W7JZoGe93K9KIg59c7eNdUfTSFoA1xfNNQdj81MYO gq1rJOGEngl1yggXe3eMmG15m8m/MX5L43dTKyW0rKNqHN8So+5SECmWFNbQ4NZ8VRfw UnaUJSJdr9cNpNGTeu4gbDSV9H0qJ6DiIatojTtlyNPAaJ6mFYcRjUql8UQKy4xaKkKW xNJQ== Received: by 10.50.94.133 with SMTP id dc5mr1569123igb.16.1344527325735; Thu, 09 Aug 2012 08:48:45 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp15286igc; Thu, 9 Aug 2012 08:48:44 -0700 (PDT) Received: by 10.180.107.103 with SMTP id hb7mr4000859wib.3.1344527324309; Thu, 09 Aug 2012 08:48:44 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id fc10si1121699wib.2.2012.08.09.08.48.43 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:44 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-we0-f178.google.com with SMTP id u7so480939wey.37 for ; Thu, 09 Aug 2012 08:48:43 -0700 (PDT) Received: by 10.180.80.134 with SMTP id r6mr4018834wix.1.1344527323819; Thu, 09 Aug 2012 08:48:43 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id q4sm2278954wix.9.2012.08.09.08.48.42 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:43 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, Lee Jones , alsa-devel@alsa-project.org Subject: [PATCH 22/22] Documentation: Add the AB8500 CODEC device to the MFD AB8500 doc Date: Thu, 9 Aug 2012 16:47:48 +0100 Message-Id: <1344527268-5964-23-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> References: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQkicNv5A3Uu/DhzAG3gTLd4dFFQB6hHyuczkmYmNaeXOjVj37NGiFuge38ewI/OuofUeJ7r Here we document the AB8500 Audio CODEC in the existing MFD AB8500 document. CC: alsa-devel@alsa-project.org Signed-off-by: Lee Jones --- Documentation/devicetree/bindings/mfd/ab8500.txt | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/ab8500.txt b/Documentation/devicetree/bindings/mfd/ab8500.txt index 69e757a..ce83c8d 100644 --- a/Documentation/devicetree/bindings/mfd/ab8500.txt +++ b/Documentation/devicetree/bindings/mfd/ab8500.txt @@ -23,6 +23,7 @@ Device IRQ Names Supply Names Description ab8500-bm : : : Battery Manager ab8500-btemp : : : Battery Temperature ab8500-charger : : : Battery Charger +ab8500-codec : : : Audio Codec ab8500-fg : : : Fuel Gauge ab8500-gpadc : HW_CONV_END : vddadc : Analogue to Digital Converter SW_CONV_END : : @@ -52,6 +53,14 @@ Optional child device properties: supplied in the interrupts property - -supply : contains a phandle to the regulator supply node in Device Tree +Non-standard child device properties: + - Audio CODEC: + - stericsson,amic[1|2]-type-single-ended : Single-ended Analoge Mic (default: differential) + - stericsson,amic1a-bias-vamic2 : Analoge Mic wishes to use a non-standard Vamic + - stericsson,amic1b-bias-vamic2 : Analoge Mic wishes to use a non-standard Vamic + - stericsson,amic2-bias-vamic1 : Analoge Mic wishes to use a non-standard Vamic + - stericsson,earpeice-cmv : Earpeice voltage (only: 950 | 1100 | 1270 | 1580) + ab8500@5 { compatible = "stericsson,ab8500"; reg = <5>; /* mailbox 5 is i2c */ @@ -110,6 +119,12 @@ ab8500@5 { compatible = "stericsson,ab8500-pwm"; }; + codec: ab8500-codec { + compatible = "stericsson,ab8500-codec"; + + stericsson,earpeice-cmv = <950>; /* Units in mV. */ + }; + ab8500-regulators { compatible = "stericsson,ab8500-regulator";