From patchwork Mon Mar 12 21:17:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 131397 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp1234216ljb; Mon, 12 Mar 2018 14:18:16 -0700 (PDT) X-Google-Smtp-Source: AG47ELsiGAZJ+pzLfI4Fr9ucPm5PAfAUW7PP/peY/EPieFoSaukbYNyNM9xx7i03BwiHat4SF8s9 X-Received: by 10.223.160.243 with SMTP id n48mr7875940wrn.92.1520889496778; Mon, 12 Mar 2018 14:18:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520889496; cv=none; d=google.com; s=arc-20160816; b=0lkl+ZUh6UjvkhENLiujKh65Hwj7HMNDDCOgnwhxwd0n1/lvIfBz2CiXZG+lz9j3MR 6wzfwnbFwiNywU8Wz0mAcQJQNKq9XBwJjQDPD+PY//2sPIM358D30iDezNxeF2DqUxUE EdB0Zwp4vj0PXGrQNbws8Tc6dbbbNasjFf0Qt7TnWKjVxMnKr1X6wHAehxAQrw+cx5oB VVvNmfvBNwEncN3QmiN4HvvOITTo7nlrgssejUcmaPoyV5uLS4TrIjDIXI5MbIVNuyFn PW7Q2UwjxSup1EPHPqkxMP7NkWcO/lEgK+CTy8DMLkqx+vuUSKxXSyXhjzbbEGu9Orab yxYg== 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:arc-authentication-results; bh=YWy1mHPJZNMhBFgBR1YgNCqBOG2xQytkkYYsz4mz/KY=; b=O5+2oVVVjcd6WDV7x+AUlctUYZgmkXBi7mdejw6rkAoxijgBVmcacOTW4oG+1mi3Qh A/n7JgipqR8krH08mqiOGFifI/QOD2Q9DbUApYk4QEgiReiPOz0Pk62u+x8Ig81qtthv 6pE3jNO95DEGp09UnmFZnAzHmLXUOJdk7s1Gq83vawmtgKAV0iyCBWw2APmJT1zF0fUc DDRWQRgFzYwt3rG7WME3fXR6PkDIZYOLQqVxAuiiXG6KCf9LjJBFBKeVYV5gf9rYu6NT jS5RAWUNFG1rsY26/QT6k5s7VjkmqdBzyB0sA9rvYXJaWiPmZOtI2Q7v3qE19lGK5zz4 kusw== 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=XyBswglc; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id e7si5768776wrd.534.2018.03.12.14.18.16; Mon, 12 Mar 2018 14:18:16 -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=XyBswglc; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 41E06267174; Mon, 12 Mar 2018 22:18:08 +0100 (CET) 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 035332670F8; Mon, 12 Mar 2018 22:18:03 +0100 (CET) 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, SPF_PASS, T_RP_MATCHES_RCVD 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 550F7267048 for ; Mon, 12 Mar 2018 22:18:02 +0100 (CET) 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=2ZVjvUCQMSuQngVwLx9xCHzrJi7LqFArqCk1kqoYs9o=; b=XyBswglc71Ci 2HVn5rppXnLL+bmgU9pDu9Dh+Qv+5Ht72HQqLMZS1xzgECr7ck3udP1BfsK7DQa/A9PcqS1eXgaWB u+GjUin7eYH4u7IgfmL+hTLooda8y/cL+bmWAHMZ6UgzazBDv22IqdgWrD9cDOi8bFFwv8C6JgKS2 vl9kk=; Received: from [67.208.111.18] (helo=finisterre.ee.mobilebroadband) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1evUpV-0006K5-PZ; Mon, 12 Mar 2018 21:18:02 +0000 Received: by finisterre.ee.mobilebroadband (Postfix, from userid 1000) id CFFD1440079; Mon, 12 Mar 2018 21:17:59 +0000 (GMT) From: Mark Brown To: Hans de Goede In-Reply-To: <20180312193436.8385-1-hdegoede@redhat.com> Message-Id: <20180312211759.CFFD1440079@finisterre.ee.mobilebroadband> Date: Mon, 12 Mar 2018 21:17:59 +0000 (GMT) Cc: Oder Chiou , Bard Liao , alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: rt5651: move definitions of dt-binding constants to include/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: rt5651: move definitions of dt-binding constants to include/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 0f2d4f162f4f54b431420df23122901a6ccd641e Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Mon, 12 Mar 2018 20:34:35 +0100 Subject: [PATCH] ASoC: rt5651: move definitions of dt-binding constants to include/dt-bindings Move the definitions of constants used in the dt-bindings from include/sound/rt5651.h to include/dt-bindings/sound/rt5651.h. As dt-bindings headers may also be parsed by the dt-compiler, they cannot use enums, only defines, so this commit also changes the code declaring the constants to use defines. Signed-off-by: Hans de Goede Signed-off-by: Mark Brown --- include/dt-bindings/sound/rt5651.h | 15 +++++++++++++++ include/sound/rt5651.h | 36 ------------------------------------ sound/soc/codecs/rt5651.h | 4 ++-- 3 files changed, 17 insertions(+), 38 deletions(-) create mode 100644 include/dt-bindings/sound/rt5651.h delete mode 100644 include/sound/rt5651.h -- 2.16.2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/include/dt-bindings/sound/rt5651.h b/include/dt-bindings/sound/rt5651.h new file mode 100644 index 000000000000..2f2dac915168 --- /dev/null +++ b/include/dt-bindings/sound/rt5651.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __DT_RT5651_H +#define __DT_RT5651_H + +#define RT5651_JD_NULL 0 +#define RT5651_JD1_1 1 +#define RT5651_JD1_2 2 +#define RT5651_JD2 3 + +#define RT5651_OVCD_SF_0P5 0 +#define RT5651_OVCD_SF_0P75 1 +#define RT5651_OVCD_SF_1P0 2 +#define RT5651_OVCD_SF_1P5 3 + +#endif /* __DT_RT5651_H */ diff --git a/include/sound/rt5651.h b/include/sound/rt5651.h deleted file mode 100644 index 6403b862fb9a..000000000000 --- a/include/sound/rt5651.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * linux/sound/rt286.h -- Platform data for RT286 - * - * Copyright 2013 Realtek Microelectronics - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __LINUX_SND_RT5651_H -#define __LINUX_SND_RT5651_H - -/* - * Note these MUST match the values from the DT binding: - * Documentation/devicetree/bindings/sound/rt5651.txt - */ -enum rt5651_jd_src { - RT5651_JD_NULL, - RT5651_JD1_1, - RT5651_JD1_2, - RT5651_JD2, -}; - -/* - * Note these MUST match the values from the DT binding: - * Documentation/devicetree/bindings/sound/rt5651.txt - */ -enum rt5651_ovcd_sf { - RT5651_OVCD_SF_0P5, - RT5651_OVCD_SF_0P75, - RT5651_OVCD_SF_1P0, - RT5651_OVCD_SF_1P5, -}; - -#endif diff --git a/sound/soc/codecs/rt5651.h b/sound/soc/codecs/rt5651.h index f20c9be94fb2..3a0968c53fde 100644 --- a/sound/soc/codecs/rt5651.h +++ b/sound/soc/codecs/rt5651.h @@ -12,7 +12,7 @@ #ifndef __RT5651_H__ #define __RT5651_H__ -#include +#include /* Info */ #define RT5651_RESET 0x00 @@ -2073,7 +2073,7 @@ struct rt5651_priv { struct regmap *regmap; struct snd_soc_jack *hp_jack; struct work_struct jack_detect_work; - enum rt5651_jd_src jd_src; + unsigned int jd_src; unsigned int ovcd_th; unsigned int ovcd_sf;