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>;