Commit d5279a57 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v5.6/soc-signed' of... 

Merge tag 'omap-for-v5.6/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc

SoC changes for omaps for v5.6 merge window

SoC related changes for omaps that mostly relate to making iommus
to start probing with ti-sysc interconnect target module driver:

- Add missing lcdc clockdomain for am43xx

- Pass auxdata for reset control driver

- Remove old pdata quirks for iommus

- Add workaround for dra7 dsp mstandby errata

- Convert iommu platform code to probe with ti-sysc

- Use sperate iommu auxdata for ipu1

* tag 'omap-for-v5.6/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: use separate IOMMU pdata to fix DRA7 IPU1 boot
  ARM: OMAP2+: omap-iommu.c conversion to ti-sysc
  ARM: OMAP2+: Add workaround for DRA7 DSP MStandby errata i879
  ARM: OMAP4+: remove pdata quirks for omap4+ iommus
  ARM: OMAP2+: pdata-quirks: add PRM data for reset support
  ARM: OMAP2+: am43xx: Add lcdc clockdomain

Link: https://lore.kernel.org/r/pull-1578420398-290837@atomide.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents d1eef1c6 4601832f

arch/arm/mach-omap2/clockdomains43xx_data.c

+10 −0
Original line number Diff line number Diff line
@@ -84,6 +84,15 @@ static struct clockdomain l3s_tsc_43xx_clkdm = { 
	.flags		  = CLKDM_CAN_SWSUP,

};



static struct clockdomain lcdc_43xx_clkdm = {

	.name		  = "lcdc_clkdm",

	.pwrdm		  = { .name = "per_pwrdm" },

	.prcm_partition	  = AM43XX_CM_PARTITION,

	.cm_inst	  = AM43XX_CM_PER_INST,

	.clkdm_offs	  = AM43XX_CM_PER_LCDC_CDOFFS,

	.flags		  = CLKDM_CAN_SWSUP,

};



static struct clockdomain dss_43xx_clkdm = {

	.name		  = "dss_clkdm",

