Skip to content

Commit

Permalink
thermal/spear_thermal: replace readl/writel with lighter _relaxed var…
Browse files Browse the repository at this point in the history
…iants

readl/writel versions for ARM contain memory barrier instruction for
synchronizing DMA buffers.  These are not required at least on this
module.  So use lighter _relaxed variants.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Viresh Kumar authored and Len Brown committed Mar 22, 2012
1 parent 6a92c36 commit de716e3
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/thermal/spear_thermal.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static inline int thermal_get_temp(struct thermal_zone_device *thermal,
* Data are ready to be read after 628 usec from POWERDOWN signal
* (PDN) = 1
*/
*temp = (readl(stdev->thermal_base) & 0x7F) * MD_FACTOR;
*temp = (readl_relaxed(stdev->thermal_base) & 0x7F) * MD_FACTOR;
return 0;
}

Expand All @@ -63,8 +63,8 @@ static int spear_thermal_suspend(struct device *dev)
unsigned int actual_mask = 0;

/* Disable SPEAr Thermal Sensor */
actual_mask = readl(stdev->thermal_base);
writel(actual_mask & ~stdev->flags, stdev->thermal_base);
actual_mask = readl_relaxed(stdev->thermal_base);
writel_relaxed(actual_mask & ~stdev->flags, stdev->thermal_base);

clk_disable(stdev->clk);
dev_info(dev, "Suspended.\n");
Expand All @@ -87,8 +87,8 @@ static int spear_thermal_resume(struct device *dev)
}

/* Enable SPEAr Thermal Sensor */
actual_mask = readl(stdev->thermal_base);
writel(actual_mask | stdev->flags, stdev->thermal_base);
actual_mask = readl_relaxed(stdev->thermal_base);
writel_relaxed(actual_mask | stdev->flags, stdev->thermal_base);

dev_info(dev, "Resumed.\n");

Expand Down Expand Up @@ -145,7 +145,7 @@ static int spear_thermal_probe(struct platform_device *pdev)
}

stdev->flags = pdata->thermal_flags;
writel(stdev->flags, stdev->thermal_base);
writel_relaxed(stdev->flags, stdev->thermal_base);

spear_thermal = thermal_zone_device_register("spear_thermal", 0,
stdev, &ops, 0, 0, 0, 0);
Expand Down Expand Up @@ -180,8 +180,8 @@ static int spear_thermal_exit(struct platform_device *pdev)
platform_set_drvdata(pdev, NULL);

/* Disable SPEAr Thermal Sensor */
actual_mask = readl(stdev->thermal_base);
writel(actual_mask & ~stdev->flags, stdev->thermal_base);
actual_mask = readl_relaxed(stdev->thermal_base);
writel_relaxed(actual_mask & ~stdev->flags, stdev->thermal_base);

clk_disable(stdev->clk);
clk_put(stdev->clk);
Expand Down

0 comments on commit de716e3

Please sign in to comment.