ram: k3-ddrss: Allow use of dt provided initial frequency
PATCH 1/1 ram: k3-ddrss: Allow use of dt provided initial frequency
Allow device tree to provide ti,ddr-freq0 to be used as the initial DDR frequency that is set for lpddr4 before initialization of the controller. Make this optional and continue to use PLL bypass frequency as is done currently if ti,ddr-freq0 is not provided.
--- .../memory-controller/k3-j721e-ddrss.txt | 2 ++ drivers/ram/k3-ddrss/k3-ddrss.c | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
doc/device-tree-bindings/memory-controller/k3-j721e-ddrss.txt +2 -0
@@ -39,6 +39,8 @@ Optional properties: - reg: Must add "ss" to list if the above ss region is included. - ti,ecc-enable: Boolean flag to enable ECC. This will reduce available DDR by 1/9. +- ti,ddr-freq0: Initial frequency set point, if not provided PLL bypass + frequency will be used. Example (J721E): ================
drivers/ram/k3-ddrss/k3-ddrss.c +10 -5
@@ -134,6 +134,7 @@ struct k3_ddrss_desc {struct power_domain ddrdata_pwrdmn;struct clk ddr_clk;struct clk osc_clk; +u32 ddr_freq0;u32 ddr_freq1;u32 ddr_freq2;u32 ddr_fhs_cnt;
@@ -223,9 +224,7 @@ static void k3_lpddr4_freq_update(struct k3_ddrss_desc *ddrss)else if (req_type ==2 )clk_set_rate (&ddrss->ddr_clk, ddrss->ddr_freq2);else if (req_type ==0 ) -/* Put DDR pll in bypass mode */ -clk_set_rate (&ddrss->ddr_clk, -clk_get_rate (&ddrss->osc_clk)); +clk_set_rate (&ddrss->ddr_clk, ddrss->ddr_freq0);else printf ("%s: Invalid freq request type\n" , __func__);
@@ -276,8 +275,7 @@ static int k3_ddrss_init_freq(struct k3_ddrss_desc *ddrss) ret =clk_set_rate (&ddrss->ddr_clk, ddrss->ddr_freq1);break ;case DENALI_CTL_0_DRAM_CLASS_LPDDR4 : -/* Set to bypass frequency for LPDDR4*/ - ret =clk_set_rate (&ddrss->ddr_clk,clk_get_rate (&ddrss->osc_clk)); + ret =clk_set_rate (&ddrss->ddr_clk, ddrss->ddr_freq0);break ;default : ret = -EINVAL ;
@@ -394,6 +392,13 @@ static int k3_ddrss_ofdata_to_priv(struct udevice *dev) ddrss->instance =0 ; } + ret =dev_read_u32 (dev,"ti,ddr-freq0" , &ddrss->ddr_freq0); +if (ret) { + ddrss->ddr_freq0 =clk_get_rate (&ddrss->osc_clk); +dev_dbg (dev, +"ddr freq0 not populated, using bypass frequency.\n" ); + } + ret =dev_read_u32 (dev,"ti,ddr-freq1" , &ddrss->ddr_freq1);if (ret)dev_err (dev,"ddr freq1 not populated %d\n" , ret);
Signature · 1 line
2.35.0
Quoted 10 lines · Dave Gerlach
Allow device tree to provide ti,ddr-freq0 to be used as the initial DDR frequency that is set for lpddr4 before initialization of the controller. Make this optional and continue to use PLL bypass frequency as is done currently if ti,ddr-freq0 is not provided.
Signed-off-by Dave Gerlach <[email protected]>--- .../memory-controller/k3-j721e-ddrss.txt | 2 ++ drivers/ram/k3-ddrss/k3-ddrss.c | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
What's the status of getting this binding upstreamed? I forget if this is one I've asked about before or not. Thanks.
Signature · 1 line
Tom
Hi,
Quoted 7 lines · Tom Rini
Quoted 5 lines · Dave Gerlach
Allow device tree to provide ti,ddr-freq0 to be used as the initial DDR frequency that is set for lpddr4 before initialization of the controller. Make this optional and continue to use PLL bypass frequency as is done currently if ti,ddr-freq0 is not provided.
Quoted 9 lines
Quoted 5 lines
Signed-off-by Dave Gerlach <[email protected]>--- .../memory-controller/k3-j721e-ddrss.txt | 2 ++ drivers/ram/k3-ddrss/k3-ddrss.c | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)What's the status of getting this binding upstreamed? I forget if this is one I've asked about before or not. Thanks.
I am pretty sure nobody is looking at this one, but I'd be happy to take it up.
Regards,
Dave
Quoted 16 lines · Dave Gerlach
Hi,
Quoted 13 lines · Tom Rini
Quoted 10 lines · Dave Gerlach
Allow device tree to provide ti,ddr-freq0 to be used as the initial DDR frequency that is set for lpddr4 before initialization of the controller. Make this optional and continue to use PLL bypass frequency as is done currently if ti,ddr-freq0 is not provided.
Signed-off-by Dave Gerlach <[email protected]>--- .../memory-controller/k3-j721e-ddrss.txt | 2 ++ drivers/ram/k3-ddrss/k3-ddrss.c | 15 ++++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)
Quoted 5 lines
Quoted 2 lines
What's the status of getting this binding upstreamed? I forget if this is one I've asked about before or not. Thanks.
I am pretty sure nobody is looking at this one, but I'd be happy to take it up.
Great, thanks!
Signature · 1 line
Tom
Quoted 6 lines · Dave Gerlach
Allow device tree to provide ti,ddr-freq0 to be used as the initial DDR frequency that is set for lpddr4 before initialization of the controller. Make this optional and continue to use PLL bypass frequency as is done currently if ti,ddr-freq0 is not provided.
Signed-off-by Dave Gerlach <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom