From patchwork Mon Aug 7 07:28:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Marc Kleine-Budde X-Patchwork-Id: 13343165 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 14365C04A6A for ; Mon, 7 Aug 2023 07:29:05 +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:Cc:To:Message-Id:MIME-Version:Subject: Date:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=OKyCnuTjB1vnVPqPb1VjaGZaByG5ICMJeAl0ur3+xbE=; b=2nZNmU9IWQDDhR oKVQLBZxSuvRCtkHROKiRjwsacojh/J/vncGj35ZIOsZAO4WegYwLFst1227O3YL7vifyHJB+T+4z mspLapnGNDWIBCJHHJ4gRB05fMWTRRBZsP9kLeWNBuorppFzxmZtgRBzn7GJWzE7mWRi3dKbRMUog +aqzM/w+FFTfsrSoDaPXl8EhMbhXYDGNabrcTtDyiTfln4lng0XxItdNTIfc8VaXXlQ6hBq5PoULR 3W8lWqBDJlHPf72+COZZAPFKasMB+6u5VxmjB3uPXeSzsf9c8gion+D+CMhTR+/02rEScQi35Q4kt 7ItIbUfc//h7JcEDgfBw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qSufk-00GMqG-0L; Mon, 07 Aug 2023 07:29:00 +0000 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qSufh-00GMpu-1b for linux-riscv@lists.infradead.org; Mon, 07 Aug 2023 07:28:58 +0000 Received: from moin.white.stw.pengutronix.de ([2a0a:edc0:0:b01:1d::7b] helo=bjornoya.blackshift.org) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qSufg-0001Ph-7T for linux-riscv@lists.infradead.org; Mon, 07 Aug 2023 09:28:56 +0200 Received: from dspam.blackshift.org (localhost [127.0.0.1]) by bjornoya.blackshift.org (Postfix) with SMTP id 9FFE82058B8 for ; Mon, 7 Aug 2023 07:28:55 +0000 (UTC) Received: from hardanger.blackshift.org (unknown [172.20.34.65]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by bjornoya.blackshift.org (Postfix) with ESMTPS id A5F8A2058B0; Mon, 7 Aug 2023 07:28:53 +0000 (UTC) Received: from [172.20.34.65] (localhost [::1]) by hardanger.blackshift.org (OpenSMTPD) with ESMTP id 3d094674; Mon, 7 Aug 2023 07:28:53 +0000 (UTC) From: Marc Kleine-Budde Date: Mon, 07 Aug 2023 09:28:50 +0200 Subject: [PATCH] Revert "riscv: dts: allwinner: d1: Add CAN controller nodes" MIME-Version: 1.0 Message-Id: <20230807-riscv-allwinner-d1-revert-can-controller-nodes-v1-1-eb3f70b435d9@pengutronix.de> X-B4-Tracking: v=1; b=H4sIADGd0GQC/x2NSwrDMAwFrxK0rsB2U/dzldCFsZVWYOQihbQQc veYLofHvNnASJkMHsMGSisbN+ngTwPkd5IXIZfOEFw4u5u7orLlFVOtXxYhxeKxe6QL5iSYmyz aau2DtEKG8TLHQG6M/p6hn36UZv79g9Nz3w8LpufJgAAAAA== To: linux-can@vger.kernel.org Cc: John Watts , kernel@pengutronix.de, Krzysztof Kozlowski , Conor Dooley , Chen-Yu Tsai , Jernej Skrabec , Samuel Holland , Paul Walmsley , Palmer Dabbelt , Albert Ou , netdev@vger.kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, Marc Kleine-Budde X-Mailer: b4 0.13-dev-099c9 X-Developer-Signature: v=1; a=openpgp-sha256; l=1973; i=mkl@pengutronix.de; h=from:subject:message-id; bh=vUrCbLfFW1umHcNBDCaMWrYMwAzAml5hh8vVrEIpxqI=; b=owEBbQGS/pANAwAKAb5QHEoqigToAcsmYgBk0J0y9XBPOwXg5qAWbtBKng7vWOKNUjlkAjCeI vJv36L8zVqJATMEAAEKAB0WIQQOzYG9qPI0qV/1MlC+UBxKKooE6AUCZNCdMgAKCRC+UBxKKooE 6DjbCACSnMGWq408y1/hhxSc6hvJR74UJgy3cIH9AiaMYbHraNzsdIVLBu00wakHgYc7iMugmbI zzCRceBYG/1iRm1Ov7CWzuMdgdRYKMOj+QusBgq9gmoB7ENKdu2HyyYF/knvvz+s0L/lkF3Vz0W VAcD+cODbYjigMa0QlhJdI0eaXi9yssJ5mNtEMm0e+yZX8RISUPGddRAoeP56OnAUn0AWK8RA6w IFvKhrbXG+UIEPQE0q+l+A2GG5AoTvGsjBnZtwRA0R0BA+Q1UsTOuCY3e8le3SaQjo+Q+xqYAsk RaI8TeSg2EmgZI6iH3SBAdSZ0uNYVKubvRGm0jQhVZQ1mElI X-Developer-Key: i=mkl@pengutronix.de; a=openpgp; fpr=C1400BA0B3989E6FBC7D5B5C2B5EE211C58AEA54 X-SA-Exim-Connect-IP: 2a0a:edc0:0:b01:1d::7b X-SA-Exim-Mail-From: mkl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-riscv@lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230807_002857_554187_97DE7F1A X-CRM114-Status: UNSURE ( 9.06 ) X-CRM114-Notice: Please train this message. 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 It turned out the dtsi changes were not quite ready, revert them for now. This reverts commit 6ea1ad888f5900953a21853e709fa499fdfcb317. Link: https://lore.kernel.org/all/2690764.mvXUDI8C0e@jernej-laptop Suggested-by: Jernej Škrabec Signed-off-by: Marc Kleine-Budde Reviewed-by: Jernej Skrabec --- arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 30 ----------------------- 1 file changed, 30 deletions(-) --- base-commit: c35e927cbe09d38b2d72183bb215901183927c68 change-id: 20230807-riscv-allwinner-d1-revert-can-controller-nodes-65f62e04619c Best regards, diff --git a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi index 4086c0cc0f9d..1bb1e5cae602 100644 --- a/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi +++ b/arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi @@ -131,18 +131,6 @@ uart3_pb_pins: uart3-pb-pins { pins = "PB6", "PB7"; function = "uart3"; }; - - /omit-if-no-ref/ - can0_pins: can0-pins { - pins = "PB2", "PB3"; - function = "can0"; - }; - - /omit-if-no-ref/ - can1_pins: can1-pins { - pins = "PB4", "PB5"; - function = "can1"; - }; }; ccu: clock-controller@2001000 { @@ -891,23 +879,5 @@ rtc: rtc@7090000 { clock-names = "bus", "hosc", "ahb"; #clock-cells = <1>; }; - - can0: can@2504000 { - compatible = "allwinner,sun20i-d1-can"; - reg = <0x02504000 0x400>; - interrupts = ; - clocks = <&ccu CLK_BUS_CAN0>; - resets = <&ccu RST_BUS_CAN0>; - status = "disabled"; - }; - - can1: can@2504400 { - compatible = "allwinner,sun20i-d1-can"; - reg = <0x02504400 0x400>; - interrupts = ; - clocks = <&ccu CLK_BUS_CAN1>; - resets = <&ccu RST_BUS_CAN1>; - status = "disabled"; - }; }; };