cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update dtb to linux 6.0.10

Browse Source 
Includes a revert of the changes in linux 5.15 that switched the cpsw(4)
bindings to a different format.  This allows us to update the dtb port
without breaking cpsw(4) on the Beaglebone Black.  If we ever adjust
cpsw(4) to work with the new bindings, this could be dropped.

ok tobhe@
This commit is contained in:
patrick 2022-11-28 15:16:20 +00:00
parent 79e929a495
commit 5fffe97e2e
18 changed files with 668 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysutils/dtb/Makefile
View File

@ -1,9 +1,7 @@
ONLY_FOR_ARCHS= ${GCC4_ARCHS} ${CLANG_ARCHS}
COMMENT= Device Tree Blobs
# 5.15 breaks cpsw(4) on bbb
VERSION= 5.14
REVISION= 1
VERSION= 6.0.10
# XXX Updating this port has a high chance of breaking drivers as breaking
# XXX changes are frequently made to device trees in linux. See commit log
@ -17,7 +15,7 @@ HOMEPAGE= https://www.devicetree.org
# dual GPL/BSD
PERMIT_PACKAGE= Yes
MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/v5.x/
MASTER_SITES= https://cdn.kernel.org/pub/linux/kernel/v6.x/
EXTRACT_SUFX= .tar.xz
#MASTER_SITES= https://git.kernel.org/torvalds/t/
PKG_ARCH= *

4
sysutils/dtb/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (linux-5.14.tar.xz) = fgaLXg0mpisQ5TILJdzldYjLvG94HAkEQhOMnJwycbI=
SIZE (linux-5.14.tar.xz) = 120669872
SHA256 (linux-6.0.10.tar.xz) = OeV/zYTNcL+j4aQYXTqg7X8UMvJMZUjRYyaww8lUHdA=
SIZE (linux-6.0.10.tar.xz) = 133913388

4
sysutils/dtb/patches/patch-arch_arm64_boot_dts_rockchip_rk3328-rock64_dts
View File

