|
@@ -41,7 +41,7 @@
|
|
|
* @id: identifier of the one instance of the TMU controller.
|
|
|
* @pdata: pointer to the tmu platform/configuration data
|
|
|
* @base: base address of the single instance of the TMU controller.
|
|
|
- * @base_common: base address of the common registers of the TMU controller.
|
|
|
+ * @base_second: base address of the common registers of the TMU controller.
|
|
|
* @irq: irq number of the TMU controller.
|
|
|
* @soc: id of the SOC type.
|
|
|
* @irq_work: pointer to the irq work structure.
|
|
@@ -56,7 +56,7 @@ struct exynos_tmu_data {
|
|
|
int id;
|
|
|
struct exynos_tmu_platform_data *pdata;
|
|
|
void __iomem *base;
|
|
|
- void __iomem *base_common;
|
|
|
+ void __iomem *base_second;
|
|
|
int irq;
|
|
|
enum soc_type soc;
|
|
|
struct work_struct irq_work;
|
|
@@ -298,7 +298,7 @@ skip_calib_data:
|
|
|
}
|
|
|
/*Clear the PMIN in the common TMU register*/
|
|
|
if (reg->tmu_pmin && !data->id)
|
|
|
- writel(0, data->base_common + reg->tmu_pmin);
|
|
|
+ writel(0, data->base_second + reg->tmu_pmin);
|
|
|
out:
|
|
|
clk_disable(data->clk);
|
|
|
mutex_unlock(&data->lock);
|
|
@@ -455,7 +455,7 @@ static void exynos_tmu_work(struct work_struct *work)
|
|
|
|
|
|
/* Find which sensor generated this interrupt */
|
|
|
if (reg->tmu_irqstatus) {
|
|
|
- val_type = readl(data->base_common + reg->tmu_irqstatus);
|
|
|
+ val_type = readl(data->base_second + reg->tmu_irqstatus);
|
|
|
if (!((val_type >> data->id) & 0x1))
|
|
|
goto out;
|
|
|
}
|
|
@@ -580,7 +580,7 @@ static int exynos_map_dt_data(struct platform_device *pdev)
|
|
|
* Check if the TMU shares some registers and then try to map the
|
|
|
* memory of common registers.
|
|
|
*/
|
|
|
- if (!TMU_SUPPORTS(pdata, SHARED_MEMORY))
|
|
|
+ if (!TMU_SUPPORTS(pdata, ADDRESS_MULTIPLE))
|
|
|
return 0;
|
|
|
|
|
|
if (of_address_to_resource(pdev->dev.of_node, 1, &res)) {
|
|
@@ -588,9 +588,9 @@ static int exynos_map_dt_data(struct platform_device *pdev)
|
|
|
return -ENODEV;
|
|
|
}
|
|
|
|
|
|
- data->base_common = devm_ioremap(&pdev->dev, res.start,
|
|
|
+ data->base_second = devm_ioremap(&pdev->dev, res.start,
|
|
|
resource_size(&res));
|
|
|
- if (!data->base_common) {
|
|
|
+ if (!data->base_second) {
|
|
|
dev_err(&pdev->dev, "Failed to ioremap memory\n");
|
|
|
return -ENOMEM;
|
|
|
}
|