On Tue, Jan 23, 2024 at 10:50 PM Quentin Schulz <foss+ub...@0leil.net> wrote:
>
> From: Heiko Stuebner <heiko.stueb...@cherry.de>
>
> The compatible for the pmugrf in the mainline kernel is dfferent from the
> one currently used in u-boot. Adapt the -u-boot.dtsi and syscon driver
> to use the correct compatible.
Reviewed-by: Weizhao Ouyang <o451686...@gmail.com>
BR,
Weizhao
>
> Signed-off-by: Heiko Stuebner <heiko.stueb...@cherry.de>
> Signed-off-by: Quentin Schulz <quentin.sch...@theobroma-systems.com>
> ---
> arch/arm/dts/rk3588s-u-boot.dtsi | 2 +-
> arch/arm/mach-rockchip/rk3588/syscon_rk3588.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/dts/rk3588s-u-boot.dtsi
> b/arch/arm/dts/rk3588s-u-boot.dtsi
> index c0fd16c4022..9a5ffec926e 100644
> --- a/arch/arm/dts/rk3588s-u-boot.dtsi
> +++ b/arch/arm/dts/rk3588s-u-boot.dtsi
> @@ -66,7 +66,7 @@
>
> pmu1_grf: syscon@fd58a000 {
> bootph-all;
> - compatible = "rockchip,rk3588-pmu1-grf", "syscon";
> + compatible = "rockchip,rk3588-pmugrf", "syscon";
> reg = <0x0 0xfd58a000 0x0 0x2000>;
> };
>
> diff --git a/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
> b/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
> index e8772d3a382..7b2cf37d9da 100644
> --- a/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
> +++ b/arch/arm/mach-rockchip/rk3588/syscon_rk3588.c
> @@ -10,7 +10,7 @@
>
> static const struct udevice_id rk3588_syscon_ids[] = {
> { .compatible = "rockchip,rk3588-sys-grf", .data =
> ROCKCHIP_SYSCON_GRF },
> - { .compatible = "rockchip,rk3588-pmu1-grf", .data =
> ROCKCHIP_SYSCON_PMUGRF },
> + { .compatible = "rockchip,rk3588-pmugrf", .data =
> ROCKCHIP_SYSCON_PMUGRF },
> { .compatible = "rockchip,rk3588-vop-grf", .data =
> ROCKCHIP_SYSCON_VOP_GRF },
> { .compatible = "rockchip,rk3588-vo-grf", .data =
> ROCKCHIP_SYSCON_VO_GRF },
> { .compatible = "rockchip,pcie30-phy-grf", .data =
> ROCKCHIP_SYSCON_PCIE30_PHY_GRF },
>
> --
> 2.43.0
>
