On Fri, 2020-05-15 at 20:09 +1000, Jonathan Gray wrote: > https://trustedfirmware-a.readthedocs.io/en/latest/change-log.html#version-2-3
Tested on rock64 gen2 and rockpro64 with u-boot v2020.04. No issues found. okay kurt@ > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v > retrieving revision 1.13 > diff -u -p -r1.13 Makefile > --- Makefile 7 Jan 2020 07:01:56 -0000 1.13 > +++ Makefile 15 May 2020 10:01:58 -0000 > @@ -6,7 +6,7 @@ COMMENT= ARM Trusted Firmware > > GH_ACCOUNT= ARM-software > GH_PROJECT= arm-trusted-firmware > -GH_TAGNAME= v2.2 > +GH_TAGNAME= v2.3 > > EPOCH= 0 > > Index: distinfo > =================================================================== > RCS file: /cvs/ports/sysutils/arm-trusted-firmware/distinfo,v > retrieving revision 1.7 > diff -u -p -r1.7 distinfo > --- distinfo 7 Jan 2020 07:01:56 -0000 1.7 > +++ distinfo 15 May 2020 10:01:58 -0000 > @@ -1,2 +1,2 @@ > -SHA256 (arm-trusted-firmware-2.2.tar.gz) = > B+PAWK4tlcfVFqRvyTVlt5fpEsMnHdvynfUjsase6RE= > -SIZE (arm-trusted-firmware-2.2.tar.gz) = 3885995 > +SHA256 (arm-trusted-firmware-2.3.tar.gz) = > ME03IyfW7Kv4naZ+Lhp7JmDxO1hRiG/vG1iuWm105gY= > +SIZE (arm-trusted-firmware-2.3.tar.gz) = 4321775 > Index: patches/patch-plat_rockchip_common_params_setup_c > =================================================================== > RCS file: patches/patch-plat_rockchip_common_params_setup_c > diff -N patches/patch-plat_rockchip_common_params_setup_c > --- patches/patch-plat_rockchip_common_params_setup_c 6 Feb 2020 07:05:51 > -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,44 +0,0 @@ > -$OpenBSD: patch-plat_rockchip_common_params_setup_c,v 1.2 2020/02/06 > 07:05:51 jsg Exp $ > - > -https://github.com/ARM-software/arm-trusted-firmware/commit/d52331d01e0efae36e837af90887a8aed33ff604.patch > - > -Index: plat/rockchip/common/params_setup.c > ---- plat/rockchip/common/params_setup.c.orig > -+++ plat/rockchip/common/params_setup.c > -@@ -6,6 +6,7 @@ > - > - #include <assert.h> > - #include <errno.h> > -+#include <limits.h> > - #include <string.h> > - > - #include <lib/bl_aux_params/bl_aux_params.h> > -@@ -21,8 +22,8 @@ > - #include <plat_params.h> > - #include <plat_private.h> > - > --static struct bl_aux_gpio_info rst_gpio; > --static struct bl_aux_gpio_info poweroff_gpio; > -+static struct bl_aux_gpio_info rst_gpio = { .index = UINT_MAX } ; > -+static struct bl_aux_gpio_info poweroff_gpio = { .index = UINT_MAX }; > - static struct bl_aux_gpio_info suspend_gpio[10]; > - uint32_t suspend_gpio_cnt; > - static struct bl_aux_rk_apio_info suspend_apio; > -@@ -174,11 +175,17 @@ uint32_t rockchip_get_uart_clock(void) > - > - struct bl_aux_gpio_info *plat_get_rockchip_gpio_reset(void) > - { > -+ if (rst_gpio.index == UINT_MAX) > -+ return NULL; > -+ > - return &rst_gpio; > - } > - > - struct bl_aux_gpio_info *plat_get_rockchip_gpio_poweroff(void) > - { > -+ if (poweroff_gpio.index == UINT_MAX) > -+ return NULL; > -+ > - return &poweroff_gpio; > - } > - > Index: patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu_c > =================================================================== > RCS file: patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu_c > diff -N patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu_c > --- patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu_c 6 Feb 2020 > 07:05:51 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,33 +0,0 @@ > -$OpenBSD: patch-plat_rockchip_rk3399_drivers_pmu_pmu_c,v 1.2 2020/02/06 > 07:05:51 jsg Exp $ > - > -https://github.com/ARM-software/arm-trusted-firmware/commit/b4899041e5f0b8e8b388c6511b5233516b8785ec.patch > - > -Index: plat/rockchip/rk3399/drivers/pmu/pmu.c > ---- plat/rockchip/rk3399/drivers/pmu/pmu.c.orig > -+++ plat/rockchip/rk3399/drivers/pmu/pmu.c > -@@ -400,6 +400,25 @@ static void pmu_power_domains_resume(void) > - clk_gate_con_restore(); > - } > - > -+void pmu_power_domains_on(void) > -+{ > -+ clk_gate_con_disable(); > -+ pmu_set_power_domain(PD_VDU, pmu_pd_on); > -+ pmu_set_power_domain(PD_VCODEC, pmu_pd_on); > -+ pmu_set_power_domain(PD_RGA, pmu_pd_on); > -+ pmu_set_power_domain(PD_IEP, pmu_pd_on); > -+ pmu_set_power_domain(PD_EDP, pmu_pd_on); > -+ pmu_set_power_domain(PD_GMAC, pmu_pd_on); > -+ pmu_set_power_domain(PD_SDIOAUDIO, pmu_pd_on); > -+ pmu_set_power_domain(PD_HDCP, pmu_pd_on); > -+ pmu_set_power_domain(PD_ISP1, pmu_pd_on); > -+ pmu_set_power_domain(PD_ISP0, pmu_pd_on); > -+ pmu_set_power_domain(PD_VO, pmu_pd_on); > -+ pmu_set_power_domain(PD_TCPD1, pmu_pd_on); > -+ pmu_set_power_domain(PD_TCPD0, pmu_pd_on); > -+ pmu_set_power_domain(PD_GPU, pmu_pd_on); > -+} > -+ > - void rk3399_flush_l2_b(void) > - { > - uint32_t wait_cnt = 0; > Index: patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu_h > =================================================================== > RCS file: patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu_h > diff -N patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu_h > --- patches/patch-plat_rockchip_rk3399_drivers_pmu_pmu_h 6 Feb 2020 > 07:05:51 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-plat_rockchip_rk3399_drivers_pmu_pmu_h,v 1.2 2020/02/06 > 07:05:51 jsg Exp $ > - > -https://github.com/ARM-software/arm-trusted-firmware/commit/b4899041e5f0b8e8b388c6511b5233516b8785ec.patch > - > -Index: plat/rockchip/rk3399/drivers/pmu/pmu.h > ---- plat/rockchip/rk3399/drivers/pmu/pmu.h.orig > -+++ plat/rockchip/rk3399/drivers/pmu/pmu.h > -@@ -136,5 +136,6 @@ struct pmu_slpdata_s { > - extern uint32_t clst_warmboot_data[PLATFORM_CLUSTER_COUNT]; > - > - extern void sram_func_set_ddrctl_pll(uint32_t pll_src); > -+void pmu_power_domains_on(void); > - > - #endif /* PMU_H */ > Index: patches/patch-plat_rockchip_rk3399_drivers_soc_soc_c > =================================================================== > RCS file: patches/patch-plat_rockchip_rk3399_drivers_soc_soc_c > diff -N patches/patch-plat_rockchip_rk3399_drivers_soc_soc_c > --- patches/patch-plat_rockchip_rk3399_drivers_soc_soc_c 6 Feb 2020 > 07:05:51 -0000 1.2 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,23 +0,0 @@ > -$OpenBSD: patch-plat_rockchip_rk3399_drivers_soc_soc_c,v 1.2 2020/02/06 > 07:05:51 jsg Exp $ > - > -https://github.com/ARM-software/arm-trusted-firmware/commit/b4899041e5f0b8e8b388c6511b5233516b8785ec.patch > - > -Index: plat/rockchip/rk3399/drivers/soc/soc.c > ---- plat/rockchip/rk3399/drivers/soc/soc.c.orig > -+++ plat/rockchip/rk3399/drivers/soc/soc.c > -@@ -17,6 +17,7 @@ > - #include <dram.h> > - #include <m0_ctl.h> > - #include <plat_private.h> > -+#include <pmu.h> > - #include <rk3399_def.h> > - #include <secure.h> > - #include <soc.h> > -@@ -327,6 +328,7 @@ void soc_global_soft_reset_init(void) > - > - void __dead2 soc_global_soft_reset(void) > - { > -+ pmu_power_domains_on(); > - set_pll_slow_mode(VPLL_ID); > - set_pll_slow_mode(NPLL_ID); > - set_pll_slow_mode(GPLL_ID);
