diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-20 21:39:40 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-20 21:39:40 -0400 |
| commit | 000fc151150150c36c58f6d8e8d2e27d3b668a7d (patch) | |
| tree | 244a6966b7b5c999bda9863537397c6f87c21496 /arch/arm | |
| parent | a2ca54ff52146f2bbf52d87bf4e121e8e15e9e07 (diff) | |
| parent | e171dc2927e4d000122c5901db392096f4b031dc (diff) | |
Merge branch '2019-08-20-ti-imports'
- More DaVinci cleanups
- Other minor omap2plus cleanups
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/Makefile | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap5/fdt.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index ebe5495d44..05ff624c07 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -807,4 +807,4 @@ PHONY += dtbs dtbs: $(addprefix $(obj)/, $(dtb-y)) @: -clean-files := *.dtb +clean-files := *.dtb *_HS diff --git a/arch/arm/mach-omap2/omap5/fdt.c b/arch/arm/mach-omap2/omap5/fdt.c index 3626d79199..8dee555c10 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)); |