From patchwork Thu Aug 22 23:37:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Kandagatla X-Patchwork-Id: 11110235 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 70AB1112C for ; Thu, 22 Aug 2019 23:41:04 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05DBA233A0 for ; Thu, 22 Aug 2019 23:41:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="iooNLaS3"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Hdh1e0vd" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05DBA233A0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 50AAC86F; Fri, 23 Aug 2019 01:40:12 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 50AAC86F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1566517262; bh=3O8xJaJv56+EPIk3FxQuHnhzHil/ymV0PT3xbhF3mLI=; h=From:To:Date:In-Reply-To:References:Cc:Subject:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=iooNLaS3FZhCmjhFAFOLz0rp6OPg1nK9KWoBBdBX70V5v5wT43sKISR47RAdci1jb 9lLQIatiljk+M1u+aoiLJsflP+U5MygTzIj7TiJiy25IAdmt9wKes1+AJjB8zHjiGX 2foqpaIzXN7Tvs3NVPYtuLjSTziKS7Ab7WHJ1SY4= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 17163F805E1; Fri, 23 Aug 2019 01:38:36 +0200 (CEST) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3BEBBF805A1; Fri, 23 Aug 2019 01:38:29 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on alsa1.perex.cz X-Spam-Level: * X-Spam-Status: No, score=1.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,PRX_BODYSUB_5,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from mail-wr1-x443.google.com (mail-wr1-x443.google.com [IPv6:2a00:1450:4864:20::443]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 25C5EF8036D for ; Fri, 23 Aug 2019 01:38:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 25C5EF8036D Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Hdh1e0vd" Received: by mail-wr1-x443.google.com with SMTP id y8so6922768wrn.10 for ; Thu, 22 Aug 2019 16:38:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wEysXn0BHtJ7BnPMP+dSrHUvSy8/goLl6VzMxecNkns=; b=Hdh1e0vdmHrJYBwIbbD5Lk9wGK6lz7Ln0Rumc29tiH3kGuxJc4cez410CygTt5ia79 1qGOwO5JqHDlNYihAcM4LfArfFjrHJ7KMoy41e1BfMa0FreZb+4ZwB83/udYC3o0ce7f nTuNvc2XyCAZY99sKdEoNXSwXuHg+1ngQ0LxU7sOHytsV1RPiFhch4Xys2EOX1I0kPtH zoZpJ4/r+81lE4nsK0ZKPvcRIBMEun/4m7sp5iGSQIBYbJ+uGUrRZSQseALCx9mYMIT6 MK2Jayx4cFOHWwHXOuD3e/evySK1baODNGro19U/e/hrXAXJoOs/AmupLx/q/QcW+a4w SLTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wEysXn0BHtJ7BnPMP+dSrHUvSy8/goLl6VzMxecNkns=; b=fsEIiJl6pe+UC0friM2pAD5mxeLb4C1s1H+O+djKqlkDpo9ei+VAORpd10bbHhBTu6 tsjaa6/bYmLnmz9vnp0QvMGSGN5o10B40eH0KrMCAu27oLLhIWfP77t+gbDYNV+MJi42 XAM72SNynmJLceV1M22EoP3VNG0oHm7gzwXU45mPByLJnxXNIpOhCYVQ+k500kAd+2iz EWfDpDXxBiR/zkl+Gj7j/hrh4HCtaFTgbQPNqv8NBuiLhYiW/Tvya84EZT6U1aO2hsqd R15A3k+zUCveLQXqJ+W0o8mro1t2FgyqveQfdU9DrUKvTogBYNs7ulkE1mnLspNvKUXZ CaTA== X-Gm-Message-State: APjAAAWE/JLdT5kiqpjsmcZJFCN3ymukEi+JwT94TxgeLQMtdPhkpFvC 8OX0gg3Y52fQVVSFHCBBVgbwrA== X-Google-Smtp-Source: APXvYqy83P7CXzVIXqtf/xuRyQ9zXOK5Yb6wPDfXGzBTGnR7D3RgJUz1NGon2hz3zt813+fCWo7YMw== X-Received: by 2002:adf:dbcd:: with SMTP id e13mr1250035wrj.314.1566517102181; Thu, 22 Aug 2019 16:38:22 -0700 (PDT) Received: from srini-hackbox.lan (cpc89974-aztw32-2-0-cust43.18-1.cable.virginm.net. [86.30.250.44]) by smtp.gmail.com with ESMTPSA id f134sm1705157wmg.20.2019.08.22.16.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Aug 2019 16:38:21 -0700 (PDT) From: Srinivas Kandagatla To: broonie@kernel.org, robh+dt@kernel.org, vkoul@kernel.org Date: Fri, 23 Aug 2019 00:37:57 +0100 Message-Id: <20190822233759.12663-3-srinivas.kandagatla@linaro.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190822233759.12663-1-srinivas.kandagatla@linaro.org> References: <20190822233759.12663-1-srinivas.kandagatla@linaro.org> MIME-Version: 1.0 Cc: devicetree@vger.kernel.org, alsa-devel@alsa-project.org, bgoswami@codeaurora.org, spapothi@codeaurora.org, lgirdwood@gmail.com, linux-kernel@vger.kernel.org, Srinivas Kandagatla Subject: [alsa-devel] [RESEND PATCH v4 2/4] soundwire: core: add device tree support for slave devices X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" This patch adds support to parsing device tree based SoundWire slave devices. Signed-off-by: Srinivas Kandagatla --- drivers/soundwire/bus.c | 2 ++ drivers/soundwire/bus.h | 1 + drivers/soundwire/slave.c | 52 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+) diff --git a/drivers/soundwire/bus.c b/drivers/soundwire/bus.c index 49f64b2115b9..c2eaeb5c38ed 100644 --- a/drivers/soundwire/bus.c +++ b/drivers/soundwire/bus.c @@ -77,6 +77,8 @@ int sdw_add_bus_master(struct sdw_bus *bus) */ if (IS_ENABLED(CONFIG_ACPI) && ACPI_HANDLE(bus->dev)) ret = sdw_acpi_find_slaves(bus); + else if (IS_ENABLED(CONFIG_OF) && bus->dev->of_node) + ret = sdw_of_find_slaves(bus); else ret = -ENOTSUPP; /* No ACPI/DT so error out */ diff --git a/drivers/soundwire/bus.h b/drivers/soundwire/bus.h index 3048ca153f22..ee46befedbd1 100644 --- a/drivers/soundwire/bus.h +++ b/drivers/soundwire/bus.h @@ -15,6 +15,7 @@ static inline int sdw_acpi_find_slaves(struct sdw_bus *bus) } #endif +int sdw_of_find_slaves(struct sdw_bus *bus); void sdw_extract_slave_id(struct sdw_bus *bus, u64 addr, struct sdw_slave_id *id); diff --git a/drivers/soundwire/slave.c b/drivers/soundwire/slave.c index f39a5815e25d..3ef265d2ee89 100644 --- a/drivers/soundwire/slave.c +++ b/drivers/soundwire/slave.c @@ -2,6 +2,7 @@ // Copyright(c) 2015-17 Intel Corporation. #include +#include #include #include #include "bus.h" @@ -35,6 +36,7 @@ static int sdw_slave_add(struct sdw_bus *bus, slave->dev.release = sdw_slave_release; slave->dev.bus = &sdw_bus_type; + slave->dev.of_node = of_node_get(to_of_node(fwnode)); slave->bus = bus; slave->status = SDW_SLAVE_UNATTACHED; slave->dev_num = 0; @@ -112,3 +114,53 @@ int sdw_acpi_find_slaves(struct sdw_bus *bus) } #endif + +/* + * sdw_of_find_slaves() - Find Slave devices in master device tree node + * @bus: SDW bus instance + * + * Scans Master DT node for SDW child Slave devices and registers it. + */ +int sdw_of_find_slaves(struct sdw_bus *bus) +{ + struct device *dev = bus->dev; + struct device_node *node; + + for_each_child_of_node(bus->dev->of_node, node) { + int link_id, sdw_version, ret, len; + const char *compat = NULL; + struct sdw_slave_id id; + const __be32 *addr; + + compat = of_get_property(node, "compatible", NULL); + if (!compat) + continue; + + ret = sscanf(compat, "sdw%01x%04hx%04hx%02hhx", &sdw_version, + &id.mfg_id, &id.part_id, &id.class_id); + + if (ret != 4) { + dev_err(dev, "Invalid compatible string found %s\n", + compat); + continue; + } + + addr = of_get_property(node, "reg", &len); + if (!addr || (len < 2 * sizeof(u32))) { + dev_err(dev, "Invalid Instance and Link ID\n"); + continue; + } + + id.unique_id = be32_to_cpup(addr++); + link_id = be32_to_cpup(addr); + id.sdw_version = sdw_version; + + /* Check for link_id match */ + if (link_id != bus->link_id) + continue; + + sdw_slave_add(bus, &id, of_fwnode_handle(node)); + } + + return 0; +}