From patchwork Thu Jan 18 14:27:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1888009 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=PP0HN0nS; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.80.249; helo=am.mirrors.kernel.org; envelope-from=linux-tegra+bounces-507-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from am.mirrors.kernel.org (am.mirrors.kernel.org [147.75.80.249]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TG4p05jrhz1yPv for ; Fri, 19 Jan 2024 01:27:20 +1100 (AEDT) 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 am.mirrors.kernel.org (Postfix) with ESMTPS id AE8B51F26DA9 for ; Thu, 18 Jan 2024 14:27:17 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 01B6A25774; Thu, 18 Jan 2024 14:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PP0HN0nS" X-Original-To: linux-tegra@vger.kernel.org Received: from mail-lj1-f171.google.com (mail-lj1-f171.google.com [209.85.208.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 44A9C28DA0; Thu, 18 Jan 2024 14:27:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705588035; cv=none; b=b9CUYuSSMqrbYVzEXqMbCGHaSOCtyCyPo+GKUD9fT973kGRZ+Iy5YWtIndt0w7Aw1PjDUMjVKGSxffqyXeO8tEDAuXZFCqLNyq6WX0PNPoTFMIrDw+dxXSSP6rp6xVOTzQhqZum8rIzoUN4j8dje3QMDQrrr8tg9FuwVQ6khmzo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705588035; c=relaxed/simple; bh=D/j1GyU/L24O3ZaC2Hu+cNxDta/9tJtjWFVstkMIzIY=; h=Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Google-Smtp-Source:X-Received:Received:From: To:Cc:Subject:Date:Message-ID:X-Mailer:MIME-Version: Content-Transfer-Encoding; b=DutxdlCXiCEW7IaEDbTc85kynNLvpJoSvbwlSwtr3jm/PNYDqJRpmHQ1tSHXE6Q8lHS68NBApIdH0EgnTCv7Qr3Mngls/yP02+EJ/BVsSRS0SNcs3IeymgKR/ZXcC4qIfO7fFp13u8raBlJ5QZjLcn3w7+wVGEMU58QvBI7QBPg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PP0HN0nS; arc=none smtp.client-ip=209.85.208.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-lj1-f171.google.com with SMTP id 38308e7fff4ca-2cd33336b32so163120831fa.0; Thu, 18 Jan 2024 06:27:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705588032; x=1706192832; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=g6jqBnJDEB9rQIrzONP7qHzsTRkK7g2PlbbDf8zY10U=; b=PP0HN0nSevwdZUvF+4XqFDhtWlArZqF7IFWBF7ngvzrsVET9k0sdNqkWLxvgzZ9SqW HCBVTiHcd371ourDs9tcOv2TdmueiIiT4h/S4ag3O9LpMMnhmxTd28KzF+X/ox4f06zO p4z5kxGyWZsrTx+DSfTaHVNNajsxLgycjYvcXMIjZ5UPZjx+SNe91Wt9/cdc+9xInQAs khl3nphv/FHKg8PV+sc+xrm55gs1S26h7FBPAyCtkijdbubLk1rcEpXulHvbkvZnOMgL 2ejnyj1aFqyP9EJnNmXAA4lsrSdMkoEPpOuK+WPNCnRqK4CXd/34W+AanYjPaSyJbXUU DUiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705588032; x=1706192832; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=g6jqBnJDEB9rQIrzONP7qHzsTRkK7g2PlbbDf8zY10U=; b=ObtJq5fTaLl3PgCSgU+A2vGTNS0slU9g1FFnJElanCNp3bFvuSPWjVUepiMSmjEmku m+REDs+eDU6IZwXSdvjxiXk+VGiqavV3aiM5/0VR1bfT8JxbPMgMKq/bU3Zn3V/dOgDw 9vz4iHubN0RSpdK1gywDaGY2hliKZMaxSEJGFxsJYosJwt4sPhFYuhp9JSgxdtpRckVY YMH65gK01f06S+mTRBoRaGHq7l2a6P/BLb01NRdDm9XZjztLjEI1vkZ3JVPAygZ0l+8F IHJ4Hr7TQeo5Xl7Qkb7dI1rwONuz6l8Oew+BRLX9afqh19xu/qU64bgmRguF0kKbN4VX FT2w== X-Gm-Message-State: AOJu0Yx/rI13+/gRV04eNkFIFk+9siKsPq4oovNiDcF8ImDpgbuEjgEm x1gssQfw3OFvo7ZO8H3fEGRbpkN2eDlVKsmO4Zzo5oNcjnLMYPgx X-Google-Smtp-Source: AGHT+IEeOM0dwWYDfghipCkz5lzmM8tdOo/kIrgn+dBJuNQ2p9ay+gQ2EYlkmJ0mDgcGiYSmvksD5Q== X-Received: by 2002:a2e:9087:0:b0:2cd:9e7b:533b with SMTP id l7-20020a2e9087000000b002cd9e7b533bmr615313ljg.43.1705588031796; Thu, 18 Jan 2024 06:27:11 -0800 (PST) Received: from localhost (p200300e41f0fa600f22f74fffe1f3a53.dip0.t-ipconnect.de. [2003:e4:1f0f:a600:f22f:74ff:fe1f:3a53]) by smtp.gmail.com with ESMTPSA id p16-20020aa7cc90000000b00558a7d36956sm9354556edt.0.2024.01.18.06.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 06:27:11 -0800 (PST) From: Thierry Reding To: Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Jon Hunter , Sameer Pujar , devicetree@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 1/2] ASoC: dt-bindings: tegra: Document iommus and interconnects for ADMAIF Date: Thu, 18 Jan 2024 15:27:05 +0100 Message-ID: <20240118142706.4179146-1-thierry.reding@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-tegra@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Thierry Reding The ADMAIF is responsible for accessing system memory on behalf of other components of the APE, so make sure it can be hooked up to an IOMMU and memory controller. Signed-off-by: Thierry Reding --- .../bindings/sound/nvidia,tegra210-admaif.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml index 15ab40aeab1e..59304f02d063 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra210-admaif.yaml @@ -39,6 +39,18 @@ properties: dma-names: true + iommus: + maxItems: 1 + + interconnects: + description: Description of the interconnect paths for the ADMA interface; see + ../interconnect/interconnect.txt for details. + + interconnect-names: + items: + - const: dma-mem # read + - const: write + ports: $ref: /schemas/graph.yaml#/properties/ports description: | From patchwork Thu Jan 18 14:27:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 1888007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=c1NclnWB; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=147.75.48.161; helo=sy.mirrors.kernel.org; envelope-from=linux-tegra+bounces-508-incoming=patchwork.ozlabs.org@vger.kernel.org; receiver=patchwork.ozlabs.org) Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org [147.75.48.161]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TG4nz3kMhz1yPv for ; Fri, 19 Jan 2024 01:27:19 +1100 (AEDT) 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 58A8DB24A3A for ; Thu, 18 Jan 2024 14:27:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 809EF286B2; Thu, 18 Jan 2024 14:27:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="c1NclnWB" X-Original-To: linux-tegra@vger.kernel.org Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B841528DA2; Thu, 18 Jan 2024 14:27:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705588036; cv=none; b=mz6HV9Ui4Hrxn4wAHObEZQkuC7d9McJFuljzOnEhDathD0WspnlmHwb8jd6I0ILeCPPRKMLs73ejKK1ZhMeKbm1Xw037SIvKjNO/k1tP5xn+ZZjtQ+0lJkFeFpxgBs2IGLHbeHDLyl6tFZ5TVEeoxqvW2wx1McDvmwPCmkAoiaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705588036; c=relaxed/simple; bh=ArYdL5PIjdacMWQIjZ3vdX8WmxylPVL+VvMknj+Av0E=; h=Received:DKIM-Signature:X-Google-DKIM-Signature: X-Gm-Message-State:X-Google-Smtp-Source:X-Received:Received:From: To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; b=BMW6M7r2S1lMmDb5dglrS5ZO2Uguvb5xYaEHZJjKe60BsZioYDqODn2H1PLAFAWsSqGAPf+7ayWt8AIoVu6P2CYrH9Xc3cOyEbGV0d+8lf4fM1hPn36Szpg7XftH7jyzLHeFcIiiywbPoC15dV/Ftm2lX4Lo5KE/a/6VrRL+XJw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=c1NclnWB; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-557dcb0f870so12569711a12.2; Thu, 18 Jan 2024 06:27:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1705588033; x=1706192833; darn=vger.kernel.org; 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=78IVCKRXca7thRE7ARfIyH1pMO0QE5lIEZ3L5dbnlKk=; b=c1NclnWBqbJnmlBUVxDOIlysr2yrIFAwz+VKJIu8BmQsnWX5YHwHb7K/6980d8A6mZ 7dr0USSXmqSWchpJhxBIZz+GJiZB/7DwnX/0qY2tQ6WhQyD3rt8cJao5NbFH9FJq0o2q vPCjU4A+ZFKPzg363UTVaGVHuLMreX3M7tgUR5gsul16cj0jYklJo8P59m2GWWYmrW5j /JPs3eI7v3EcMrDPJJ/JYEub2y9pEZMce0Huhu2/YnVTEon4XI8nQ9FXSgl75xGiYYzH T7wi0EariPt7cbqcsdU+IMvoAdfa3mNQdVzRp32JeG2fWkXkbmxgcXbsa+wYgzK398hq DoLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705588033; x=1706192833; 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=78IVCKRXca7thRE7ARfIyH1pMO0QE5lIEZ3L5dbnlKk=; b=ol+/9BYlBTTr7eMoxDvYnoxoCSg8Q9M29KuALiKO0zGNDZYz4b3nGBmryCbSpG5XuG c4OzJ6WbVkXulm12fTOgLE/nUYE7YuYhP0Q2eReJUhLA1FHwDFRgAeHCwXavJVCXSI+6 aIkG+DjwdTnSaDGX9SnKrkfmChmCchqbF9dMnZ9DsJPuAORQz6OlXV32U3yVvzKGBG2/ MS/GQgr9yCGSXGgwaO3EWvqH2wF0YS8hVQQ5LFaQXGjpav/0ZqioAO75tavGM+YrcwFU VqscoJugGU9fUvxdpjjZRtkmCQN+7Hd1Z/1nLf4/HX9R+KqEEtN4xa2np/s9vKYPLI8l DmKw== X-Gm-Message-State: AOJu0YxxmkLr3jtsmg59oiFrUtVuiNbpM4yX8F1i2WfKmebyUj4XW8ET aM0IUL9m1pzVPyeKSF2rAtndBcBlgIc4w8n1S5Mlw1haAUb3RPgk X-Google-Smtp-Source: AGHT+IH6ORuEmtQx+qjHZhnbKTw9oDOMB02TWbVb1eVUKbXZ7AB4RSKYDuA74ANl4jgjpy8I1OzxfQ== X-Received: by 2002:a05:6402:1a28:b0:559:f5fe:e1d5 with SMTP id be8-20020a0564021a2800b00559f5fee1d5mr601806edb.62.1705588032691; Thu, 18 Jan 2024 06:27:12 -0800 (PST) Received: from localhost (p200300e41f0fa600f22f74fffe1f3a53.dip0.t-ipconnect.de. [2003:e4:1f0f:a600:f22f:74ff:fe1f:3a53]) by smtp.gmail.com with ESMTPSA id r1-20020a056402018100b00558e2a97fc2sm7961039edv.68.2024.01.18.06.27.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 06:27:12 -0800 (PST) From: Thierry Reding To: Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Jon Hunter , Sameer Pujar , devicetree@vger.kernel.org, linux-tegra@vger.kernel.org Subject: [PATCH 2/2] dt-bindings: sound: tegra: Correct clocks and resets for HDA Date: Thu, 18 Jan 2024 15:27:06 +0100 Message-ID: <20240118142706.4179146-2-thierry.reding@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240118142706.4179146-1-thierry.reding@gmail.com> References: <20240118142706.4179146-1-thierry.reding@gmail.com> Precedence: bulk X-Mailing-List: linux-tegra@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Thierry Reding The HDA controller on Tegra194 and Tegra234 uses a slightly different set of clocks and resets, so describe those accurately in the bindings. Signed-off-by: Thierry Reding Reviewed-by: Rob Herring --- .../bindings/sound/nvidia,tegra30-hda.yaml | 95 +++++++++++++++++-- 1 file changed, 85 insertions(+), 10 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml index 12c31b4b99e1..e64c99b6b20b 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra30-hda.yaml @@ -23,8 +23,6 @@ properties: - const: nvidia,tegra30-hda - items: - enum: - - nvidia,tegra234-hda - - nvidia,tegra194-hda - nvidia,tegra186-hda - nvidia,tegra210-hda - nvidia,tegra124-hda @@ -33,6 +31,8 @@ properties: - const: nvidia,tegra132-hda - const: nvidia,tegra124-hda - const: nvidia,tegra30-hda + - const: nvidia,tegra194-hda + - const: nvidia,tegra234-hda reg: maxItems: 1 @@ -47,10 +47,7 @@ properties: clock-names: minItems: 2 - items: - - const: hda - - const: hda2hdmi - - const: hda2codec_2x + maxItems: 3 resets: minItems: 2 @@ -58,10 +55,7 @@ properties: reset-names: minItems: 2 - items: - - const: hda - - const: hda2hdmi - - const: hda2codec_2x + maxItems: 3 power-domains: maxItems: 1 @@ -83,6 +77,87 @@ properties: The user-visible name of this sound complex. If this property is not specified then boards can use default name provided in hda driver. +allOf: + - if: + properties: + compatible: + contains: + enum: + - nvidia,tegra30-hda + - nvidia,tegra114-hda + - nvidia,tegra124-hda + - nvidia,tegra132-hda + - nvidia,tegra210-hda + - nvidia,tegra186-hda + then: + properties: + clocks: + minItems: 3 + maxItems: 3 + + clock-names: + items: + - const: hda + - const: hda2hdmi + - const: hda2codec_2x + + resets: + minItems: 3 + maxItems: 3 + + reset-names: + items: + - const: hda + - const: hda2hdmi + - const: hda2codec_2x + + - if: + properties: + compatible: + contains: + const: nvidia,tegra194-hda + then: + properties: + clocks: + minItems: 3 + + clock-names: + items: + - const: hda + - const: hda2hdmi + - const: hda2codec_2x + + resets: + maxItems: 2 + + reset-names: + items: + - const: hda + - const: hda2hdmi + + - if: + properties: + compatible: + contains: + const: nvidia,tegra234-hda + then: + properties: + clocks: + maxItems: 2 + + clock-names: + items: + - const: hda + - const: hda2codec_2x + + resets: + maxItems: 2 + + reset-names: + items: + - const: hda + - const: hda2codec_2x + required: - compatible - reg