From patchwork Sun Jul 30 20:18: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: 128293 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp1678840vqg; Sun, 30 Jul 2023 15:04:20 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5UG4+WeJ+kE7tA1LOVffceuT0QkgWaLBsj6Gjm+ETc7qrEGWUd0xJ9oGZJGdMEDINkZcK X-Received: by 2002:a17:902:e751:b0:1b0:f727:bc41 with SMTP id p17-20020a170902e75100b001b0f727bc41mr9380888plf.42.1690754660312; Sun, 30 Jul 2023 15:04:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690754660; cv=none; d=google.com; s=arc-20160816; b=rWwzgeT8oXFRlZh+Ydb1U6KYtUeB1r9EtT47v31OFCb0BN+KDmKfoQJQd7wuJN9pea af2wHBPHFZtueWEXAWFNsgtSTpr73mz/EfZTcFOBZLaX8Yb4fdTkFmoyK6geuEj5Fy0L XOOJLs70XqpprDamOh6ceGAhVeJEMydYML1o/rwTfupvSq5L/3VoD4Lt7/S3yOSfgjRk 81CYFlUktDZP7PLsNdqdvBBEwCNptbxFwasd/o8LGYLPpgLKgmV2/3B+buaeEUNwia83 x88xrbejotcer/E7dUcbE5/vHVu/lSGGQ9enrgwh3/3o4iZeK/hRtbm5ArY9+MSnmFrk DqAw== 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=oxhyfb9b6r+ILlCqox+06L7O4WmZ3Hats0OpcMu4s50=; fh=ZbrOnfU4k6VUf6mDIeMQ7cW+rUGc+xA3djv1YNuD43E=; b=BxbKDtFSAiDe8JDUpkXA6k2LH8RZyxTHMPdKGKw7GgZy5yT83TIoK7my6E9AeBuMD7 ot+mO2mSHYooxA5/4zNREeVZE+sxtUYg4lq7Zpoyhe+4/QswpKWyDi8hwHtSaHQnxdsj 4hxTI6B1vVR3NYMbXOI+0g+3Jd44FIr+J5ttsPogYjdMss5FPa3SLfc8JutjhgkVUQ9A qF/V0WJp0FqIjcrczZUI1wMZrBHjzNwKCPuris6LyR4VtjsT6+ph3hdnEP7b+2672EGz hCk98cjLoz2288fd54IIeJPDcraXLyq/MkOBdOYUakveravFxbcHWW0YgjIYj8HFs8la eSmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YepRCYQA; 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 e15-20020a17090301cf00b001b81a9aa3d1si6422286plh.223.2023.07.30.15.04.07; Sun, 30 Jul 2023 15:04: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=YepRCYQA; 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 S230033AbjG3US4 (ORCPT + 99 others); Sun, 30 Jul 2023 16:18:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbjG3USo (ORCPT ); Sun, 30 Jul 2023 16:18:44 -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 12739199 for ; Sun, 30 Jul 2023 13:18:43 -0700 (PDT) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-9936b3d0286so612980166b.0 for ; Sun, 30 Jul 2023 13:18:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1690748321; x=1691353121; 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=oxhyfb9b6r+ILlCqox+06L7O4WmZ3Hats0OpcMu4s50=; b=YepRCYQAwQdrVTDwU7YVpyPnL7NUxDA+DobhsTWMKIIwA2gO6FYhbuDWQMJu7picnV gy/Q0/Rlol83kBrb9fgsavYXr05RES9yl/4dlvM3QW8i4ntQYGRqTadzMbKIdIknAjxg vmImxA4gCJGkc9aKab0lkOau7E0nYhj8wwx7arVtxHzjhbqHRg9KpKCjC3oFgiWgY+9k eLfrK2THa3I7oS47S4boREa4BsUIKLKCGnp9nroSxYjEIGpxr1WOS+2d7TM2xoA0NbyQ CcQ+9Yxim8xq1swBTOWQXNhHwDd/1c5WdkXISuZPm0OHYZ1vKRMzayHrWamZbqopiSdc avYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690748321; x=1691353121; 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=oxhyfb9b6r+ILlCqox+06L7O4WmZ3Hats0OpcMu4s50=; b=WvY1rhRUiWyZ85zxNuMrAnlhSkWWgYtFtVpPP/2y2dtBVZmQvdchyZLIV/2PAJtAmU ufTqDb+xpDQ9QJibUdWICXD0TeaaW9OcdqlLXQa0tvaivbaADUjPZ5/wE65PxqcOPKfW HKjRGSNna0lEbxTCnAtEDa1Vc6UKLZ1qhHqxhiitKHWgPJV9dYxw5RefOmc+38u+rHFY leiqk7JdDe63HUezBWiKNZr2mJFKTbj4RTXsh4wt6aYDTe9mk0Lz3n2sZEnZBVuiTHhB 36sTUV+wz2itwvyxptZ4BVpOfZRtpd7CYpUapN4aD7VRaQH26SJGUUZ0D4ZOKd46zStz 8QlQ== X-Gm-Message-State: ABy/qLY3HMgjOFQU54GJ0lSuXSe+jxFunKrZOWTNjxeANQbPHuSsYFyo 3RxIqZl5OsDAPdyveaIpjTGq+g== X-Received: by 2002:a17:906:77d0:b0:99b:ef9c:e634 with SMTP id m16-20020a17090677d000b0099bef9ce634mr5124535ejn.65.1690748321625; Sun, 30 Jul 2023 13:18:41 -0700 (PDT) Received: from krzk-bin.. ([178.197.222.183]) by smtp.gmail.com with ESMTPSA id va16-20020a17090711d000b0099bc0daf3d7sm5115533ejb.182.2023.07.30.13.18.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Jul 2023 13:18:41 -0700 (PDT) From: Krzysztof Kozlowski To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , Ryan Lee , alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH v2 2/3] ASoC: codecs: max9892x: Unify interleave mode OF property Date: Sun, 30 Jul 2023 22:18:25 +0200 Message-Id: <20230730201826.70453-2-krzysztof.kozlowski@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230730201826.70453-1-krzysztof.kozlowski@linaro.org> References: <20230730201826.70453-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: 1772884758685152791 X-GMAIL-MSGID: 1772884758685152791 MAX98926 and MAX98927 are quite similar and use the same bindings, although drivers were not implementing them in the same way: MAX98926 has boolean "interleave-mode" but MAX98927 has uint32 "interleave_mode". Unify them under maxim,interleave-mode, already used in other Maxim device. Signed-off-by: Krzysztof Kozlowski --- Changes in v2: 1. New patch --- sound/soc/codecs/max98926.c | 3 ++- sound/soc/codecs/max98927.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c index bdc508e23e59..922ce0dc4e60 100644 --- a/sound/soc/codecs/max98926.c +++ b/sound/soc/codecs/max98926.c @@ -528,7 +528,8 @@ static int max98926_i2c_probe(struct i2c_client *i2c) "Failed to allocate regmap: %d\n", ret); goto err_out; } - if (of_property_read_bool(i2c->dev.of_node, "interleave-mode")) + if (of_property_read_bool(i2c->dev.of_node, "maxim,interleave-mode") || + of_property_read_bool(i2c->dev.of_node, "interleave-mode")) max98926->interleave_mode = true; if (!of_property_read_u32(i2c->dev.of_node, "vmon-slot-no", &value)) { diff --git a/sound/soc/codecs/max98927.c b/sound/soc/codecs/max98927.c index 0aaf2e6ae78d..e20aa5b1bce9 100644 --- a/sound/soc/codecs/max98927.c +++ b/sound/soc/codecs/max98927.c @@ -879,14 +879,14 @@ static int max98927_i2c_probe(struct i2c_client *i2c) i2c_set_clientdata(i2c, max98927); /* update interleave mode info */ - if (!of_property_read_u32(i2c->dev.of_node, - "interleave_mode", &value)) { - if (value > 0) - max98927->interleave_mode = true; - else - max98927->interleave_mode = false; - } else - max98927->interleave_mode = false; + if (of_property_read_bool(i2c->dev.of_node, "maxim,interleave-mode")) { + max98927->interleave_mode = true; + } else { + if (!of_property_read_u32(i2c->dev.of_node, "interleave_mode", + &value)) + if (value > 0) + max98927->interleave_mode = true; + } /* regmap initialization */ max98927->regmap