From patchwork Mon Jul 31 09:57:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128559 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1927686vqg; Mon, 31 Jul 2023 03:48:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlFARbmzRcp6J/pnPOJ2ESiF6nVCvB8n+krTHy+lijDBThMFNjO+K0/H8vZbcAmwUTbu8MsD X-Received: by 2002:a05:6a21:7807:b0:134:149e:7b74 with SMTP id be7-20020a056a21780700b00134149e7b74mr7693940pzc.61.1690800509014; Mon, 31 Jul 2023 03:48:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690800508; cv=none; d=google.com; s=arc-20160816; b=mW/kZLUcSp/bP1EV9ccAmTlpuUsqK7s2iMVGa4s0yLE5ZethlogQ/1WXdyQtBYO8Nf 6CdeMnMy8Pjd2kh6bLlaTzlG/y5YpwMc45Os0BSBdkOcOVtbzv4Fjvvtuio/Lw6otfHY iU1Qq9JMEZ64z/JpLcgISqiJmTqoJrCGIi+UsghxPp+Bmhbw8NoycB577qq9WeWR6viG O3GzUBcNt2x0niBJeedk2l/LnQMAL6g/6vCLwTHljePXjQA6oD0WLzRVQAbiJIUmjkVU 6Cmkkd6IGHlw0hxCJWhYt6HXD0bpFyQTvu0u7tSXHxKhZWYbzRK94bgd+pDYXbAL3zNd OcAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ge5Y7e80bFTSfkAsJqtzum36Yq9ImlNuV8r4LpCez9Q=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=ReRR5fsbwZfkQxNY+8FSIjGo0rmd6k6U0sZ61uGHyeaKM2hhz5VTTOT58M0m3Hgu3+ rTsq/NJmJXRcarkQwY7oh8IFnrEfE7Zjb/LxtuzJAf762Tt8w6xmVqC9qPUVTKZD1c7i VKqAsY7NaeQAV+VzjbiJJRa9rAwWxzOStsBgqCOUfqdPqpw/Dg049ahE0xpumbMEo0MX NNz3892R90DwU+FAlBC+FzJgi+YNTWOf6VyyHAeDxitj40aedUdzS82/x2+FFXe46NzV IZ5GlTzP8mlfjtkCiSdNRk8QphDF66xPpEDNj9JcIm3UpWLwgMnHKJ0JdJWMn9HuH36P tdaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iF7H4X5L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y28-20020a056a001c9c00b0068302ab63e4si7093923pfw.273.2023.07.31.03.48.16; Mon, 31 Jul 2023 03:48:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iF7H4X5L; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232161AbjGaJ7B (ORCPT + 99 others); Mon, 31 Jul 2023 05:59:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232568AbjGaJ6c (ORCPT ); Mon, 31 Jul 2023 05:58:32 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 621B810C0 for ; Mon, 31 Jul 2023 02:57:35 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-99bcfe28909so609792566b.3 for ; Mon, 31 Jul 2023 02:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690797454; x=1691402254; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ge5Y7e80bFTSfkAsJqtzum36Yq9ImlNuV8r4LpCez9Q=; b=iF7H4X5LMK2f9JBc7gEO1OHfCB2DE0uzwiR3fLL3hC3P0P7He8K+uJhUKT6O7qvg4J hisqSpRSyLdr1sZfkEDCiWtKset4HpCUul75BrBxg5qqgaJHB0hkANumnlHXu63Bnznq Qv42a/7bGRyjiqXVXnyXwUNpS+AHlzvhJYYFYq64g5UFQCE6031+EaWJ3ek7V44eyOe9 8ngDibUCNh+ysNYoQsogznIZEXqPfeXRcbOGp7qTZO9rOGts0al6r9iF++dXGfe0SNQk Okh2HEcXRWW3fyWg4yFTUjdi1yo4/LEWNxFPFNVEHeG67O2/MfMSyK3suorDrh6pjcIe vy/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690797454; x=1691402254; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ge5Y7e80bFTSfkAsJqtzum36Yq9ImlNuV8r4LpCez9Q=; b=An+3qSVVBEoG5TyCknZsacorg28/sqjt4wQVmdKouU2xkgCRagDpoUiX4rMtnauqVz S6zUVTZNcjh2D9I0iCWHY/m+6DhdrsPMeanYcica6p6niJWlVxW/+ArgjzR7LLa2kb8c gWP/0SS8hd0TRJRnlh98gXhG8QnzWOqUWobstoU3zpcTm9SvPKlwbBWfnCwMPSpQqL7f k+qbcTwp1o3Mt/3S+KkZ3yfeVl+pYzUhDr88WACzEgqpvJmUzE2CxmIBby6loEAyiB3y yDJ+6vOzG4OzQzOT9ismuJSENo3eb3BuTXWoCFdQrmMCVJyVlrOUNlY2oZPIKQsesVFF LATw== X-Gm-Message-State: ABy/qLY67TPoAdAzMTiG+Sa4hB4plfnwRIv0p0350j3CFGpFJNsRulT7 JrQZ4Zx1CoTxzkSvE+O3gyGlpQ== X-Received: by 2002:a17:907:b13:b0:99b:5574:7d0f with SMTP id h19-20020a1709070b1300b0099b55747d0fmr5889800ejl.23.1690797453930; Mon, 31 Jul 2023 02:57:33 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id kq6-20020a170906abc600b009828e26e519sm5860678ejb.122.2023.07.31.02.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:57:33 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 1/8] arm64: dts: exynos: exynos5433-tm2: switch sound card to audio-routing Date: Mon, 31 Jul 2023 11:57:23 +0200 Message-Id: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772932834974961335 X-GMAIL-MSGID: 1772932834974961335 "samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Signed-off-by: Krzysztof Kozlowski --- Change depends on ASoC: https://lore.kernel.org/linux-devicetree/20230731094303.185067-1-krzysztof.kozlowski@linaro.org/T/#t --- .../dts/exynos/exynos5433-tm2-common.dtsi | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index d163891cd399..2a4dc560252e 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -124,19 +124,18 @@ sound { audio-amplifier = <&max98504>; mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>; model = "wm5110"; - samsung,audio-routing = - /* Headphone */ - "HP", "HPOUT1L", - "HP", "HPOUT1R", + audio-routing = /* Headphone */ + "HP", "HPOUT1L", + "HP", "HPOUT1R", - /* Speaker */ - "SPK", "SPKOUT", - "SPKOUT", "HPOUT2L", - "SPKOUT", "HPOUT2R", + /* Speaker */ + "SPK", "SPKOUT", + "SPKOUT", "HPOUT2L", + "SPKOUT", "HPOUT2R", - /* Receiver */ - "RCV", "HPOUT3L", - "RCV", "HPOUT3R"; + /* Receiver */ + "RCV", "HPOUT3L", + "RCV", "HPOUT3R"; }; }; From patchwork Mon Jul 31 09:57:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128576 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1931004vqg; Mon, 31 Jul 2023 03:57:13 -0700 (PDT) X-Google-Smtp-Source: APBJJlGOT9elbx0NAGkjLXlcDHYZrDNvReYwBjUNEbykXltX8tGeZaa7FasG34T9xwYNtau3QRl5 X-Received: by 2002:a17:902:aa41:b0:1bb:c7c6:3454 with SMTP id c1-20020a170902aa4100b001bbc7c63454mr8185868plr.48.1690801033493; Mon, 31 Jul 2023 03:57:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690801033; cv=none; d=google.com; s=arc-20160816; b=YeidkBct27cjTp+ILfeSaD1ZksM0LNXG7S3DVdDnGAF1J0N2icn17cH8a6k5ikjaNL +cJUtvG2t5XtoS/h2wEaz5zu+X4UrHm8h+57xxRLNHbEIj3yDeatVNl69uWmBug57qqa syktf6J77jqpIziHuhesrxcYHVxyYqDpi92xQMOBVlgQFljnZcz5xuBZKpNlHlMXLofi vihlquf/pUP1TdX+0LfFaHlBktFu2TPL7P43Vt8oxxynPhM18qKAVf50IZu9ZKSQY45Y PPisuKbdzqWYB9J01R58EmKUQV5/PU+E4ONKTps1YcyYsiHMSmqvySnL1C7BuF/4Fv2I oZ9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Zfg4ljS/G5hMXyWN2ybdTjORVp3riaVQeb5S/esVdkk=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=qOVS+Ha2o+PHYBOJ03I6YR+Q0K6ayzK7G0QJk+wt4ha9O8EF/fF0sm/Bv5CecdyBHx R9xkNDgKBWvaFx5h37b9aIS0HdzTiye9/VAiSqPKcSzk+I3NynLSEU64JSmNmJbCxaUw kNdse80IlAACL8tdg1N2nzsSWn6YGSuLiBGOUADbG/95Q83TJiiOg8sSXsqTsHLKgtNP 9A6nrrnubRsFjCB9+a+C8yk2x0OPuojW0z49lzwSIXO1JcCsyVjlrdOvEHoa1VST1KqS AZS+doyc9qCjRBkZqidt9+BnUcy5Ai4xre5iDKSKoi9N4PZL5XHsk4qxBx31u2mahKjI Doaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qh2reV8J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l19-20020a170902e2d300b001b84f9263e7si6798408plc.325.2023.07.31.03.56.59; Mon, 31 Jul 2023 03:57:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Qh2reV8J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229748AbjGaJ7D (ORCPT + 99 others); Mon, 31 Jul 2023 05:59:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40166 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232585AbjGaJ6d (ORCPT ); Mon, 31 Jul 2023 05:58:33 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2C6B10DE for ; Mon, 31 Jul 2023 02:57:36 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-99bf91956cdso300648566b.3 for ; Mon, 31 Jul 2023 02:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690797455; x=1691402255; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Zfg4ljS/G5hMXyWN2ybdTjORVp3riaVQeb5S/esVdkk=; b=Qh2reV8J3b6DOV5dQBvY+Ke9EcprVGYC7vPLfFQNe5jmOaOSLewH4yhj1rs8bAnyQ0 5kYQeOyaZqNxfeV1XfQCl5Fa3DsxPYSWheE5/L1dF3F+TsAiiqUMlnZS9gYKdbkESNzy tj/WTgNSFWk08Zy7B5le8O302OjKjJY5MRqFORs8pVCQl8BnTiPjlC8Dpi2cKQz4kmct QQAn++GTaV+22JnmVV4Y1+fixidEyDLLYfDDRpjmFWuSqr0SvFK8Ml5xWPGLlASjbaS6 HuYC0okeMTsTaPVVJW/rqbwmHNGlYQVOLjG1HbcYWP7cKRYihZMc8ydbWrHGuVtuTGxk UXbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690797455; x=1691402255; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zfg4ljS/G5hMXyWN2ybdTjORVp3riaVQeb5S/esVdkk=; b=Dzk4Qf59yi8NE2dkK1oipV6etYLayT9zKTXK4MM0abudgoyVrbuSfX6LPwC9jY7VM4 nm3niwv7ItOWUnRpaDMQfCk6KhWiBXySI5WbQ2fl33/Sa/pd0ZPzMnPwDIfVz7PGaxY2 R6gXatc/6ZrM1A7V1cwVp3QBl99tnW3TVa5uebXBgS+570SI/yO2ScSgX1OwS6iedcMY 85LeNcY8Ezjft1Kcvlt6hjCJlzNb2qOllXtO0egS1NAx3BOGtj3SuI3Ktxf/+PEt5ZU9 Yqc6UQ4NA4scSpXKq0Tczha8S/UoR8jnnFzRdDjltjaarKP9drsHZEfXuCkcU5oDQ3Z0 cW1A== X-Gm-Message-State: ABy/qLb6oqADz5WzW/QlLlqldivxdf5x9kD0pNaSOYr8hgmGpjSPt1mG 77ooJt7C82scDSZCQ/sQInZFXQ== X-Received: by 2002:a17:907:a077:b0:993:d536:3cb8 with SMTP id ia23-20020a170907a07700b00993d5363cb8mr5558534ejc.2.1690797455143; Mon, 31 Jul 2023 02:57:35 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id kq6-20020a170906abc600b009828e26e519sm5860678ejb.122.2023.07.31.02.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:57:34 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 2/8] ARM: dts: samsung: exynos4212-tab3: switch sound card to audio-routing Date: Mon, 31 Jul 2023 11:57:24 +0200 Message-Id: <20230731095730.204567-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> References: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772933384487223376 X-GMAIL-MSGID: 1772933384487223376 "samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Signed-off-by: Krzysztof Kozlowski --- Change depends on ASoC: https://lore.kernel.org/linux-devicetree/20230731094303.185067-1-krzysztof.kozlowski@linaro.org/T/#t --- .../arm/boot/dts/samsung/exynos4212-tab3.dtsi | 41 +++++++++---------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi index ce81e42bf5eb..d7954ff466b4 100644 --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi @@ -300,34 +300,33 @@ sound: sound { mic-bias-supply = <&mic_bias_reg>; submic-bias-supply = <&submic_bias_reg>; - samsung,audio-routing = - "HP", "HPOUT1L", - "HP", "HPOUT1R", + audio-routing = "HP", "HPOUT1L", + "HP", "HPOUT1R", - "SPK", "SPKOUTLN", - "SPK", "SPKOUTLP", - "SPK", "SPKOUTRN", - "SPK", "SPKOUTRP", + "SPK", "SPKOUTLN", + "SPK", "SPKOUTLP", + "SPK", "SPKOUTRN", + "SPK", "SPKOUTRP", - "RCV", "HPOUT2N", - "RCV", "HPOUT2P", + "RCV", "HPOUT2N", + "RCV", "HPOUT2P", - "LINE", "LINEOUT2N", - "LINE", "LINEOUT2P", + "LINE", "LINEOUT2N", + "LINE", "LINEOUT2P", - "HDMI", "LINEOUT1N", - "HDMI", "LINEOUT1P", + "HDMI", "LINEOUT1N", + "HDMI", "LINEOUT1P", - "IN2LP:VXRN", "MICBIAS1", - "IN2LN", "MICBIAS1", - "Main Mic", "MICBIAS1", + "IN2LP:VXRN", "MICBIAS1", + "IN2LN", "MICBIAS1", + "Main Mic", "MICBIAS1", - "IN1RP", "MICBIAS2", - "IN1RN", "MICBIAS2", - "Sub Mic", "MICBIAS2", + "IN1RP", "MICBIAS2", + "IN1RN", "MICBIAS2", + "Sub Mic", "MICBIAS2", - "IN1LP", "Headset Mic", - "IN1LN", "Headset Mic"; + "IN1LP", "Headset Mic", + "IN1LN", "Headset Mic"; cpu { sound-dai = <&i2s0 0>; From patchwork Mon Jul 31 09:57:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128608 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1949837vqg; Mon, 31 Jul 2023 04:32:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlE2fFWIKxFgQL1AnYYVGPHViXDiOJ4jvGvx+g2PDiaYfgmvCQ+kaFEsf86f7d7lnlH3cYih X-Received: by 2002:a17:90b:4b4c:b0:268:31f3:79d6 with SMTP id mi12-20020a17090b4b4c00b0026831f379d6mr7426143pjb.36.1690803179358; Mon, 31 Jul 2023 04:32:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690803179; cv=none; d=google.com; s=arc-20160816; b=Hbj8F6p5TIHa3P+EpzclWjQJA/SiNL9QbjqOBob0x4j6/8s3KNd1S0pqeT94CZeedI m6xQ3RyRzGjgcRYS6Af5/Nq2VZojr7UUWuFIh8KrzS7IX0vKteTzFBZj58LqKOib1nbG 2VPD8W4YYlJdG2FmXSXP7kK7hhNRGGI6Igg3lQP/QrRp4ycXY87LyNQxJSvqoA/65TyU 6alDorDnSOOkO45sT6Pj2iKoBc6lVFHsK2c5CRfvnGFdbI0DzYcdmJafvbn2EAho2z6b mAItWH6BRzW60hoJiWc03Gz7suvTO5Ksq7hfHUzlYDiUQnLKgG4+6tJJUe3V8OQV0wjt +/ig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=p3Vi3YksCGCOpys5s2S1isiXjJ58pK8I2do3CJIG8is=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=RG9HUpLlsGL+nQm1QACAHZtSXOoisl4D9zHsrhF8JoBaF/hG9O5gc3N6pSD27rL/Bn JxzGXxMhUBBNRUSfbtKREdiGD0UNAgUY5B6TeFOjEGNZagmQ/Ylqeyfs4IPitpl+gedc ZwINxkH/H+JQbBerkgQ/Rx/T82fnXZdPPPxDW5BgbFJ43fb1FbbM6Wq5B7YWUySw4Bxd Dnet3rdW/jRaN7cUvvr1Amupc3oyKeAWHjpWYrqVbGX+16lprkwpjpKF3XvjivVQnLIQ TsEuToz4q/SNdKEYhdyU4WlhvnVP1Ikp4GPtBIFWvBndcThztXoal+jKlp/0C31ijmXx DEMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qXD0FZMJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f7-20020a17090ac28700b002680abd9398si7203189pjt.88.2023.07.31.04.32.46; Mon, 31 Jul 2023 04:32:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=qXD0FZMJ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232428AbjGaJ7L (ORCPT + 99 others); Mon, 31 Jul 2023 05:59:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232621AbjGaJ6h (ORCPT ); Mon, 31 Jul 2023 05:58:37 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AEF971986 for ; Mon, 31 Jul 2023 02:57:37 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-99bccc9ec02so683952266b.2 for ; Mon, 31 Jul 2023 02:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690797456; x=1691402256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=p3Vi3YksCGCOpys5s2S1isiXjJ58pK8I2do3CJIG8is=; b=qXD0FZMJApl4Mp3Bmbcu1JKQXXzNDllLdrv529BiQqs99pL1pEfemp3T/ZTVBeORKJ iMjJPNgpf0DaYxxpkwu+5hLIWI6Y47Lw2ebBfav9aS40MERd9ZH5ZlwU4H/wa11SaTpM /le8FItPRToM0N/gtmfT2BNlIKfZCTs3eWGkr42uR0hh0BhF0g6W0u5kuYMTlMylhSSs okY3TB1gd/IoPIE/w3GCXNdfqkvdNSc1Daw+LDpMn82Fhw8I02hR7ZjIKsmYkGPFeB3V UVQT7iBtd4G2bhDeLu45mMn7OqLSuvHpwvzF6ob3mlheQGImCyDdinCmMw45BD1QYMsu cdpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690797456; x=1691402256; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=p3Vi3YksCGCOpys5s2S1isiXjJ58pK8I2do3CJIG8is=; b=XNa4Xcv7Mqc8C4aRVb0x+cFHqMNxZe0sxjTO/pPizzMTpsl8xRVBcJgaC/DXu14e3M kLemJKj/xjEXeL7xLpl+uU1Oq3mqVpVS5Gb/ZJuLx2TEkqGfge3fytzqzsJu1cj5QBEP xwd1kFunQki5Mqze7/NjKK8tRpiDU3ulOLsUociyHCM4SQnyIE/3QuXTUW8h8yMDoE86 nRBXYBjz0rzJXb9lRy0pkQZz3EQ6OlfBF1rs+nI5N76em652tY2XPVuyU9FPzAq0pbgq 33FfPElqT8lmemdyrPU8oQZ6uX6rVeeM+viamZVCBDIiY65oadZtw8EFMvsyN+MO2b41 PJOA== X-Gm-Message-State: ABy/qLYrs6SXwAY+chipHd1IRTvcCLP7L1erNaYwExna1WLBNkHyrN/1 Wg1xr7BvS/he1PGJ+gamOEujI/9I2A2w2/MGUaI= X-Received: by 2002:a17:907:7743:b0:99b:f392:10b0 with SMTP id kx3-20020a170907774300b0099bf39210b0mr6514452ejc.37.1690797456264; Mon, 31 Jul 2023 02:57:36 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id kq6-20020a170906abc600b009828e26e519sm5860678ejb.122.2023.07.31.02.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:57:35 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 3/8] ARM: dts: samsung: exynos4412-galaxy-s3: switch sound card to audio-routing Date: Mon, 31 Jul 2023 11:57:25 +0200 Message-Id: <20230731095730.204567-3-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> References: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772935634763227247 X-GMAIL-MSGID: 1772935634763227247 "samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Signed-off-by: Krzysztof Kozlowski --- .../dts/samsung/exynos4412-galaxy-s3.dtsi | 43 +++++++++---------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi b/arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi index 94122e9c6625..54e1a57ae886 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi @@ -173,36 +173,35 @@ &s5c73m3 { }; &sound { - samsung,audio-routing = - "HP", "HPOUT1L", - "HP", "HPOUT1R", + audio-routing = "HP", "HPOUT1L", + "HP", "HPOUT1R", - "SPK", "SPKOUTLN", - "SPK", "SPKOUTLP", - "SPK", "SPKOUTRN", - "SPK", "SPKOUTRP", + "SPK", "SPKOUTLN", + "SPK", "SPKOUTLP", + "SPK", "SPKOUTRN", + "SPK", "SPKOUTRP", - "RCV", "HPOUT2N", - "RCV", "HPOUT2P", + "RCV", "HPOUT2N", + "RCV", "HPOUT2P", - "HDMI", "LINEOUT1N", - "HDMI", "LINEOUT1P", + "HDMI", "LINEOUT1N", + "HDMI", "LINEOUT1P", - "LINE", "LINEOUT2N", - "LINE", "LINEOUT2P", + "LINE", "LINEOUT2N", + "LINE", "LINEOUT2P", - "IN1LP", "MICBIAS1", - "IN1LN", "MICBIAS1", - "Main Mic", "MICBIAS1", + "IN1LP", "MICBIAS1", + "IN1LN", "MICBIAS1", + "Main Mic", "MICBIAS1", - "IN1RP", "Sub Mic", - "IN1RN", "Sub Mic", + "IN1RP", "Sub Mic", + "IN1RN", "Sub Mic", - "IN2LP:VXRN", "MICBIAS2", - "Headset Mic", "MICBIAS2", + "IN2LP:VXRN", "MICBIAS2", + "Headset Mic", "MICBIAS2", - "IN2RN", "FM In", - "IN2RP:VXRP", "FM In"; + "IN2RN", "FM In", + "IN2RP:VXRP", "FM In"; }; &submic_bias_reg { From patchwork Mon Jul 31 09:57:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128595 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1942651vqg; Mon, 31 Jul 2023 04:18:21 -0700 (PDT) X-Google-Smtp-Source: APBJJlGOiKMavLaKU2P+q+AvMjm8UFsyB66Ay+uEd1EzFA+zk9FuNyhlyJCzfpDxbORZSiJFgRKn X-Received: by 2002:a05:6402:1516:b0:51e:309:2e11 with SMTP id f22-20020a056402151600b0051e03092e11mr8596172edw.36.1690802300811; Mon, 31 Jul 2023 04:18:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690802300; cv=none; d=google.com; s=arc-20160816; b=vxbuRwb6LjDxRSu4FAfBobGtVdBNOhRYSKlMa0hm+PRPw9c/dvPhWF1fSW1RFvk5tX Yi3vnZKQQWJ6P9c4ki3aPt9Rs7s+O6JIBJzVrvlU+57L+Y61vURYuRQ72wt6/XT6Lugy gX0BFwaTa8RLCHzBLVmxzfV07Y2P/u+CjWpDwqBnFvwyS/OBJ5TGVNDbLbjNNBwrXQ9k eCyWHxLBiNRNTW6tu7RltU3eAmsvn+s7FefEcavo9NoBTBzIDzmqr+UOHA9ZcAnO8E+/ /+F/5OcdFd7Xp+NDgY/xZSjyQhnRNj34gLR6TQam+CMsBSSVUD0bE22+s2OZrffY/3YB WOfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=G4xCUnvnajAMffo2tQXzXco0sqRw4y5MSAi7V6IpqSc=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=cDmjY//sT/KZqEPERL6iiOzvN1Bc5zF7rgrxTtHcJoQryPC7lWSRMalQO6mB1hK9mF GO5bXE/0HfVTKWX8lb49C790GhBCm6smFdWFlL49l23COyiHMKFCC8PDLQRK/V6vEkts DFcfCjvVeSBfmss/pHYREfGDkMScY/8bVzyvXg0esQpJK/xkvhb+jU5v6jQIumVbfHl4 hl4B+WRB80vwNAlQzKiMt716dQe0L6MFP/KrUUq7MbCv64jJ7r/I3RDyuIQ4lwbHjOLp 7H/Yuj93xk/DMCfYtk8gp8FowUNr59DciDS3oSZgxBciBrsWeRfvbORzTii/SoZx9OKx KYyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ztFrXwmj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m21-20020a50ef15000000b005223b6e4cf9si3087714eds.443.2023.07.31.04.17.52; Mon, 31 Jul 2023 04:18:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ztFrXwmj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232359AbjGaJ73 (ORCPT + 99 others); Mon, 31 Jul 2023 05:59:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40226 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229861AbjGaJ6j (ORCPT ); Mon, 31 Jul 2023 05:58:39 -0400 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [IPv6:2a00:1450:4864:20::62a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09E5E1999 for ; Mon, 31 Jul 2023 02:57:38 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-99bed101b70so504505966b.3 for ; Mon, 31 Jul 2023 02:57:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690797457; x=1691402257; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=G4xCUnvnajAMffo2tQXzXco0sqRw4y5MSAi7V6IpqSc=; b=ztFrXwmjIr3RyuCrEofPXVRRQ5k26Vo8kxVM8mq2xIsonEuDi9jI4txDcx15PjOrMq Xneo6ilBVxSAxME/g+XfeuoQctrRuIfpNASpyxNQhhjaQ+49xIZmvXH411JnaxlpxaXE 5YP4cay3g2PNHUNC/dKgbtLm8334mjd6al/JpxV13vxYqA8amGHJTCj9vXA7t7BSc3NU ufUcKLlm1j6qjKz+GSO7x+SzkdBhWbF9FB7eJ2IvroOUFucI8AQCYhqvx82W0V/X1ndv C7LLgZCoVD8fiiOWhyVAr1nbsNUgwVXmOt/IATMd26RUgk3nRdY/o4OhuzJOxK80lu3W Ne8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690797457; x=1691402257; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=G4xCUnvnajAMffo2tQXzXco0sqRw4y5MSAi7V6IpqSc=; b=V7sxDzMHPHjiVOsBguOYHRYE1Y58oA0BhBWY7oizZIOJJO+f7eYCztcSznfGikVLeC vnRfjmqay7vvS2G6pzP4ePX47FHR2/Gsh5OIu8PWMhHKUXGKHtX9RtPUYg7OGYUW/oQ+ Gz14YsX4Yc6x2qpLYsywT6PzHYuwO9HBibpm0M82RGfvbjEDxDlTTE+KBBkuvqxufp2Z HPXiRuuosojtbenIFttYEAAYTRUg27fzNNRAtFtasm1RO7VCfy50XpkAzlCzZDKfAEag 62yeWhK0LgUrgcW0ShBKXviK3DJE7StPcbSoMJXtwOgxqQY9sq0nAiR7Kh23u8mNYF7X xGHg== X-Gm-Message-State: ABy/qLb11db61dIZEjd7ezGWgY0ORPIAO9AxATJmQeUIYA10BznsZTnE lScK67qZCZKsMT+K4XqOuLf9+g== X-Received: by 2002:a17:906:518f:b0:99b:ed53:5bff with SMTP id y15-20020a170906518f00b0099bed535bffmr7183670ejk.10.1690797457393; Mon, 31 Jul 2023 02:57:37 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id kq6-20020a170906abc600b009828e26e519sm5860678ejb.122.2023.07.31.02.57.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:57:37 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 4/8] ARM: dts: samsung: exynos4412-n710x: switch sound card to audio-routing Date: Mon, 31 Jul 2023 11:57:26 +0200 Message-Id: <20230731095730.204567-4-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> References: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772934713450824896 X-GMAIL-MSGID: 1772934713450824896 "samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Signed-off-by: Krzysztof Kozlowski --- .../arm/boot/dts/samsung/exynos4412-n710x.dts | 39 +++++++++---------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4412-n710x.dts b/arch/arm/boot/dts/samsung/exynos4412-n710x.dts index 9ae05b0d684c..0a151437fc73 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-n710x.dts +++ b/arch/arm/boot/dts/samsung/exynos4412-n710x.dts @@ -76,34 +76,33 @@ &s5c73m3 { }; &sound { - samsung,audio-routing = - "HP", "HPOUT1L", - "HP", "HPOUT1R", + audio-routing = "HP", "HPOUT1L", + "HP", "HPOUT1R", - "SPK", "SPKOUTLN", - "SPK", "SPKOUTLP", + "SPK", "SPKOUTLN", + "SPK", "SPKOUTLP", - "RCV", "HPOUT2N", - "RCV", "HPOUT2P", + "RCV", "HPOUT2N", + "RCV", "HPOUT2P", - "HDMI", "LINEOUT1N", - "HDMI", "LINEOUT1P", + "HDMI", "LINEOUT1N", + "HDMI", "LINEOUT1P", - "LINE", "LINEOUT2N", - "LINE", "LINEOUT2P", + "LINE", "LINEOUT2N", + "LINE", "LINEOUT2P", - "IN1LP", "MICBIAS2", - "IN1LN", "MICBIAS2", - "Headset Mic", "MICBIAS2", + "IN1LP", "MICBIAS2", + "IN1LN", "MICBIAS2", + "Headset Mic", "MICBIAS2", - "IN1RP", "Sub Mic", - "IN1RN", "Sub Mic", + "IN1RP", "Sub Mic", + "IN1RN", "Sub Mic", - "IN2LP:VXRN", "Main Mic", - "IN2LN", "Main Mic", + "IN2LP:VXRN", "Main Mic", + "IN2LN", "Main Mic", - "IN2RN", "FM In", - "IN2RP:VXRP", "FM In"; + "IN2RN", "FM In", + "IN2RP:VXRP", "FM In"; }; &submic_bias_reg { From patchwork Mon Jul 31 09:57:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128548 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1915810vqg; Mon, 31 Jul 2023 03:20:00 -0700 (PDT) X-Google-Smtp-Source: APBJJlEhPe/ho1ZdIOM2XHXyXfY7RsZJX/iHksnvH8TtjSrmkGhUff4J1pnWGbXhq6SX8vl6da8r X-Received: by 2002:a17:902:8216:b0:1b8:c6:ec8f with SMTP id x22-20020a170902821600b001b800c6ec8fmr7027146pln.46.1690798800077; Mon, 31 Jul 2023 03:20:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690798800; cv=none; d=google.com; s=arc-20160816; b=jBHSgoGQlglJpioHs0XqkhW12HVgP1CplPCkjfD237fS//S8+M90sBwZbKUcAqAIr1 zXERhlq8cDtbcmIz+DW04Zni59XSF0B6S9jKxNHEdy7bZiCWbTu+pqQnmyvM2RBG47Ia iQpLL8M/WFE8Ooeys0IFTK5QWOOm3mH72AwnRdhyMCzuyEwEnDlra6RwJitzd41TB70K 6EIkrXhZ9trxhJs6fpFh9Lv+IQ3da0eXJ6qohjJ0Jf8Ne6I8eVN0qXx1wYmFYGmg9xf2 bZYlXTJBLCKynCmX9X6flG1JHA/E57cRZwgQ8dmoG25eWZKDvHghSadwgQtF+Hf0tsHY 3+7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cpkYmwWQAX5IRqIDyYqczdN8ZGCbV1KYfKad4Zm6mVk=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=eMs4Qv5xJmT4OWD0JvpGAR2SCJrmeg4W1v5i8RmpKMMOegEzfstaTCYM+F8O67Cr2q LmXgd1iNFQpVbKpigdhska7W1jLl2Q3QE8uAsPxRDV4dV4qkOTiTRYlYQig0WL7dEcrl jRro5p2F+VGwZolgu0hd403ww2ahuDn270+Qz5cn2eUdqysUMNxOly9vBCA3uhG0vQtS o/QJWqgwflV7+rpdBGLLGvF52zGMML78urPhqcn9+rJ3uJxviCcMCQdOkfD165/fA1uc KKuoTIhqmqhyw7oJv/WeIrs6Nq/L7PyUpMK7Ch0Qc5YZASAjbw2Y4jkOvf0d/2BwIZRL 02rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EZM3AIwQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w3-20020a170902d10300b001bb54abfc0fsi3648873plw.380.2023.07.31.03.19.47; Mon, 31 Jul 2023 03:20:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EZM3AIwQ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232445AbjGaJ7Q (ORCPT + 99 others); Mon, 31 Jul 2023 05:59:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232625AbjGaJ6h (ORCPT ); Mon, 31 Jul 2023 05:58:37 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54BC5E54 for ; Mon, 31 Jul 2023 02:57:40 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-9891c73e0fbso902769066b.1 for ; Mon, 31 Jul 2023 02:57:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690797458; x=1691402258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cpkYmwWQAX5IRqIDyYqczdN8ZGCbV1KYfKad4Zm6mVk=; b=EZM3AIwQm6576bw8dxiCHAWmm2g+2+mSlfTMvqqSK4gs/zsi9M6ceknMqL0koW31UK RHOTdrW7hIoghuJbKhIv+J7sXrB7klxLevcXTj7ott7L05gIN5vQRH6KB/d79uEBkHN8 IBRAFMKB6xKZXvy6v7d0XRw6zme8qkr8Rl5hEriAr8g1mQzxR/muKWud/oivstd8Xqm7 fy17qi41OZ5l4okEoMcsVE285FNYT3PI2SzcEBT5fki6zIOl2vIc2RHFiZl61vSiy5hH 7u5FnvyDdOjo8ctnOcrkcc0o/sgSqfRWBYSdN3fZ22m7Z92tcholMQMXlyvv8pth5UJU YWtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690797458; x=1691402258; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cpkYmwWQAX5IRqIDyYqczdN8ZGCbV1KYfKad4Zm6mVk=; b=IQjdRJcZSg4Go5USpllgIIxUH52p1GdcFbV2YwP61jDsE9Xfav5j2elIy+i+8pV1Ie 9oD8i8DkEL8ySKaEjMvthmnbo2as1sM7y3/Le1EqkWQpEdJFldAA8tC8YYUJGajEXWcE 3ZY5GB/qQC2KphksJLfuiKjkY6Ew/WFMq7teNJ0iGAGcWA9TMbpdBQ3UzJmRYrP3aySX YKZhJpjDV2mJxG2xSf5Xv404j7WEE2C2EnQm6diuTDEIbwJy85hUQXh1iIwv1MRLDvPx DGuiNMPDh5gGNL1vMtwy9G1oLmepwiyTvtLPr3JQIoFsLJj34RRhC0kzdTHTvDqOTzrh lMHA== X-Gm-Message-State: ABy/qLYNhKnVDzr30toQb7zUPwPcVvTqbFB2CltVvOxy3bItMJUu7Md1 bGpETD4w9AwExrluPLkhMBcHkw== X-Received: by 2002:a17:907:e8b:b0:988:d841:7f90 with SMTP id ho11-20020a1709070e8b00b00988d8417f90mr6421072ejc.27.1690797458470; Mon, 31 Jul 2023 02:57:38 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id kq6-20020a170906abc600b009828e26e519sm5860678ejb.122.2023.07.31.02.57.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:57:38 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 5/8] ARM: dts: samsung: exynos4412-odroid: switch sound card to audio-routing Date: Mon, 31 Jul 2023 11:57:27 +0200 Message-Id: <20230731095730.204567-5-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> References: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772931042647985508 X-GMAIL-MSGID: 1772931042647985508 "samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts | 13 ++++++------- arch/arm/boot/dts/samsung/exynos4412-odroidx.dts | 9 ++++----- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts b/arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts index 42812da1f882..b1b0916b1505 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts +++ b/arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts @@ -138,13 +138,12 @@ &sound { samsung,audio-widgets = "Headphone", "Headphone Jack", "Speakers", "Speakers"; - samsung,audio-routing = - "Headphone Jack", "HPL", - "Headphone Jack", "HPR", - "Headphone Jack", "MICBIAS", - "IN1", "Headphone Jack", - "Speakers", "SPKL", - "Speakers", "SPKR"; + audio-routing = "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "Headphone Jack", "MICBIAS", + "IN1", "Headphone Jack", + "Speakers", "SPKL", + "Speakers", "SPKR"; }; &spi_1 { diff --git a/arch/arm/boot/dts/samsung/exynos4412-odroidx.dts b/arch/arm/boot/dts/samsung/exynos4412-odroidx.dts index d5316cf2fbb6..0eb8a2680a20 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/samsung/exynos4412-odroidx.dts @@ -135,9 +135,8 @@ &sound { "Headphone", "Headphone Jack", "Microphone", "Mic Jack", "Microphone", "DMIC"; - samsung,audio-routing = - "Headphone Jack", "HPL", - "Headphone Jack", "HPR", - "IN1", "Mic Jack", - "Mic Jack", "MICBIAS"; + audio-routing = "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "IN1", "Mic Jack", + "Mic Jack", "MICBIAS"; }; From patchwork Mon Jul 31 09:57:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128617 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1952755vqg; Mon, 31 Jul 2023 04:39:07 -0700 (PDT) X-Google-Smtp-Source: APBJJlFcKk0cMhHSw9l12HB/zNl2zgdolIUhYNgu0qIqBN80HagQAyLrB/4v3CR/UvRlOYEMdR9Q X-Received: by 2002:a05:6a21:998c:b0:13d:7aa3:aa72 with SMTP id ve12-20020a056a21998c00b0013d7aa3aa72mr5008875pzb.5.1690803546971; Mon, 31 Jul 2023 04:39:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690803546; cv=none; d=google.com; s=arc-20160816; b=v6pJljoKClswAUyxX31OAKUwXbo0lWmRLMQA0vqJlKugv76mEpu2lB8q+hNC5g7dLp TWqZYTBRdBYL/sonpkfe/X7weMSngjA4l/BsvGD9aX57pNHyzgZn9NEHbGigeGEIo1Df +RiQZDbkKnbssD5iPHRf5GPOV6z0MLqlueeoENTiOpt/h7GfiLke3D8SHBtmoAmb7yBX maW9BYVf+AMkwblHGL7E1Ij4IUChOij4f0lgVPEvKYZ5zNj9gXBP18yJpLe9QoFuPfvR YWHrx8biwy7y1Hx2RNexOiDgK6EfyWEVExRTQtjgQsoSdPqzecr7rPzZX4lGUNmLC2RR OaeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=5b7lqvl9+xzm2M9ezYAd3WHYZ/uyZwwx1X/wyt05wXs=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=J3n8Fz9lGxPN8TUoyN96UCmkjbyaqFK0jzuFWTSmijULvUdt4dy44T7aCjhmczLwqc ajojZqanVhKyZ108MSI5kPUinybDixccWRlYsNsQSM1sU33T5xAtSfB8vc0/RMjyGIUI l8LbAVAsD4fmIY7VhTWoiwYprtCNRqA4si5x9X2sH8+jmK0hKmKGx1iqAFeSYYxHMvpG 8qnwcXrE/yORyID097sWKK9ydt0JSJArjCgsHV2PMAC4LyBvruN7davOKqUEX9NmN14j zat3AH2rQ22CpLF6bSupc7gTWVCSRx/j6h7+usAfInuK3eLqV3fL8w99ChIwxmSFO6Y1 D9vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YM3wWg+B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l19-20020a056a0016d300b00686e01db946si7519841pfc.64.2023.07.31.04.38.54; Mon, 31 Jul 2023 04:39:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YM3wWg+B; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230467AbjGaJ7W (ORCPT + 99 others); Mon, 31 Jul 2023 05:59:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40228 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229618AbjGaJ6j (ORCPT ); Mon, 31 Jul 2023 05:58:39 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5774619A2 for ; Mon, 31 Jul 2023 02:57:41 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-5221c6a2d3dso6335016a12.3 for ; Mon, 31 Jul 2023 02:57:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690797460; x=1691402260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5b7lqvl9+xzm2M9ezYAd3WHYZ/uyZwwx1X/wyt05wXs=; b=YM3wWg+BcN8YWbbDRDbtcqbGGzUtCRPEwYwJSQr9i1Sfybow52eXTVfuhlIyhzRFsE vbiYQ9wuQ+IiFitk6haoefzTZw6wRIynZAdvz0L71car4R0QYVYEZZcrJZIOEBQcHR0v rQihg9rHtpzVyGBc1StdV2D/urxoP/a4UDwPJjb/WTpe8Fa2W0PIKxPP17hswzXGYFuW TSTo2eUHCPMtshATIVLC1ves23BpsIpENSKRbI+Brx90ydLwUcT+BIgvW8BWDOxfayBo PlGW54hzHKkrCPAV8HLXPL0/KKEApzI9vy9aToxaYa/B0QMCBMW+W8VGty9GnJKkcGGO LuOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690797460; x=1691402260; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5b7lqvl9+xzm2M9ezYAd3WHYZ/uyZwwx1X/wyt05wXs=; b=F6Qu9UVoUis1pGOh5aPERwfeEr8CjoKnU4iWl3fYvSZ+wZQkJ9xlG7mh4gRu9Q1L3F 7PU2n3pI2CpVyfqegiQ0z1nOyEG1LnJeJbv5i4p6O7nh4/YL+ify2AiCQboFXayJ0gxe 4wqCwwPma5LxzzKE5aJOajq+lQD2B/vx/jLiaRn7G2bbUFIVryUSTwNLvr/bOVZwv5Q7 25U3NPwVcJskRM9T2bOnPaKuLRmAhhPQtuwoRr11j0wA2ImoewTKmzGrtDoNg47EXhqR XfpkEKkSUnY70Ita5N3RD7snd9ZnALABPUt8qqxFDnks9RSzw98pTQ14KHPcxwmZmg4D gdzw== X-Gm-Message-State: ABy/qLZ8xx9bRDM1BM4jUgoI3Q5FgLR5hp5pLltHtPy0sdMYwZMqehv4 lMjq1DITk0oMN7FqEnjAmc6aIw== X-Received: by 2002:a17:906:77d0:b0:99b:ef9c:e634 with SMTP id m16-20020a17090677d000b0099bef9ce634mr6089122ejn.65.1690797459730; Mon, 31 Jul 2023 02:57:39 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id kq6-20020a170906abc600b009828e26e519sm5860678ejb.122.2023.07.31.02.57.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:57:39 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 6/8] ARM: dts: samsung: exynos5422-odroid: switch sound card to audio-routing Date: Mon, 31 Jul 2023 11:57:28 +0200 Message-Id: <20230731095730.204567-6-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> References: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772936019923346387 X-GMAIL-MSGID: 1772936019923346387 "samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Signed-off-by: Krzysztof Kozlowski --- .../samsung/exynos5422-odroidxu3-audio.dtsi | 19 +++++++++---------- .../boot/dts/samsung/exynos5422-odroidxu4.dts | 2 +- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/samsung/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/samsung/exynos5422-odroidxu3-audio.dtsi index 86b96f9706db..52a1d8fd5452 100644 --- a/arch/arm/boot/dts/samsung/exynos5422-odroidxu3-audio.dtsi +++ b/arch/arm/boot/dts/samsung/exynos5422-odroidxu3-audio.dtsi @@ -18,16 +18,15 @@ sound: sound { samsung,audio-widgets = "Headphone", "Headphone Jack", "Speakers", "Speakers"; - samsung,audio-routing = - "Headphone Jack", "HPL", - "Headphone Jack", "HPR", - "Headphone Jack", "MICBIAS", - "IN12", "Headphone Jack", - "Speakers", "SPKL", - "Speakers", "SPKR", - "I2S Playback", "Mixer DAI TX", - "HiFi Playback", "Mixer DAI TX", - "Mixer DAI RX", "HiFi Capture"; + audio-routing = "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "Headphone Jack", "MICBIAS", + "IN12", "Headphone Jack", + "Speakers", "SPKL", + "Speakers", "SPKR", + "I2S Playback", "Mixer DAI TX", + "HiFi Playback", "Mixer DAI TX", + "Mixer DAI RX", "HiFi Capture"; cpu { sound-dai = <&i2s0 0>, <&i2s0 1>; diff --git a/arch/arm/boot/dts/samsung/exynos5422-odroidxu4.dts b/arch/arm/boot/dts/samsung/exynos5422-odroidxu4.dts index f5fb617f46bd..363786f032cc 100644 --- a/arch/arm/boot/dts/samsung/exynos5422-odroidxu4.dts +++ b/arch/arm/boot/dts/samsung/exynos5422-odroidxu4.dts @@ -35,7 +35,7 @@ sound: sound { compatible = "samsung,odroid-xu3-audio"; model = "Odroid-XU4"; - samsung,audio-routing = "I2S Playback", "Mixer DAI TX"; + audio-routing = "I2S Playback", "Mixer DAI TX"; cpu { sound-dai = <&i2s0 0>, <&i2s0 1>; From patchwork Mon Jul 31 09:57:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128582 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1932253vqg; Mon, 31 Jul 2023 04:00:23 -0700 (PDT) X-Google-Smtp-Source: APBJJlHZSBT7Zlw19NWOiS8/FhLzEKYwH4vydN8QBvJwhl3rvUS71wqXFk4N8CzBvRHrF71grTv3 X-Received: by 2002:a05:6808:1449:b0:3a1:eb47:a943 with SMTP id x9-20020a056808144900b003a1eb47a943mr11549047oiv.10.1690801223314; Mon, 31 Jul 2023 04:00:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690801223; cv=none; d=google.com; s=arc-20160816; b=TjGdo9vwrcV7c0VTrKcY2Nd4jUyHiKBAnTaYLfHdFt75TFMYKKNVWdoNsrKmvqw4Mi JXpaoMJeJiJquTrD0T1EASZZVesIlKNmrmcK8NdBlsL0MIjxtLfYQ6Ld3eaGiVgJceBW eQbPKGnXjn2CGZBbc7ev5xoUTLGvEGL5pSFXzkBGeAUKX1odAB6KZBjfQ15QvCWa3lNJ QveogUTWke9TyleYdNaM00Ivnx5/lPspLJpKMawgpHyqsMfYKbsPqDMlY6WUTMA6+0mS m7IBChz5eKp2Il6S3M0Nxbzmo2ApYYgY2GXfgvUmroRTOLFoW/HI8bcCEgYdGaWpxsuV TMjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Fo+0+vHRPXrDtZ0tjQ0v+C3nzYHHH+ZPuoUPguExYlo=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=kLERzH1N5vDl5rFC1+veGG96pR5OnpYNlWlrwn9dczhC0RQqOYK8l/G7Dj5uBvepyM l/w55V2o+1Tw7QfX6jGlPBlzOuuZH7r6w7Ot3eP1HDUatkAkpz8wJGNjINCBnYB52jQB AC07pD64qbhJLQU7rzlHyDTEKdexXbC4bgGDR4f/bQki3tcIEuF4+tnGTCwwKs3BoKtm hCPDUxqk/NCXg5QZphiiLQ6BToSihkblLEj+zPucHDxqOqC3CAQAto0doo8neSll3zBs moDfB9RnNkNjRPpizeWmBI5V68jkJKh3pPIdSopga9mGIcKyrtMEUenPznwsd4SbKAsb R9Iw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bRdfh7za; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h4-20020a17090a710400b00250331e6044si7143869pjk.25.2023.07.31.04.00.08; Mon, 31 Jul 2023 04:00:23 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bRdfh7za; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229793AbjGaJ7c (ORCPT + 99 others); Mon, 31 Jul 2023 05:59:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230014AbjGaJ6k (ORCPT ); Mon, 31 Jul 2023 05:58:40 -0400 Received: from mail-ej1-x62c.google.com (mail-ej1-x62c.google.com [IPv6:2a00:1450:4864:20::62c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FF422110 for ; Mon, 31 Jul 2023 02:57:42 -0700 (PDT) Received: by mail-ej1-x62c.google.com with SMTP id a640c23a62f3a-99357737980so694265266b.2 for ; Mon, 31 Jul 2023 02:57:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690797461; x=1691402261; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Fo+0+vHRPXrDtZ0tjQ0v+C3nzYHHH+ZPuoUPguExYlo=; b=bRdfh7zayUh7aqsg780V5bn+wNnhzY3nk6VWazS3ho77ejVFkv4/nvSEg+bdgvVrXm XADgcLLTEptPX6ysTK9okJ9ZSr5vcsugy3/N9ipsO1wOPWJ2uq3mzpDZchB+ZOHmLEPF nhfmSrmNLC2FVnAHrZUGVjXWzuL9Att+eAsBFGwHdyyewQ4XU8mP7R8cVQL/XsOyln1v SQrmzU50ZEdu08/MFaVn5DKSfxUGxii7p92jVZI5gMVE5K/SJRMWa5eHlpY2bMIBq4CK DJuCqcZl/MfpGWmqWLTPRBgNb3URC1lhOMYhkx3F3XuCeHQj+X3Du+NP7Gu0xJKuboLv aLsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690797461; x=1691402261; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Fo+0+vHRPXrDtZ0tjQ0v+C3nzYHHH+ZPuoUPguExYlo=; b=a0aXzxBrqubzQ8MMuMV3Qf8tw/TQqLZp0FJwLY2Nv4ow4a3lkBL90xGEqlFoL7F/4l i6avyEbnEHDa6Yj4u9Pn/68r8dld6KMwZ+rvItH7x5mywM213TeZAeQbvq1aeWvVsIYP t3D0Oi0bluiCwXcuhKQnXIhNlRv7xMEAPjhJSDGmCW74cBeNtM37jtQeJUR7O6EeDHym httbeWwWJmdAU7W14JoaH24YX/9NvrvNrjk1c9heI4VQKbPuwdbT/SV1pKfYtxL1yMtL t+VoojH0UsvpIoe6zQ1XJASAWUEE4FAEQ9FMEyB1GmJXZWYniVNwxtmeqZizwTPmPFij rVXA== X-Gm-Message-State: ABy/qLbF34AcI9gTOYqRswSoUl6S6O2r68WhStqWZtRi0CcCsYm05j+j kRKx0N2/N29Lo6NRyfYtCdh03w== X-Received: by 2002:a17:906:2181:b0:997:865a:77e5 with SMTP id 1-20020a170906218100b00997865a77e5mr7773666eju.45.1690797460913; Mon, 31 Jul 2023 02:57:40 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id kq6-20020a170906abc600b009828e26e519sm5860678ejb.122.2023.07.31.02.57.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:57:40 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 7/8] ARM: dts: samsung: s5pv210-fascinate4g: switch sound card to audio-routing Date: Mon, 31 Jul 2023 11:57:29 +0200 Message-Id: <20230731095730.204567-7-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> References: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772933583654892444 X-GMAIL-MSGID: 1772933583654892444 "samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Signed-off-by: Krzysztof Kozlowski --- .../boot/dts/samsung/s5pv210-fascinate4g.dts | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/arch/arm/boot/dts/samsung/s5pv210-fascinate4g.dts b/arch/arm/boot/dts/samsung/s5pv210-fascinate4g.dts index eaa7c4f0e257..149e488f8e74 100644 --- a/arch/arm/boot/dts/samsung/s5pv210-fascinate4g.dts +++ b/arch/arm/boot/dts/samsung/s5pv210-fascinate4g.dts @@ -74,30 +74,29 @@ sound { headset-detect-gpios = <&gph0 6 GPIO_ACTIVE_HIGH>; headset-key-gpios = <&gph3 6 GPIO_ACTIVE_HIGH>; - samsung,audio-routing = - "HP", "HPOUT1L", - "HP", "HPOUT1R", + audio-routing = "HP", "HPOUT1L", + "HP", "HPOUT1R", - "SPK", "SPKOUTLN", - "SPK", "SPKOUTLP", + "SPK", "SPKOUTLN", + "SPK", "SPKOUTLP", - "RCV", "HPOUT2N", - "RCV", "HPOUT2P", + "RCV", "HPOUT2N", + "RCV", "HPOUT2P", - "LINE", "LINEOUT2N", - "LINE", "LINEOUT2P", + "LINE", "LINEOUT2N", + "LINE", "LINEOUT2P", - "IN1LP", "Main Mic", - "IN1LN", "Main Mic", + "IN1LP", "Main Mic", + "IN1LN", "Main Mic", - "IN1RP", "Headset Mic", - "IN1RN", "Headset Mic", + "IN1RP", "Headset Mic", + "IN1RN", "Headset Mic", - "Modem Out", "Modem TX", - "Modem RX", "Modem In", + "Modem Out", "Modem TX", + "Modem RX", "Modem In", - "Bluetooth SPK", "TX", - "RX", "Bluetooth Mic"; + "Bluetooth SPK", "TX", + "RX", "Bluetooth Mic"; pinctrl-names = "default"; pinctrl-0 = <&headset_det &earpath_sel>; From patchwork Mon Jul 31 09:57:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 128580 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1931891vqg; Mon, 31 Jul 2023 03:59:39 -0700 (PDT) X-Google-Smtp-Source: APBJJlGYmpPsNjHQHas0qnKofWmBZoROF5j9nvJqYTbYm3XA0zHm4E/RixeoBm5+xaZcVxyoM7lm X-Received: by 2002:a17:902:bf07:b0:1bb:f653:9f9e with SMTP id bi7-20020a170902bf0700b001bbf6539f9emr5544755plb.25.1690801179329; Mon, 31 Jul 2023 03:59:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690801179; cv=none; d=google.com; s=arc-20160816; b=ZlIZEjKwa9UdmhC1saopJxiOaV9arM86jrG+lXYWezjdPJ48c5p3LInc/j4c6NbxYd vnTWvJTM7ftSbfR5J/E/L1PpKV1iKd3lc5NKzjTkW+sUDM0J+9XvrrGezuIaezO2dV1z DxlqwHr39WSVfR9XdFnzKNI/loxxC9OWTNrmSodqjxtvaoNBpaZsVK4pEUGGCwlsy76B yqVJSkF1Cb1/TfNBmqpTRHj+I4wMz4xDpeYVG9lviU+YtxLWoq2YAaZA74X/5wp0BCS2 NPYirm0360z6T4SC3u9wrHk0/idEqTJBvuOSDjlSB1CpgeJWv9YdH8jJ+xix1hn68+cC p8ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KuWBFCHnpavR+uWZCU4/e6Sz+oK71FihdZ9BIB+RC3Y=; fh=0wF5EaWROVR5L/uLEzKU7BJpmGtNNKvZ4t5gNBHtG7M=; b=dg6iogWdruhzPSiEvc5FYDya/c0FH/WifPCWpTv7tGOjHt9EmeAt+OdKFyN6VMZmje RbizYP2Cy+SFQ0vfb5Z+WNZ/7QEww8KpVR5BrzZTP2CacBUUom0pQFjYhICVGpygIokN VbBHv1qNQMlo3dPjwzJ8se+J05tqrfIOXOiTGoQ9GAnRA6hQLvpZIPwTukJ+jDq9TF3X GSZcFK6NtMcnodG5OKRUAws9ZHuw2ZPWAEcviy6a/QT+GfioyG0qw2fagaI/4dvgEvTd C0H/aanQJFtf6twtOIs2pgA2u9t7UvzxFaP9QhCcd8HW6WmV+a/9ThR9bfExnJX18mY/ E/EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VXokx3Yd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g18-20020a170902d1d200b001bbd586d29esi7052651plb.34.2023.07.31.03.59.26; Mon, 31 Jul 2023 03:59:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=VXokx3Yd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232461AbjGaJ7g (ORCPT + 99 others); Mon, 31 Jul 2023 05:59:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230359AbjGaJ6l (ORCPT ); Mon, 31 Jul 2023 05:58:41 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B61B2115 for ; Mon, 31 Jul 2023 02:57:43 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-5221f3affe4so5815918a12.0 for ; Mon, 31 Jul 2023 02:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690797462; x=1691402262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=KuWBFCHnpavR+uWZCU4/e6Sz+oK71FihdZ9BIB+RC3Y=; b=VXokx3YdZziuf0563Ipki4nEt3pLAjvdLB420+OvDFfu3LcUlzWqwjvH/FLB1vEgFa d36eEG9PpTJ/BB0YMsJrnVShxDhufEINJE32dzFMe9B2QFjC3br7kM2tyuXrjDD0f0Aa 24c1nAXSO4R3SA9ovqpVrHlttsPH40HEJ5Y+cwI8gfrVw4f/+HecNVOe3MIdd4P3HkRl eiUqUIYFLj06UT2WfxJg7TmgjCC6zQH9xNgA1x4qvFiSVc5XsbWg2xk1V8YcjT9N5UT3 ySXTQhTB1ra54Mz+enGkFPY2bjDgaV+/nqp5F2bd4GYIKnTAuJewmsEQt7LbpoKAs94w 34FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690797462; x=1691402262; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KuWBFCHnpavR+uWZCU4/e6Sz+oK71FihdZ9BIB+RC3Y=; b=GVYr5vzsNK1cCbJqn1cPdDRrVkmYmwXlsUcmm9oMesgX/C1QarE8UXyni188asI+xk uuyN25TbXAIIUA/Jvw33h1rgk6liG/qtDj+VxHhNCXtS6NOhiPeYSRb6UUEwCrDgkWPu 4+4Wc6f3bypPI7297NipP8vqZhEtYi106yY5JuIJzNambjuWg7b/5PEP5lyGILPVlwY+ pf4QXHJGexte5X2K5//NlGdE27pCA82cmwFPZJ7yonLNEdrnzxn8/5v10mqQtEtrFhTL CKnwYrFfWa0fitgB0WvLvUl1vzY8HvUZO0tMe4yugQLRnHGClUQeesMTXTqafPuFZqNX bbew== X-Gm-Message-State: ABy/qLbpS+eH+BOy+oqlJh3SfdTWjzvfcPCOrl4zeSJ6TKlYJUJ8jDwF WGJpwmJdqk2SM0ZQfwc2E0NMLQ== X-Received: by 2002:a17:907:a072:b0:99b:efc8:51d with SMTP id ia18-20020a170907a07200b0099befc8051dmr5456986ejc.21.1690797462029; Mon, 31 Jul 2023 02:57:42 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id kq6-20020a170906abc600b009828e26e519sm5860678ejb.122.2023.07.31.02.57.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Jul 2023 02:57:41 -0700 (PDT) From: Krzysztof Kozlowski To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Alim Akhtar , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 8/8] ARM: dts: samsung: s5pv210-galaxys: switch sound card to audio-routing Date: Mon, 31 Jul 2023 11:57:30 +0200 Message-Id: <20230731095730.204567-8-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> References: <20230731095730.204567-1-krzysztof.kozlowski@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772933537674911240 X-GMAIL-MSGID: 1772933537674911240 "samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/samsung/s5pv210-galaxys.dts | 37 +++++++++---------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/arch/arm/boot/dts/samsung/s5pv210-galaxys.dts b/arch/arm/boot/dts/samsung/s5pv210-galaxys.dts index 532d3f5bceb1..879294412381 100644 --- a/arch/arm/boot/dts/samsung/s5pv210-galaxys.dts +++ b/arch/arm/boot/dts/samsung/s5pv210-galaxys.dts @@ -101,33 +101,32 @@ sound { headset-detect-gpios = <&gph0 6 GPIO_ACTIVE_LOW>; headset-key-gpios = <&gph3 6 GPIO_ACTIVE_HIGH>; - samsung,audio-routing = - "HP", "HPOUT1L", - "HP", "HPOUT1R", + audio-routing = "HP", "HPOUT1L", + "HP", "HPOUT1R", - "SPK", "SPKOUTLN", - "SPK", "SPKOUTLP", + "SPK", "SPKOUTLN", + "SPK", "SPKOUTLP", - "RCV", "HPOUT2N", - "RCV", "HPOUT2P", + "RCV", "HPOUT2N", + "RCV", "HPOUT2P", - "LINE", "LINEOUT2N", - "LINE", "LINEOUT2P", + "LINE", "LINEOUT2N", + "LINE", "LINEOUT2P", - "IN1LP", "Main Mic", - "IN1LN", "Main Mic", + "IN1LP", "Main Mic", + "IN1LN", "Main Mic", - "IN1RP", "Headset Mic", - "IN1RN", "Headset Mic", + "IN1RP", "Headset Mic", + "IN1RN", "Headset Mic", - "IN2LN", "FM In", - "IN2RN", "FM In", + "IN2LN", "FM In", + "IN2RN", "FM In", - "Modem Out", "Modem TX", - "Modem RX", "Modem In", + "Modem Out", "Modem TX", + "Modem RX", "Modem In", - "Bluetooth SPK", "TX", - "RX", "Bluetooth Mic"; + "Bluetooth SPK", "TX", + "RX", "Bluetooth Mic"; pinctrl-names = "default"; pinctrl-0 = <&headset_det &earpath_sel>;