-
-
Notifications
You must be signed in to change notification settings - Fork 2.7k
armsom-sige5: add edge kernel support #8585
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
patch/kernel/archive/rockchip64-6.16/rk3576-0001-sige5-wifi.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| From 358ccc1d8b242b8c659e5e177caef174624e8cb6 Mon Sep 17 00:00:00 2001 | ||
| From: Alexey Charkov <[email protected]> | ||
| Date: Sat, 14 Jun 2025 22:14:35 +0400 | ||
| Subject: arm64: dts: rockchip: add version-independent WiFi/BT nodes on Sige5 | ||
|
|
||
| ArmSoM Sige5 uses a soldered-on WiFi/BT module with WiFi on SDIO and BT | ||
| on UART. However, board v1.1 uses a Realtek based BL-M8852BS2, while | ||
| v1.2 uses a Broadcom based BW3752-50B1. They use the same pins and | ||
| controllers, but require different DT properties to enable. | ||
|
|
||
| Thankfully, the WiFi part at least works without explicitly listing it in | ||
| the device tree, albeit without OOB interrupt functionality. | ||
|
|
||
| Add required device tree nodes that do not depend on the board version so | ||
| that at least the WiFi module can appear on the SDIO bus. | ||
|
|
||
| WiFi OOB interrupt and Bluetooth function support are not enabled here, as | ||
| they require module specific properties. | ||
|
|
||
| Signed-off-by: Alexey Charkov <[email protected]> | ||
| Link: https://lore.kernel.org/r/[email protected] | ||
| Signed-off-by: Heiko Stuebner <[email protected]> | ||
| --- | ||
| .../boot/dts/rockchip/rk3576-armsom-sige5.dts | 57 ++++++++++++++++++++++ | ||
| 1 file changed, 57 insertions(+) | ||
|
|
||
| (limited to 'arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts') | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts b/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | ||
| index 34e51cd71eac03..8f6d50febf830e 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | ||
| @@ -205,6 +205,15 @@ vcc_3v3_ufs_s0: regulator-vcc-ufs-s0 { | ||
| regulator-max-microvolt = <3300000>; | ||
| vin-supply = <&vcc_5v0_sys>; | ||
| }; | ||
| + | ||
| + sdio_pwrseq: sdio-pwrseq { | ||
| + compatible = "mmc-pwrseq-simple"; | ||
| + clocks = <&hym8563>; | ||
| + clock-names = "ext_clock"; | ||
| + pinctrl-names = "default"; | ||
| + pinctrl-0 = <&wifi_reg_on>; | ||
| + reset-gpios = <&gpio1 RK_PC6 GPIO_ACTIVE_LOW>; | ||
| + }; | ||
| }; | ||
|
|
||
| &combphy0_ps { | ||
| @@ -736,6 +745,30 @@ pcie_reset: pcie-reset { | ||
| rockchip,pins = <2 RK_PB4 RK_FUNC_GPIO &pcfg_pull_up>; | ||
| }; | ||
| }; | ||
| + | ||
| + wireless-bluetooth { | ||
| + bt_reg_on: bt-reg-on { | ||
| + rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; | ||
| + }; | ||
| + | ||
| + host_wake_bt: host-wake-bt { | ||
| + rockchip,pins = <1 RK_PD4 RK_FUNC_GPIO &pcfg_pull_up>; | ||
| + }; | ||
| + | ||
| + bt_wake_host: bt-wake-host { | ||
| + rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_down>; | ||
| + }; | ||
| + }; | ||
| + | ||
| + wireless-wlan { | ||
| + wifi_wake_host: wifi-wake-host { | ||
| + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>; | ||
| + }; | ||
| + | ||
| + wifi_reg_on: wifi-reg-on { | ||
| + rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; | ||
| + }; | ||
| + }; | ||
| }; | ||
|
|
||
| &sai1 { | ||
| @@ -763,6 +796,23 @@ &sdhci { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| +&sdio { | ||
| + bus-width = <4>; | ||
| + cap-sdio-irq; | ||
| + disable-wp; | ||
| + keep-power-in-suspend; | ||
| + mmc-pwrseq = <&sdio_pwrseq>; | ||
| + no-sd; | ||
| + no-mmc; | ||
| + non-removable; | ||
| + sd-uhs-sdr50; | ||
| + sd-uhs-sdr104; | ||
| + vmmc-supply = <&vcc_3v3_s3>; | ||
| + vqmmc-supply = <&vcc_1v8_s3>; | ||
| + wakeup-source; | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| &sdmmc { | ||
| bus-width = <4>; | ||
| cap-mmc-highspeed; | ||
| @@ -782,6 +832,13 @@ &uart0 { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| +/* Used by Bluetooth modules, enabled in a version specific overlay */ | ||
| +&uart4 { | ||
| + pinctrl-0 = <&uart4m1_xfer &uart4m1_ctsn &uart4m1_rtsn>; | ||
| + pinctrl-names = "default"; | ||
| + uart-has-rtscts; | ||
| +}; | ||
| + | ||
| &vop { | ||
| status = "okay"; | ||
| }; | ||
| -- | ||
| cgit 1.2.3-korg | ||
|
|
234 changes: 234 additions & 0 deletions
234
patch/kernel/archive/rockchip64-6.16/rk3576-0002-sige5-usb.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,234 @@ | ||
| From 64df8e2e207a2152201ef3515baacd8816c13282 Mon Sep 17 00:00:00 2001 | ||
| From: Nicolas Frattaroli <[email protected]> | ||
| Date: Thu, 19 Jun 2025 20:36:37 +0200 | ||
| Subject: arm64: dts: rockchip: enable USB on Sige5 | ||
|
|
||
| The ArmSoM Sige5 has several USB ports: a Type-A USB 3 port (USB2 lines | ||
| going through a hub), a Type-A USB 2.0 port (also going through a hub), | ||
| a Type-C DC input port that has absolutely no USB data connection and a | ||
| Type-C port with USB3.2 Gen1x1 that's also the maskrom programming port. | ||
|
|
||
| Enable these ports, and set the device role to be host for the host | ||
| ports. | ||
|
|
||
| The data capable Type-C USB port uses a fusb302 for data role switching. | ||
|
|
||
| Signed-off-by: Nicolas Frattaroli <[email protected]> | ||
| Link: https://lore.kernel.org/r/[email protected] | ||
| Signed-off-by: Heiko Stuebner <[email protected]> | ||
| --- | ||
| .../boot/dts/rockchip/rk3576-armsom-sige5.dts | 161 +++++++++++++++++++++ | ||
| 1 file changed, 161 insertions(+) | ||
|
|
||
| (limited to 'arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts') | ||
|
|
||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts b/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | ||
| index 8f6d50febf830e..78add29f8a5c73 100644 | ||
| --- a/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | ||
| +++ b/arch/arm64/boot/dts/rockchip/rk3576-armsom-sige5.dts | ||
| @@ -196,6 +196,30 @@ vcc_5v0_device: regulator-vcc-5v0-device { | ||
| vin-supply = <&vcc_12v0_dcin>; | ||
| }; | ||
|
|
||
| + vcc_5v0_typec0: regulator-vcc-5v0-typec0 { | ||
| + compatible = "regulator-fixed"; | ||
| + enable-active-high; | ||
| + gpios = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; | ||
| + pinctrl-names = "default"; | ||
| + pinctrl-0 = <&usb_otg0_pwren>; | ||
| + regulator-name = "vcc_5v0_typec0"; | ||
| + regulator-min-microvolt = <5000000>; | ||
| + regulator-max-microvolt = <5000000>; | ||
| + vin-supply = <&vcc_5v0_device>; | ||
| + }; | ||
| + | ||
| + vcc_5v0_usbhost: regulator-vcc-5v0-usbhost { | ||
| + compatible = "regulator-fixed"; | ||
| + enable-active-high; | ||
| + gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>; | ||
| + pinctrl-names = "default"; | ||
| + pinctrl-0 = <&usb_host_pwren>; | ||
| + regulator-name = "vcc_5v0_usbhost"; | ||
| + regulator-min-microvolt = <5000000>; | ||
| + regulator-max-microvolt = <5000000>; | ||
| + vin-supply = <&vcc_5v0_device>; | ||
| + }; | ||
| + | ||
| vcc_3v3_ufs_s0: regulator-vcc-ufs-s0 { | ||
| compatible = "regulator-fixed"; | ||
| regulator-name = "vcc_3v3_ufs_s0"; | ||
| @@ -216,6 +240,10 @@ sdio_pwrseq: sdio-pwrseq { | ||
| }; | ||
| }; | ||
|
|
||
| +&combphy1_psu { | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| &combphy0_ps { | ||
| status = "okay"; | ||
| }; | ||
| @@ -640,6 +668,58 @@ regulator-state-mem { | ||
| &i2c2 { | ||
| status = "okay"; | ||
|
|
||
| + usbc0: typec-portc@22 { | ||
| + compatible = "fcs,fusb302"; | ||
| + reg = <0x22>; | ||
| + interrupt-parent = <&gpio0>; | ||
| + interrupts = <RK_PA5 IRQ_TYPE_LEVEL_LOW>; | ||
| + pinctrl-names = "default"; | ||
| + pinctrl-0 = <&usbc0_interrupt>; | ||
| + vbus-supply = <&vcc_5v0_typec0>; | ||
| + | ||
| + connector { | ||
| + compatible = "usb-c-connector"; | ||
| + label = "USB-C"; | ||
| + data-role = "dual"; | ||
| + /* fusb302 supports PD Rev 2.0 Ver 1.2 */ | ||
| + pd-revision = /bits/ 8 <0x2 0x0 0x1 0x2>; | ||
| + power-role = "source"; | ||
| + source-pdos = <PDO_FIXED(5000, 2000, | ||
| + PDO_FIXED_USB_COMM | PDO_FIXED_DATA_SWAP)>; | ||
| + | ||
| + altmodes { | ||
| + displayport { | ||
| + svid = /bits/ 16 <0xff01>; | ||
| + vdo = <0xffffffff>; | ||
| + }; | ||
| + }; | ||
| + | ||
| + ports { | ||
| + #address-cells = <1>; | ||
| + #size-cells = <0>; | ||
| + | ||
| + port@0 { | ||
| + reg = <0>; | ||
| + usbc0_hs_ep: endpoint { | ||
| + remote-endpoint = <&usb_drd0_hs_ep>; | ||
| + }; | ||
| + }; | ||
| + port@1 { | ||
| + reg = <1>; | ||
| + usbc0_ss_ep: endpoint { | ||
| + remote-endpoint = <&usb_drd0_ss_ep>; | ||
| + }; | ||
| + }; | ||
| + port@2 { | ||
| + reg = <2>; | ||
| + usbc0_dp_ep: endpoint { | ||
| + remote-endpoint = <&usbdp_phy_ep>; | ||
| + }; | ||
| + }; | ||
| + }; | ||
| + }; | ||
| + }; | ||
| + | ||
| hym8563: rtc@51 { | ||
| compatible = "haoyu,hym8563"; | ||
| reg = <0x51>; | ||
| @@ -746,6 +826,24 @@ pcie_reset: pcie-reset { | ||
| }; | ||
| }; | ||
|
|
||
| + usb { | ||
| + usb_host_pwren: usb-host-pwren { | ||
| + rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>; | ||
| + }; | ||
| + usb_otg0_pwren: usb-otg0-pwren { | ||
| + rockchip,pins = <4 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>; | ||
| + }; | ||
| + usbc0_interrupt: usbc0-interrupt { | ||
| + rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>; | ||
| + }; | ||
| + usbc0_sbu1: usbc0-sbu1 { | ||
| + rockchip,pins = <2 RK_PA6 RK_FUNC_GPIO &pcfg_pull_down>; | ||
| + }; | ||
| + usbc0_sbu2: usbc0-sbu2 { | ||
| + rockchip,pins = <2 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>; | ||
| + }; | ||
| + }; | ||
| + | ||
| wireless-bluetooth { | ||
| bt_reg_on: bt-reg-on { | ||
| rockchip,pins = <1 RK_PC7 RK_FUNC_GPIO &pcfg_pull_up>; | ||
| @@ -827,6 +925,23 @@ &sdmmc { | ||
| status = "okay"; | ||
| }; | ||
|
|
||
| +&u2phy0 { | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&u2phy0_otg { | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&u2phy1 { | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&u2phy1_otg { | ||
| + phy-supply = <&vcc_5v0_usbhost>; | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| &uart0 { | ||
| pinctrl-0 = <&uart0m0_xfer>; | ||
| status = "okay"; | ||
| @@ -839,6 +954,52 @@ &uart4 { | ||
| uart-has-rtscts; | ||
| }; | ||
|
|
||
| +&usb_drd0_dwc3 { | ||
| + usb-role-switch; | ||
| + dr_mode = "otg"; | ||
| + status = "okay"; | ||
| + | ||
| + ports { | ||
| + #address-cells = <1>; | ||
| + #size-cells = <0>; | ||
| + | ||
| + port@0 { | ||
| + reg = <0>; | ||
| + usb_drd0_hs_ep: endpoint { | ||
| + remote-endpoint = <&usbc0_hs_ep>; | ||
| + }; | ||
| + }; | ||
| + | ||
| + port@1 { | ||
| + reg = <1>; | ||
| + usb_drd0_ss_ep: endpoint { | ||
| + remote-endpoint = <&usbc0_ss_ep>; | ||
| + }; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| +&usb_drd1_dwc3 { | ||
| + dr_mode = "host"; | ||
| + status = "okay"; | ||
| +}; | ||
| + | ||
| +&usbdp_phy { | ||
| + mode-switch; | ||
| + orientation-switch; | ||
| + pinctrl-names = "default"; | ||
| + pinctrl-0 = <&usbc0_sbu1 &usbc0_sbu2>; | ||
| + sbu1-dc-gpios = <&gpio2 RK_PA6 GPIO_ACTIVE_HIGH>; | ||
| + sbu2-dc-gpios = <&gpio2 RK_PA7 GPIO_ACTIVE_HIGH>; | ||
| + status = "okay"; | ||
| + | ||
| + port { | ||
| + usbdp_phy_ep: endpoint { | ||
| + remote-endpoint = <&usbc0_dp_ep>; | ||
| + }; | ||
| + }; | ||
| +}; | ||
| + | ||
| &vop { | ||
| status = "okay"; | ||
| }; | ||
| -- | ||
| cgit 1.2.3-korg | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.