@@ -71,7 +71,7 @@ struct shdwc_config {
7171struct shdwc {
7272 const struct shdwc_config * cfg ;
7373 struct clk * sclk ;
74- void __iomem * at91_shdwc_base ;
74+ void __iomem * shdwc_base ;
7575 void __iomem * mpddrc_base ;
7676 void __iomem * pmc_base ;
7777};
@@ -92,7 +92,7 @@ static void __init at91_wakeup_status(struct platform_device *pdev)
9292 u32 reg ;
9393 char * reason = "unknown" ;
9494
95- reg = readl (shdw -> at91_shdwc_base + AT91_SHDW_SR );
95+ reg = readl (shdw -> shdwc_base + AT91_SHDW_SR );
9696
9797 dev_dbg (& pdev -> dev , "%s: status = %#x\n" , __func__ , reg );
9898
@@ -138,7 +138,7 @@ static void at91_poweroff(void)
138138 :
139139 : "r" (at91_shdwc -> mpddrc_base ),
140140 "r" cpu_to_le32 (AT91_DDRSDRC_LPDDR2_PWOFF ),
141- "r" (at91_shdwc -> at91_shdwc_base ),
141+ "r" (at91_shdwc -> shdwc_base ),
142142 "r" cpu_to_le32 (AT91_SHDW_KEY | AT91_SHDW_SHDW ),
143143 "r" (at91_shdwc -> pmc_base )
144144 : "r6" );
@@ -222,10 +222,10 @@ static void at91_shdwc_dt_configure(struct platform_device *pdev)
222222 mode |= SHDW_RTCWKEN (shdw -> cfg );
223223
224224 dev_dbg (& pdev -> dev , "%s: mode = %#x\n" , __func__ , mode );
225- writel (mode , shdw -> at91_shdwc_base + AT91_SHDW_MR );
225+ writel (mode , shdw -> shdwc_base + AT91_SHDW_MR );
226226
227227 input = at91_shdwc_get_wakeup_input (pdev , np );
228- writel (input , shdw -> at91_shdwc_base + AT91_SHDW_WUIR );
228+ writel (input , shdw -> shdwc_base + AT91_SHDW_WUIR );
229229}
230230
231231static const struct shdwc_config sama5d2_shdwc_config = {
@@ -262,10 +262,10 @@ static int __init at91_shdwc_probe(struct platform_device *pdev)
262262 platform_set_drvdata (pdev , at91_shdwc );
263263
264264 res = platform_get_resource (pdev , IORESOURCE_MEM , 0 );
265- at91_shdwc -> at91_shdwc_base = devm_ioremap_resource (& pdev -> dev , res );
266- if (IS_ERR (at91_shdwc -> at91_shdwc_base )) {
265+ at91_shdwc -> shdwc_base = devm_ioremap_resource (& pdev -> dev , res );
266+ if (IS_ERR (at91_shdwc -> shdwc_base )) {
267267 dev_err (& pdev -> dev , "Could not map reset controller address\n" );
268- return PTR_ERR (at91_shdwc -> at91_shdwc_base );
268+ return PTR_ERR (at91_shdwc -> shdwc_base );
269269 }
270270
271271 match = of_match_node (at91_shdwc_of_match , pdev -> dev .of_node );
@@ -341,8 +341,8 @@ static int __exit at91_shdwc_remove(struct platform_device *pdev)
341341 pm_power_off = NULL ;
342342
343343 /* Reset values to disable wake-up features */
344- writel (0 , shdw -> at91_shdwc_base + AT91_SHDW_MR );
345- writel (0 , shdw -> at91_shdwc_base + AT91_SHDW_WUIR );
344+ writel (0 , shdw -> shdwc_base + AT91_SHDW_MR );
345+ writel (0 , shdw -> shdwc_base + AT91_SHDW_WUIR );
346346
347347 if (shdw -> mpddrc_base )
348348 iounmap (shdw -> mpddrc_base );
0 commit comments