[PATCH 0/8] rockchip: rk3308-rock-pi-s: Update DT to v6.11-rc1
This series cherry picks related rk3308 and rk3308-rock-pi-s commits from devicetree-rebasing v6.11-rc1-dts tag to improve support for the new v1.5 hw revision of Radxa Rock Pi S.
This series loosely depends on following patches: - mmc: rockchip_dw_mmc: Allow 4-bit mode when 8-bit mode is supported [1] - rockchip: io-domain: Add support for RK3308 [2]
[1] https://patchwork.ozlabs.org/patch/1964169/ [2] https://patchwork.ozlabs.org/patch/1964170/
Jonas Karlman (8): arm64: dts: rockchip: Add rk3308 IO voltage domains arm64: dts: rockchip: Add sdmmc related properties on rk3308-rock-pi-s arm64: dts: rockchip: Add pinctrl for UART0 to rk3308-rock-pi-s arm64: dts: rockchip: Add mdio and ethernet-phy nodes to rk3308-rock-pi-s arm64: dts: rockchip: Add io-domains to rk3308-rock-pi-s arm64: dts: rockchip: Update WIFi/BT related nodes on rk3308-rock-pi-s rockchip: rk3308-rock-pi-s: Remove unnecessary u-boot dtsi overrides rockchip: rk3308-rock-pi-s: Enable LED and IO Domain driver
arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 19 ----- configs/rock-pi-s-rk3308_defconfig | 4 + .../src/arm64/rockchip/rk3308-rock-pi-s.dts | 81 +++++++++++++++++-- dts/upstream/src/arm64/rockchip/rk3308.dtsi | 5 ++ 4 files changed, 83 insertions(+), 26 deletions(-)
Add a disabled RK3308 IO voltage domains node to SoC DT.
Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-12-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: d1829ba469d5743734e37d59fece73e3668ab084 ]
(cherry picked from commit cebde305971e33a76efc3280e09814499ef89f54) --- dts/upstream/src/arm64/rockchip/rk3308.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308.dtsi b/dts/upstream/src/arm64/rockchip/rk3308.dtsi index 6531ede13af9..31c25de2d689 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3308.dtsi @@ -173,6 +173,11 @@ compatible = "rockchip,rk3308-grf", "syscon", "simple-mfd"; reg = <0x0 0xff000000 0x0 0x08000>;
+ io_domains: io-domains { + compatible = "rockchip,rk3308-io-voltage-domain"; + status = "disabled"; + }; + reboot-mode { compatible = "syscon-reboot-mode"; offset = <0x500>;
On 2024/7/30 22:51, Jonas Karlman wrote:
Add a disabled RK3308 IO voltage domains node to SoC DT.
Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-12-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: d1829ba469d5743734e37d59fece73e3668ab084 ]
(cherry picked from commit cebde305971e33a76efc3280e09814499ef89f54)
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
dts/upstream/src/arm64/rockchip/rk3308.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308.dtsi b/dts/upstream/src/arm64/rockchip/rk3308.dtsi index 6531ede13af9..31c25de2d689 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308.dtsi +++ b/dts/upstream/src/arm64/rockchip/rk3308.dtsi @@ -173,6 +173,11 @@ compatible = "rockchip,rk3308-grf", "syscon", "simple-mfd"; reg = <0x0 0xff000000 0x0 0x08000>;
io_domains: io-domains {compatible = "rockchip,rk3308-io-voltage-domain";status = "disabled";};- reboot-mode { compatible = "syscon-reboot-mode"; offset = <0x500>;
Add cap-mmc-highspeed to allow use of high speed MMC mode using an eMMC to uSD board. Use disable-wp to signal that no physical write-protect line is present. Also add vcc_io used for card and IO line power as vmmc-supply.
Fixes: 2e04c25b1320 ("arm64: dts: rockchip: add ROCK Pi S DTS support") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-5-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: fc0daeccc384233eadfa9d5ddbd00159653c6bdc ]
(cherry picked from commit 39110e4bec51c9ce6bbd342234b288dbfccb9f80) --- dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index 079101cddd65..8ea984906403 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -272,7 +272,10 @@ };
&sdmmc { + cap-mmc-highspeed; cap-sd-highspeed; + disable-wp; + vmmc-supply = <&vcc_io>; status = "okay"; };
On 2024/7/30 22:51, Jonas Karlman wrote:
Add cap-mmc-highspeed to allow use of high speed MMC mode using an eMMC to uSD board. Use disable-wp to signal that no physical write-protect line is present. Also add vcc_io used for card and IO line power as vmmc-supply.
Fixes: 2e04c25b1320 ("arm64: dts: rockchip: add ROCK Pi S DTS support") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-5-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: fc0daeccc384233eadfa9d5ddbd00159653c6bdc ]
(cherry picked from commit 39110e4bec51c9ce6bbd342234b288dbfccb9f80)
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index 079101cddd65..8ea984906403 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -272,7 +272,10 @@ };
&sdmmc {
- cap-mmc-highspeed; cap-sd-highspeed;
- disable-wp;
- vmmc-supply = <&vcc_io>; status = "okay"; };
UAR0 CTS/RTS is not wired to any pin and is not used for the default serial console use of UART0 on ROCK Pi S.
Override the SoC defined pinctrl props to limit configuration of the two xfer pins wired to one of the GPIO pin headers.
Fixes: 2e04c25b1320 ("arm64: dts: rockchip: add ROCK Pi S DTS support") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-6-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 7affb86ef62581e3475ce3e0a7640da1f2ee29f8 ]
(cherry picked from commit 9c72cd5fa9f971be8ebbc1f43bd74a72e33db2fa) --- dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index 8ea984906403..d4cf6026241c 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -294,6 +294,8 @@ };
&uart0 { + pinctrl-names = "default"; + pinctrl-0 = <&uart0_xfer>; status = "okay"; };
On 2024/7/30 22:51, Jonas Karlman wrote:
UAR0 CTS/RTS is not wired to any pin and is not used for the default serial console use of UART0 on ROCK Pi S.
Override the SoC defined pinctrl props to limit configuration of the two xfer pins wired to one of the GPIO pin headers.
Fixes: 2e04c25b1320 ("arm64: dts: rockchip: add ROCK Pi S DTS support") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-6-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 7affb86ef62581e3475ce3e0a7640da1f2ee29f8 ]
(cherry picked from commit 9c72cd5fa9f971be8ebbc1f43bd74a72e33db2fa)
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index 8ea984906403..d4cf6026241c 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -294,6 +294,8 @@ };
&uart0 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart0_xfer>; status = "okay"; };
Be explicit about the Ethernet port and define mdio and ethernet-phy nodes in the device tree for ROCK Pi S.
Fixes: bc3753aed81f ("arm64: dts: rockchip: rock-pi-s add more peripherals") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-8-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 4b64ed510ed946a4e4ca6d51d6512bf5361f6a04 ]
(cherry picked from commit 703b8eae20eec5dbb0e52f0e1fb71e712c007dae) --- .../src/arm64/rockchip/rk3308-rock-pi-s.dts | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index d4cf6026241c..f6fb90e13ad0 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -144,11 +144,25 @@
&gmac { clock_in_out = "output"; + phy-handle = <&rtl8201f>; phy-supply = <&vcc_io>; - snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; - snps,reset-active-low; - snps,reset-delays-us = <0 50000 50000>; status = "okay"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + rtl8201f: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + pinctrl-names = "default"; + pinctrl-0 = <&mac_rst>; + reset-assert-us = <20000>; + reset-deassert-us = <50000>; + reset-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; + }; + }; };
&gpio0 { @@ -221,6 +235,12 @@ pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>;
+ gmac { + mac_rst: mac-rst { + rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + leds { green_led: green-led { rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
On 2024/7/30 22:51, Jonas Karlman wrote:
Be explicit about the Ethernet port and define mdio and ethernet-phy nodes in the device tree for ROCK Pi S.
Fixes: bc3753aed81f ("arm64: dts: rockchip: rock-pi-s add more peripherals") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-8-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 4b64ed510ed946a4e4ca6d51d6512bf5361f6a04 ]
(cherry picked from commit 703b8eae20eec5dbb0e52f0e1fb71e712c007dae)
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
.../src/arm64/rockchip/rk3308-rock-pi-s.dts | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index d4cf6026241c..f6fb90e13ad0 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -144,11 +144,25 @@
&gmac { clock_in_out = "output";
- phy-handle = <&rtl8201f>; phy-supply = <&vcc_io>;
- snps,reset-gpio = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;
- snps,reset-active-low;
- snps,reset-delays-us = <0 50000 50000>; status = "okay";
mdio {
compatible = "snps,dwmac-mdio";#address-cells = <1>;#size-cells = <0>;rtl8201f: ethernet-phy@1 {compatible = "ethernet-phy-ieee802.3-c22";reg = <1>;pinctrl-names = "default";pinctrl-0 = <&mac_rst>;reset-assert-us = <20000>;reset-deassert-us = <50000>;reset-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>;};}; };
&gpio0 {
@@ -221,6 +235,12 @@ pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>;
- gmac {
mac_rst: mac-rst {rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- leds { green_led: green-led { rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>;
The VCCIO4 io-domain used for WiFi/BT is using 1v8 IO signal voltage.
Add io-domains node with the VCCIO supplies connected on the board.
Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-13-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 100b3bdee6035192f6d4a1847970fe004bb505fb ]
(cherry picked from commit f93b224359278728f01767a4701678ada9c25570) --- dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index f6fb90e13ad0..5c702f00b27f 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -231,6 +231,16 @@ status = "okay"; };
+&io_domains { + vccio0-supply = <&vcc_io>; + vccio1-supply = <&vcc_io>; + vccio2-supply = <&vcc_io>; + vccio3-supply = <&vcc_io>; + vccio4-supply = <&vcc_1v8>; + vccio5-supply = <&vcc_io>; + status = "okay"; +}; + &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>;
On 2024/7/30 22:51, Jonas Karlman wrote:
The VCCIO4 io-domain used for WiFi/BT is using 1v8 IO signal voltage.
Add io-domains node with the VCCIO supplies connected on the board.
Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-13-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 100b3bdee6035192f6d4a1847970fe004bb505fb ]
(cherry picked from commit f93b224359278728f01767a4701678ada9c25570)
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts | 10 ++++++++++ 1 file changed, 10 insertions(+)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index f6fb90e13ad0..5c702f00b27f 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -231,6 +231,16 @@ status = "okay"; };
+&io_domains {
- vccio0-supply = <&vcc_io>;
- vccio1-supply = <&vcc_io>;
- vccio2-supply = <&vcc_io>;
- vccio3-supply = <&vcc_io>;
- vccio4-supply = <&vcc_1v8>;
- vccio5-supply = <&vcc_io>;
- status = "okay";
+};
- &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>;
Update WiFi SDIO and BT UART related props to better reflect details about the optional onboard RTL8723DS WiFi/BT module.
Also correct the compatible used for bluetooth to match the WiFi/BT module used on the board.
Fixes: bc3753aed81f ("arm64: dts: rockchip: rock-pi-s add more peripherals") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-14-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 12c3ec878cbe3709782e85b88124abecc3bb8617 ]
(cherry picked from commit caba73747c927b4fdccea3aeb16e077b4e6af006) --- .../src/arm64/rockchip/rk3308-rock-pi-s.dts | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index 5c702f00b27f..62d18ca769a1 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -17,6 +17,7 @@ ethernet0 = &gmac; mmc0 = &emmc; mmc1 = &sdmmc; + mmc2 = &sdio; };
chosen { @@ -245,6 +246,20 @@ pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>;
+ bluetooth { + bt_reg_on: bt-reg-on { + rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>; + }; + + bt_wake_host: bt-wake-host { + rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>; + }; + + host_wake_bt: host-wake-bt { + rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + gmac { mac_rst: mac-rst { rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>; @@ -294,11 +309,24 @@ cap-sd-highspeed; cap-sdio-irq; keep-power-in-suspend; - max-frequency = <1000000>; + max-frequency = <100000000>; mmc-pwrseq = <&sdio_pwrseq>; + no-mmc; + no-sd; non-removable; - sd-uhs-sdr104; + sd-uhs-sdr50; + vmmc-supply = <&vcc_io>; + vqmmc-supply = <&vcc_1v8>; status = "okay"; + + rtl8723ds: wifi@1 { + reg = <1>; + interrupt-parent = <&gpio0>; + interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "host-wake"; + pinctrl-names = "default"; + pinctrl-0 = <&wifi_host_wake>; + }; };
&sdmmc { @@ -330,12 +358,16 @@ };
&uart4 { + uart-has-rtscts; status = "okay";
bluetooth { - compatible = "realtek,rtl8723bs-bt"; - device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; + compatible = "realtek,rtl8723ds-bt"; + device-wake-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; + enable-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>; host-wake-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>; }; };
On 2024/7/30 22:51, Jonas Karlman wrote:
Update WiFi SDIO and BT UART related props to better reflect details about the optional onboard RTL8723DS WiFi/BT module.
Also correct the compatible used for bluetooth to match the WiFi/BT module used on the board.
Fixes: bc3753aed81f ("arm64: dts: rockchip: rock-pi-s add more peripherals") Signed-off-by: Jonas Karlman jonas@kwiboo.se Link: https://lore.kernel.org/r/20240521211029.1236094-14-jonas@kwiboo.se Signed-off-by: Heiko Stuebner heiko@sntech.de
[ upstream commit: 12c3ec878cbe3709782e85b88124abecc3bb8617 ]
(cherry picked from commit caba73747c927b4fdccea3aeb16e077b4e6af006)
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
.../src/arm64/rockchip/rk3308-rock-pi-s.dts | 40 +++++++++++++++++-- 1 file changed, 36 insertions(+), 4 deletions(-)
diff --git a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts index 5c702f00b27f..62d18ca769a1 100644 --- a/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts +++ b/dts/upstream/src/arm64/rockchip/rk3308-rock-pi-s.dts @@ -17,6 +17,7 @@ ethernet0 = &gmac; mmc0 = &emmc; mmc1 = &sdmmc;
mmc2 = &sdio;};
chosen {
@@ -245,6 +246,20 @@ pinctrl-names = "default"; pinctrl-0 = <&rtc_32k>;
- bluetooth {
bt_reg_on: bt-reg-on {rockchip,pins = <4 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>;};bt_wake_host: bt-wake-host {rockchip,pins = <4 RK_PB4 RK_FUNC_GPIO &pcfg_pull_down>;};host_wake_bt: host-wake-bt {rockchip,pins = <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;};- };
- gmac { mac_rst: mac-rst { rockchip,pins = <0 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -294,11 +309,24 @@ cap-sd-highspeed; cap-sdio-irq; keep-power-in-suspend;
- max-frequency = <1000000>;
- max-frequency = <100000000>; mmc-pwrseq = <&sdio_pwrseq>;
- no-mmc;
- no-sd; non-removable;
- sd-uhs-sdr104;
sd-uhs-sdr50;
vmmc-supply = <&vcc_io>;
vqmmc-supply = <&vcc_1v8>; status = "okay";
rtl8723ds: wifi@1 {
reg = <1>;interrupt-parent = <&gpio0>;interrupts = <RK_PA0 IRQ_TYPE_LEVEL_HIGH>;interrupt-names = "host-wake";pinctrl-names = "default";pinctrl-0 = <&wifi_host_wake>;}; };
&sdmmc {
@@ -330,12 +358,16 @@ };
&uart4 {
uart-has-rtscts; status = "okay";
bluetooth {
compatible = "realtek,rtl8723bs-bt";device-wake-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
compatible = "realtek,rtl8723ds-bt";device-wake-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;enable-gpios = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;pinctrl-names = "default";pinctrl-0 = <&bt_reg_on &bt_wake_host &host_wake_bt>;
With the emmc and uart0 DT nodes updated to v6.11-rc1 in dts/upstream there is no longer any need to keep overrides in board u-boot dtsi.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 19 ------------------- 1 file changed, 19 deletions(-)
diff --git a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi index a6fb8b12da38..ff5bab316a34 100644 --- a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi +++ b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi @@ -4,17 +4,6 @@ */ #include "rk3308-u-boot.dtsi"
-&emmc { - cap-sd-highspeed; - pinctrl-names = "default"; - pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus4>; -}; - -&emmc_bus4 { - bootph-pre-ram; - bootph-some-ram; -}; - &u2phy_otg { /delete-property/ phy-supply; }; @@ -24,14 +13,6 @@ clock-frequency = <24000000>; };
-&uart0_cts { - bootph-all; -}; - -&uart0_rts { - bootph-all; -}; - &uart0_xfer { bootph-all; };
On 2024/7/30 22:51, Jonas Karlman wrote:
With the emmc and uart0 DT nodes updated to v6.11-rc1 in dts/upstream there is no longer any need to keep overrides in board u-boot dtsi.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi | 19 ------------------- 1 file changed, 19 deletions(-)
diff --git a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi index a6fb8b12da38..ff5bab316a34 100644 --- a/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi +++ b/arch/arm/dts/rk3308-rock-pi-s-u-boot.dtsi @@ -4,17 +4,6 @@ */ #include "rk3308-u-boot.dtsi"
-&emmc {
- cap-sd-highspeed;
- pinctrl-names = "default";
- pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_bus4>;
-};
-&emmc_bus4 {
- bootph-pre-ram;
- bootph-some-ram;
-};
- &u2phy_otg { /delete-property/ phy-supply; };
@@ -24,14 +13,6 @@ clock-frequency = <24000000>; };
-&uart0_cts {
- bootph-all;
-};
-&uart0_rts {
- bootph-all;
-};
- &uart0_xfer { bootph-all; };
Add LED=y and LED_GPIO=y to support the onboard leds.
Add ROCKCHIP_IODOMAIN=y to configure correct io voltage domains.
Add DM_MDIO=y now that the DT contain a Ethernet phy node.
Signed-off-by: Jonas Karlman jonas@kwiboo.se --- configs/rock-pi-s-rk3308_defconfig | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig index e450a0618020..54f7744c9895 100644 --- a/configs/rock-pi-s-rk3308_defconfig +++ b/configs/rock-pi-s-rk3308_defconfig @@ -38,10 +38,14 @@ CONFIG_CLK=y # CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY_REALTEK=y +CONFIG_DM_MDIO=y CONFIG_DM_ETH_PHY=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y
On 2024/7/30 22:51, Jonas Karlman wrote:
Add LED=y and LED_GPIO=y to support the onboard leds.
Add ROCKCHIP_IODOMAIN=y to configure correct io voltage domains.
Add DM_MDIO=y now that the DT contain a Ethernet phy node.
Signed-off-by: Jonas Karlman jonas@kwiboo.se
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
configs/rock-pi-s-rk3308_defconfig | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig index e450a0618020..54f7744c9895 100644 --- a/configs/rock-pi-s-rk3308_defconfig +++ b/configs/rock-pi-s-rk3308_defconfig @@ -38,10 +38,14 @@ CONFIG_CLK=y # CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY_REALTEK=y +CONFIG_DM_MDIO=y CONFIG_DM_ETH_PHY=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y
Hi,
On 7/30/24 23:51, Jonas Karlman wrote:
Add LED=y and LED_GPIO=y to support the onboard leds.
Add ROCKCHIP_IODOMAIN=y to configure correct io voltage domains.
Add DM_MDIO=y now that the DT contain a Ethernet phy node.
Signed-off-by: Jonas Karlman jonas@kwiboo.se Reviewed-by: Kever Yang kever.yang@rock-chips.com
for the whole series,
Tested-by: FUKAUMI Naoki naoki@radxa.com
Best regards,
-- FUKAUMI Naoki Radxa Computer (Shenzhen) Co., Ltd.
configs/rock-pi-s-rk3308_defconfig | 4 ++++ 1 file changed, 4 insertions(+)
diff --git a/configs/rock-pi-s-rk3308_defconfig b/configs/rock-pi-s-rk3308_defconfig index e450a0618020..54f7744c9895 100644 --- a/configs/rock-pi-s-rk3308_defconfig +++ b/configs/rock-pi-s-rk3308_defconfig @@ -38,10 +38,14 @@ CONFIG_CLK=y # CONFIG_USB_FUNCTION_FASTBOOT is not set CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y +CONFIG_LED=y +CONFIG_LED_GPIO=y +CONFIG_ROCKCHIP_IODOMAIN=y CONFIG_SUPPORT_EMMC_RPMB=y CONFIG_MMC_DW=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_PHY_REALTEK=y +CONFIG_DM_MDIO=y CONFIG_DM_ETH_PHY=y CONFIG_ETH_DESIGNWARE=y CONFIG_GMAC_ROCKCHIP=y
participants (4)
-
FUKAUMI Naoki -
Jonas Karlman -
Kever Yang -
Quentin Schulz