lkml.org 
[lkml]   [2020]   [Jul]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 066/215] ARM: OMAP4+: remove pdata quirks for omap4+ iommus
    Date
    From: Tero Kristo <t-kristo@ti.com>

    [ Upstream commit e4c4b540e1e6c21ff8b987e92b2bd170ee006a94 ]

    IOMMU driver will be using ti-sysc bus driver for power management control
    going forward, and the pdata quirks are not needed for anything anymore.

    Signed-off-by: Tero Kristo <t-kristo@ti.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-omap2/pdata-quirks.c | 14 --------------
    1 file changed, 14 deletions(-)

    diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
    index 247e3f8acffe6..5acd29cb8d749 100644
    --- a/arch/arm/mach-omap2/pdata-quirks.c
    +++ b/arch/arm/mach-omap2/pdata-quirks.c
    @@ -311,16 +311,6 @@ static void __init omap3_pandora_legacy_init(void)
    }
    #endif /* CONFIG_ARCH_OMAP3 */

    -#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
    -static struct iommu_platform_data omap4_iommu_pdata = {
    - .reset_name = "mmu_cache",
    - .assert_reset = omap_device_assert_hardreset,
    - .deassert_reset = omap_device_deassert_hardreset,
    - .device_enable = omap_device_enable,
    - .device_idle = omap_device_idle,
    -};
    -#endif
    -
    #if defined(CONFIG_SOC_AM33XX) || defined(CONFIG_SOC_AM43XX)
    static struct wkup_m3_platform_data wkup_m3_data = {
    .reset_name = "wkup_m3",
    @@ -543,10 +533,6 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = {
    &wkup_m3_data),
    #endif
    #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
    - OF_DEV_AUXDATA("ti,omap4-iommu", 0x4a066000, "4a066000.mmu",
    - &omap4_iommu_pdata),
    - OF_DEV_AUXDATA("ti,omap4-iommu", 0x55082000, "55082000.mmu",
    - &omap4_iommu_pdata),
    OF_DEV_AUXDATA("ti,omap4-smartreflex-iva", 0x4a0db000,
    "4a0db000.smartreflex", &omap_sr_pdata[OMAP_SR_IVA]),
    OF_DEV_AUXDATA("ti,omap4-smartreflex-core", 0x4a0dd000,
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-07-20 18:40    [W:6.191 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site