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