| Date: | 2013-04-28 12:35:55 (10 years 1 month ago) |
|---|---|
| Author: | Lars C. |
| Commit: | 8a8fe1c14234e370db978bf339242607b904d2c4 |
| Message: | drivers/rtc/rtc-jz4740.c: Use managed resources Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> |
| Files: |
drivers/rtc/rtc-jz4740.c (4 diffs) |
Change Details
| drivers/rtc/rtc-jz4740.c | ||
|---|---|---|
| 39 | 39 | #define JZ_RTC_CTRL_ENABLE BIT(0) |
| 40 | 40 | |
| 41 | 41 | struct jz4740_rtc { |
| 42 | struct resource *mem; | |
| 43 | 42 | void __iomem *base; |
| 44 | 43 | |
| 45 | 44 | struct rtc_device *rtc; |
| ... | ... | |
| 216 | 215 | { |
| 217 | 216 | int ret; |
| 218 | 217 | struct jz4740_rtc *rtc; |
| 218 | struct resource *mem; | |
| 219 | 219 | uint32_t scratchpad; |
| 220 | 220 | struct clk *rtc_clk; |
| 221 | 221 | |
| ... | ... | |
| 229 | 229 | return -ENOENT; |
| 230 | 230 | } |
| 231 | 231 | |
| 232 | rtc->mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | |
| 233 | if (!rtc->mem) { | |
| 234 | dev_err(&pdev->dev, "Failed to get platform mmio memory\n"); | |
| 235 | return -ENOENT; | |
| 236 | } | |
| 237 | ||
| 238 | rtc->mem = devm_request_mem_region(&pdev->dev, rtc->mem->start, | |
| 239 | resource_size(rtc->mem), pdev->name); | |
| 240 | if (!rtc->mem) { | |
| 241 | dev_err(&pdev->dev, "Failed to request mmio memory region\n"); | |
| 242 | return -EBUSY; | |
| 243 | } | |
| 244 | ||
| 245 | rtc->base = devm_ioremap_nocache(&pdev->dev, rtc->mem->start, | |
| 246 | resource_size(rtc->mem)); | |
| 247 | if (!rtc->base) { | |
| 248 | dev_err(&pdev->dev, "Failed to ioremap mmio memory\n"); | |
| 249 | return -EBUSY; | |
| 250 | } | |
| 232 | mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); | |
| 233 | rtc->base = devm_ioremap_resource(&pdev->dev, mem); | |
| 234 | if (!rtc->base) | |
| 235 | return PTR_ERR(rtc->base); | |
| 251 | 236 | |
| 252 | 237 | spin_lock_init(&rtc->lock); |
| 253 | 238 | |
| ... | ... | |
| 283 | 268 | rtc_clk = clk_get(&pdev->dev, "rtc"); |
| 284 | 269 | if (IS_ERR(rtc_clk)) { |
| 285 | 270 | dev_err(&pdev->dev, "Failed to get RTC clock\n"); |
| 286 | goto err_free_irq; | |
| 271 | return PTR_ERR(rtc_clk); | |
| 287 | 272 | } |
| 288 | 273 | |
| 289 | 274 | /* TODO: initialize the ADJC bits (25:16) to fine-tune |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9
