diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/clk/clk_stm32f7.c | 5 | ||||
-rw-r--r-- | drivers/clk/clk_stm32h7.c | 4 | ||||
-rw-r--r-- | drivers/gpio/stm32f7_gpio.c | 4 | ||||
-rw-r--r-- | drivers/misc/stm32_rcc.c | 4 | ||||
-rw-r--r-- | drivers/mmc/fsl_esdhc.c | 26 | ||||
-rw-r--r-- | drivers/mmc/sti_sdhci.c | 6 | ||||
-rw-r--r-- | drivers/mmc/stm32_sdmmc2.c | 4 | ||||
-rw-r--r-- | drivers/phy/sti_usb_phy.c | 4 | ||||
-rw-r--r-- | drivers/pinctrl/pinctrl-sti.c | 6 | ||||
-rw-r--r-- | drivers/ram/stm32_sdram.c | 4 | ||||
-rw-r--r-- | drivers/reset/sti-reset.c | 4 | ||||
-rw-r--r-- | drivers/reset/stm32-reset.c | 4 | ||||
-rw-r--r-- | drivers/serial/serial_sti_asc.c | 6 | ||||
-rw-r--r-- | drivers/serial/serial_stm32x7.c | 4 | ||||
-rw-r--r-- | drivers/serial/serial_stm32x7.h | 4 | ||||
-rw-r--r-- | drivers/sysreset/sysreset_sti.c | 3 | ||||
-rw-r--r-- | drivers/timer/sti-timer.c | 3 | ||||
-rw-r--r-- | drivers/tpm/tpm_tis_st33zp24_i2c.c | 3 | ||||
-rw-r--r-- | drivers/tpm/tpm_tis_st33zp24_spi.c | 3 | ||||
-rw-r--r-- | drivers/usb/host/dwc3-sti-glue.c | 4 |
20 files changed, 55 insertions, 50 deletions
diff --git a/drivers/clk/clk_stm32f7.c b/drivers/clk/clk_stm32f7.c index 96a06b8f8c..a273f8ff5e 100644 --- a/drivers/clk/clk_stm32f7.c +++ b/drivers/clk/clk_stm32f7.c @@ -1,9 +1,10 @@ /* - * (C) Copyright 2017 - * Vikas Manocha, <vikas.manocha@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ + #include <common.h> #include <clk-uclass.h> #include <dm.h> diff --git a/drivers/clk/clk_stm32h7.c b/drivers/clk/clk_stm32h7.c index f84a4d2b2f..c9594d405a 100644 --- a/drivers/clk/clk_stm32h7.c +++ b/drivers/clk/clk_stm32h7.c @@ -1,6 +1,6 @@ /* - * Copyright (C) STMicroelectronics SA 2017 - * Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics. + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/gpio/stm32f7_gpio.c b/drivers/gpio/stm32f7_gpio.c index 653e9bef4b..a7cfb8c923 100644 --- a/drivers/gpio/stm32f7_gpio.c +++ b/drivers/gpio/stm32f7_gpio.c @@ -1,6 +1,6 @@ /* - * (C) Copyright 2017 - * Vikas Manocha, <vikas.manocha@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/misc/stm32_rcc.c b/drivers/misc/stm32_rcc.c index a6c2a757ec..32d39719d8 100644 --- a/drivers/misc/stm32_rcc.c +++ b/drivers/misc/stm32_rcc.c @@ -1,6 +1,6 @@ /* - * Copyright (C) STMicroelectronics SA 2017 - * Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics. + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c index cc188c4260..499d622c6d 100644 --- a/drivers/mmc/fsl_esdhc.c +++ b/drivers/mmc/fsl_esdhc.c @@ -171,20 +171,20 @@ static void esdhc_pio_read_write(struct fsl_esdhc_priv *priv, uint databuf; uint size; uint irqstat; - uint timeout; + ulong start; if (data->flags & MMC_DATA_READ) { blocks = data->blocks; buffer = data->dest; while (blocks) { - timeout = PIO_TIMEOUT; + start = get_timer(0); size = data->blocksize; irqstat = esdhc_read32(®s->irqstat); - while (!(esdhc_read32(®s->prsstat) & PRSSTAT_BREN) - && --timeout); - if (timeout <= 0) { - printf("\nData Read Failed in PIO Mode."); - return; + while (!(esdhc_read32(®s->prsstat) & PRSSTAT_BREN)) { + if (get_timer(start) > PIO_TIMEOUT) { + printf("\nData Read Failed in PIO Mode."); + return; + } } while (size && (!(irqstat & IRQSTAT_TC))) { udelay(100); /* Wait before last byte transfer complete */ @@ -200,14 +200,14 @@ static void esdhc_pio_read_write(struct fsl_esdhc_priv *priv, blocks = data->blocks; buffer = (char *)data->src; while (blocks) { - timeout = PIO_TIMEOUT; + start = get_timer(0); size = data->blocksize; irqstat = esdhc_read32(®s->irqstat); - while (!(esdhc_read32(®s->prsstat) & PRSSTAT_BWEN) - && --timeout); - if (timeout <= 0) { - printf("\nData Write Failed in PIO Mode."); - return; + while (!(esdhc_read32(®s->prsstat) & PRSSTAT_BWEN)) { + if (get_timer(start) > PIO_TIMEOUT) { + printf("\nData Write Failed in PIO Mode."); + return; + } } while (size && (!(irqstat & IRQSTAT_TC))) { udelay(100); /* Wait before last byte transfer complete */ diff --git a/drivers/mmc/sti_sdhci.c b/drivers/mmc/sti_sdhci.c index a98c1eba0f..1c92bb2b37 100644 --- a/drivers/mmc/sti_sdhci.c +++ b/drivers/mmc/sti_sdhci.c @@ -1,8 +1,8 @@ /* - * Copyright (c) 2017 - * Patrice Chotard <patrice.chotard@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/mmc/stm32_sdmmc2.c b/drivers/mmc/stm32_sdmmc2.c index 5e43397f8e..f3b77f512e 100644 --- a/drivers/mmc/stm32_sdmmc2.c +++ b/drivers/mmc/stm32_sdmmc2.c @@ -1,6 +1,6 @@ /* - * Copyright (C) STMicroelectronics SA 2017 - * Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics. + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/phy/sti_usb_phy.c b/drivers/phy/sti_usb_phy.c index 88fcfbb3e5..c671ac648c 100644 --- a/drivers/phy/sti_usb_phy.c +++ b/drivers/phy/sti_usb_phy.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2017 - * Patrice Chotard <patrice.chotard@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/pinctrl/pinctrl-sti.c b/drivers/pinctrl/pinctrl-sti.c index 735e412f60..a9c1495f55 100644 --- a/drivers/pinctrl/pinctrl-sti.c +++ b/drivers/pinctrl/pinctrl-sti.c @@ -1,10 +1,10 @@ /* * Pinctrl driver for STMicroelectronics STi SoCs * - * Copyright (c) 2017 - * Patrice Chotard <patrice.chotard@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/ram/stm32_sdram.c b/drivers/ram/stm32_sdram.c index fdf088e783..6e92b2222d 100644 --- a/drivers/ram/stm32_sdram.c +++ b/drivers/ram/stm32_sdram.c @@ -1,6 +1,6 @@ /* - * (C) Copyright 2017 - * Vikas Manocha, <vikas.manocha@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/reset/sti-reset.c b/drivers/reset/sti-reset.c index 024b996f0c..17786f976a 100644 --- a/drivers/reset/sti-reset.c +++ b/drivers/reset/sti-reset.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2017 - * Patrice Chotard <patrice.chotard@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/reset/stm32-reset.c b/drivers/reset/stm32-reset.c index 9c627d879f..b266f46263 100644 --- a/drivers/reset/stm32-reset.c +++ b/drivers/reset/stm32-reset.c @@ -1,6 +1,6 @@ /* - * Copyright (C) STMicroelectronics SA 2017 - * Author(s): Patrice CHOTARD, <patrice.chotard@st.com> for STMicroelectronics. + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/serial/serial_sti_asc.c b/drivers/serial/serial_sti_asc.c index 8dcd4f8d25..00773cca50 100644 --- a/drivers/serial/serial_sti_asc.c +++ b/drivers/serial/serial_sti_asc.c @@ -1,10 +1,10 @@ /* * Support for Serial I/O using STMicroelectronics' on-chip ASC. * - * Copyright (c) 2017 - * Patrice Chotard <patrice.chotard@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * - * SPDX-License-Identifier: GPL-2.0 + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/drivers/serial/serial_stm32x7.c b/drivers/serial/serial_stm32x7.c index a5d529cab2..d1580e3cb5 100644 --- a/drivers/serial/serial_stm32x7.c +++ b/drivers/serial/serial_stm32x7.c @@ -1,6 +1,6 @@ /* - * (C) Copyright 2016 - * Vikas Manocha, <vikas.manocha@st.com> + * Copyright (C) 2016, STMicroelectronics - All Rights Reserved + * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/serial/serial_stm32x7.h b/drivers/serial/serial_stm32x7.h index b914edf28a..f7dca39103 100644 --- a/drivers/serial/serial_stm32x7.h +++ b/drivers/serial/serial_stm32x7.h @@ -1,6 +1,6 @@ /* - * (C) Copyright 2016 - * Vikas Manocha, <vikas.manocha@st.com> + * Copyright (C) 2016, STMicroelectronics - All Rights Reserved + * Author(s): Vikas Manocha, <vikas.manocha@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/sysreset/sysreset_sti.c b/drivers/sysreset/sysreset_sti.c index bf698a737b..910f486516 100644 --- a/drivers/sysreset/sysreset_sti.c +++ b/drivers/sysreset/sysreset_sti.c @@ -1,5 +1,6 @@ /* - * (C) Copyright 2017 Patrice Chotard <patrice.chotard@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/timer/sti-timer.c b/drivers/timer/sti-timer.c index e1419c4976..a8bd139e0e 100644 --- a/drivers/timer/sti-timer.c +++ b/drivers/timer/sti-timer.c @@ -1,5 +1,6 @@ /* - * (C) Copyright 2017 Patrice Chotard <patrice.chotard@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ diff --git a/drivers/tpm/tpm_tis_st33zp24_i2c.c b/drivers/tpm/tpm_tis_st33zp24_i2c.c index 9e4829fea2..c8d01254d2 100644 --- a/drivers/tpm/tpm_tis_st33zp24_i2c.c +++ b/drivers/tpm/tpm_tis_st33zp24_i2c.c @@ -1,7 +1,8 @@ /* * STMicroelectronics TPM ST33ZP24 I2C UBOOT driver * - * Copyright (C) 2016 STMicroelectronics + * Copyright (C) 2016, STMicroelectronics - All Rights Reserved + * Author(s): Christophe Ricard <christophe-h.ricard@st.com> for STMicroelectronics. * * Description: Device driver for ST33ZP24 I2C TPM TCG. * diff --git a/drivers/tpm/tpm_tis_st33zp24_spi.c b/drivers/tpm/tpm_tis_st33zp24_spi.c index 417bbf1c69..dcf55ee03a 100644 --- a/drivers/tpm/tpm_tis_st33zp24_spi.c +++ b/drivers/tpm/tpm_tis_st33zp24_spi.c @@ -1,7 +1,8 @@ /* * STMicroelectronics TPM ST33ZP24 SPI UBOOT driver * - * Copyright (C) 2016 STMicroelectronics + * Copyright (C) 2016, STMicroelectronics - All Rights Reserved + * Author(s): Christophe Ricard <christophe-h.ricard@st.com> for STMicroelectronics. * * Description: Device driver for ST33ZP24 SPI TPM TCG. * diff --git a/drivers/usb/host/dwc3-sti-glue.c b/drivers/usb/host/dwc3-sti-glue.c index 6dc656af89..67b256140e 100644 --- a/drivers/usb/host/dwc3-sti-glue.c +++ b/drivers/usb/host/dwc3-sti-glue.c @@ -1,8 +1,8 @@ /* * STiH407 family DWC3 specific Glue layer * - * Copyright (c) 2017 - * Patrice Chotard <patrice.chotard@st.com> + * Copyright (C) 2017, STMicroelectronics - All Rights Reserved + * Author(s): Patrice Chotard, <patrice.chotard@st.com> for STMicroelectronics. * * SPDX-License-Identifier: GPL-2.0+ */ |