[PATCH net-next 0/1] pull-request: can-next 2023-08-07

[PATCH net-next 0/1] pull-request: can-next 2023-08-07

[Marc Kleine-Budde]

Hello netdev-team,

this is a pull request of 1 patch for net-next/master.

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

regards,
Marc

---

The following changes since commit c35e927cbe09d38b2d72183bb215901183927c68:

  net: omit ndo_hwtstamp_get() call when possible in dev_set_hwtstamp_phylib() (2023-08-06 13:25:10 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git tags/linux-can-next-for-6.6-20230807

for you to fetch changes up to 84059a0ef5c6bea71b4f8f87de61d6218c4ddc9c:

  Revert "riscv: dts: allwinner: d1: Add CAN controller nodes" (2023-08-07 09:37:31 +0200)

----------------------------------------------------------------
linux-can-next-for-6.6-20230807

----------------------------------------------------------------
Marc Kleine-Budde (1):
      Revert "riscv: dts: allwinner: d1: Add CAN controller nodes"

 arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 30 -----------------------
 1 file changed, 30 deletions(-)

[PATCH net-next] Revert "riscv: dts: allwinner: d1: Add CAN controller nodes"

[Marc Kleine-Budde]

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>
---
 .../boot/dts/allwinner/sunxi-d1s-t113.dtsi    | 30 -------------------
 1 file changed, 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 @@ 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";
-		};
 	};
 };

base-commit: c35e927cbe09d38b2d72183bb215901183927c68
-- 
2.40.1

Re: [PATCH net-next] Revert "riscv: dts: allwinner: d1: Add CAN controller nodes"

[Jernej Škrabec]

Dne ponedeljek, 07. avgust 2023 ob 09:42:22 CEST je Marc Kleine-Budde 
napisal(a):
> 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-controll
> er-nodes-v1-1-eb3f70b435d9@pengutronix.de Signed-off-by: Marc Kleine-Budde
> <mkl@pengutronix.de>

Reviewed-by: Jernej Skrabec <jernej.skrabec@gmail.com>

Best regards,
Jernej

> ---
>  .../boot/dts/allwinner/sunxi-d1s-t113.dtsi    | 30 -------------------
>  1 file changed, 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 @@ 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";
> -		};
>  	};
>  };
> 
> base-commit: c35e927cbe09d38b2d72183bb215901183927c68

Re: [PATCH net-next] Revert "riscv: dts: allwinner: d1: Add CAN controller nodes"

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (main)
by Marc Kleine-Budde <mkl@pengutronix.de>:

On Mon,  7 Aug 2023 09:42:22 +0200 you wrote:
> 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>
> 
> [...]

Here is the summary with links:
  - [net-next] Revert "riscv: dts: allwinner: d1: Add CAN controller nodes"
    https://git.kernel.org/netdev/net-next/c/84059a0ef5c6

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html