diff --git a/.version b/.version index 45a4fb75db86..f599e28b8ab0 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -8 +10 diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can1-m0-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can1-m0-overlay.dts index 8510816e0374..f272660493f5 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can1-m0-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can1-m0-overlay.dts @@ -4,14 +4,13 @@ #include / { - compatible = "rockchip,rk3568"; fragment@0 { target = <&can1>; __overlay__ { status = "okay"; - compatible = "rockchip,can-1.0"; + compatible = "rockchip,rk3568-can-2.0"; assigned-clocks = <&cru CLK_CAN1>; assigned-clock-rates = <200000000>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can1-m1-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can1-m1-overlay.dts index 2b9a532bd312..32712464fc3d 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can1-m1-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can1-m1-overlay.dts @@ -3,14 +3,13 @@ #include / { - compatible = "rockchip,rk3568"; fragment@0 { target = <&can1>; __overlay__ { status = "okay"; - compatible = "rockchip,can-1.0"; + compatible = "rockchip,rk3568-can-2.0"; assigned-clocks = <&cru CLK_CAN1>; assigned-clock-rates = <200000000>; pinctrl-names = "default"; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can2-m0-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can2-m0-overlay.dts index a260dd4d6dae..29524330a4ea 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can2-m0-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-can2-m0-overlay.dts @@ -4,14 +4,13 @@ #include / { - compatible = "rockchip,rk3568"; fragment@0 { target = <&can2>; __overlay__ { status = "okay"; - compatible = "rockchip,can-1.0"; + compatible = "rockchip,rk3568-can-2.0"; pinctrl-names = "default"; assigned-clocks = <&cru CLK_CAN2>; assigned-clock-rates = <200000000>; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd1-m0-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd1-m0-overlay.dts index 56b6ee55cb69..443d53b648d5 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd1-m0-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd1-m0-overlay.dts @@ -4,13 +4,13 @@ #include / { - compatible = "rockchip,rk3568"; fragment@0 { target = <&can1>; __overlay__ { status = "okay"; + compatible = "rockchip,canfd-1.0"; pinctrl-names = "default"; assigned-clocks = <&cru CLK_CAN1>; assigned-clock-rates = <100000000>; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd1-m1-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd1-m1-overlay.dts index 95faae25a2e4..fcbf606e9f7a 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd1-m1-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd1-m1-overlay.dts @@ -4,13 +4,13 @@ #include / { - compatible = "rockchip,rk3568"; fragment@0 { target = <&can1>; __overlay__ { status = "okay"; + compatible = "rockchip,canfd-1.0"; pinctrl-names = "default"; assigned-clocks = <&cru CLK_CAN1>; assigned-clock-rates = <100000000>; diff --git a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd2-m0-overlay.dts b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd2-m0-overlay.dts index 8b24bcb66393..6bb257be270d 100644 --- a/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd2-m0-overlay.dts +++ b/arch/arm64/boot/dts/rockchip/overlay/rk3568-lubancat-canfd2-m0-overlay.dts @@ -4,13 +4,13 @@ #include / { - compatible = "rockchip,rk3568"; fragment@0 { target = <&can2>; __overlay__ { status = "okay"; + compatible = "rockchip,canfd-1.0"; pinctrl-names = "default"; assigned-clocks = <&cru CLK_CAN2>; assigned-clock-rates = <100000000>;