usb: ehci: Properly set hub devnum and portnr with usb-1 hubs in the chain

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

diff --git a/drivers/rtc/mxsrtc.c b/drivers/rtc/mxsrtc.c
index 72f740039abe66783b2cb741f6db615b1a61373e..32ba8a3062ce07f1d2cb4db9af8dcd0ac2020e65 100644 (file)
--- a/drivers/rtc/mxsrtc.c
+++ b/drivers/rtc/mxsrtc.c
@@ -4,20 +4,7 @@
  * Copyright (C) 2011 Marek Vasut <marek.vasut@gmail.com>
  * on behalf of DENX Software Engineering GmbH
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -41,7 +28,7 @@ int mxs_rtc_set_time(uint32_t secs)
         * is taken from the linux kernel driver for the STMP37xx RTC since
         * documentation doesn't mention it.
         */
-       ret = mx28_wait_mask_clr(&rtc_regs->hw_rtc_stat_reg,
+       ret = mxs_wait_mask_clr(&rtc_regs->hw_rtc_stat_reg,
                0x80 << RTC_STAT_STALE_REGS_OFFSET, MXS_RTC_MAX_TIMEOUT);
 
        if (ret)
@@ -80,7 +67,7 @@ void rtc_reset(void)
        mxs_rtc_set_time(0);
 
        /* Reset the RTC block */
-       ret = mx28_reset_block(&rtc_regs->hw_rtc_ctrl_reg);
+       ret = mxs_reset_block(&rtc_regs->hw_rtc_ctrl_reg);
        if (ret)
                printf("MXS RTC: Block reset timeout\n");
 }