Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Jakub Kicinski <kuba@kernel.org>
-30
-30
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
-30
arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi
···
131
131
pins = "PB6", "PB7";
132
132
function = "uart3";
133
133
};
134
-
135
-
/omit-if-no-ref/
136
-
can0_pins: can0-pins {
137
-
pins = "PB2", "PB3";
138
-
function = "can0";
139
-
};
140
-
141
-
/omit-if-no-ref/
142
-
can1_pins: can1-pins {
143
-
pins = "PB4", "PB5";
144
-
function = "can1";
145
-
};
146
134
};
147
135
148
136
ccu: clock-controller@2001000 {
···
878
890
<&r_ccu CLK_R_AHB>;
879
891
clock-names = "bus", "hosc", "ahb";
880
892
#clock-cells = <1>;
881
-
};
882
-
883
-
can0: can@2504000 {
884
-
compatible = "allwinner,sun20i-d1-can";
885
-
reg = <0x02504000 0x400>;
886
-
interrupts = <SOC_PERIPHERAL_IRQ(21) IRQ_TYPE_LEVEL_HIGH>;
887
-
clocks = <&ccu CLK_BUS_CAN0>;
888
-
resets = <&ccu RST_BUS_CAN0>;
889
-
status = "disabled";
890
-
};
891
-
892
-
can1: can@2504400 {
893
-
compatible = "allwinner,sun20i-d1-can";
894
-
reg = <0x02504400 0x400>;
895
-
interrupts = <SOC_PERIPHERAL_IRQ(22) IRQ_TYPE_LEVEL_HIGH>;
896
-
clocks = <&ccu CLK_BUS_CAN1>;
897
-
resets = <&ccu RST_BUS_CAN1>;
898
-
status = "disabled";
899
893
};
900
894
};
901
895
};