[PATCH 1/2] arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E

[PATCH 1/2] arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E

[FUKAUMI Naoki]

use GPIO0_A2 as interrupt pin for PMIC. GPIO2_A6 was used for
pre-production board.

Fixes: b918e81f2145 ("arm64: dts: rockchip: rk3328: Add Radxa ROCK Pi E")
Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
index f09d60bbe6c4..a608a219543e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
@@ -241,8 +241,8 @@ &i2c1 {
 	rk805: pmic@18 {
 		compatible = "rockchip,rk805";
 		reg = <0x18>;
-		interrupt-parent = <&gpio2>;
-		interrupts = <6 IRQ_TYPE_LEVEL_LOW>;
+		interrupt-parent = <&gpio0>;
+		interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
 		#clock-cells = <1>;
 		clock-output-names = "xin32k", "rk805-clkout2";
 		gpio-controller;
-- 
2.43.0

[PATCH 2/2] arm64: dts: rockchip: reorder mmc aliases for ROCK Pi E

[FUKAUMI Naoki]

align with other Radxa products.

- mmc0 is eMMC
- mmc1 is microSD

Signed-off-by: FUKAUMI Naoki <naoki@radxa.com>
---
 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
index a608a219543e..1f2cf8574a9d 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
@@ -23,8 +23,8 @@ / {
 	aliases {
 		ethernet0 = &gmac2io;
 		ethernet1 = &gmac2phy;
-		mmc0 = &sdmmc;
-		mmc1 = &emmc;
+		mmc0 = &emmc;
+		mmc1 = &sdmmc;
 	};
 
 	chosen {
-- 
2.43.0

Re: (subset) [PATCH 1/2] arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E

[Heiko Stuebner]

On Wed, 19 Jun 2024 14:00:46 +0900, FUKAUMI Naoki wrote:
> use GPIO0_A2 as interrupt pin for PMIC. GPIO2_A6 was used for
> pre-production board.
> 
> 

Applied, thanks!

[1/2] arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E
      commit: 02afd3d5b9fa4ffed284c0f7e7bec609097804fc


Patch 2 is not appropriate, sorry.

The aliases are sorted this way since 2021 and the order is userspace-
facing. So for the last 3 years people have boards with the sdmmc as
mmc0 and changing this now would possibly break a number of boards.


Best regards,
-- 
Heiko Stuebner <heiko@sntech.de>

Re: (subset) [PATCH 1/2] arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E

[FUKAUMI Naoki]

Hello,

On 6/20/24 04:31, Heiko Stuebner wrote:
> On Wed, 19 Jun 2024 14:00:46 +0900, FUKAUMI Naoki wrote:
>> use GPIO0_A2 as interrupt pin for PMIC. GPIO2_A6 was used for
>> pre-production board.
>>
>>
> 
> Applied, thanks!
> 
> [1/2] arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E
>        commit: 02afd3d5b9fa4ffed284c0f7e7bec609097804fc
> 
> 
> Patch 2 is not appropriate, sorry.
> 
> The aliases are sorted this way since 2021 and the order is userspace-
> facing. So for the last 3 years people have boards with the sdmmc as
> mmc0 and changing this now would possibly break a number of boards.

this is the reason I didn't add Fixes tag. I think this change in next 
major release is acceptable... but it's wrong?

Best regards,

--
FUKAUMI Naoki
Radxa Computer (Shenzhen) Co., Ltd.

Re: (subset) [PATCH 1/2] arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E

[Heiko Stübner]

Am Mittwoch, 19. Juni 2024, 22:07:25 CEST schrieb FUKAUMI Naoki:
> Hello,
> 
> On 6/20/24 04:31, Heiko Stuebner wrote:
> > On Wed, 19 Jun 2024 14:00:46 +0900, FUKAUMI Naoki wrote:
> >> use GPIO0_A2 as interrupt pin for PMIC. GPIO2_A6 was used for
> >> pre-production board.
> >>
> >>
> > 
> > Applied, thanks!
> > 
> > [1/2] arm64: dts: rockchip: fix PMIC interrupt pin on ROCK Pi E
> >        commit: 02afd3d5b9fa4ffed284c0f7e7bec609097804fc
> > 
> > 
> > Patch 2 is not appropriate, sorry.
> > 
> > The aliases are sorted this way since 2021 and the order is userspace-
> > facing. So for the last 3 years people have boards with the sdmmc as
> > mmc0 and changing this now would possibly break a number of boards.
> 
> this is the reason I didn't add Fixes tag. I think this change in next 
> major release is acceptable... but it's wrong?

Correct.

Because with that change, all people mounting /dev/mmcblk0p1 or
whatever in their system would break their userspace after a simple
kernel update.

And that falls under the "we don't break userspace" mantra.

People should be able to expect their system to keep booting with kernel
updates, without neededing to meticulously validate each kernel release.

Hence that mmc order needs to stay that way.


Heiko