	.pwrdm		  = { .name = "per_pwrdm" },
@@ -173,6 +182,7 @@ static struct clockdomain *clockdomains_am43xx[] __initdata = { 
	&pruss_ocp_43xx_clkdm,

	&ocpwp_l3_43xx_clkdm,

	&l3s_tsc_43xx_clkdm,

	&lcdc_43xx_clkdm,

	&dss_43xx_clkdm,

	&l3_aon_43xx_clkdm,

	&emif_43xx_clkdm,

arch/arm/mach-omap2/omap-iommu.c

+113 −15
Original line number Diff line number Diff line
@@ -8,36 +8,134 @@ 


#include <linux/platform_device.h>

#include <linux/err.h>

#include <linux/clk.h>

#include <linux/list.h>



#include "omap_hwmod.h"

#include "omap_device.h"

#include "clockdomain.h"

#include "powerdomain.h"



struct pwrdm_link {

	struct device *dev;

	struct powerdomain *pwrdm;

	struct list_head node;

};



static DEFINE_SPINLOCK(iommu_lock);

static struct clockdomain *emu_clkdm;

static atomic_t emu_count;



static void omap_iommu_dra7_emu_swsup_config(struct platform_device *pdev,

					     bool enable)

{

	struct device_node *np = pdev->dev.of_node;

	unsigned long flags;



	if (!of_device_is_compatible(np, "ti,dra7-dsp-iommu"))

		return;



	if (!emu_clkdm) {

		emu_clkdm = clkdm_lookup("emu_clkdm");

		if (WARN_ON_ONCE(!emu_clkdm))

			return;

	}



	spin_lock_irqsave(&iommu_lock, flags);



	if (enable && (atomic_inc_return(&emu_count) == 1))

		clkdm_deny_idle(emu_clkdm);

	else if (!enable && (atomic_dec_return(&emu_count) == 0))

		clkdm_allow_idle(emu_clkdm);



	spin_unlock_irqrestore(&iommu_lock, flags);

}



static struct powerdomain *_get_pwrdm(struct device *dev)

{

	struct clk *clk;

	struct clk_hw_omap *hwclk;

	struct clockdomain *clkdm;

	struct powerdomain *pwrdm = NULL;

	struct pwrdm_link *entry;

	unsigned long flags;

	static LIST_HEAD(cache);



	spin_lock_irqsave(&iommu_lock, flags);



	list_for_each_entry(entry, &cache, node) {

		if (entry->dev == dev) {

			pwrdm = entry->pwrdm;

			break;

		}

	}



	spin_unlock_irqrestore(&iommu_lock, flags);



	if (pwrdm)

		return pwrdm;



	clk = of_clk_get(dev->of_node->parent, 0);

	if (!clk) {

		dev_err(dev, "no fck found\n");

		return NULL;

	}



	hwclk = to_clk_hw_omap(__clk_get_hw(clk));

	clk_put(clk);

	if (!hwclk || !hwclk->clkdm_name) {

		dev_err(dev, "no hwclk data\n");

		return NULL;

	}



	clkdm = clkdm_lookup(hwclk->clkdm_name);

	if (!clkdm) {

		dev_err(dev, "clkdm not found: %s\n", hwclk->clkdm_name);

		return NULL;

	}



	pwrdm = clkdm_get_pwrdm(clkdm);

	if (!pwrdm) {

		dev_err(dev, "pwrdm not found: %s\n", clkdm->name);

		return NULL;

	}



	entry = kmalloc(sizeof(*entry), GFP_KERNEL);

	if (entry) {

		entry->dev = dev;

		entry->pwrdm = pwrdm;

		spin_lock_irqsave(&iommu_lock, flags);

		list_add(&entry->node, &cache);

		spin_unlock_irqrestore(&iommu_lock, flags);

	}



	return pwrdm;

}



int omap_iommu_set_pwrdm_constraint(struct platform_device *pdev, bool request,

				    u8 *pwrst)

{

	struct powerdomain *pwrdm;

	struct omap_device *od;

	u8 next_pwrst;

	int ret = 0;



	od = to_omap_device(pdev);

	if (!od)

		return -ENODEV;



	if (od->hwmods_cnt != 1)

		return -EINVAL;



	pwrdm = omap_hwmod_get_pwrdm(od->hwmods[0]);

	pwrdm = _get_pwrdm(&pdev->dev);

	if (!pwrdm)

		return -EINVAL;

		return -ENODEV;



	if (request)

	if (request) {

		*pwrst = pwrdm_read_next_pwrst(pwrdm);

		omap_iommu_dra7_emu_swsup_config(pdev, true);

	}



	if (*pwrst > PWRDM_POWER_RET)

		return 0;

		goto out;



	next_pwrst = request ? PWRDM_POWER_ON : *pwrst;



	return pwrdm_set_next_pwrst(pwrdm, next_pwrst);

	ret = pwrdm_set_next_pwrst(pwrdm, next_pwrst);



out:

	if (!request)

		omap_iommu_dra7_emu_swsup_config(pdev, false);



	return ret;

}

arch/arm/mach-omap2/pdata-quirks.c

+29 −14
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/platform_data/ti-sysc.h>

#include <linux/platform_data/wkup_m3.h>

#include <linux/platform_data/asoc-ti-mcbsp.h>

#include <linux/platform_data/ti-prm.h>



#include "clockdomain.h"

#include "common.h"
@@ -42,6 +43,17 @@ struct pdata_init { 
static struct of_dev_auxdata omap_auxdata_lookup[];

static struct twl4030_gpio_platform_data twl_gpio_auxdata;



#if IS_ENABLED(CONFIG_OMAP_IOMMU)

int omap_iommu_set_pwrdm_constraint(struct platform_device *pdev, bool request,

				    u8 *pwrst);

#else

static inline int omap_iommu_set_pwrdm_constraint(struct platform_device *pdev,

						  bool request, u8 *pwrst)

{

	return 0;

}

#endif



#ifdef CONFIG_MACH_NOKIA_N8X0

static void __init omap2420_n8x0_legacy_init(void)

{
@@ -260,16 +272,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",
@@ -285,6 +287,10 @@ static void __init omap5_uevm_legacy_init(void) 
#endif



#ifdef CONFIG_SOC_DRA7XX

static struct iommu_platform_data dra7_ipu1_dsp_iommu_pdata = {

	.set_pwrdm_constraint = omap_iommu_set_pwrdm_constraint,

};



static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc1;

static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc2;

static struct omap_hsmmc_platform_data dra7_hsmmc_data_mmc3;
@@ -408,6 +414,12 @@ void omap_pcs_legacy_init(int irq, void (*rearm)(void)) 
	pcs_pdata.rearm = rearm;

}



static struct ti_prm_platform_data ti_prm_pdata = {

	.clkdm_deny_idle = clkdm_deny_idle,

	.clkdm_allow_idle = clkdm_allow_idle,

	.clkdm_lookup = clkdm_lookup,

};



/*

 * GPIOs for TWL are initialized by the I2C bus and need custom

 * handing until DSS has device tree bindings.
@@ -488,10 +500,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,
@@ -506,10 +514,17 @@ static struct of_dev_auxdata omap_auxdata_lookup[] = { 
		       &dra7_hsmmc_data_mmc2),

	OF_DEV_AUXDATA("ti,dra7-hsmmc", 0x480ad000, "480ad000.mmc",

		       &dra7_hsmmc_data_mmc3),

	OF_DEV_AUXDATA("ti,dra7-dsp-iommu", 0x40d01000, "40d01000.mmu",

		       &dra7_ipu1_dsp_iommu_pdata),

	OF_DEV_AUXDATA("ti,dra7-dsp-iommu", 0x41501000, "41501000.mmu",

		       &dra7_ipu1_dsp_iommu_pdata),

	OF_DEV_AUXDATA("ti,dra7-iommu", 0x58882000, "58882000.mmu",

		       &dra7_ipu1_dsp_iommu_pdata),

#endif

	/* Common auxdata */

	OF_DEV_AUXDATA("ti,sysc", 0, NULL, &ti_sysc_pdata),

	OF_DEV_AUXDATA("pinctrl-single", 0, NULL, &pcs_pdata),

	OF_DEV_AUXDATA("ti,omap-prm-inst", 0, NULL, &ti_prm_pdata),

	{ /* sentinel */ },

};

arch/arm/mach-omap2/prcm43xx.h

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#define AM43XX_CM_PER_ICSS_CDOFFS			0x0300

#define AM43XX_CM_PER_L4LS_CDOFFS			0x0400

#define AM43XX_CM_PER_EMIF_CDOFFS			0x0700

#define AM43XX_CM_PER_LCDC_CDOFFS			0x0800

#define AM43XX_CM_PER_DSS_CDOFFS			0x0a00

#define AM43XX_CM_PER_CPSW_CDOFFS			0x0b00

#define AM43XX_CM_PER_OCPWP_L3_CDOFFS			0x0c00

CRA Git | Maintained and supported by SUSTech CRA and CCSE