@ -1,8 +1,8 @@
Index: arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
--- arch/arm64/boot/dts/rockchip/rk3328-rock64.dts.orig
+++ arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -11,7 +11,7 @@
compatible = "pine64,rock64", "rockchip,rk3328";
@@ -16,7 +16,7 @@
};
chosen {
- stdout-path = "serial2:1500000n8";

4
sysutils/dtb/patches/patch-arch_arm64_boot_dts_rockchip_rk3399-firefly_dts
View File

@ -1,8 +1,8 @@
Index: arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
--- arch/arm64/boot/dts/rockchip/rk3399-firefly.dts.orig
+++ arch/arm64/boot/dts/rockchip/rk3399-firefly.dts
@@ -14,7 +14,7 @@
compatible = "firefly,firefly-rk3399", "rockchip,rk3399";
@@ -22,7 +22,7 @@
};
chosen {
- stdout-path = "serial2:1500000n8";

4
sysutils/dtb/patches/patch-arch_arm64_boot_dts_rockchip_rk3399-nanopi4_dtsi
View File

@ -1,9 +1,9 @@
Index: arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
--- arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi.orig
+++ arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
@@ -18,7 +18,7 @@
@@ -24,7 +24,7 @@
};
/ {
chosen {
- stdout-path = "serial2:1500000n8";
+ stdout-path = "serial2:115200n8";

4
sysutils/dtb/patches/patch-arch_arm64_boot_dts_rockchip_rk3399-pinebook-pro_dts
View File

@ -1,8 +1,8 @@
Index: arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
--- arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts.orig
+++ arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
@@ -19,7 +19,7 @@
compatible = "pine64,pinebook-pro", "rockchip,rk3399";
@@ -26,7 +26,7 @@
};
chosen {
- stdout-path = "serial2:1500000n8";

4
sysutils/dtb/patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rock-pi-4_dtsi
View File

@ -1,9 +1,9 @@
Index: arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
--- arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi.orig
+++ arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -12,7 +12,7 @@
@@ -17,7 +17,7 @@
};
/ {
chosen {
- stdout-path = "serial2:1500000n8";
+ stdout-path = "serial2:115200n8";

6
sysutils/dtb/patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
View File

@ -1,12 +1,12 @@
Index: arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
--- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi.orig
+++ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
@@ -11,7 +11,7 @@
@@ -17,7 +17,7 @@
};
/ {
chosen {
- stdout-path = "serial2:1500000n8";
+ stdout-path = "serial2:115200n8";
};
clkin_gmac: external-gmac-clock {
/* enable for panel backlight support */

4
sysutils/dtb/patches/patch-arch_arm64_boot_dts_rockchip_rk3399_dtsi
View File

@ -1,7 +1,7 @@
Index: arch/arm64/boot/dts/rockchip/rk3399.dtsi
--- arch/arm64/boot/dts/rockchip/rk3399.dtsi.orig
+++ arch/arm64/boot/dts/rockchip/rk3399.dtsi
@@ -857,6 +857,11 @@
@@ -894,6 +894,11 @@
status = "disabled";
};
@ -11,5 +11,5 @@ Index: arch/arm64/boot/dts/rockchip/rk3399.dtsi
+ };
+
qos_emmc: qos@ffa58000 {
compatible = "syscon";
compatible = "rockchip,rk3399-qos", "syscon";
reg = <0x0 0xffa58000 0x0 0x20>;

36
sysutils/dtb/patches/patch-arch_arm_boot_dts_am335x-bone-common_dtsi Normal file
View File

@ -0,0 +1,36 @@
Index: arch/arm/boot/dts/am335x-bone-common.dtsi
--- arch/arm/boot/dts/am335x-bone-common.dtsi.orig
+++ arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -353,27 +353,24 @@
};
};
-&cpsw_port1 {
+&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "mii";
- ti,dual-emac-pvid = <1>;
};
-&cpsw_port2 {
- status = "disabled";
-};
-
-&mac_sw {
+&mac {
+ slaves = <1>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
};
-&davinci_mdio_sw {
+&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
+ status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;

12
sysutils/dtb/patches/patch-arch_arm_boot_dts_am335x-boneblack-wireless_dts Normal file
View File

@ -0,0 +1,12 @@
Index: arch/arm/boot/dts/am335x-boneblack-wireless.dts
--- arch/arm/boot/dts/am335x-boneblack-wireless.dts.orig
+++ arch/arm/boot/dts/am335x-boneblack-wireless.dts
@@ -63,7 +63,7 @@
};
};
-&mac_sw {
+&mac {
status = "disabled";
};

12
sysutils/dtb/patches/patch-arch_arm_boot_dts_am335x-bonegreen-wireless_dts Normal file
View File

@ -0,0 +1,12 @@
Index: arch/arm/boot/dts/am335x-bonegreen-wireless.dts
--- arch/arm/boot/dts/am335x-bonegreen-wireless.dts.orig
+++ arch/arm/boot/dts/am335x-bonegreen-wireless.dts
@@ -62,7 +62,7 @@
};
};
-&mac_sw {
+&mac {
status = "disabled";
};

40
sysutils/dtb/patches/patch-arch_arm_boot_dts_am335x-evm_dts Normal file
View File

@ -0,0 +1,40 @@
Index: arch/arm/boot/dts/am335x-evm.dts
--- arch/arm/boot/dts/am335x-evm.dts.orig
+++ arch/arm/boot/dts/am335x-evm.dts
@@ -682,31 +682,28 @@
};
};
-&mac_sw {
+&mac {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
+ slaves = <1>;
};
-&davinci_mdio_sw {
+&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
+ status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;
};
};
-&cpsw_port1 {
+&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-id";
- ti,dual-emac-pvid = <1>;
-};
-
-&cpsw_port2 {
- status = "disabled";
};
&tscadc {

46
sysutils/dtb/patches/patch-arch_arm_boot_dts_am335x-evmsk_dts Normal file
View File

@ -0,0 +1,46 @@
Index: arch/arm/boot/dts/am335x-evmsk.dts
--- arch/arm/boot/dts/am335x-evmsk.dts.orig
+++ arch/arm/boot/dts/am335x-evmsk.dts
@@ -596,17 +596,19 @@
};
};
-&mac_sw {
+&mac {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
+ dual_emac = <1>;
status = "okay";
};
-&davinci_mdio_sw {
+&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
+ status = "okay";
ethphy0: ethernet-phy@0 {
reg = <0>;
@@ -617,16 +619,16 @@
};
};
-&cpsw_port1 {
+&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-id";
- ti,dual-emac-pvid = <1>;
+ dual_emac_res_vlan = <1>;
};
-&cpsw_port2 {
+&cpsw_emac1 {
phy-handle = <&ethphy1>;
phy-mode = "rgmii-id";
- ti,dual-emac-pvid = <2>;
+ dual_emac_res_vlan = <2>;
};
&mmc1 {

41
sysutils/dtb/patches/patch-arch_arm_boot_dts_am335x-icev2_dts Normal file
View File

@ -0,0 +1,41 @@
Index: arch/arm/boot/dts/am335x-icev2.dts
--- arch/arm/boot/dts/am335x-icev2.dts.orig
+++ arch/arm/boot/dts/am335x-icev2.dts
@@ -474,29 +474,31 @@
};
};
-&cpsw_port1 {
+&cpsw_emac0 {
phy-handle = <&ethphy0>;
phy-mode = "rmii";
- ti,dual-emac-pvid = <1>;
+ dual_emac_res_vlan = <1>;
};
-&cpsw_port2 {
+&cpsw_emac1 {
phy-handle = <&ethphy1>;
phy-mode = "rmii";
- ti,dual-emac-pvid = <2>;
+ dual_emac_res_vlan = <2>;
};
-&mac_sw {
+&mac {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
status = "okay";
+ dual_emac;
};
-&davinci_mdio_sw {
+&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>;
+ status = "okay";
reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
reset-delay-us = <2>; /* PHY datasheet states 1uS min */

55
sysutils/dtb/patches/patch-arch_arm_boot_dts_am335x-sancloud-bbe-common_dtsi Normal file
View File

@ -0,0 +1,55 @@
Index: arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi
--- arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi.orig
+++ arch/arm/boot/dts/am335x-sancloud-bbe-common.dtsi
@@ -40,6 +40,22 @@
>;
};
+ davinci_mdio_default: davinci_mdio_default {
+ pinctrl-single,pins = <
+ /* MDIO */
+ AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLUP | SLEWCTRL_FAST, MUX_MODE0)
+ AM33XX_PADCONF(AM335X_PIN_MDC, PIN_OUTPUT_PULLUP, MUX_MODE0)
+ >;
+ };
+
+ davinci_mdio_sleep: davinci_mdio_sleep {
+ pinctrl-single,pins = <
+ /* MDIO reset value */
+ AM33XX_PADCONF(AM335X_PIN_MDIO, PIN_INPUT_PULLDOWN, MUX_MODE7)
+ AM33XX_PADCONF(AM335X_PIN_MDC, PIN_INPUT_PULLDOWN, MUX_MODE7)
+ >;
+ };
+
usb_hub_ctrl: usb_hub_ctrl {
pinctrl-single,pins = <
AM33XX_PADCONF(AM335X_PIN_RMII1_REF_CLK, PIN_OUTPUT_PULLUP, MUX_MODE7) /* rmii1_refclk.gpio0_29 */
@@ -47,12 +63,26 @@
};
};
-&mac_sw {
+&mac {
+ pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>;
+ status = "okay";
};
-&cpsw_port1 {
+&davinci_mdio {
+ pinctrl-names = "default", "sleep";
+ pinctrl-0 = <&davinci_mdio_default>;
+ pinctrl-1 = <&davinci_mdio_sleep>;
+ status = "okay";
+
+ ethphy0: ethernet-phy@0 {
+ reg = <0>;
+ };
+};
+
+&cpsw_emac0 {
+ phy-handle = <&ethphy0>;
phy-mode = "rgmii-id";
};

14
sysutils/dtb/patches/patch-arch_arm_boot_dts_am33xx_dtsi Normal file
View File

@ -0,0 +1,14 @@
Index: arch/arm/boot/dts/am33xx.dtsi
--- arch/arm/boot/dts/am33xx.dtsi.orig
+++ arch/arm/boot/dts/am33xx.dtsi
@@ -33,8 +33,8 @@
usb1 = &usb1;
phy0 = &usb0_phy;
phy1 = &usb1_phy;
- ethernet0 = &cpsw_port1;
- ethernet1 = &cpsw_port2;
+ ethernet0 = &cpsw_emac0;
+ ethernet1 = &cpsw_emac1;
spi0 = &spi0;
spi1 = &spi1;
mmc0 = &mmc1;

417
sysutils/dtb/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff