From patchwork Thu Oct 4 10:42:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 148113 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp780290lji; Thu, 4 Oct 2018 03:42:25 -0700 (PDT) X-Google-Smtp-Source: ACcGV63Vk70iTAkUljS5B9QATw0azo9gkfkpcBLk4I98pcGO0+YwYh4dfyUhQLa3VdceD+XKMXqQ X-Received: by 2002:a5d:5301:: with SMTP id e1-v6mr4547380wrv.297.1538649745065; Thu, 04 Oct 2018 03:42:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538649745; cv=none; d=google.com; s=arc-20160816; b=w/Mxm0OD/DX2MUWbZ/zn+Omd3W8VA0F3JEg5cBYqwNvYcSADVIppT0iLkMLGUjtdnc joNyEuBAmeJ1+u6KVNXI6/3BA6pVrIChJNhW5dcI2hoqOdhqzAmAv1mzVU5aKcND0WrN LFuL5E4RTWOPUAExC3J6LqW7zTe9YifAVwghaYtgHr+qGIk7O3dAQMnjsbqyEOgGbk02 D9mcGS4+7IvcwDBEod72zaEwK/2Pt6oO+Xe9sHq3+KdqRgRTogVliNDYa3D0vIEileE2 LLxQhCdH/cTzwpRU5gxHuq+OOHkkU17WcdOtPcnzrCJGx5D2kdkZeMpb/lsg+pfTR269 cYvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=iWvhQf0l2erOe1Vs6MU4z2lB2nlKcIiVBVMq1eGXQ5o=; b=dAMHXJ8O9r29EjpS/ZZ/PYICsegvGrLkpu+QgRtqdlxr5gkK4yu8I6ZsfyMBHhVFgu U7an6YcdxlSw6lWbbj4xTYD+iDADgbSwpqZuAwuDKPGs72nZFTsmqXLrnrNZKPQNptbh kKSmcM4Vqv1dL18spP/FaBC3+XAG4rHCzvGUD9ITPzMKttdlTg3Oq1e5qgUMgnx3uMMu c2/lECCd460VJnsdFGbiOKkZWtAT7XKYnchF75fc+E3IPiy+WoCOyiQLI2xUKXIaT2pB eq8xboNhnPYYCw5yUkIv7B1G7YFQfww2rWIm0Id06JsCyFG97CbLHQF5AAdt74M/JrBW ny+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=c4jBcq63; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id p9-v6si3405040wmh.49.2018.10.04.03.42.24; Thu, 04 Oct 2018 03:42:25 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=c4jBcq63; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 3C44026783D; Thu, 4 Oct 2018 12:42:23 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 59597267844; Thu, 4 Oct 2018 12:42:20 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_NONE autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id 9ADA02676A7 for ; Thu, 4 Oct 2018 12:42:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=np+KykFi160Wua1Qi0/WZy4/Q6IboGHH7qFledUwbbQ=; b=c4jBcq639DFI 2beFGJ92rHDx8mPhWOMWQWRoFcSAqTSrFcpVyShG3W3wkiPr4cvgXql2Gkvo9a6h1oD44on24znoe 1H+wHcwRfB0/9hPX+a5HBk9rtQOfTdtKXITIqNT+XGmdk6EklbRpBIrmhV50d/tTI22kr/H9PCNsD wGwrw=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1g815D-0008Hh-SO; Thu, 04 Oct 2018 10:42:15 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 6BF891121BA8; Thu, 4 Oct 2018 11:42:15 +0100 (BST) From: Mark Brown To: Daniel Mack In-Reply-To: <20181003193234.5049-1-daniel@zonque.org> Message-Id: <20181004104215.6BF891121BA8@debutante.sirena.org.uk> Date: Thu, 4 Oct 2018 11:42:15 +0100 (BST) Cc: tiwai@suse.de, alsa-devel@alsa-project.org, broonie@kernel.org Subject: [alsa-devel] Applied "ASoC: add fault detect recovery property to DT bindings" to the asoc tree X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org The patch ASoC: add fault detect recovery property to DT bindings has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 466dee75b3364d05b43ddfe41ef2e8887b6a3ea7 Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Wed, 3 Oct 2018 21:32:34 +0200 Subject: [PATCH] ASoC: add fault detect recovery property to DT bindings The driver already has support for setting the FDRB bit in the CONFA register through platform data, but there was no property to set it in the device-tree bindings. Signed-off-by: Daniel Mack Signed-off-by: Mark Brown --- Documentation/devicetree/bindings/sound/st,sta32x.txt | 3 +++ sound/soc/codecs/sta32x.c | 2 ++ 2 files changed, 5 insertions(+) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/Documentation/devicetree/bindings/sound/st,sta32x.txt b/Documentation/devicetree/bindings/sound/st,sta32x.txt index 255de3ae5b2f..ff4a685a4303 100644 --- a/Documentation/devicetree/bindings/sound/st,sta32x.txt +++ b/Documentation/devicetree/bindings/sound/st,sta32x.txt @@ -39,6 +39,9 @@ Optional properties: - st,thermal-warning-recover: If present, thermal warning recovery is enabled. + - st,fault-detect-recovery: + If present, fault detect recovery is enabled. + - st,thermal-warning-adjustment: If present, thermal warning adjustment is enabled. diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c index d5035f2f2b2b..22de1593443c 100644 --- a/sound/soc/codecs/sta32x.c +++ b/sound/soc/codecs/sta32x.c @@ -1038,6 +1038,8 @@ static int sta32x_probe_dt(struct device *dev, struct sta32x_priv *sta32x) of_property_read_u8(np, "st,ch3-output-mapping", &pdata->ch3_output_mapping); + if (of_get_property(np, "st,fault-detect-recovery", NULL)) + pdata->fault_detect_recovery = 1; if (of_get_property(np, "st,thermal-warning-recovery", NULL)) pdata->thermal_warning_recovery = 1; if (of_get_property(np, "st,thermal-warning-adjustment", NULL))