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