From patchwork Mon Apr 15 12:50:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannah Peuckmann X-Patchwork-Id: 13630000 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CEA7CC00A94 for ; Mon, 15 Apr 2024 12:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sUD+b5Nu60cVMGtCuuOoVaAMTgey/gBRkrKYfh/1heE=; b=YxouzC/xqyZLpb GXF1JOSqf8tyYzQvz93TrpgspgYt8K6CDO6IppicgyUibyu4Ro89K8CVGZ9QFO9BMdQ7Ed3LovS4Y G/326S/tXw0pcEvb/b7qEdaSg/ygjwZTNiDBomeTj0JGhWpFL20KN0JS2N+ITRNmS7J9zzaDBLfba StU02msNJP57PB+9kSM87yJCqYfLwV0BVWSjjSSvMCvuFmENvVdGDllU5T8BOGmGQ2zE/r1ZKOYuM ddLcQ8FVBayKY1QDvYYd/X7Ut53VfieBoLmRJit+iX4cJf1cLY8mTERxCZs2XWILkRRZPtQja1ofy GtnsFakZbN9oGZrQkYHw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwLnN-00000008HcD-0QOX; Mon, 15 Apr 2024 12:50:49 +0000 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwLnF-00000008HUK-2G8E for linux-riscv@lists.infradead.org; Mon, 15 Apr 2024 12:50:44 +0000 Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 04332411E8 for ; Mon, 15 Apr 2024 12:50:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1713185437; bh=KmekjPunqQwx9/LdecI0/rtOQB/X9fvmAzvCggbvjQY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Gx8DB9LtRLjkw7SEvI7Me+D79gd/E9mjRErDF79nemkXReawNRSHWOQY2ahsexOU9 hwTCOMTsKxxetw+KMi6QfxS11hrp+hDuLFVWoxxMVd3mYmugiKQgcuTI1pZ9KyqZkf QiTL0+wTnof2fkpjhu0Zi1dJbUeftvF0/G4z4D+muroOF0jrdGP6CusL3tMSEbaIZR RdmXVNRig5bmSuwhynQcWX/wcTA+R4XrQupOvppFTH1ILaXP+/h7WPaHnlSry+xHMG e963I7NPbV+vbrqb1E2Vta5pjX/wRytZYUOTNgsCa1xssLwVh66YgAfhccjV9oN500 jKwC9fYQ7+yDw== Received: by mail-ed1-f69.google.com with SMTP id 4fb4d7f45d1cf-56ff7c2a5d1so782981a12.0 for ; Mon, 15 Apr 2024 05:50:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713185436; x=1713790236; 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=KmekjPunqQwx9/LdecI0/rtOQB/X9fvmAzvCggbvjQY=; b=B/fg39OCWBMfgPUGel5cdC2xGyeD3prVPNIiJH+NXBXC83giWC1RF7caos3iH7hj+N VzPal40hotUEaUuloNBF8locnXKYtH3ge4E6aAGslmdNQSI9VnBSR8KpU86S1T0n5zr+ PNATh3EPelJPqxLTpiCnETDB3fZKdeY83hLXGArfot4LrCM4xxwmHqjmjus8ErQw/ic8 zZ7v7AjwHVz+5ZEi5a+E3kIXelr6lb4LGPth6JwdATGTtaU0cn8V04M62SsQx1X+1LEa 3MNlt+K7hPllyczId8lZy9y8FPldC/UZLw2sNMtWstPWwypr8vEU6QS0lpitAB/kVLT2 FkuA== X-Gm-Message-State: AOJu0YxVKQzsWN9ozcvlprHgo5O3qVhw+xVQcMswyGA8H33PznI1uFYW XIj5WeiACTRU9PN9zuWbWiUbIRz/SKB4IYRaOLqYKZVjYK9ijcIgUnEyfPEBz5Mr78UETue+t5W 0thErDXj6pHqSQAE42QUPz8lSAfHXeFRrlnqGHcDRxcUFaqL/gsXCJy+M4XkCOvY5kXs9ChVKHq sADtulgh0Tf2z6P0qw X-Received: by 2002:a17:907:928a:b0:a52:3d34:bde5 with SMTP id bw10-20020a170907928a00b00a523d34bde5mr5939393ejc.1.1713185436176; Mon, 15 Apr 2024 05:50:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHbDSFDAh81t4CyCpnLMRcCLXKjawAJU7twGdLHmsQPxMI6uKxYLnFjMX6oz36uGBk2vF0fng== X-Received: by 2002:a17:907:928a:b0:a52:3d34:bde5 with SMTP id bw10-20020a170907928a00b00a523d34bde5mr5939384ejc.1.1713185435879; Mon, 15 Apr 2024 05:50:35 -0700 (PDT) Received: from bojack.fritz.box (197-53-142-46.pool.kielnet.net. [46.142.53.197]) by smtp.gmail.com with ESMTPSA id bz2-20020a1709070aa200b00a51a9eccf2asm5455573ejc.125.2024.04.15.05.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 05:50:35 -0700 (PDT) From: Hannah Peuckmann To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Walker Chen , Hal Feng , Xingyu Wu Subject: [PATCH v1 1/2] riscv: dts: starfive: visionfive 2: Remove non-existing TDM hardware Date: Mon, 15 Apr 2024 14:50:32 +0200 Message-Id: <20240415125033.86909-2-hannah.peuckmann@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240415125033.86909-1-hannah.peuckmann@canonical.com> References: <20240415125033.86909-1-hannah.peuckmann@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240415_055041_952877_9900536E X-CRM114-Status: GOOD ( 11.78 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org This partially reverts commit e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm") This added device tree nodes for TDM hardware that is not actually on the VisionFive 2 board, but connected on the 40pin header. Many different extension boards could be added on those pins, so this should be handled by overlays instead. This also conflicts with the I2S node which also attempts to grab GPIO 44: starfive-jh7110-sys-pinctrl 13040000.pinctrl: pin GPIO44 already requested by 10090000.tdm; cannot claim for 120c0000.i2s Fixes: e7c304c0346d ("riscv: dts: starfive: jh7110: add the node and pins configuration for tdm") Signed-off-by: Hannah Peuckmann --- .../jh7110-starfive-visionfive-2.dtsi | 40 ------------------- 1 file changed, 40 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index 45b58b6f3df8..d89eef6e2633 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -622,40 +622,6 @@ GPOEN_ENABLE, }; }; - tdm_pins: tdm-0 { - tx-pins { - pinmux = ; - bias-pull-up; - drive-strength = <2>; - input-disable; - input-schmitt-disable; - slew-rate = <0>; - }; - - rx-pins { - pinmux = ; - input-enable; - }; - - sync-pins { - pinmux = ; - input-enable; - }; - - pcmclk-pins { - pinmux = ; - input-enable; - }; - }; - uart0_pins: uart0-0 { tx-pins { pinmux = ; - status = "okay"; -}; - &uart0 { pinctrl-names = "default"; pinctrl-0 = <&uart0_pins>; From patchwork Mon Apr 15 12:50:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannah Peuckmann X-Patchwork-Id: 13630001 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id F23BFC41513 for ; Mon, 15 Apr 2024 12:50:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=YXDHXEpaXCHjHB9GPCvGBFHjcZaSp9C8fpILor4/Jc4=; b=3XRlIErtjLuU9e b3cWUdo2rWKpDhBQrLy3y4I7VQ4wuz+qBGAFyH0xoQ9JkVKxEbu+IiBeX9833sRNa2kmVRyawNzYv qPX6O8pxssVL4qmuSWRM2VLCIbIsznYY1pmoPCKHJUIMaZ//jkZjoyuBwzDUGUVg7XqfXzmJZJM8F 41eH5dLJXM7XgzK7L23YIRD5/aQK2zYHTewVQ30wzND0igow3n/tn+JtHqZD3rXiRgw4nd3MPza1k 5XRjHCJGE13dHMqRB07yzl/v1dEaJKOc0eC2ROrviO++uU9Z38RclBXAmfDpKbxUjrUUf7eCmD9iK Zs34Ud9uUU8JCye23pcQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwLnK-00000008HaO-2Cz8; Mon, 15 Apr 2024 12:50:46 +0000 Received: from smtp-relay-internal-0.canonical.com ([185.125.188.122]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rwLnF-00000008HUo-23yN for linux-riscv@lists.infradead.org; Mon, 15 Apr 2024 12:50:44 +0000 Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 5ED423F188 for ; Mon, 15 Apr 2024 12:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1713185438; bh=/+lz4gvRbuYKUPO9p5AcEAQ4a8bxIR1nS1c0YAZAbpc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Qi62ZbHX3jEmBBki5sgQCmjCJ0CpzUeM1/KajapOmfDC8HByZgiz646btqOHsRlny m4KruAuL13iB35qHJmLCXauo9KoAk/KkdieCH566sXO/3EdhVmwlEI61IceIddpJ0L +ZLVJXDflUFrVdXbAAVnQJewoDIvwm9w9vrldq4VJHc2BeMGJVGSG+Ug5gaCF0jJHC ZJ6RfYvabgYIFWM4/Z1n1n5803b3jEcDpK7hZLm/pJU60XB3MeW5mW3E1MUbdFGJ5Y 5e/MqJ0yj1IKQ6ebp1Y4WAyNNk09JOnuRVmOoAqKh9Wz/d69j6tgcXgEcm+po/gx+o SSTd2zgIjZ0Gg== Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a46938e24dbso53768666b.0 for ; Mon, 15 Apr 2024 05:50:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713185438; x=1713790238; 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=/+lz4gvRbuYKUPO9p5AcEAQ4a8bxIR1nS1c0YAZAbpc=; b=hmf5B3dtJPpqeYrSTVYW5iX7PQ/DqZj5oDsDRglgKbeVUY5eREEtXvgHT2DLeERaG0 OVt4sE8u4JBzFBZBbKDFqy7ELgupIuLJ23QkgkO/GX43KEhlMohR1HMUHRlJpPHozUtK 4aBRacPkTToR5yuHgclIJgi7xVXxS7FsndJtzIXQUJE3QO02ggoZP5YQUYPepcgCcqgh 7ShyWGi7kWSOiNUqFaInZnpnX16jOHalJJcjUR/pvkI4cAQtaTKS1W9fe6U+RIsLYb2E vxn/nE5iCtpVc30ciRkqB26JNWGXoFWqcp2SrIKoI9KCXtSYCxesnebfb8LTM8casfaJ wPCA== X-Gm-Message-State: AOJu0YwFacGjpjZwRrTw2FWSx8/qPHsHCqYaQvpVuF8ok4wyejcVaF20 1NfehUaOBSkkAPzYZ/SCcqbVmrSz9ceRWekPVwWUXo7HCLbiwjYxc/KEgyEsf8+SPq8isM/+XJm 2i5TMoysSo/Gqi1VmguHQ8uaiP0KSUs4kz33pBWzloYTsw8enHtXLlVvN0S4xXtg3ssUmATG+KH KFWSA1Bz3Z4Y4GEA== X-Received: by 2002:a17:906:6d0e:b0:a52:561c:ca87 with SMTP id m14-20020a1709066d0e00b00a52561cca87mr2392071ejr.1.1713185437888; Mon, 15 Apr 2024 05:50:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHZfcd/TjRul4GHXkO5qH5k2zYzb1Tgdzi4hxLh3ejZJdiWBUESLY7cEG1prI/RLPSXTbTpRg== X-Received: by 2002:a17:906:6d0e:b0:a52:561c:ca87 with SMTP id m14-20020a1709066d0e00b00a52561cca87mr2392062ejr.1.1713185437542; Mon, 15 Apr 2024 05:50:37 -0700 (PDT) Received: from bojack.fritz.box (197-53-142-46.pool.kielnet.net. [46.142.53.197]) by smtp.gmail.com with ESMTPSA id bz2-20020a1709070aa200b00a51a9eccf2asm5455573ejc.125.2024.04.15.05.50.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Apr 2024 05:50:36 -0700 (PDT) From: Hannah Peuckmann To: linux-riscv@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Emil Renner Berthing , Conor Dooley , Rob Herring , Krzysztof Kozlowski , Paul Walmsley , Palmer Dabbelt , Albert Ou , Walker Chen , Hal Feng , Xingyu Wu Subject: [PATCH v1 2/2] riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware Date: Mon, 15 Apr 2024 14:50:33 +0200 Message-Id: <20240415125033.86909-3-hannah.peuckmann@canonical.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240415125033.86909-1-hannah.peuckmann@canonical.com> References: <20240415125033.86909-1-hannah.peuckmann@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240415_055041_993250_7C471FBA X-CRM114-Status: GOOD ( 11.56 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org This partially reverts commit 92cfc35838b2 ("riscv: dts: starfive: Add the nodes and pins of I2Srx/I2Stx0/I2Stx1") This added device tree nodes for I2S hardware that is not actually on the VisionFive 2 board, but connected on the 40pin header. Many different extension boards could be added on those pins, so this should be handled by overlays instead. This also conflicts with the TDM node which also attempts to grab GPIO 44: starfive-jh7110-sys-pinctrl 13040000.pinctrl: pin GPIO44 already requested by 10090000.tdm; cannot claim for 120c0000.i2s Fixes: 92cfc35838b2 ("riscv: dts: starfive: Add the nodes and pins of I2Srx/I2Stx0/I2Stx1") Signed-off-by: Hannah Peuckmann --- .../jh7110-starfive-visionfive-2.dtsi | 58 ------------------- 1 file changed, 58 deletions(-) diff --git a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi index d89eef6e2633..2b3e952513e4 100644 --- a/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +++ b/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi @@ -279,24 +279,6 @@ &i2c6 { status = "okay"; }; -&i2srx { - pinctrl-names = "default"; - pinctrl-0 = <&i2srx_pins>; - status = "okay"; -}; - -&i2stx0 { - pinctrl-names = "default"; - pinctrl-0 = <&mclk_ext_pins>; - status = "okay"; -}; - -&i2stx1 { - pinctrl-names = "default"; - pinctrl-0 = <&i2stx1_pins>; - status = "okay"; -}; - &mmc0 { max-frequency = <100000000>; assigned-clocks = <&syscrg JH7110_SYSCLK_SDIO0_SDCARD>; @@ -447,46 +429,6 @@ GPOEN_SYS_I2C6_DATA, }; }; - i2srx_pins: i2srx-0 { - clk-sd-pins { - pinmux = , - , - , - , - ; - input-enable; - }; - }; - - i2stx1_pins: i2stx1-0 { - sd-pins { - pinmux = ; - bias-disable; - input-disable; - }; - }; - - mclk_ext_pins: mclk-ext-0 { - mclk-ext-pins { - pinmux = ; - input-enable; - }; - }; - mmc0_pins: mmc0-0 { rst-pins { pinmux =