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 {