Commit: 77ca8f514ae1ed6c828909b72e30e7f281ba5e38 - uboot (git)

Commit MetaInfo

• Revisión: 77ca8f514ae1ed6c828909b72e30e7f281ba5e38 (tree)
• Tiempo: 2020-05-27 20:40:24
• Autor: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

fix error.

Cambiar Resumen

• modified: drivers/timer/Makefile
• modified: drivers/timer/rx_timer.c

Diferencia incremental

--- a/drivers/timer/Makefile
+++ b/drivers/timer/Makefile
@@ -12,11 +12,8 @@ obj-$(CONFIG_OMAP_TIMER)	+= omap-timer.o
 obj-$(CONFIG_AST_TIMER)	+= ast_timer.o
 obj-$(CONFIG_STI_TIMER)		+= sti-timer.o
 obj-$(CONFIG_ARC_TIMER)	+= arc_timer.o
-<<<<<<< HEAD
-obj-$(CONFIG_RX_TIMER)		+= rx_timer.o
-=======
 obj-$(CONFIG_AG101P_TIMER) += ag101p_timer.o
 obj-$(CONFIG_AE3XX_TIMER) += ae3xx_timer.o
 obj-$(CONFIG_ROCKCHIP_TIMER) += rockchip_timer.o
 obj-$(CONFIG_ATMEL_PIT_TIMER) += atmel_pit_timer.o
->>>>>>> v2017.11
+obj-$(CONFIG_RX_TIMER)		+= rx_timer.o

--- a/drivers/timer/rx_timer.c
+++ b/drivers/timer/rx_timer.c
@@ -59,8 +59,8 @@ static int rx_timer_ofdata_to_platdata(struct udevice *dev)
 {
 	struct rx_timer_platdata *plat = dev_get_platdata(dev);
 
-	plat->regs = map_physmem(dev_get_addr(dev), 0x0700, MAP_NOCACHE);
-	plat->unit = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+	plat->regs = map_physmem(dev_read_addr(dev), 0x0700, MAP_NOCACHE);
+	plat->unit = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                    "renesas,unit", 0);
 	return 0;
 }