diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-08-07 12:25:46 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-08-07 12:25:46 -0700 |
| commit | 96bc313783cbad7682f5f91f7483dc47296398bb (patch) | |
| tree | c82021cd16d55d89bdd96288e0daeed8b1315be9 | |
| parent | 0d0c5f0b9b4e81462a35aed655e41e7bff165107 (diff) | |
| parent | 84059a0ef5c6bea71b4f8f87de61d6218c4ddc9c (diff) | |
| download | linux-96bc313783cbad7682f5f91f7483dc47296398bb.tar.gz linux-96bc313783cbad7682f5f91f7483dc47296398bb.tar.bz2 linux-96bc313783cbad7682f5f91f7483dc47296398bb.zip | |
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>
| -rw-r--r-- | arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 30 |
1 files changed, 0 insertions, 30 deletions
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 @@ 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 @@ 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"; - }; }; }; |