]> git.itanic.dy.fi Git - linux-stable/commitdiff
Revert "riscv: dts: allwinner: d1: Add CAN controller nodes"
authorMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 7 Aug 2023 07:28:50 +0000 (09:28 +0200)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Mon, 7 Aug 2023 07:37:31 +0000 (09:37 +0200)
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 <jernej.skrabec@gmail.com>
Link: https://lore.kernel.org/all/20230807-riscv-allwinner-d1-revert-can-controller-nodes-v1-1-eb3f70b435d9@pengutronix.de
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi

index 4086c0cc0f9da0c4281d129907b74231b90e399c..1bb1e5cae6021cfb065adfc5b043ebc1a8c259d8 100644 (file)
@@ -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 = <SOC_PERIPHERAL_IRQ(21) IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&ccu CLK_BUS_CAN0>;
-                       resets = <&ccu RST_BUS_CAN0>;
-                       status = "disabled";
-               };
-
-               can1: can@2504400 {
-                       compatible = "allwinner,sun20i-d1-can";
-                       reg = <0x02504400 0x400>;
-                       interrupts = <SOC_PERIPHERAL_IRQ(22) IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&ccu CLK_BUS_CAN1>;
-                       resets = <&ccu RST_BUS_CAN1>;
-                       status = "disabled";
-               };
        };
 };