| Message ID | 20190816223016.28983-1-s-anna@ti.com |
|---|---|
| State | Accepted |
| Commit | a517c1f62f49d7e16b328d9d12785ca58c887346 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [U-Boot] ARM: DRA7: Fixup DPLL clock rate fixup logic for newer kernels | expand |
On Fri, Aug 16, 2019 at 05:30:16PM -0500, Suman Anna wrote: > The commit 1b42ab3eda8a ("ARM: DRA7: Fixup DSPEVE, IVA and GPU clock > frequencies based on OPP") updates the kernel device-tree blob to adjust > the DSP, IVA and GPU DPLL clocks based on a one-time OPP choice selected > in U-Boot. All these DPLL clocks are children of the cm_core_aon clocks > DT node. > > The hierarchy of this clocks DT node has changed in newer Linux kernels > starting from v5.0, and this results in a failure in ft_fixup_clocks() > function to update the clock rates on these newer kernels. Fix this by > updating the lookup logic to look through both the newer and older > DT hierarchy paths for the cm_core_aon clocks node. > > Signed-off-by: Suman Anna <s-anna@ti.com> Applied to u-boot/master, thanks!
diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c index 3626d79199af..8dee555c10c6 100644 --- a/arch/arm/mach-omap2/omap5/fdt.c +++ b/arch/arm/mach-omap2/omap5/fdt.c @@ -201,7 +201,9 @@ static int ft_fixup_clocks(void *fdt, const char **names, u32 *rates, int num) int offs, node_offs, ret, i; uint32_t phandle; - offs = fdt_path_offset(fdt, "/ocp/l4@4a000000/cm_core_aon@5000/clocks"); + offs = fdt_path_offset(fdt, "/ocp/interconnect@4a000000/segment@0/target-module@5000/cm_core_aon@0/clocks"); + if (offs < 0) + offs = fdt_path_offset(fdt, "/ocp/l4@4a000000/cm_core_aon@5000/clocks"); if (offs < 0) { debug("Could not find cm_core_aon clocks node path offset : %s\n", fdt_strerror(offs));
The commit 1b42ab3eda8a ("ARM: DRA7: Fixup DSPEVE, IVA and GPU clock frequencies based on OPP") updates the kernel device-tree blob to adjust the DSP, IVA and GPU DPLL clocks based on a one-time OPP choice selected in U-Boot. All these DPLL clocks are children of the cm_core_aon clocks DT node. The hierarchy of this clocks DT node has changed in newer Linux kernels starting from v5.0, and this results in a failure in ft_fixup_clocks() function to update the clock rates on these newer kernels. Fix this by updating the lookup logic to look through both the newer and older DT hierarchy paths for the cm_core_aon clocks node. Signed-off-by: Suman Anna <s-anna@ti.com> --- arch/arm/mach-omap2/omap5/fdt.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)