Commit 96bc3137 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'linux-can-next-for-6.6-20230807' of... 

Merge tag 'linux-can-next-for-6.6-20230807' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2023-08-07

The patch is from me and reverts the addition of the CAN controller
nodes in the allwinner d1 SoC.

* tag 'linux-can-next-for-6.6-20230807' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next:
  Revert "riscv: dts: allwinner: d1: Add CAN controller nodes"
====================

Link: https://lore.kernel.org/r/20230807074222.1576119-1-mkl@pengutronix.de


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 0d0c5f0b 84059a0e

arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi

+0 −30
Original line number Diff line number Diff line
@@ -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";

		};

	};

};