From patchwork Fri Feb 9 06:22:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Winklhofer via B4 Relay X-Patchwork-Id: 198758 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp662591dyd; Thu, 8 Feb 2024 22:26:35 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX7sN9TMCpMUcgxEvkH+rdqucaMgsrC1NAatr0wqW/eWyvcta7eoCPh7dRxrnHmMjZt7j4x+fBMs+HTp3Am67ft1Jvawg== X-Google-Smtp-Source: AGHT+IGyj/txQco+6udumAvgedZDaT2v3JPBGZcw80xLIPMPwfyW7VBNjuPwlCCu487zpPD64/BE X-Received: by 2002:a05:6830:43a6:b0:6e1:367:4485 with SMTP id s38-20020a05683043a600b006e103674485mr856739otv.18.1707459995321; Thu, 08 Feb 2024 22:26:35 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707459995; cv=pass; d=google.com; s=arc-20160816; b=mv8SLqHdkLU4wYmuN9NDE5+4IkLSFTzKpMPKxdDTdNVxVWTreRh+bxdoRwjizdMXpR WwmV6iaoFpyy27j5eTOqvkzZYcoe5SHlGIwntQ/Q5JVpWBKgIozPaQTnGyQUu5Fyrx+6 DNt+VixXp5Swh2yEcX6CUH08apH6WHqBs58rA0frMWezW2EjeqpHgrjWzun+k3TFIJqL Z4LfkD3wyQ9vbw1lzvrppJ2XRLFwiyl7CREo5KQlMp5PxTcjM8e271tzqfm4eNZz95M5 AjaTxW7GZkKyQ3rMjxd+/9oZkqT+9djozXtrDe3ka+VHpLGR07BZAu6AkXWOV4MvL67Z qsSw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=reply-to:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:subject:date:from:dkim-signature; bh=tEgDorvBuJGU5YIabV9jOCAycxFxDhRp7PtLF8ukfaQ=; fh=7LMli9a/6ApbitCfVrf1pbp/2+WBgIvjfMU1M6FnH5E=; b=MYxfTZqdoqrAIVhKT1y5Xow5D8oTe7L6XxNfM/Z1Q2OB9vXDSS21Y7Sk6t80rxveit fZ745jIpCFFx/SSdSL9uNht1r0oB1kA75duqKKYxHcJ3aqkCs3EjqHdMBltwAIR0SK2j 1ubeaOu0vdbTWFA4sgUjE2CBYrAiOGwJHghJGZKZl747JPsWzxpjrdIW3XOFMbQ8IZTD 8CpyZlfZXaNRklZFnzSgCPz9IBZkis58bYicNWGjtuOcSLWaaPN+8JQ1BkNhZ1j6I/HM YDINenVRmZVa64qepBAEXAIlHgF5w2q+touUfhFKieYuWw19yRAzuCx185BMGPTUZBc5 vEVg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ml0o+mxK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-59036-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59036-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=2; AJvYcCXTP9KBB/WHa0V1qgKt5dWnrRhrG7RX2kgGxZBvOj/8FsDeHsrpKKujKbLmLJ4/A8D0rUDgNZwzNMfpQNmguKKmSVmg0w== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id n25-20020a638f19000000b005dbec1f4dd1si1165889pgd.367.2024.02.08.22.26.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 22:26:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59036-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=ml0o+mxK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-59036-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59036-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 09345283A19 for ; Fri, 9 Feb 2024 06:24:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A807B58133; Fri, 9 Feb 2024 06:23:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ml0o+mxK" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC28E57300; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707459796; cv=none; b=B+p7JQuKxyTK7wSeEUhOKANEdBTTKHx4odqmDHdpxd91SSIuiQpQmw090bwB1dnhZLM9KBIc/51T++g1sdOn9D3dPeq65zB8mY5/NYCeaqfKWj5w5/rCcFfvo0DqS0cQ1hEkJ2J3yEeScervVSk+r4JDnYu2LogxVVWFF3ow03E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707459796; c=relaxed/simple; bh=S5QTvUq6sE9Cp1C8VwuWZA/YXB1LZbFmxjhmWirs68s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ts/YrmMn/U8wGOM0UKQPLJeDCdgS/2J/RP6AO97k4TTYD4gTSNHQ0gYB3rKZ1qcGTMzfEh7eK4M5IuzdmNfpVEhMCyJqqCwEOVi2BHtMEULOpW9dRERwLEn3kxF1sqVn6D88mUdEEKWlpC+OwXNSVcqnu+EeDGQAg6Xzg7jN7bw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ml0o+mxK; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id 2B762C43390; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707459796; bh=S5QTvUq6sE9Cp1C8VwuWZA/YXB1LZbFmxjhmWirs68s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=ml0o+mxKk9MSlKVF04FEo+v2cT7c01rbMvj+JLhCZsAjGU4m8dmwJIclZo6Nsjyeh CH1tGQkBze/bDM6/NfpBvZFrULLYdLkRFaEGkp7hcA7f0r99AQZsMOABTueHEzlOpu bcXCLbZcjVZ74VR2RZ8WMuXrJ0G6tLfKh+NzI0XTO7QKpOI8BflBauWFhjPUj3sRuU 1QYEnb7F0OQfoJw5qHFfAIeZ/gAi7hR7ZWoEESZT3ffttUwUKqCOX/88xkoIgo0gS7 e+Gvhj4o3NC1F4BTp0chh03Q5kedeNrhWeBDIWLd/DGiUrxj0sPF6UWhWMMJDRlhka 5uiEb0E+MpQIw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0ACD8C4828F; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) From: Christoph Winklhofer via B4 Relay Date: Fri, 09 Feb 2024 07:22:37 +0100 Subject: [PATCH v6 1/3] dt-bindings: serial: allow onewire as child node Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240209-w1-uart-v6-1-3e753c149196@gmail.com> References: <20240209-w1-uart-v6-0-3e753c149196@gmail.com> In-Reply-To: <20240209-w1-uart-v6-0-3e753c149196@gmail.com> To: Krzysztof Kozlowski , Rob Herring , Conor Dooley , Christoph Winklhofer , Rob Herring , Greg Kroah-Hartman , Jiri Slaby , Krzysztof Kozlowski , Jonathan Corbet Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-doc@vger.kernel.org X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1707459793; l=868; i=cj.winklhofer@gmail.com; s=20240104; h=from:subject:message-id; bh=f5JrNqSq+DhQN/cCXZvlLdSNxNweO7or4GNetVHb2s4=; b=i8nJeuGuspoRflRfsdAvwXwHC6q3tS8FQ/gCfqsWKHyQLg1nXRc0Y/yiXb4KYxkuo6oZ8QYuP CpbSwlzBOFsAMsB3OQttNwgWA02rBgI7Qj1l+ju9rG7ixylpxbIrgt0 X-Developer-Key: i=cj.winklhofer@gmail.com; a=ed25519; pk=lgjGjOt7hFKJT9UXhgUyrdthxvZ7DJ5F1U/7d9qdAsk= X-Endpoint-Received: by B4 Relay for cj.winklhofer@gmail.com/20240104 with auth_id=111 X-Original-From: Christoph Winklhofer Reply-To: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790401571997980810 X-GMAIL-MSGID: 1790401571997980810 From: Christoph Winklhofer The UART 1-Wire bus utilizes the Serial Device Bus to create the 1-wire timing patterns. Acked-by: Rob Herring Signed-off-by: Christoph Winklhofer --- Documentation/devicetree/bindings/serial/serial.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/serial/serial.yaml b/Documentation/devicetree/bindings/serial/serial.yaml index 65804ca274ae..ffc9198ae214 100644 --- a/Documentation/devicetree/bindings/serial/serial.yaml +++ b/Documentation/devicetree/bindings/serial/serial.yaml @@ -88,7 +88,7 @@ properties: TX FIFO threshold configuration (in bytes). patternProperties: - "^(bluetooth|bluetooth-gnss|gnss|gps|mcu)$": + "^(bluetooth|bluetooth-gnss|gnss|gps|mcu|onewire)$": if: type: object then: From patchwork Fri Feb 9 06:22:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Winklhofer via B4 Relay X-Patchwork-Id: 198757 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp661859dyd; Thu, 8 Feb 2024 22:24:08 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWdqYFsZT5b2wfi52CcPvT0XitZ4w2oGokEfRY++hrnTnqkT5yNOzCWsNHwZ4144U2glM29zS+x3DVpwF6yEOlyyTuhiA== X-Google-Smtp-Source: AGHT+IFbRsg7FmDDqOzeeGWyC0DMgrBTUbIidpkLU1UY3ylaG4m4dDRNso6ojb/82CE7V3PyGB0B X-Received: by 2002:a0c:cb0e:0:b0:68c:7f46:8327 with SMTP id o14-20020a0ccb0e000000b0068c7f468327mr703476qvk.3.1707459848171; Thu, 08 Feb 2024 22:24:08 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707459848; cv=pass; d=google.com; s=arc-20160816; b=EAJq7sVftc3MKIm09eSbptB2YpO+fQqZt+rFphe/DGSjGrJfsQbo0UIHRsJD/C7+bd aJHsWfW8lTlfdql9qPEDpW7oaXZ3pP9ICay3Lk8HN2LwhYDjdbWAhm6RG38GvCEWZVSb IUYUqAS2uD82fc4Yp11UkV6tUaTxv/FodTq6TyQvqXiKjnL/Ymv0Yhbsk0dQr6d/A/EB 5+3NwA0xvCbH13qe3tZ68wCnRAv+nxHQudqQF175Qi/Pq9fWUWDxacUn7poXHSlgmcXW hYkgCW6AiPkZl3FoVxzILDXS0PhwBqHNVM12J3Tbpd8Dt+tR5ZuQEAmaIMA6SHQCLt/4 UWXQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=reply-to:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:subject:date:from:dkim-signature; bh=P7Rn/hlGc9wu3rZPc4JxKCNa0wjj1l/5y4j9ZOLsbT4=; fh=c4KNoT4nhpCPBc2vAxh76RcOwWQDuE9nGh5iEqXMtmI=; b=Dg0hVpv25EJr1zRSI1K/8ASzyZARYOAkPrvwtJHWXTyXlFs7RRXHKJLUCEiYbWKH6H 5tJOI8ZrZ0k/PhRK3yJMjo4ZbNLt+0XUryz2mPmli3X6HvS/gSKU+f8X09tBOmW44MHl 9Sep37XZ3qXQyRTml3UbUZuDTfWIjxbKKzzu8wBePNdqW93fUCYHeueGfoQpYT18gPA3 hcfmE5ZSV2GPN43eZXklSJbm9tQAgxEOGIGnhe4hbTZTbVr9LuW/pxRLJ5zdw4dlzNeP o4tZqPq3Xs5mGTXsTrehfpM+kPcPNI3KoXnhQ8g8c9iBtjej5XIDdKBxe6zehs6GkvOE +Q0w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pY5Qdf+4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-59037-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59037-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=2; AJvYcCWOAJy9WLw55ClwkK93GSKPzpHhephVg0Q4TJJJIm3IgzzYX1T5diX7bjBcnb3zTRefOqDjO+/nsxrEFeKHfQ6B1uChJA== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id a4-20020a056214062400b0068c508e015dsi1293781qvx.299.2024.02.08.22.24.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 22:24:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59037-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pY5Qdf+4; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-59037-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59037-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id EF2E61C21E0F for ; Fri, 9 Feb 2024 06:24:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D3CD458138; Fri, 9 Feb 2024 06:23:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="pY5Qdf+4" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AC2E75730C; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707459796; cv=none; b=YU32kwvZVYplhYp56IccmpphE94ieFmfK+9a0/BsvWKXqyO3nbHv4XDmbdhAXIJNzGo8sKrUYACKrvTgRqunZ5p8XY5VjQw7ev3Xs8x8edOK8RiRgol0Ie6Te7otBzqRmGP9qegkIkvlkphMZz2qdp7e0+hF4goTk30X0exC1BU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707459796; c=relaxed/simple; bh=eMfD7O3mKBgytq6cqeXHFyoxCZgEikAzzCVwKh35KmQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MIeZCf1pC8P+3F0CIpSJ1L5Mj+SvGy8tVJEWAr2m2NF3s2UJ0cAmglq4zd1OPJJk/LVGsuboJJnSEPv+y3q0ah1rKJnfCN3zNH4XI9PuFx8gAok5p88UMTMjlkdzdbSl0TzbBt1XELlrusGLCWqx9b6oHzAPvFxZ3waVbI6DKws= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=pY5Qdf+4; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id 3A365C43399; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707459796; bh=eMfD7O3mKBgytq6cqeXHFyoxCZgEikAzzCVwKh35KmQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=pY5Qdf+47Ovvmfc1ue+PIA1/FErBGb5sLDmDbICBGVsXU3KYAfZ+gq6qb5AEA3k0Q QLy+2Bw3uD/+qpQzmKPAuwRKspjuUFbvMj/Y23z6QYZaYzxgQ04wJPSv7OYdKIOo0n CEs+FpS2FV+dXExXZwLFhRRFnVNDzhSbbJ9ov1GOkKvTSn7j6WQwfHywKLuwfYY10a fQIh+e4HHvRR4DrqXbbmNWfv4ZcN4PQZPfQmw0vqfArfRHZJk/pvvoFOBs9LW5SvBY tHmKB5nkE/JUmKtvhYdk/Mw4b9f5DH/3LsJp7uznVfFVHw6mKCsYW1OzSILo/xqz3l dlvbUwjHcwAsA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1A6F4C4829E; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) From: Christoph Winklhofer via B4 Relay Date: Fri, 09 Feb 2024 07:22:38 +0100 Subject: [PATCH v6 2/3] dt-bindings: w1: UART 1-Wire bus Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240209-w1-uart-v6-2-3e753c149196@gmail.com> References: <20240209-w1-uart-v6-0-3e753c149196@gmail.com> In-Reply-To: <20240209-w1-uart-v6-0-3e753c149196@gmail.com> To: Krzysztof Kozlowski , Rob Herring , Conor Dooley , Christoph Winklhofer , Rob Herring , Greg Kroah-Hartman , Jiri Slaby , Krzysztof Kozlowski , Jonathan Corbet Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-doc@vger.kernel.org X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1707459793; l=2213; i=cj.winklhofer@gmail.com; s=20240104; h=from:subject:message-id; bh=yLV7IXmfdL8oY7fuePFUPpVLjP+tA63tYbAEut11d5g=; b=XTioNouOeMzVmx5vfRRoH3PgXL1pxauzYWe7m/SThPOjSBgrv3cmnljAs1GxV1K98WEGdv3Bj CIwD0VN16oOBqW5BbyRlUAC6iejnzkjRAD9ZqtV+8AvvPRAWMV1oUSs X-Developer-Key: i=cj.winklhofer@gmail.com; a=ed25519; pk=lgjGjOt7hFKJT9UXhgUyrdthxvZ7DJ5F1U/7d9qdAsk= X-Endpoint-Received: by B4 Relay for cj.winklhofer@gmail.com/20240104 with auth_id=111 X-Original-From: Christoph Winklhofer Reply-To: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790401417538608718 X-GMAIL-MSGID: 1790401417538608718 From: Christoph Winklhofer Add device tree binding for UART 1-Wire bus. Reviewed-by: Rob Herring Signed-off-by: Christoph Winklhofer --- Documentation/devicetree/bindings/w1/w1-uart.yaml | 60 +++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/Documentation/devicetree/bindings/w1/w1-uart.yaml b/Documentation/devicetree/bindings/w1/w1-uart.yaml new file mode 100644 index 000000000000..7173820c78f9 --- /dev/null +++ b/Documentation/devicetree/bindings/w1/w1-uart.yaml @@ -0,0 +1,60 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/w1/w1-uart.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: UART 1-Wire Bus + +maintainers: + - Christoph Winklhofer + +description: | + UART 1-wire bus. Utilizes the UART interface via the Serial Device Bus + to create the 1-Wire timing patterns. + + The UART peripheral must support full-duplex and operate in open-drain + mode. The timing patterns are generated by a specific combination of + baud-rate and transmitted byte, which corresponds to a 1-Wire read bit, + write bit or reset pulse. + + The default baud-rate for reset and presence detection is 9600 and for + a 1-Wire read or write operation 115200. In case the actual baud-rate + is different from the requested one, the transmitted byte is adapted + to generate the 1-Wire timing patterns. + + https://www.analog.com/en/technical-articles/using-a-uart-to-implement-a-1wire-bus-master.html + + +properties: + compatible: + const: w1-uart + + reset-bps: + default: 9600 + description: + The baud rate for the 1-Wire reset and presence detect. + + write-0-bps: + default: 115200 + description: + The baud rate for the 1-Wire write-0 cycle. + + write-1-bps: + default: 115200 + description: + The baud rate for the 1-Wire write-1 and read cycle. + +required: + - compatible + +additionalProperties: + type: object + +examples: + - | + serial { + onewire { + compatible = "w1-uart"; + }; + }; From patchwork Fri Feb 9 06:22:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Winklhofer via B4 Relay X-Patchwork-Id: 198759 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp663450dyd; Thu, 8 Feb 2024 22:29:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IFY0PdA4E70cBvaZU5TcZ7LW0IN3i+uGW+i6h0AkEQkt/5XR4cGY11sGEmepaDQVH6DqnyA X-Received: by 2002:a05:6358:989d:b0:176:5a5e:4bfc with SMTP id q29-20020a056358989d00b001765a5e4bfcmr627373rwa.3.1707460182816; Thu, 08 Feb 2024 22:29:42 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707460182; cv=pass; d=google.com; s=arc-20160816; b=WXO9pYgYduZvr4pJPYVmWcLwJE7CcXC6i2MRRXcp/RHZ96bFe3+Mt5Dv+5fGHlk17D PMahTZcpgzYahAY63kNSHCbwaQn1EqoF75JitPYnZgp0GCb0N6rQy9xlBJloe6Tf/FVJ ppdaMzDMrltxrt6eVuav3eDoRrMpwBfywUKCGu7Bcia7TI6bYXKlZDXzghzYZO2yBle0 NeHKa1TC+P+BVlnIkH9zy5TNU8zf75avZM8mdYHQ9dT8Gmij3QxrrcSH9/nheXy4ynGk trTR60EUbadiKhm8hfiH8INRC2+izt/j9uvTOMRDFvbs3cVRPeJz+xmNfHR5BlNZS36l JzUw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=reply-to:cc:to:in-reply-to:references:message-id :content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:subject:date:from:dkim-signature; bh=YtCuT0xFfEwxG7kK+SVCef5RaZoHSXDnp5ROdKM6Cng=; fh=Vkz5tmucT+h+TaW4UEYaIfEDSw3g5qA1Wkyke/NPBBI=; b=oI9hVX7mgeON5I1s4dN0imZQ/+38C8giw/YZFOaedsBn3N4JqMSxjxclHCv2EC/5bQ KkS+pFfYoQEPGxRa6ImlkSZZv3iyC1+09A16f8kYWLxJEYjy+wf4ImBjGeNjGRPEadKX BiXp8jK6LcLUiGoFhni+wb3vRRQl+0ofko6vBmB8cEcmDPxddXEf0NsgJEA5ud9y4G9a 5ONimZS3Eq/CvYwUVB0cObtLZKJM5Le/bkil99XaXqIuLGiWQ3dETK+tdVj9p1LiJnIs BuOEJcBKmtkDmkmCyLLW0/YOjYnmtCcLsQIQwV24QXul8o+RnUEeIQr1C9Yj4pc/ci4m RmaA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=quKkCyaT; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-59039-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59039-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=2; AJvYcCXxRDOSjsVEQC06vG1RoEP6hKf9SiI0nPgmlk9xj+g3ZS1EjqS8nXCGZROKFCnEDzWGRK/2QaGZMCo0/esfA4CUnjWi6w== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id p17-20020a056a0026d100b006e0390d0ef1si1044782pfw.80.2024.02.08.22.29.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 22:29:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59039-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=quKkCyaT; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-59039-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59039-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 6ED2AB20E86 for ; Fri, 9 Feb 2024 06:24:24 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id CA53C5730C; Fri, 9 Feb 2024 06:23:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="quKkCyaT" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BBF6057315; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707459796; cv=none; b=lvQPzEW2ClUlYgo+3ft90uwtyJI5HS71fmr9W14v7uK98OWayqIbzWESrOFEXx1jkImhLy0oaugAzjj+RD7GLVivlkqueZN0AadUVFv+P9lKM8ON8VvNGvlze11Q1WGiYqyvMgERLu8yCJIYU/rmeIfwDGAEmwK6iJr/i7HF42I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707459796; c=relaxed/simple; bh=OHn7Ih2hE+4Auwm7Az0fL8Wy5ShopO6Z7lYrianBK8o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=i3Cz2fUoEesAqUhavZC8l9ZlWaFigMdPWAFGOBbILcgkAlYRIJFFXhvPyEbppxPe7UZJzD3Ve3fjfqzQyjqlUpEehJUqGGACE75uW8RA7P4uZFdLbKwLtJb24zunwv6U6+6XIEM2/ug3OnsA/gZHD6gI+G0QlGU3sAxY0znLqCI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=quKkCyaT; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPS id 47FCBC43330; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707459796; bh=OHn7Ih2hE+4Auwm7Az0fL8Wy5ShopO6Z7lYrianBK8o=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=quKkCyaTcuF0C4hjG76meHiwp7ycbG/v4ie8/7l3QcFSx2udnoGXWK7iQObGncdfw eC6nZZUVHF/Bg9B2BaZ/aPzPZZyqpFMKCHZYtSgEkwJ1Rw4Kj0GRwScYhst5poZega zgejDQZA5L0Dnz8u0csAyTcygc2apxbdvp2viH6Wk6c4og9/3PW3MgYZyZC1+/3AnW +i6squ71aGIvN0bsoEUJ40mwdeDbr2gpK4ojybT7thr2aWaANgrgXyJ+rRs5Jd7ZiG 2rYlSv2UQXGWNMN7NRE9gJWM82qjtxO8Q7gH9XhtOdvJYj3Q+Uh6WPQ8r3fSE2Re38 jR/nCNVAMAAgQ== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27A02C4829D; Fri, 9 Feb 2024 06:23:16 +0000 (UTC) From: Christoph Winklhofer via B4 Relay Date: Fri, 09 Feb 2024 07:22:39 +0100 Subject: [PATCH v6 3/3] w1: add UART w1 bus driver Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240209-w1-uart-v6-3-3e753c149196@gmail.com> References: <20240209-w1-uart-v6-0-3e753c149196@gmail.com> In-Reply-To: <20240209-w1-uart-v6-0-3e753c149196@gmail.com> To: Krzysztof Kozlowski , Rob Herring , Conor Dooley , Christoph Winklhofer , Rob Herring , Greg Kroah-Hartman , Jiri Slaby , Krzysztof Kozlowski , Jonathan Corbet Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org, linux-doc@vger.kernel.org X-Mailer: b4 0.12.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1707459793; l=16391; i=cj.winklhofer@gmail.com; s=20240104; h=from:subject:message-id; bh=urZhPJ6Jctu0jj5iVlUgHi/Yf795oqM3NmQDo23+NDg=; b=mPcasqnteFuOv4E54UsbVOWtDkN0J14TDrKQmmGZ7tzI7ibL5nnM/5TzsSclvKodEZjliq4fB iNHabBUmyIiDT6caPdiOPALnbZHBM9BIGvlIMe7cKXkjkv/blkicoGy X-Developer-Key: i=cj.winklhofer@gmail.com; a=ed25519; pk=lgjGjOt7hFKJT9UXhgUyrdthxvZ7DJ5F1U/7d9qdAsk= X-Endpoint-Received: by B4 Relay for cj.winklhofer@gmail.com/20240104 with auth_id=111 X-Original-From: Christoph Winklhofer Reply-To: X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790401433028006843 X-GMAIL-MSGID: 1790401768569510904 From: Christoph Winklhofer Add a UART 1-Wire bus driver. The driver utilizes the UART interface via the Serial Device Bus to create the 1-Wire timing patterns. The driver was tested on a "Raspberry Pi 3B" with a DS18B20 and on a "Variscite DART-6UL" with a DS18S20 temperature sensor. The 1-Wire timing pattern and the corresponding UART baud-rate with the interpretation of the transferred bytes are described in the document: Link: https://www.analog.com/en/technical-articles/using-a-uart-to-implement-a-1wire-bus-master.html In short, the UART peripheral must support full-duplex and operate in open-drain mode. The timing patterns are generated by a specific combination of baud-rate and transmitted byte, which corresponds to a 1-Wire read bit, write bit or reset. Signed-off-by: Christoph Winklhofer --- Documentation/w1/masters/index.rst | 1 + Documentation/w1/masters/w1-uart.rst | 54 +++++ drivers/w1/masters/Kconfig | 10 + drivers/w1/masters/Makefile | 1 + drivers/w1/masters/w1-uart.c | 417 +++++++++++++++++++++++++++++++++++ 5 files changed, 483 insertions(+) diff --git a/Documentation/w1/masters/index.rst b/Documentation/w1/masters/index.rst index 4442a98850ad..cc40189909fd 100644 --- a/Documentation/w1/masters/index.rst +++ b/Documentation/w1/masters/index.rst @@ -12,3 +12,4 @@ mxc-w1 omap-hdq w1-gpio + w1-uart diff --git a/Documentation/w1/masters/w1-uart.rst b/Documentation/w1/masters/w1-uart.rst new file mode 100644 index 000000000000..8d0f122178d4 --- /dev/null +++ b/Documentation/w1/masters/w1-uart.rst @@ -0,0 +1,54 @@ +.. SPDX-License-Identifier: GPL-2.0-or-later + +===================== +Kernel driver w1-uart +===================== + +Author: Christoph Winklhofer + + +Description +----------- + +UART 1-Wire bus driver. The driver utilizes the UART interface via the +Serial Device Bus to create the 1-Wire timing patterns as described in +the document `"Using a UART to Implement a 1-Wire Bus Master"`_. + +.. _"Using a UART to Implement a 1-Wire Bus Master": https://www.analog.com/en/technical-articles/using-a-uart-to-implement-a-1wire-bus-master.html + +In short, the UART peripheral must support full-duplex and operate in +open-drain mode. The timing patterns are generated by a specific +combination of baud-rate and transmitted byte, which corresponds to a +1-Wire read bit, write bit or reset pulse. + +For instance the timing pattern for a 1-Wire reset and presence detect uses +the baud-rate 9600, i.e. 104.2 us per bit. The transmitted byte 0xf0 over +UART (least significant bit first, start-bit low) sets the reset low time +for 1-Wire to 521 us. A present 1-Wire device changes the received byte by +pulling the line low, which is used by the driver to evaluate the result of +the 1-Wire operation. + +Similar for a 1-Wire read bit or write bit, which uses the baud-rate +115200, i.e. 8.7 us per bit. The transmitted byte 0x80 is used for a +Write-0 operation (low time 69.6us) and the byte 0xff for Read-0, Read-1 +and Write-1 (low time 8.7us). + +The default baud-rate for reset and presence detection is 9600 and for +a 1-Wire read or write operation 115200. In case the actual baud-rate +is different from the requested one, the transmitted byte is adapted +to generate the 1-Wire timing patterns. + + +Usage +----- + +Specify the UART 1-wire bus in the device tree by adding the single child +onewire to the serial node (e.g. uart0). For example: +:: + + @uart0 { + ... + onewire { + compatible = "w1-uart"; + }; + }; diff --git a/drivers/w1/masters/Kconfig b/drivers/w1/masters/Kconfig index 513c0b114337..e6049a75b35b 100644 --- a/drivers/w1/masters/Kconfig +++ b/drivers/w1/masters/Kconfig @@ -78,5 +78,15 @@ config W1_MASTER_SGI This support is also available as a module. If so, the module will be called sgi_w1. +config W1_MASTER_UART + tristate "UART 1-wire driver" + depends on SERIAL_DEV_BUS + help + Say Y here if you want to communicate with your 1-wire devices using + UART interface. + + This support is also available as a module. If so, the module + will be called w1-uart. + endmenu diff --git a/drivers/w1/masters/Makefile b/drivers/w1/masters/Makefile index 6c5a21f9b88c..227f80987e69 100644 --- a/drivers/w1/masters/Makefile +++ b/drivers/w1/masters/Makefile @@ -12,3 +12,4 @@ obj-$(CONFIG_W1_MASTER_MXC) += mxc_w1.o obj-$(CONFIG_W1_MASTER_GPIO) += w1-gpio.o obj-$(CONFIG_HDQ_MASTER_OMAP) += omap_hdq.o obj-$(CONFIG_W1_MASTER_SGI) += sgi_w1.o +obj-$(CONFIG_W1_MASTER_UART) += w1-uart.o diff --git a/drivers/w1/masters/w1-uart.c b/drivers/w1/masters/w1-uart.c new file mode 100644 index 000000000000..857f4908b9bb --- /dev/null +++ b/drivers/w1/masters/w1-uart.c @@ -0,0 +1,417 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * w1-uart - UART 1-Wire bus driver + * + * Uses the UART interface (via Serial Device Bus) to create the 1-Wire + * timing patterns. Implements the following 1-Wire master interface: + * + * - reset_bus: requests baud-rate 9600 + * + * - touch_bit: requests baud-rate 115200 + * + * Author: Christoph Winklhofer + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +/* UART packet contains start and stop bit */ +#define W1_UART_BITS_PER_PACKET (BITS_PER_BYTE + 2) + +/* Timeout to wait for completion of serdev-receive */ +#define W1_UART_TIMEOUT msecs_to_jiffies(500) + +/* + * struct w1_uart_config - configuration for 1-Wire operation + * + * @baudrate: baud-rate returned from serdev + * @delay_us: delay to complete a 1-Wire cycle (in us) + * @tx_byte: byte to generate 1-Wire timing pattern + */ +struct w1_uart_config { + unsigned int baudrate; + unsigned int delay_us; + u8 tx_byte; +}; + +/* + * struct w1_uart_config - w1-uart device data + * + * @serdev: serial device + * @bus: w1-bus master + * @cfg_reset: config for 1-Wire reset + * @cfg_touch_0: config for 1-Wire write-0 cycle + * @cfg_touch_1: config for 1-Wire write-1 and read cycle + * @rx_byte_received: completion for serdev receive + * @rx_err: indicates an error in serdev-receive + * @rx_byte: result byte from serdev-receive + * @mutex: mutex to protected rx_err and rx_byte from concurrent access + * in w1-callbacks and serdev-receive. + */ +struct w1_uart_device { + struct serdev_device *serdev; + struct w1_bus_master bus; + + struct w1_uart_config cfg_reset; + struct w1_uart_config cfg_touch_0; + struct w1_uart_config cfg_touch_1; + + struct completion rx_byte_received; + int rx_err; + u8 rx_byte; + + struct mutex mutex; +}; + +/* + * struct w1_uart_limits - limits for 1-Wire operations + * + * @baudrate: Requested baud-rate to create 1-Wire timing pattern + * @bit_min_us: minimum time for a bit (in us) + * @bit_max_us: maximum time for a bit (in us) + * @sample_us: timespan to sample 1-Wire response + * @cycle_us: duration of the 1-Wire cycle + */ +struct w1_uart_limits { + unsigned int baudrate; + unsigned int bit_min_us; + unsigned int bit_max_us; + unsigned int sample_us; + unsigned int cycle_us; +}; + +static inline unsigned int baud_to_bit_ns(unsigned int baud) +{ + return NSEC_PER_SEC / baud; +} + +static inline unsigned int to_ns(unsigned int us) +{ + return us * NSEC_PER_USEC; +} + +/* + * Set baud-rate, delay and tx-byte to create a 1-Wire pulse and adapt + * the tx-byte according to the actual baud-rate. + * + * Reject when: + * - time for a bit outside min/max range + * - a 1-Wire response is not detectable for sent byte + */ +static int w1_uart_set_config(struct serdev_device *serdev, + const struct w1_uart_limits *limits, + struct w1_uart_config *w1cfg) +{ + unsigned int packet_ns; + unsigned int bits_low; + unsigned int bit_ns; + unsigned int low_ns; + + w1cfg->baudrate = serdev_device_set_baudrate(serdev, limits->baudrate); + if (w1cfg->baudrate == 0) + return -EINVAL; + + /* Compute in nanoseconds for accuracy */ + bit_ns = baud_to_bit_ns(w1cfg->baudrate); + bits_low = to_ns(limits->bit_min_us) / bit_ns; + /* start bit is always low */ + low_ns = bit_ns * (bits_low + 1); + + if (low_ns < to_ns(limits->bit_min_us)) + return -EINVAL; + + if (low_ns > to_ns(limits->bit_max_us)) + return -EINVAL; + + /* 1-Wire response detectable for sent byte */ + if (limits->sample_us > 0 && + bit_ns * BITS_PER_BYTE < low_ns + to_ns(limits->sample_us)) + return -EINVAL; + + /* delay: 1-Wire cycle takes longer than the UART packet */ + packet_ns = bit_ns * W1_UART_BITS_PER_PACKET; + w1cfg->delay_us = 0; + if (to_ns(limits->cycle_us) > packet_ns) + w1cfg->delay_us = + (to_ns(limits->cycle_us) - packet_ns) / NSEC_PER_USEC; + + /* byte to create 1-Wire pulse */ + w1cfg->tx_byte = 0xff << bits_low; + + return 0; +} + +/* + * Configuration for reset and presence detect + * - bit_min_us is 480us, add margin and use 485us + * - limits for sample time 60us-75us, use 65us + */ +static int w1_uart_set_config_reset(struct w1_uart_device *w1dev) +{ + struct serdev_device *serdev = w1dev->serdev; + struct device_node *np = serdev->dev.of_node; + + struct w1_uart_limits limits = { .baudrate = 9600, + .bit_min_us = 485, + .bit_max_us = 640, + .sample_us = 65, + .cycle_us = 960 }; + + of_property_read_u32(np, "reset-bps", &limits.baudrate); + + return w1_uart_set_config(serdev, &limits, &w1dev->cfg_reset); +} + +/* + * Configuration for write-0 cycle (touch bit 0) + * - bit_min_us is 60us, add margin and use 65us + * - no sampling required, sample_us = 0 + */ +static int w1_uart_set_config_touch_0(struct w1_uart_device *w1dev) +{ + struct serdev_device *serdev = w1dev->serdev; + struct device_node *np = serdev->dev.of_node; + + struct w1_uart_limits limits = { .baudrate = 115200, + .bit_min_us = 65, + .bit_max_us = 120, + .sample_us = 0, + .cycle_us = 70 }; + + of_property_read_u32(np, "write-0-bps", &limits.baudrate); + + return w1_uart_set_config(serdev, &limits, &w1dev->cfg_touch_0); +} + +/* + * Configuration for write-1 and read cycle (touch bit 1) + * - bit_min_us is 5us, add margin and use 6us + * - limits for sample time 5us-15us, use 15us + */ +static int w1_uart_set_config_touch_1(struct w1_uart_device *w1dev) +{ + struct serdev_device *serdev = w1dev->serdev; + struct device_node *np = serdev->dev.of_node; + + struct w1_uart_limits limits = { .baudrate = 115200, + .bit_min_us = 6, + .bit_max_us = 15, + .sample_us = 15, + .cycle_us = 70 }; + + of_property_read_u32(np, "write-1-bps", &limits.baudrate); + + return w1_uart_set_config(serdev, &limits, &w1dev->cfg_touch_1); +} + +/* + * Configure and open the serial device + */ +static int w1_uart_serdev_open(struct w1_uart_device *w1dev) +{ + struct serdev_device *serdev = w1dev->serdev; + struct device *dev = &serdev->dev; + int ret; + + /* serdev is automatically closed on unbind or driver remove */ + ret = devm_serdev_device_open(dev, serdev); + if (ret < 0) + return ret; + + ret = serdev_device_set_parity(serdev, SERDEV_PARITY_NONE); + if (ret < 0) { + dev_err(dev, "set parity failed\n"); + return ret; + } + + ret = w1_uart_set_config_reset(w1dev); + if (ret < 0) { + dev_err(dev, "config for reset failed\n"); + return ret; + } + + ret = w1_uart_set_config_touch_0(w1dev); + if (ret < 0) { + dev_err(dev, "config for touch-0 failed\n"); + return ret; + } + + ret = w1_uart_set_config_touch_1(w1dev); + if (ret < 0) { + dev_err(dev, "config for touch-1 failed\n"); + return ret; + } + + serdev_device_set_flow_control(serdev, false); + + return 0; +} + +/* + * Send one byte (tx_byte) and read one byte (rx_byte) via serdev. + */ +static int w1_uart_serdev_tx_rx(struct w1_uart_device *w1dev, + const struct w1_uart_config *w1cfg, u8 *rx_byte) +{ + struct serdev_device *serdev = w1dev->serdev; + int ret; + + serdev_device_write_flush(serdev); + serdev_device_set_baudrate(serdev, w1cfg->baudrate); + + /* write and immediately read one byte */ + reinit_completion(&w1dev->rx_byte_received); + ret = serdev_device_write_buf(serdev, &w1cfg->tx_byte, 1); + if (ret != 1) + return -EIO; + ret = wait_for_completion_interruptible_timeout( + &w1dev->rx_byte_received, W1_UART_TIMEOUT); + if (ret <= 0) + return -EIO; + + /* locking could fail when serdev is unexpectedly receiving. */ + if (!mutex_trylock(&w1dev->mutex)) + return -EIO; + + ret = w1dev->rx_err; + if (ret == 0) + *rx_byte = w1dev->rx_byte; + + mutex_unlock(&w1dev->mutex); + + if (w1cfg->delay_us > 0) + fsleep(w1cfg->delay_us); + + return ret; +} + +static ssize_t w1_uart_serdev_receive_buf(struct serdev_device *serdev, + const u8 *buf, size_t count) +{ + struct w1_uart_device *w1dev = serdev_device_get_drvdata(serdev); + + mutex_lock(&w1dev->mutex); + + /* sent a single byte and receive one single byte */ + if (count == 1) { + w1dev->rx_byte = buf[0]; + w1dev->rx_err = 0; + } else { + w1dev->rx_err = -EIO; + } + + mutex_unlock(&w1dev->mutex); + complete(&w1dev->rx_byte_received); + + return count; +} + +static const struct serdev_device_ops w1_uart_serdev_ops = { + .receive_buf = w1_uart_serdev_receive_buf, + .write_wakeup = serdev_device_write_wakeup, +}; + +/* + * 1-wire reset and presence detect: A present slave will manipulate + * the received byte by pulling the 1-Wire low. + */ +static u8 w1_uart_reset_bus(void *data) +{ + struct w1_uart_device *w1dev = data; + const struct w1_uart_config *w1cfg = &w1dev->cfg_reset; + int ret; + u8 val; + + ret = w1_uart_serdev_tx_rx(w1dev, w1cfg, &val); + if (ret < 0) + return -1; + + /* Device present (0) or no device (1) */ + return val != w1cfg->tx_byte ? 0 : 1; +} + +/* + * 1-Wire read and write cycle: Only the read-0 manipulates the + * received byte, all others left the line untouched. + */ +static u8 w1_uart_touch_bit(void *data, u8 bit) +{ + struct w1_uart_device *w1dev = data; + const struct w1_uart_config *w1cfg = bit ? &w1dev->cfg_touch_1 : + &w1dev->cfg_touch_0; + int ret; + u8 val; + + ret = w1_uart_serdev_tx_rx(w1dev, w1cfg, &val); + + /* return inactive bus state on error */ + if (ret < 0) + return 1; + + return val == w1cfg->tx_byte ? 1 : 0; +} + +static int w1_uart_probe(struct serdev_device *serdev) +{ + struct device *dev = &serdev->dev; + struct w1_uart_device *w1dev; + int ret; + + w1dev = devm_kzalloc(dev, sizeof(*w1dev), GFP_KERNEL); + if (!w1dev) + return -ENOMEM; + w1dev->bus.data = w1dev; + w1dev->bus.reset_bus = w1_uart_reset_bus; + w1dev->bus.touch_bit = w1_uart_touch_bit; + w1dev->serdev = serdev; + + init_completion(&w1dev->rx_byte_received); + mutex_init(&w1dev->mutex); + + ret = w1_uart_serdev_open(w1dev); + if (ret < 0) + return ret; + serdev_device_set_drvdata(serdev, w1dev); + serdev_device_set_client_ops(serdev, &w1_uart_serdev_ops); + + return w1_add_master_device(&w1dev->bus); +} + +static void w1_uart_remove(struct serdev_device *serdev) +{ + struct w1_uart_device *w1dev = serdev_device_get_drvdata(serdev); + + /* + * Waits until w1-uart callbacks are finished, serdev is closed + * and its device data released automatically by devres (waits + * until serdev-receive is finished). + */ + w1_remove_master_device(&w1dev->bus); +} + +static const struct of_device_id w1_uart_of_match[] = { + { .compatible = "w1-uart" }, + {}, +}; +MODULE_DEVICE_TABLE(of, w1_uart_of_match); + +static struct serdev_device_driver w1_uart_driver = { + .driver = { + .name = "w1-uart", + .of_match_table = w1_uart_of_match, + }, + .probe = w1_uart_probe, + .remove = w1_uart_remove, +}; + +module_serdev_device_driver(w1_uart_driver); + +MODULE_DESCRIPTION("UART w1 bus driver"); +MODULE_AUTHOR("Christoph Winklhofer "); +MODULE_LICENSE("GPL");