mptcp/openmptcprouter
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter.git synced 2025-03-09 15:40:20 +00:00
Code Issues Releases Wiki Activity

Update 950-0785-ARM-dts-Add-bcm2711-rpi-cm4antrouter5g.dts.patch

Browse source
This commit is contained in:
suyuan168 2022-01-05 02:14:31 +08:00
parent 16859cda61
commit 051e61d2ab
1 changed files with 248 additions and 263 deletions
Download patch file Download diff file Expand all files Collapse all files

511
root/target/linux/bcm27xx/patches-5.15/950-0785-ARM-dts-Add-bcm2711-rpi-cm4antrouter5g.dts.patch
View file

@ -1,316 +1,301 @@
--- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts 2022-01-04 02:51:16.000000000 +0800 --- a/arch/arm/boot/dts/bcm2711-rpi-cm4.dts 2022-01-04 02:51:16.000000000 +0800
+++ b/arch/arm/boot/dts/bcm2711-rpi-cm41.dts 2022-01-04 03:10:34.000000000 +0800 +++ b/arch/arm/boot/dts/bcm2711-rpi-cm41.dts 2022-01-04 03:10:34.000000000 +0800
@@ -6,7 +6,7 @@ @@ -74,12 +74,6 @@
"SD_PWR_ON",
"ANT2";
/ { - ant1: ant1 {
compatible = "raspberrypi,4-compute-module", "brcm,bcm2711"; - gpio-hog;
- model = "Raspberry Pi Compute Module 4"; - gpios = <3 GPIO_ACTIVE_HIGH>;
+ model = "openmptcprouter5G_M4"; - output-high;
- };
chosen {
/* 8250 auxiliary UART instead of pl011 */
@@ -68,18 +68,11 @@
gpio-line-names = "BT_ON",
"WL_ON",
"PWR_LED_OFF",
- "ANT1",
"VDD_SD_IO_SEL",
"CAM_GPIO",
"SD_PWR_ON",
"ANT2";
- ant1: ant1 {
- gpio-hog;
- gpios = <3 GPIO_ACTIVE_HIGH>;
- output-high;
- };
- -
ant2: ant2 { ant2: ant2 {
gpio-hog; gpio-hog;
gpios = <7 GPIO_ACTIVE_HIGH>; gpios = <7 GPIO_ACTIVE_HIGH>;
@@ -108,23 +101,10 @@ @@ -108,23 +102,10 @@
"SPI_MISO", "SPI_MISO",
"SPI_MOSI", "SPI_MOSI",
"SPI_SCLK", "SPI_SCLK",
- "GPIO12", - "GPIO12",
- "GPIO13", - "GPIO13",
/* Serial port */ /* Serial port */
"TXD1", "TXD1",
"RXD1", "RXD1",
- "GPIO16", - "GPIO16",
- "GPIO17", - "GPIO17",
- "GPIO18", - "GPIO18",
- "GPIO19", - "GPIO19",
- "GPIO20", - "GPIO20",
- "GPIO21", - "GPIO21",
- "GPIO22", - "GPIO22",
- "GPIO23", - "GPIO23",
- "GPIO24", - "GPIO24",
"GPIO25", "GPIO25",
- "GPIO26", - "GPIO26",
- "GPIO27", - "GPIO27",
"RGMII_MDIO", "RGMII_MDIO",
"RGMIO_MDC", "RGMIO_MDC",
/* Used by BT module */ /* Used by BT module */
@@ -311,14 +291,9 @@ @@ -311,14 +292,9 @@
mmc2 = &sdhost; mmc2 = &sdhost;
i2c3 = &i2c3; i2c3 = &i2c3;
i2c4 = &i2c4; i2c4 = &i2c4;
- i2c5 = &i2c5; - i2c5 = &i2c5;
- i2c6 = &i2c6; - i2c6 = &i2c6;
i2c20 = &ddc0; i2c20 = &ddc0;
i2c21 = &ddc1; i2c21 = &ddc1;
- spi3 = &spi3; - spi3 = &spi3;
spi4 = &spi4; spi4 = &spi4;
- spi5 = &spi5; - spi5 = &spi5;
- spi6 = &spi6; - spi6 = &spi6;
/delete-property/ intc; /delete-property/ intc;
}; };
@@ -341,49 +316,7 @@ @@ -341,49 +317,7 @@
pinctrl-0 = <&uart1_pins>; pinctrl-0 = <&uart1_pins>;
}; };
-&spi0 { -&spi0 {
- pinctrl-names = "default"; - pinctrl-names = "default";
- pinctrl-0 = <&spi0_pins &spi0_cs_pins>; - pinctrl-0 = <&spi0_pins &spi0_cs_pins>;
- cs-gpios = <&gpio 8 1>, <&gpio 7 1>; - cs-gpios = <&gpio 8 1>, <&gpio 7 1>;
- -
- spidev0: spidev@0{ - spidev0: spidev@0{
- compatible = "spidev"; - compatible = "spidev";
- reg = <0>; /* CE0 */ - reg = <0>; /* CE0 */
- #address-cells = <1>; - #address-cells = <1>;
- #size-cells = <0>; - #size-cells = <0>;
- spi-max-frequency = <125000000>; - spi-max-frequency = <125000000>;
- }; - };
- -
- spidev1: spidev@1{ - spidev1: spidev@1{
- compatible = "spidev"; - compatible = "spidev";
- reg = <1>; /* CE1 */ - reg = <1>; /* CE1 */
- #address-cells = <1>; - #address-cells = <1>;
- #size-cells = <0>; - #size-cells = <0>;
- spi-max-frequency = <125000000>; - spi-max-frequency = <125000000>;
- }; - };
-}; -};
- -
&gpio { &gpio {
- spi0_pins: spi0_pins { - spi0_pins: spi0_pins {
- brcm,pins = <9 10 11>; - brcm,pins = <9 10 11>;
- brcm,function = <BCM2835_FSEL_ALT0>; - brcm,function = <BCM2835_FSEL_ALT0>;
- }; - };
- -
- spi0_cs_pins: spi0_cs_pins { - spi0_cs_pins: spi0_cs_pins {
- brcm,pins = <8 7>; - brcm,pins = <8 7>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>; - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- }; - };
- -
- spi3_pins: spi3_pins { - spi3_pins: spi3_pins {
- brcm,pins = <1 2 3>; - brcm,pins = <1 2 3>;
- brcm,function = <BCM2835_FSEL_ALT3>; - brcm,function = <BCM2835_FSEL_ALT3>;
- }; - };
- -
- spi3_cs_pins: spi3_cs_pins { - spi3_cs_pins: spi3_cs_pins {
- brcm,pins = <0 24>; - brcm,pins = <0 24>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>; - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- }; - };
- -
spi4_pins: spi4_pins { spi4_pins: spi4_pins {
brcm,pins = <5 6 7>; brcm,pins = <5 6 7>;
brcm,function = <BCM2835_FSEL_ALT3>; brcm,function = <BCM2835_FSEL_ALT3>;
@@ -394,38 +327,12 @@ @@ -394,38 +328,12 @@
brcm,function = <BCM2835_FSEL_GPIO_OUT>; brcm,function = <BCM2835_FSEL_GPIO_OUT>;
}; };
- spi5_pins: spi5_pins { - spi5_pins: spi5_pins {
- brcm,pins = <13 14 15>; - brcm,pins = <13 14 15>;
- brcm,function = <BCM2835_FSEL_ALT3>; - brcm,function = <BCM2835_FSEL_ALT3>;
- }; - };
- -
- spi5_cs_pins: spi5_cs_pins { - spi5_cs_pins: spi5_cs_pins {
- brcm,pins = <12 26>; - brcm,pins = <12 26>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>; - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- }; - };
- -
- spi6_pins: spi6_pins { - spi6_pins: spi6_pins {
- brcm,pins = <19 20 21>; - brcm,pins = <19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT3>; - brcm,function = <BCM2835_FSEL_ALT3>;
- }; - };
- -
- spi6_cs_pins: spi6_cs_pins { - spi6_cs_pins: spi6_cs_pins {
- brcm,pins = <18 27>; - brcm,pins = <18 27>;
- brcm,function = <BCM2835_FSEL_GPIO_OUT>; - brcm,function = <BCM2835_FSEL_GPIO_OUT>;
- }; - };
- -
i2c0_pins: i2c0 { i2c0_pins: i2c0 {
brcm,pins = <0 1>; brcm,pins = <0 1>;
brcm,function = <BCM2835_FSEL_ALT0>; brcm,function = <BCM2835_FSEL_ALT0>;
brcm,pull = <BCM2835_PUD_UP>; brcm,pull = <BCM2835_PUD_UP>;
}; };
- i2c1_pins: i2c1 { - i2c1_pins: i2c1 {
- brcm,pins = <2 3>; - brcm,pins = <2 3>;
- brcm,function = <BCM2835_FSEL_ALT0>; - brcm,function = <BCM2835_FSEL_ALT0>;
- brcm,pull = <BCM2835_PUD_UP>; - brcm,pull = <BCM2835_PUD_UP>;
- }; - };
- -
i2c3_pins: i2c3 { i2c3_pins: i2c3 {
brcm,pins = <4 5>; brcm,pins = <4 5>;
brcm,function = <BCM2835_FSEL_ALT5>; brcm,function = <BCM2835_FSEL_ALT5>;
@@ -438,23 +345,6 @@ @@ -438,23 +346,6 @@
brcm,pull = <BCM2835_PUD_UP>; brcm,pull = <BCM2835_PUD_UP>;
}; };
- i2c5_pins: i2c5 { - i2c5_pins: i2c5 {
- brcm,pins = <12 13>; - brcm,pins = <12 13>;
- brcm,function = <BCM2835_FSEL_ALT5>; - brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>; - brcm,pull = <BCM2835_PUD_UP>;
- }; - };
- -
- i2c6_pins: i2c6 { - i2c6_pins: i2c6 {
- brcm,pins = <22 23>; - brcm,pins = <22 23>;
- brcm,function = <BCM2835_FSEL_ALT5>; - brcm,function = <BCM2835_FSEL_ALT5>;
- brcm,pull = <BCM2835_PUD_UP>; - brcm,pull = <BCM2835_PUD_UP>;
- }; - };
- -
- i2s_pins: i2s { - i2s_pins: i2s {
- brcm,pins = <18 19 20 21>; - brcm,pins = <18 19 20 21>;
- brcm,function = <BCM2835_FSEL_ALT0>; - brcm,function = <BCM2835_FSEL_ALT0>;
- }; - };
- -
sdio_pins: sdio_pins { sdio_pins: sdio_pins {
brcm,pins = <34 35 36 37 38 39>; brcm,pins = <34 35 36 37 38 39>;
brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1 brcm,function = <BCM2835_FSEL_ALT3>; // alt3 = SD1
@@ -498,28 +388,12 @@ @@ -497,29 +388,12 @@
brcm,pull = <0 2>; brcm,function = <BCM2835_FSEL_ALT4>;
}; brcm,pull = <0 2>;
};
- uart5_pins: uart5_pins { -
- brcm,pins = <12 13>; - uart5_pins: uart5_pins {
- brcm,function = <BCM2835_FSEL_ALT4>; - brcm,pins = <12 13>;
- brcm,pull = <0 2>; - brcm,function = <BCM2835_FSEL_ALT4>;
- }; - brcm,pull = <0 2>;
- };
}; };
&i2c0if { &i2c0if {
clock-frequency = <100000>; clock-frequency = <100000>;
}; };
-&i2c1 { -&i2c1 {
- pinctrl-names = "default"; - pinctrl-names = "default";
- pinctrl-0 = <&i2c1_pins>; - pinctrl-0 = <&i2c1_pins>;
- clock-frequency = <100000>; - clock-frequency = <100000>;
-}; -};
- -
-&i2s { -&i2s {
- pinctrl-names = "default"; - pinctrl-names = "default";
- pinctrl-0 = <&i2s_pins>; - pinctrl-0 = <&i2s_pins>;
-}; -};
- -
// ============================================= // =============================================
// Board specific stuff here // Board specific stuff here
@@ -554,6 +428,81 @@ @@ -554,6 +428,80 @@
linux,default-trigger = "default-on"; linux,default-trigger = "default-on";
gpios = <&expgpio 2 GPIO_ACTIVE_LOW>; gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;
}; };
+ + wlan2g {
+ wlan2g { + label = "wlan2g";
+ label = "wlan2g"; + gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio 17 GPIO_ACTIVE_HIGH>; + };
+ }; +
+ + wlan5g {
+ wlan5g { + label = "wlan5g";
+ label = "wlan5g"; + gpios = <&gpio 3 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio 3 GPIO_ACTIVE_HIGH>; + };
+ }; +
+ + wan {
+ wan { + label = "wan";
+ label = "wan"; + gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;
+ gpios = <&gpio 27 GPIO_ACTIVE_HIGH>; + };
+ };
+
+ 5g1 {
+ label = "5g1";
+ gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ };
+
+ 5g2 {
+ label = "5g2";
+ gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
+ };
+
+ 5g3 {
+ label = "5g3";
+ gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
+ };
+
+ 5g4 {
+ label = "5g4";
+ gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
+ };
+ +
+ 5g5 { + 5g1 {
+ label = "5g5"; + label = "5g1";
+ gpios = <&gpio 10 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 21 GPIO_ACTIVE_HIGH>;
+ }; + };
+
+ 5g6 {
+ label = "5g6";
+ gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
+ };
+ +
+ 5gpwr1 { + 5g2 {
+ label = "5gpwr1"; + label = "5g2";
+ gpios = <&gpio 26 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 20 GPIO_ACTIVE_HIGH>;
+ }; + };
+ +
+ 5gpwr2 { + 5g3 {
+ label = "5gpwr2"; + label = "5g3";
+ gpios = <&gpio 19 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
+ }; + };
+ +
+ 5gpwr3 { + 5g4 {
+ label = "5gpwr3"; + label = "5g4";
+ gpios = <&gpio 13 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 12 GPIO_ACTIVE_HIGH>;
+ }; + };
+
+ 5gpwr4 {
+ label = "5gpwr4";
+ gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
+ };
+ +
+ 5gpwr5 { + 5g5 {
+ label = "5gpwr5"; + label = "5g5";
+ gpios = <&gpio 23 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 10 GPIO_ACTIVE_HIGH>;
+ }; + };
+ +
+ 5gpwr6 { + 5g6 {
+ label = "5gpwr6"; + label = "5g6";
+ gpios = <&gpio 18 GPIO_ACTIVE_HIGH>; + gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;
+ }; + };
+
+ 5gpwr1 {
+ label = "5gpwr1";
+ gpios = <&gpio 26 GPIO_ACTIVE_HIGH>;
+ };
+
+ 5gpwr2 {
+ label = "5gpwr2";
+ gpios = <&gpio 19 GPIO_ACTIVE_HIGH>;
+ };
+
+ 5gpwr3 {
+ label = "5gpwr3";
+ gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
+ };
+
+ 5gpwr4 {
+ label = "5gpwr4";
+ gpios = <&gpio 24 GPIO_ACTIVE_HIGH>;
+ };
+
+ 5gpwr5 {
+ label = "5gpwr5";
+ gpios = <&gpio 23 GPIO_ACTIVE_HIGH>;
+ };
+
+ 5gpwr6 {
+ label = "5gpwr6";
+ gpios = <&gpio 18 GPIO_ACTIVE_HIGH>;
+ };
}; };
&pwm1 { &pwm1 {
@@ -583,21 +532,6 @@ @@ -583,21 +531,6 @@
eth_led0 = <&phy1>,"led-modes:0"; eth_led0 = <&phy1>,"led-modes:0";
eth_led1 = <&phy1>,"led-modes:4"; eth_led1 = <&phy1>,"led-modes:4";
- ant1 = <&ant1>,"output-high?=on", - ant1 = <&ant1>,"output-high?=on",
- <&ant1>, "output-low?=off", - <&ant1>, "output-low?=off",
- <&ant2>, "output-high?=off", - <&ant2>, "output-high?=off",
- <&ant2>, "output-low?=on"; - <&ant2>, "output-low?=on";
- ant2 = <&ant1>,"output-high?=off", - ant2 = <&ant1>,"output-high?=off",
- <&ant1>, "output-low?=on", - <&ant1>, "output-low?=on",
- <&ant2>, "output-high?=on", - <&ant2>, "output-high?=on",
- <&ant2>, "output-low?=off"; - <&ant2>, "output-low?=off";
- noant = <&ant1>,"output-high?=off", - noant = <&ant1>,"output-high?=off",
- <&ant1>, "output-low?=on", - <&ant1>, "output-low?=on",
- <&ant2>, "output-high?=off", - <&ant2>, "output-high?=off",
- <&ant2>, "output-low?=on"; - <&ant2>, "output-low?=on";
- -
sd_poll_once = <&emmc2>, "non-removable?"; sd_poll_once = <&emmc2>, "non-removable?";
- spi_dma4 = <&spi0>, "dmas:0=", <&dma40>, - spi_dma4 = <&spi0>, "dmas:0=", <&dma40>,
- <&spi0>, "dmas:8=", <&dma40>; - <&spi0>, "dmas:8=", <&dma40>;
}; };
}; };
\ No newline at end of file \ No newline at end of file