mmc: Fix mmc_spi error on cmd->flags field

[u-boot] / drivers / rtc / ds1306.c

diff --git a/drivers/rtc/ds1306.c b/drivers/rtc/ds1306.c
index 03c4089267e1923522308a77ff6c7a027e53363b..288c5f8c4acbf881730ecf4d5342fec384bcd100 100644 (file)
--- a/drivers/rtc/ds1306.c
+++ b/drivers/rtc/ds1306.c
@@ -62,9 +62,6 @@
 
 #define        RTC_USER_RAM_BASE       0x20
 
-static unsigned int bin2bcd (unsigned int n);
-static unsigned char bcd2bin (unsigned char c);
-
 /* ************************************************************************* */
 #ifdef CONFIG_SXNI855T         /* !!! SHOULD BE CHANGED TO NEW CODE !!! */
 
@@ -86,7 +83,7 @@ static void init_spi (void);
 /* read clock time from DS1306 and return it in *tmp */
 int rtc_get (struct rtc_time *tmp)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        unsigned char spi_byte; /* Data Byte */
 
        init_spi ();            /* set port B for software SPI */
@@ -143,7 +140,7 @@ int rtc_get (struct rtc_time *tmp)
 /* set clock time in DS1306 RTC and in MPC8xx RTC */
 int rtc_set (struct rtc_time *tmp)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
        init_spi ();            /* set port B for software SPI */
 
@@ -218,7 +215,7 @@ int rtc_set (struct rtc_time *tmp)
 /* Initialize Port B for software SPI */
 static void init_spi (void)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
        /* Force output pins to begin at logic 0 */
        immap->im_cpm.cp_pbdat &= ~(PB_SPI_CE | PB_SPIMOSI | PB_SPISCK);
@@ -235,7 +232,7 @@ static void init_spi (void)
 /* NOTE: soft_spi_send() assumes that the I/O lines are configured already */
 static void soft_spi_send (unsigned char n)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
        unsigned char bitpos;   /* bit position to receive */
        unsigned char i;        /* Loop Control */
 
@@ -264,7 +261,7 @@ static void soft_spi_send (unsigned char n)
 /* NOTE: soft_spi_read() assumes that the I/O lines are configured already */
 static unsigned char soft_spi_read (void)
 {
-       volatile immap_t *immap = (immap_t *) CFG_IMMR;
+       volatile immap_t *immap = (immap_t *) CONFIG_SYS_IMMR;
 
        unsigned char spi_byte = 0;     /* Return value, assume success */
        unsigned char bitpos;   /* bit position to receive */
@@ -314,7 +311,7 @@ int rtc_get (struct rtc_time *tmp)
         * step just once.
         */
        if (!slave) {
-               slave = spi_setup_slave(0, CFG_SPI_RTC_DEVID, 600000,
+               slave = spi_setup_slave(0, CONFIG_SYS_SPI_RTC_DEVID, 600000,
                                SPI_MODE_3 | SPI_CS_HIGH);
                if (!slave)
                        return;
@@ -377,7 +374,7 @@ int rtc_set (struct rtc_time *tmp)
 {
        /* Assuming Vcc = 2.0V (lowest speed) */
        if (!slave) {
-               slave = spi_setup_slave(0, CFG_SPI_RTC_DEVID, 600000,
+               slave = spi_setup_slave(0, CONFIG_SYS_SPI_RTC_DEVID, 600000,
                                SPI_MODE_3 | SPI_CS_HIGH);
                if (!slave)
                        return;
@@ -408,7 +405,7 @@ void rtc_reset (void)
 {
        /* Assuming Vcc = 2.0V (lowest speed) */
        if (!slave) {
-               slave = spi_setup_slave(0, CFG_SPI_RTC_DEVID, 600000,
+               slave = spi_setup_slave(0, CONFIG_SYS_SPI_RTC_DEVID, 600000,
                                SPI_MODE_3 | SPI_CS_HIGH);
                if (!slave)
                        return;
@@ -459,19 +456,4 @@ static void rtc_write (unsigned char reg, unsigned char val)
 
 #endif /* end of code exclusion (see #ifdef CONFIG_SXNI855T above) */
 
-/* ------------------------------------------------------------------------- */
-
-static unsigned char bcd2bin (unsigned char n)
-{
-       return ((((n >> 4) & 0x0F) * 10) + (n & 0x0F));
-}
-
-/* ------------------------------------------------------------------------- */
-
-static unsigned int bin2bcd (unsigned int n)
-{
-       return (((n / 10) << 4) | (n % 10));
-}
-/* ------------------------------------------------------------------------- */
-
 #endif