diff options
| author | Olof Johansson <olof@lixom.net> | 2020-01-07 11:16:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-01-07 11:16:52 -0800 |
| commit | 8a6c3e88bb7aae4ef2bd88057531c34aa5d5574a (patch) | |
| tree | 2efa614ab591cd71ec783f31fe731fa262b0b1fa /arch/arm/mach-omap2/pdata-quirks.c | |
| parent | 3f9c6a6d9056c1e2b5a5fb3815b4afefca8325c1 (diff) | |
| parent | d71b48236c83a8a732ccaf23dbf3b719d5c62e88 (diff) | |
Merge tag 'omap-for-v5.6/ti-sysc-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt
dts changes for omaps for ti-sysc driver for v5.6 merge window
Devicetree changes for omaps to configure more devices to probe with
ti-sysc interconnect target module:
- Configure am4 qspi
- Configure aes, des and sham accelerators for am3, 4 and dra7
- Configure iommus for omap4, 5 and dra7
- Add a generic compatible for sdma, and configure omap2 and 3 sdma
* tag 'omap-for-v5.6/ti-sysc-dt-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (24 commits)
ARM: dts: omap5: convert IOMMUs to use ti-sysc
ARM: dts: omap4: convert IOMMUs to use ti-sysc
ARM: dts: dra74x: convert IOMMUs to use ti-sysc
ARM: dts: dra7: convert IOMMUs to use ti-sysc
ARM: dts: Configure interconnect target module for dra7 des
ARM: dts: Configure interconnect target module for am4 des
ARM: dts: Configure interconnect target module for dra7 aes
ARM: dts: Configure interconnect target module for am4 aes
ARM: dts: Configure interconnect target module for am3 aes
ARM: dts: Configure interconnect target module for dra7 sham
ARM: dts: Configure interconnect target module for am4 sham
ARM: dts: Configure interconnect target module for am3 sham
ARM: dts: Configure interconnect target module for am4 qspi
ARM: dts: Configure interconnect target module for omap3 sdma
ARM: dts: Configure interconnect target module for omap2 sdma
ARM: dts: Add generic compatible for omap sdma instances
bus: ti-sysc: Fix iterating over clocks
ARM: OMAP2+: Fix ti_sysc_find_one_clockdomain to check for to_clk_hw_omap
bus: ti-sysc: Fix missing reset delay handling
ARM: dts: am437x-gp/epos-evm: fix panel compatible
...
Link: https://lore.kernel.org/r/pull-1578420398-290837@atomide.com-3
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-omap2/pdata-quirks.c')
| -rw-r--r-- | arch/arm/mach-omap2/pdata-quirks.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index ca52271de5a8..e95c224ffc4d 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -306,10 +306,14 @@ static void __init dra7x_evm_mmc_quirk(void) static struct clockdomain *ti_sysc_find_one_clockdomain(struct clk *clk) { + struct clk_hw *hw = __clk_get_hw(clk); struct clockdomain *clkdm = NULL; struct clk_hw_omap *hwclk; - hwclk = to_clk_hw_omap(__clk_get_hw(clk)); + hwclk = to_clk_hw_omap(hw); + if (!omap2_clk_is_hw_omap(hw)) + return NULL; + if (hwclk && hwclk->clkdm_name) clkdm = clkdm_lookup(hwclk->clkdm_name); |