* [PATCH 0/4] User Requested Fixes for Anbernic RGxx3
@ 2024-03-25 14:37 Chris Morgan
2024-03-25 14:37 ` [PATCH 1/4] arm64: dts: rockchip: rgxx3: Add additional properties for WiFi Chris Morgan
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Chris Morgan @ 2024-03-25 14:37 UTC (permalink / raw)
To: linux-rockchip
Cc: devicetree, heiko, conor+dt, krzysztof.kozlowski+dt, robh,
Chris Morgan
From: Chris Morgan <macromorgan@hotmail.com>
Users have requested fixes for Anbernic devices to help with some
intermittent WiFi issues by adding additional properties to the
SDMMC2 node and by making the sdmmc aliases consistent across the
device lineup. They have also requested that the model name be
represented consistently with both the manufacturer name and model
name.
I have added the new/additional property of "chasis-type" as well.
Chris Morgan (4):
arm64: dts: rockchip: rgxx3: Add additional properties for WiFi
arm64: dts: rockchip: rgxx3: Add optional node for chasis-type
arm64: dts: rockchip: Correct RGxx3 SDMMC ordering
arm64: dts: rockchip: Correct model name for Anbernic RGxx3 Devices
.../boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts | 7 -------
.../boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts | 6 ------
.../boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 9 +--------
.../boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 8 +-------
.../boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 9 +--------
.../boot/dts/rockchip/rk3566-anbernic-rg353vs.dts | 8 +-------
.../boot/dts/rockchip/rk3566-anbernic-rg503.dts | 8 +-------
.../boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 12 ++++++++++++
8 files changed, 17 insertions(+), 50 deletions(-)
--
2.34.1
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH 1/4] arm64: dts: rockchip: rgxx3: Add additional properties for WiFi 2024-03-25 14:37 [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Chris Morgan @ 2024-03-25 14:37 ` Chris Morgan 2024-03-25 14:37 ` [PATCH 2/4] arm64: dts: rockchip: rgxx3: Add optional node for chasis-type Chris Morgan ` (3 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Chris Morgan @ 2024-03-25 14:37 UTC (permalink / raw) To: linux-rockchip Cc: devicetree, heiko, conor+dt, krzysztof.kozlowski+dt, robh, Chris Morgan From: Chris Morgan <macromorgan@hotmail.com> Add additional properties for the SDMMC2 node. Based on user feedback these help correct some issues with probing the WiFi hardware. Signed-off-by: Chris Morgan <macromorgan@hotmail.com> --- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi index 18b8c2e7befa..c8fdb1b817f5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi @@ -623,9 +623,12 @@ &sdmmc2 { cap-sdio-irq; keep-power-in-suspend; mmc-pwrseq = <&sdio_pwrseq>; + no-mmc; + no-sd; non-removable; pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>; pinctrl-names = "default"; + sd-uhs-sdr50; vmmc-supply = <&vcc_wifi>; vqmmc-supply = <&vcca1v8_pmu>; status = "okay"; -- 2.34.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/4] arm64: dts: rockchip: rgxx3: Add optional node for chasis-type 2024-03-25 14:37 [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Chris Morgan 2024-03-25 14:37 ` [PATCH 1/4] arm64: dts: rockchip: rgxx3: Add additional properties for WiFi Chris Morgan @ 2024-03-25 14:37 ` Chris Morgan 2024-03-25 14:37 ` [PATCH 3/4] arm64: dts: rockchip: Correct RGxx3 SDMMC ordering Chris Morgan ` (2 subsequent siblings) 4 siblings, 0 replies; 9+ messages in thread From: Chris Morgan @ 2024-03-25 14:37 UTC (permalink / raw) To: linux-rockchip Cc: devicetree, heiko, conor+dt, krzysztof.kozlowski+dt, robh, Chris Morgan From: Chris Morgan <macromorgan@hotmail.com> Add optional node for chasis-type defining this device as a handset. Signed-off-by: Chris Morgan <macromorgan@hotmail.com> --- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi index c8fdb1b817f5..233eade30f21 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi @@ -10,6 +10,8 @@ #include "rk3566.dtsi" / { + chassis-type = "handset"; + chosen: chosen { stdout-path = "serial2:1500000n8"; }; -- 2.34.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/4] arm64: dts: rockchip: Correct RGxx3 SDMMC ordering 2024-03-25 14:37 [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Chris Morgan 2024-03-25 14:37 ` [PATCH 1/4] arm64: dts: rockchip: rgxx3: Add additional properties for WiFi Chris Morgan 2024-03-25 14:37 ` [PATCH 2/4] arm64: dts: rockchip: rgxx3: Add optional node for chasis-type Chris Morgan @ 2024-03-25 14:37 ` Chris Morgan 2024-03-25 15:39 ` Heiko Stübner 2024-03-25 14:37 ` [PATCH 4/4] arm64: dts: rockchip: Correct model name for Anbernic RGxx3 Devices Chris Morgan 2024-04-11 18:29 ` (subset) [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Heiko Stuebner 4 siblings, 1 reply; 9+ messages in thread From: Chris Morgan @ 2024-03-25 14:37 UTC (permalink / raw) To: linux-rockchip Cc: devicetree, heiko, conor+dt, krzysztof.kozlowski+dt, robh, Chris Morgan From: Chris Morgan <macromorgan@hotmail.com> Make the order of SDMMC predictable across the entire device lineup. This allows userspace to always know that sdmmc0 is the eMMC (when present), sdmmc1 is always the first sd card slot, sdmmc2 is always the 2nd sd card slot (when present), and sdmmc3 is always the wifi (when present). Signed-off-by: Chris Morgan <macromorgan@hotmail.com> --- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts | 7 ------- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts | 6 ------ arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 7 ------- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 6 ------ arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 7 ------- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts | 6 ------ arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts | 6 ------ arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 7 +++++++ 8 files changed, 7 insertions(+), 45 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts index ab83e8a61615..d239a8452957 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts @@ -10,13 +10,6 @@ / { model = "Anbernic RG ARC-D"; compatible = "anbernic,rg-arc-d", "rockchip,rk3566"; - - aliases { - mmc0 = &sdhci; - mmc1 = &sdmmc0; - mmc2 = &sdmmc1; - mmc3 = &sdmmc2; - }; }; &i2c2 { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts index 6264a8c78d0b..4bb13d94a759 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts @@ -10,10 +10,4 @@ / { model = "Anbernic RG ARC-S"; compatible = "anbernic,rg-arc-s", "rockchip,rk3566"; - - aliases { - mmc1 = &sdmmc0; - mmc2 = &sdmmc1; - mmc3 = &sdmmc2; - }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts index 8aa93c646bec..94c678c44d3a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts @@ -11,13 +11,6 @@ / { model = "RG353P"; compatible = "anbernic,rg353p", "rockchip,rk3566"; - aliases { - mmc0 = &sdhci; - mmc1 = &sdmmc0; - mmc2 = &sdmmc1; - mmc3 = &sdmmc2; - }; - battery: battery { compatible = "simple-battery"; charge-full-design-microamp-hours = <3472000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts index b211973e36c2..25edd81ce26b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts @@ -11,12 +11,6 @@ / { model = "RG353PS"; compatible = "anbernic,rg353ps", "rockchip,rk3566"; - aliases { - mmc0 = &sdmmc0; - mmc1 = &sdmmc1; - mmc2 = &sdmmc2; - }; - battery: battery { compatible = "simple-battery"; charge-full-design-microamp-hours = <3472000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts index f49ce29ba597..5354c5958df2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts @@ -11,13 +11,6 @@ / { model = "RG353V"; compatible = "anbernic,rg353v", "rockchip,rk3566"; - aliases { - mmc0 = &sdhci; - mmc1 = &sdmmc0; - mmc2 = &sdmmc1; - mmc3 = &sdmmc2; - }; - battery: battery { compatible = "simple-battery"; charge-full-design-microamp-hours = <3151000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts index a7dc462fe21f..02653b59f6c2 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts @@ -11,12 +11,6 @@ / { model = "RG353VS"; compatible = "anbernic,rg353vs", "rockchip,rk3566"; - aliases { - mmc0 = &sdmmc0; - mmc1 = &sdmmc1; - mmc2 = &sdmmc2; - }; - battery: battery { compatible = "simple-battery"; charge-full-design-microamp-hours = <3151000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts index 94e6dd61a2db..e7161a86a9f1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts @@ -11,12 +11,6 @@ / { model = "RG503"; compatible = "anbernic,rg503", "rockchip,rk3566"; - aliases { - mmc0 = &sdmmc0; - mmc1 = &sdmmc1; - mmc2 = &sdmmc2; - }; - adc-joystick { compatible = "adc-joystick"; io-channels = <&adc_mux 0>, diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi index 233eade30f21..47c8fdc7c843 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi @@ -12,6 +12,13 @@ / { chassis-type = "handset"; + aliases { + mmc0 = &sdhci; + mmc1 = &sdmmc0; + mmc2 = &sdmmc1; + mmc3 = &sdmmc2; + }; + chosen: chosen { stdout-path = "serial2:1500000n8"; }; -- 2.34.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] arm64: dts: rockchip: Correct RGxx3 SDMMC ordering 2024-03-25 14:37 ` [PATCH 3/4] arm64: dts: rockchip: Correct RGxx3 SDMMC ordering Chris Morgan @ 2024-03-25 15:39 ` Heiko Stübner 2024-03-25 17:16 ` Chris Morgan 0 siblings, 1 reply; 9+ messages in thread From: Heiko Stübner @ 2024-03-25 15:39 UTC (permalink / raw) To: linux-rockchip, Chris Morgan Cc: devicetree, conor+dt, krzysztof.kozlowski+dt, robh, Chris Morgan Hmm, Am Montag, 25. März 2024, 15:37:28 CET schrieb Chris Morgan: > From: Chris Morgan <macromorgan@hotmail.com> > > Make the order of SDMMC predictable across the entire device lineup. > This allows userspace to always know that sdmmc0 is the eMMC (when > present), sdmmc1 is always the first sd card slot, sdmmc2 is always > the 2nd sd card slot (when present), and sdmmc3 is always the wifi > (when present). > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> this is really really difficult. For example, you added the rg353p, rk503 nad rg353vs and their aliases two years ago for 6.1 , the rg353ps for 6.5. So someone might actually rely on those already in their userspace setup. So reorganizing the aliases to point to different devices might actually break userspace, which as you might know, is sort of a big deal ;-) . Userspace programs can determine the mmc mapping via the board-compatible though. Heiko > --- > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts | 7 ------- > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts | 6 ------ > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 7 ------- > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 6 ------ > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 7 ------- > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts | 6 ------ > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts | 6 ------ > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 7 +++++++ > 8 files changed, 7 insertions(+), 45 deletions(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts > index ab83e8a61615..d239a8452957 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts > @@ -10,13 +10,6 @@ > / { > model = "Anbernic RG ARC-D"; > compatible = "anbernic,rg-arc-d", "rockchip,rk3566"; > - > - aliases { > - mmc0 = &sdhci; > - mmc1 = &sdmmc0; > - mmc2 = &sdmmc1; > - mmc3 = &sdmmc2; > - }; > }; > > &i2c2 { > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts > index 6264a8c78d0b..4bb13d94a759 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts > @@ -10,10 +10,4 @@ > / { > model = "Anbernic RG ARC-S"; > compatible = "anbernic,rg-arc-s", "rockchip,rk3566"; > - > - aliases { > - mmc1 = &sdmmc0; > - mmc2 = &sdmmc1; > - mmc3 = &sdmmc2; > - }; > }; > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts > index 8aa93c646bec..94c678c44d3a 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts > @@ -11,13 +11,6 @@ / { > model = "RG353P"; > compatible = "anbernic,rg353p", "rockchip,rk3566"; > > - aliases { > - mmc0 = &sdhci; > - mmc1 = &sdmmc0; > - mmc2 = &sdmmc1; > - mmc3 = &sdmmc2; > - }; > - > battery: battery { > compatible = "simple-battery"; > charge-full-design-microamp-hours = <3472000>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts > index b211973e36c2..25edd81ce26b 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts > @@ -11,12 +11,6 @@ / { > model = "RG353PS"; > compatible = "anbernic,rg353ps", "rockchip,rk3566"; > > - aliases { > - mmc0 = &sdmmc0; > - mmc1 = &sdmmc1; > - mmc2 = &sdmmc2; > - }; > - > battery: battery { > compatible = "simple-battery"; > charge-full-design-microamp-hours = <3472000>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts > index f49ce29ba597..5354c5958df2 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts > @@ -11,13 +11,6 @@ / { > model = "RG353V"; > compatible = "anbernic,rg353v", "rockchip,rk3566"; > > - aliases { > - mmc0 = &sdhci; > - mmc1 = &sdmmc0; > - mmc2 = &sdmmc1; > - mmc3 = &sdmmc2; > - }; > - > battery: battery { > compatible = "simple-battery"; > charge-full-design-microamp-hours = <3151000>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts > index a7dc462fe21f..02653b59f6c2 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts > @@ -11,12 +11,6 @@ / { > model = "RG353VS"; > compatible = "anbernic,rg353vs", "rockchip,rk3566"; > > - aliases { > - mmc0 = &sdmmc0; > - mmc1 = &sdmmc1; > - mmc2 = &sdmmc2; > - }; > - > battery: battery { > compatible = "simple-battery"; > charge-full-design-microamp-hours = <3151000>; > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts > index 94e6dd61a2db..e7161a86a9f1 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts > @@ -11,12 +11,6 @@ / { > model = "RG503"; > compatible = "anbernic,rg503", "rockchip,rk3566"; > > - aliases { > - mmc0 = &sdmmc0; > - mmc1 = &sdmmc1; > - mmc2 = &sdmmc2; > - }; > - > adc-joystick { > compatible = "adc-joystick"; > io-channels = <&adc_mux 0>, > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi > index 233eade30f21..47c8fdc7c843 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi > @@ -12,6 +12,13 @@ > / { > chassis-type = "handset"; > > + aliases { > + mmc0 = &sdhci; > + mmc1 = &sdmmc0; > + mmc2 = &sdmmc1; > + mmc3 = &sdmmc2; > + }; > + > chosen: chosen { > stdout-path = "serial2:1500000n8"; > }; > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 3/4] arm64: dts: rockchip: Correct RGxx3 SDMMC ordering 2024-03-25 15:39 ` Heiko Stübner @ 2024-03-25 17:16 ` Chris Morgan 0 siblings, 0 replies; 9+ messages in thread From: Chris Morgan @ 2024-03-25 17:16 UTC (permalink / raw) To: Heiko Stübner Cc: linux-rockchip, Chris Morgan, devicetree, conor+dt, krzysztof.kozlowski+dt, robh On Mon, Mar 25, 2024 at 04:39:28PM +0100, Heiko Stübner wrote: > Hmm, > > Am Montag, 25. März 2024, 15:37:28 CET schrieb Chris Morgan: > > From: Chris Morgan <macromorgan@hotmail.com> > > > > Make the order of SDMMC predictable across the entire device lineup. > > This allows userspace to always know that sdmmc0 is the eMMC (when > > present), sdmmc1 is always the first sd card slot, sdmmc2 is always > > the 2nd sd card slot (when present), and sdmmc3 is always the wifi > > (when present). > > > > Signed-off-by: Chris Morgan <macromorgan@hotmail.com> > > this is really really difficult. > > For example, you added the rg353p, rk503 nad rg353vs and their aliases > two years ago for 6.1 , the rg353ps for 6.5. So someone might actually > rely on those already in their userspace setup. > > So reorganizing the aliases to point to different devices might actually > break userspace, which as you might know, is sort of a big deal ;-) . > > Userspace programs can determine the mmc mapping via the board-compatible > though. Okay, then this might need to be disregarded. Perhaps at a minimum we can set the WiFi device to be mmc3 at least for a consistent basis. That was the main driver of this request and shouldn't be a major concern for userspace. Would that work? Thank you. > > > Heiko > > > --- > > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts | 7 ------- > > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts | 6 ------ > > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 7 ------- > > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 6 ------ > > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 7 ------- > > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts | 6 ------ > > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts | 6 ------ > > arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi | 7 +++++++ > > 8 files changed, 7 insertions(+), 45 deletions(-) > > > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts > > index ab83e8a61615..d239a8452957 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-d.dts > > @@ -10,13 +10,6 @@ > > / { > > model = "Anbernic RG ARC-D"; > > compatible = "anbernic,rg-arc-d", "rockchip,rk3566"; > > - > > - aliases { > > - mmc0 = &sdhci; > > - mmc1 = &sdmmc0; > > - mmc2 = &sdmmc1; > > - mmc3 = &sdmmc2; > > - }; > > }; > > > > &i2c2 { > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts > > index 6264a8c78d0b..4bb13d94a759 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg-arc-s.dts > > @@ -10,10 +10,4 @@ > > / { > > model = "Anbernic RG ARC-S"; > > compatible = "anbernic,rg-arc-s", "rockchip,rk3566"; > > - > > - aliases { > > - mmc1 = &sdmmc0; > > - mmc2 = &sdmmc1; > > - mmc3 = &sdmmc2; > > - }; > > }; > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts > > index 8aa93c646bec..94c678c44d3a 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts > > @@ -11,13 +11,6 @@ / { > > model = "RG353P"; > > compatible = "anbernic,rg353p", "rockchip,rk3566"; > > > > - aliases { > > - mmc0 = &sdhci; > > - mmc1 = &sdmmc0; > > - mmc2 = &sdmmc1; > > - mmc3 = &sdmmc2; > > - }; > > - > > battery: battery { > > compatible = "simple-battery"; > > charge-full-design-microamp-hours = <3472000>; > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts > > index b211973e36c2..25edd81ce26b 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts > > @@ -11,12 +11,6 @@ / { > > model = "RG353PS"; > > compatible = "anbernic,rg353ps", "rockchip,rk3566"; > > > > - aliases { > > - mmc0 = &sdmmc0; > > - mmc1 = &sdmmc1; > > - mmc2 = &sdmmc2; > > - }; > > - > > battery: battery { > > compatible = "simple-battery"; > > charge-full-design-microamp-hours = <3472000>; > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts > > index f49ce29ba597..5354c5958df2 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts > > @@ -11,13 +11,6 @@ / { > > model = "RG353V"; > > compatible = "anbernic,rg353v", "rockchip,rk3566"; > > > > - aliases { > > - mmc0 = &sdhci; > > - mmc1 = &sdmmc0; > > - mmc2 = &sdmmc1; > > - mmc3 = &sdmmc2; > > - }; > > - > > battery: battery { > > compatible = "simple-battery"; > > charge-full-design-microamp-hours = <3151000>; > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts > > index a7dc462fe21f..02653b59f6c2 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts > > @@ -11,12 +11,6 @@ / { > > model = "RG353VS"; > > compatible = "anbernic,rg353vs", "rockchip,rk3566"; > > > > - aliases { > > - mmc0 = &sdmmc0; > > - mmc1 = &sdmmc1; > > - mmc2 = &sdmmc2; > > - }; > > - > > battery: battery { > > compatible = "simple-battery"; > > charge-full-design-microamp-hours = <3151000>; > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts > > index 94e6dd61a2db..e7161a86a9f1 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts > > @@ -11,12 +11,6 @@ / { > > model = "RG503"; > > compatible = "anbernic,rg503", "rockchip,rk3566"; > > > > - aliases { > > - mmc0 = &sdmmc0; > > - mmc1 = &sdmmc1; > > - mmc2 = &sdmmc2; > > - }; > > - > > adc-joystick { > > compatible = "adc-joystick"; > > io-channels = <&adc_mux 0>, > > diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi > > index 233eade30f21..47c8fdc7c843 100644 > > --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi > > +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rgxx3.dtsi > > @@ -12,6 +12,13 @@ > > / { > > chassis-type = "handset"; > > > > + aliases { > > + mmc0 = &sdhci; > > + mmc1 = &sdmmc0; > > + mmc2 = &sdmmc1; > > + mmc3 = &sdmmc2; > > + }; > > + > > chosen: chosen { > > stdout-path = "serial2:1500000n8"; > > }; > > > > > > ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 4/4] arm64: dts: rockchip: Correct model name for Anbernic RGxx3 Devices 2024-03-25 14:37 [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Chris Morgan ` (2 preceding siblings ...) 2024-03-25 14:37 ` [PATCH 3/4] arm64: dts: rockchip: Correct RGxx3 SDMMC ordering Chris Morgan @ 2024-03-25 14:37 ` Chris Morgan 2024-04-11 18:29 ` (subset) [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Heiko Stuebner 4 siblings, 0 replies; 9+ messages in thread From: Chris Morgan @ 2024-03-25 14:37 UTC (permalink / raw) To: linux-rockchip Cc: devicetree, heiko, conor+dt, krzysztof.kozlowski+dt, robh, Chris Morgan From: Chris Morgan <macromorgan@hotmail.com> Some Anbernic model names begin with the company "Anbernic" and others simply list the model number. Make this consistent across the device lineup by including the manufacturer in the model name. Signed-off-by: Chris Morgan <macromorgan@hotmail.com> --- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts index 94c678c44d3a..0df1254f89af 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353p.dts @@ -8,7 +8,7 @@ #include "rk3566-anbernic-rg353x.dtsi" / { - model = "RG353P"; + model = "Anbernic RG353P"; compatible = "anbernic,rg353p", "rockchip,rk3566"; battery: battery { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts index 25edd81ce26b..b1fd2b0f6719 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353ps.dts @@ -8,7 +8,7 @@ #include "rk3566-anbernic-rg353x.dtsi" / { - model = "RG353PS"; + model = "Anbernic RG353PS"; compatible = "anbernic,rg353ps", "rockchip,rk3566"; battery: battery { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts index 5354c5958df2..9fa68cc53015 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353v.dts @@ -8,7 +8,7 @@ #include "rk3566-anbernic-rg353x.dtsi" / { - model = "RG353V"; + model = "Anbernic RG353V"; compatible = "anbernic,rg353v", "rockchip,rk3566"; battery: battery { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts index 02653b59f6c2..78adac9fff58 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg353vs.dts @@ -8,7 +8,7 @@ #include "rk3566-anbernic-rg353x.dtsi" / { - model = "RG353VS"; + model = "Anbernic RG353VS"; compatible = "anbernic,rg353vs", "rockchip,rk3566"; battery: battery { diff --git a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts index e7161a86a9f1..b7e029a7039a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts +++ b/arch/arm64/boot/dts/rockchip/rk3566-anbernic-rg503.dts @@ -8,7 +8,7 @@ #include "rk3566-anbernic-rgxx3.dtsi" / { - model = "RG503"; + model = "Anbernic RG503"; compatible = "anbernic,rg503", "rockchip,rk3566"; adc-joystick { -- 2.34.1 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: (subset) [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 2024-03-25 14:37 [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Chris Morgan ` (3 preceding siblings ...) 2024-03-25 14:37 ` [PATCH 4/4] arm64: dts: rockchip: Correct model name for Anbernic RGxx3 Devices Chris Morgan @ 2024-04-11 18:29 ` Heiko Stuebner 2024-04-12 14:32 ` Chris Morgan 4 siblings, 1 reply; 9+ messages in thread From: Heiko Stuebner @ 2024-04-11 18:29 UTC (permalink / raw) To: Chris Morgan, linux-rockchip Cc: Heiko Stuebner, krzysztof.kozlowski+dt, conor+dt, devicetree, robh, Chris Morgan On Mon, 25 Mar 2024 09:37:25 -0500, Chris Morgan wrote: > From: Chris Morgan <macromorgan@hotmail.com> > > Users have requested fixes for Anbernic devices to help with some > intermittent WiFi issues by adding additional properties to the > SDMMC2 node and by making the sdmmc aliases consistent across the > device lineup. They have also requested that the model name be > represented consistently with both the manufacturer name and model > name. > > [...] Applied, thanks! [1/4] arm64: dts: rockchip: rgxx3: Add additional properties for WiFi commit: 6bc8e01c7284ea1f56c6506f38c2ba9474db497a [2/4] arm64: dts: rockchip: rgxx3: Add optional node for chasis-type commit: 8db673210ae24ed44acf15642f4abd6d4b4cae52 [4/4] arm64: dts: rockchip: Correct model name for Anbernic RGxx3 Devices commit: b41b83b701056421bdc494c8e1488d38f2990c3d Dropped the sdmmc alias patch. Best regards, -- Heiko Stuebner <heiko@sntech.de> ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: (subset) [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 2024-04-11 18:29 ` (subset) [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Heiko Stuebner @ 2024-04-12 14:32 ` Chris Morgan 0 siblings, 0 replies; 9+ messages in thread From: Chris Morgan @ 2024-04-12 14:32 UTC (permalink / raw) To: Heiko Stuebner Cc: Chris Morgan, linux-rockchip, krzysztof.kozlowski+dt, conor+dt, devicetree, robh On Thu, Apr 11, 2024 at 08:29:52PM +0200, Heiko Stuebner wrote: > On Mon, 25 Mar 2024 09:37:25 -0500, Chris Morgan wrote: > > From: Chris Morgan <macromorgan@hotmail.com> > > > > Users have requested fixes for Anbernic devices to help with some > > intermittent WiFi issues by adding additional properties to the > > SDMMC2 node and by making the sdmmc aliases consistent across the > > device lineup. They have also requested that the model name be > > represented consistently with both the manufacturer name and model > > name. > > > > [...] > > Applied, thanks! > > [1/4] arm64: dts: rockchip: rgxx3: Add additional properties for WiFi > commit: 6bc8e01c7284ea1f56c6506f38c2ba9474db497a > [2/4] arm64: dts: rockchip: rgxx3: Add optional node for chasis-type > commit: 8db673210ae24ed44acf15642f4abd6d4b4cae52 > [4/4] arm64: dts: rockchip: Correct model name for Anbernic RGxx3 Devices > commit: b41b83b701056421bdc494c8e1488d38f2990c3d > > Dropped the sdmmc alias patch. Thank you. At a minimum, could we reorder the non-boot mmc devices? To at least ensure that the wifi is always mmc3? If so, I can submit that patch again. > > Best regards, > -- > Heiko Stuebner <heiko@sntech.de> ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-04-12 14:33 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-03-25 14:37 [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Chris Morgan 2024-03-25 14:37 ` [PATCH 1/4] arm64: dts: rockchip: rgxx3: Add additional properties for WiFi Chris Morgan 2024-03-25 14:37 ` [PATCH 2/4] arm64: dts: rockchip: rgxx3: Add optional node for chasis-type Chris Morgan 2024-03-25 14:37 ` [PATCH 3/4] arm64: dts: rockchip: Correct RGxx3 SDMMC ordering Chris Morgan 2024-03-25 15:39 ` Heiko Stübner 2024-03-25 17:16 ` Chris Morgan 2024-03-25 14:37 ` [PATCH 4/4] arm64: dts: rockchip: Correct model name for Anbernic RGxx3 Devices Chris Morgan 2024-04-11 18:29 ` (subset) [PATCH 0/4] User Requested Fixes for Anbernic RGxx3 Heiko Stuebner 2024-04-12 14:32 ` Chris Morgan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).