diff options
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | drivers/rtc/Makefile | 2 | ||||
| -rw-r--r-- | drivers/rtc/mc13xxx-rtc.c (renamed from drivers/rtc/mc13783-rtc.c) | 0 | ||||
| -rw-r--r-- | include/configs/efikamx.h | 2 | ||||
| -rw-r--r-- | include/configs/imx31_litekit.h | 2 | ||||
| -rw-r--r-- | include/configs/mx31ads.h | 2 | ||||
| -rw-r--r-- | include/configs/mx31pdk.h | 2 | ||||
| -rw-r--r-- | include/configs/qong.h | 2 | ||||
| -rw-r--r-- | include/configs/vision2.h | 2 | 
9 files changed, 8 insertions, 8 deletions
| @@ -876,7 +876,7 @@ The following options need to be configured:  		CONFIG_RTC_MPC8xx	- use internal RTC of MPC8xx  		CONFIG_RTC_PCF8563	- use Philips PCF8563 RTC -		CONFIG_RTC_MC13783	- use MC13783 RTC +		CONFIG_RTC_MC13XXX	- use MC13783 or MC13892 RTC  		CONFIG_RTC_MC146818	- use MC146818 RTC  		CONFIG_RTC_DS1307	- use Maxim, Inc. DS1307 RTC  		CONFIG_RTC_DS1337	- use Maxim, Inc. DS1337 RTC diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index df440c62f..a16f59051 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -50,7 +50,7 @@ COBJS-$(CONFIG_RTC_M41T62) += m41t62.o  COBJS-$(CONFIG_RTC_M41T94) += m41t94.o  COBJS-$(CONFIG_RTC_M48T35A) += m48t35ax.o  COBJS-$(CONFIG_RTC_MAX6900) += max6900.o -COBJS-$(CONFIG_RTC_MC13783) += mc13783-rtc.o +COBJS-$(CONFIG_RTC_MC13XXX) += mc13xxx-rtc.o  COBJS-$(CONFIG_RTC_MC146818) += mc146818.o  COBJS-$(CONFIG_MCFRTC) += mcfrtc.o  COBJS-$(CONFIG_RTC_MK48T59) += mk48t59.o diff --git a/drivers/rtc/mc13783-rtc.c b/drivers/rtc/mc13xxx-rtc.c index 70ea8a158..70ea8a158 100644 --- a/drivers/rtc/mc13783-rtc.c +++ b/drivers/rtc/mc13xxx-rtc.c diff --git a/include/configs/efikamx.h b/include/configs/efikamx.h index b507786bf..a07c8b58e 100644 --- a/include/configs/efikamx.h +++ b/include/configs/efikamx.h @@ -132,7 +132,7 @@  #define CONFIG_FSL_PMIC_CLK		25000000  #define CONFIG_FSL_PMIC_MODE		(SPI_MODE_0 | SPI_CS_HIGH)  #define CONFIG_FSL_PMIC_BITLEN	32 -#define CONFIG_RTC_MC13783 +#define CONFIG_RTC_MC13XXX  #endif  /* diff --git a/include/configs/imx31_litekit.h b/include/configs/imx31_litekit.h index 89e71c069..1455ea247 100644 --- a/include/configs/imx31_litekit.h +++ b/include/configs/imx31_litekit.h @@ -81,7 +81,7 @@  #define CONFIG_FSL_PMIC_CLK	1000000  #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)  #define CONFIG_FSL_PMIC_BITLEN	32 -#define CONFIG_RTC_MC13783 +#define CONFIG_RTC_MC13XXX  /* allow to overwrite serial and ethaddr */  #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx31ads.h b/include/configs/mx31ads.h index c9d80ef07..7e011aea9 100644 --- a/include/configs/mx31ads.h +++ b/include/configs/mx31ads.h @@ -78,7 +78,7 @@  #define CONFIG_FSL_PMIC_CLK	1000000  #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)  #define CONFIG_FSL_PMIC_BITLEN	32 -#define CONFIG_RTC_MC13783 +#define CONFIG_RTC_MC13XXX  /* allow to overwrite serial and ethaddr */  #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index 2e5cde540..4253c3e2b 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -79,7 +79,7 @@  #define CONFIG_FSL_PMIC_CLK	1000000  #define CONFIG_FSL_PMIC_MODE	(SPI_MODE_0 | SPI_CS_HIGH)  #define CONFIG_FSL_PMIC_BITLEN	32 -#define CONFIG_RTC_MC13783 +#define CONFIG_RTC_MC13XXX  /* allow to overwrite serial and ethaddr */  #define CONFIG_ENV_OVERWRITE diff --git a/include/configs/qong.h b/include/configs/qong.h index f30855b9c..4e6bf3b34 100644 --- a/include/configs/qong.h +++ b/include/configs/qong.h @@ -58,7 +58,7 @@  #define CONFIG_MXC_SPI  #define CONFIG_DEFAULT_SPI_BUS	1  #define CONFIG_DEFAULT_SPI_MODE	(SPI_MODE_0 | SPI_CS_HIGH) -#define CONFIG_RTC_MC13783 +#define CONFIG_RTC_MC13XXX  #define CONFIG_PMIC  #define CONFIG_PMIC_SPI diff --git a/include/configs/vision2.h b/include/configs/vision2.h index bee9e970a..2d020ca83 100644 --- a/include/configs/vision2.h +++ b/include/configs/vision2.h @@ -95,7 +95,7 @@  #define CONFIG_FSL_PMIC_CLK	2500000  #define CONFIG_FSL_PMIC_MODE	SPI_MODE_0  #define CONFIG_FSL_PMIC_BITLEN	32 -#define CONFIG_RTC_MC13783 +#define CONFIG_RTC_MC13XXX  /*   * MMC Configs |