spi: stm32-qspi: Fix compilation warning in ARM64
From: Patrice Chotard This fixes warnings detected when compiling in ARM64. Introduced by 'commit 18674dee3cd6 ("spi: stm32-qspi: Add dirmap support")' Signed-off-by: Patrice Chotard --- drivers/spi/spi-stm32-qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index e2a99f054551..02691c1603d9 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -478,7 +478,7 @@ static ssize_t stm32_qspi_dirmap_read(struct spi_mem_dirmap_desc *desc, * all needed transfer information into struct spi_mem_op */ memcpy(, >info.op_tmpl, sizeof(struct spi_mem_op)); - dev_dbg(qspi->dev, "%s len = 0x%x offs = 0x%llx buf = 0x%p\n", __func__, len, offs, buf); + dev_dbg(qspi->dev, "%s len = 0x%lx offs = 0x%llx buf = 0x%p\n", __func__, len, offs, buf); op.data.nbytes = len; op.addr.val = desc->info.offset + offs; -- 2.17.1
[PATCH 0/3] spi: stm32-qspi: Fix and update
From: Patrice Chotard Christophe Kerello (1): spi: stm32-qspi: fix pm_runtime usage_count counter Patrice Chotard (2): spi: stm32-qspi: Trigger DMA only if more than 4 bytes to transfer spi: stm32-qspi: Add dirmap support drivers/spi/spi-stm32-qspi.c | 106 +++ 1 file changed, 84 insertions(+), 22 deletions(-) -- 2.17.1
[PATCH 2/3] spi: stm32-qspi: Trigger DMA only if more than 4 bytes to transfer
From: Patrice Chotard In order to optimize accesses to spi flashes, trigger a DMA only if more than 4 bytes has to be transferred. DMA transfer preparation's cost becomes negligible above 4 bytes to transfer. Below this threshold, indirect transfer give more throughput. mtd_speedtest shows that page write throughtput increases : - from 779 to 853 KiB/s (~9.5%) with s25fl512s SPI-NOR. - from 5283 to 5666 KiB/s (~7.25%) with Micron SPI-NAND. Signed-off-by: Christophe Kerello Signed-off-by: Patrice Chotard --- drivers/spi/spi-stm32-qspi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 2786470a5201..6e74d6bed54c 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -269,8 +269,9 @@ static int stm32_qspi_tx(struct stm32_qspi *qspi, const struct spi_mem_op *op) if (qspi->fmode == CCR_FMODE_MM) return stm32_qspi_tx_mm(qspi, op); - else if ((op->data.dir == SPI_MEM_DATA_IN && qspi->dma_chrx) || -(op->data.dir == SPI_MEM_DATA_OUT && qspi->dma_chtx)) + else if (((op->data.dir == SPI_MEM_DATA_IN && qspi->dma_chrx) || +(op->data.dir == SPI_MEM_DATA_OUT && qspi->dma_chtx)) && + op->data.nbytes > 4) if (!stm32_qspi_tx_dma(qspi, op)) return 0; -- 2.17.1
[PATCH 1/3] spi: stm32-qspi: fix pm_runtime usage_count counter
From: Christophe Kerello pm_runtime usage_count counter is not well managed. pm_runtime_put_autosuspend callback drops the usage_counter but this one has never been increased. Add pm_runtime_get_sync callback to bump up the usage counter. It is also needed to use pm_runtime_force_suspend and pm_runtime_force_resume APIs to handle properly the clock. Fixes: 9d282c17b023 ("spi: stm32-qspi: Add pm_runtime support") Signed-off-by: Christophe Kerello Cc: sta...@vger.kernel.org --- drivers/spi/spi-stm32-qspi.c | 18 ++ 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 947e6b9dc9f4..2786470a5201 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -727,21 +727,31 @@ static int __maybe_unused stm32_qspi_suspend(struct device *dev) { pinctrl_pm_select_sleep_state(dev); - return 0; + return pm_runtime_force_suspend(dev); } static int __maybe_unused stm32_qspi_resume(struct device *dev) { struct stm32_qspi *qspi = dev_get_drvdata(dev); + int ret; + + ret = pm_runtime_force_resume(dev); + if (ret < 0) + return ret; pinctrl_pm_select_default_state(dev); - clk_prepare_enable(qspi->clk); + + ret = pm_runtime_get_sync(dev); + if (ret < 0) { + pm_runtime_put_noidle(dev); + return ret; + } writel_relaxed(qspi->cr_reg, qspi->io_base + QSPI_CR); writel_relaxed(qspi->dcr_reg, qspi->io_base + QSPI_DCR); - pm_runtime_mark_last_busy(qspi->dev); - pm_runtime_put_autosuspend(qspi->dev); + pm_runtime_mark_last_busy(dev); + pm_runtime_put_autosuspend(dev); return 0; } -- 2.17.1
[PATCH 3/3] spi: stm32-qspi: Add dirmap support
From: Patrice Chotard Add stm32_qspi_dirmap_read() and stm32_qspi_dirmap_create() to get dirmap support. Update the exec_op callback which doens't allow anymore memory map access. Memory map access are only available through the dirmap_read callback. Signed-off-by: Patrice Chotard --- drivers/spi/spi-stm32-qspi.c | 83 +--- 1 file changed, 67 insertions(+), 16 deletions(-) diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 6e74d6bed54c..e2a99f054551 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -331,7 +331,7 @@ static int stm32_qspi_send(struct spi_mem *mem, const struct spi_mem_op *op) { struct stm32_qspi *qspi = spi_controller_get_devdata(mem->spi->master); struct stm32_qspi_flash *flash = >flash[mem->spi->chip_select]; - u32 ccr, cr, addr_max; + u32 ccr, cr; int timeout, err = 0; dev_dbg(qspi->dev, "cmd:%#x mode:%d.%d.%d.%d addr:%#llx len:%#x\n", @@ -343,18 +343,6 @@ static int stm32_qspi_send(struct spi_mem *mem, const struct spi_mem_op *op) if (err) goto abort; - addr_max = op->addr.val + op->data.nbytes + 1; - - if (op->data.dir == SPI_MEM_DATA_IN) { - if (addr_max < qspi->mm_size && - op->addr.buswidth) - qspi->fmode = CCR_FMODE_MM; - else - qspi->fmode = CCR_FMODE_INDR; - } else { - qspi->fmode = CCR_FMODE_INDW; - } - cr = readl_relaxed(qspi->io_base + QSPI_CR); cr &= ~CR_PRESC_MASK & ~CR_FSEL; cr |= FIELD_PREP(CR_PRESC_MASK, flash->presc); @@ -364,8 +352,6 @@ static int stm32_qspi_send(struct spi_mem *mem, const struct spi_mem_op *op) if (op->data.nbytes) writel_relaxed(op->data.nbytes - 1, qspi->io_base + QSPI_DLR); - else - qspi->fmode = CCR_FMODE_INDW; ccr = qspi->fmode; ccr |= FIELD_PREP(CCR_INST_MASK, op->cmd.opcode); @@ -441,6 +427,11 @@ static int stm32_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) } mutex_lock(>lock); + if (op->data.dir == SPI_MEM_DATA_IN && op->data.nbytes) + qspi->fmode = CCR_FMODE_INDR; + else + qspi->fmode = CCR_FMODE_INDW; + ret = stm32_qspi_send(mem, op); mutex_unlock(>lock); @@ -450,6 +441,64 @@ static int stm32_qspi_exec_op(struct spi_mem *mem, const struct spi_mem_op *op) return ret; } +static int stm32_qspi_dirmap_create(struct spi_mem_dirmap_desc *desc) +{ + struct stm32_qspi *qspi = spi_controller_get_devdata(desc->mem->spi->master); + + if (desc->info.op_tmpl.data.dir == SPI_MEM_DATA_OUT) + return -EOPNOTSUPP; + + /* should never happen, as mm_base == null is an error probe exit condition */ + if (!qspi->mm_base && desc->info.op_tmpl.data.dir == SPI_MEM_DATA_IN) + return -EOPNOTSUPP; + + if (!qspi->mm_size) + return -EOPNOTSUPP; + + return 0; +} + +static ssize_t stm32_qspi_dirmap_read(struct spi_mem_dirmap_desc *desc, + u64 offs, size_t len, void *buf) +{ + struct stm32_qspi *qspi = spi_controller_get_devdata(desc->mem->spi->master); + struct spi_mem_op op; + u32 addr_max; + int ret; + + ret = pm_runtime_get_sync(qspi->dev); + if (ret < 0) { + pm_runtime_put_noidle(qspi->dev); + return ret; + } + + mutex_lock(>lock); + /* make a local copy of desc op_tmpl and complete dirmap rdesc +* spi_mem_op template with offs, len and *buf in order to get +* all needed transfer information into struct spi_mem_op +*/ + memcpy(, >info.op_tmpl, sizeof(struct spi_mem_op)); + dev_dbg(qspi->dev, "%s len = 0x%x offs = 0x%llx buf = 0x%p\n", __func__, len, offs, buf); + + op.data.nbytes = len; + op.addr.val = desc->info.offset + offs; + op.data.buf.in = buf; + + addr_max = op.addr.val + op.data.nbytes + 1; + if (addr_max < qspi->mm_size && op.addr.buswidth) + qspi->fmode = CCR_FMODE_MM; + else + qspi->fmode = CCR_FMODE_INDR; + + ret = stm32_qspi_send(desc->mem, ); + mutex_unlock(>lock); + + pm_runtime_mark_last_busy(qspi->dev); + pm_runtime_put_autosuspend(qspi->dev); + + return ret ?: len; +} + static int stm32_qspi_setup(struct spi_device *spi) { struct spi_controller *ctrl = spi->master; @@ -555,7 +604,9 @@ static void stm32_qspi_dma_free(struct stm32_qspi *qspi) * to check supported mode. */ static const struct spi_controller_mem_ops stm32_qspi_mem_ops = { - .exec_op = stm32_qspi_exec_op, + .exec_op= stm32_qspi_exec_op, + .dirmap_create = stm32_qspi_dirmap_create, + .dirmap_read=
[RESEND PATCH 1/3] MAINTAINERS: Update some st.com email addresses to foss.st.com
From: Patrice Chotard Update some st.com to foss.st.com addresses related to STMicroelectronics drivers. All these people will now use this new email address for upstream activities. Signed-off-by: Patrice Chotard --- MAINTAINERS | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 667d03852191..98802b71385b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2504,7 +2504,7 @@ N:sc27xx N: sc2731 ARM/STI ARCHITECTURE -M: Patrice Chotard +M: Patrice Chotard L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) S: Maintained W: http://www.stlinux.com @@ -2537,7 +2537,7 @@ F:include/linux/remoteproc/st_slim_rproc.h ARM/STM32 ARCHITECTURE M: Maxime Coquelin -M: Alexandre Torgue +M: Alexandre Torgue L: linux-st...@st-md-mailman.stormreply.com (moderated for non-subscribers) L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -3149,7 +3149,7 @@ C:irc://irc.oftc.net/bcache F: drivers/md/bcache/ BDISP ST MEDIA DRIVER -M: Fabien Dessenne +M: Fabien Dessenne L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -5042,7 +5042,7 @@ S:Maintained F: drivers/platform/x86/dell-wmi.c DELTA ST MEDIA DRIVER -M: Hugues Fruchet +M: Hugues Fruchet L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -5974,8 +5974,8 @@ F: Documentation/devicetree/bindings/display/st,stih4xx.txt F: drivers/gpu/drm/sti DRM DRIVERS FOR STM -M: Yannick Fertre -M: Philippe Cornu +M: Yannick Fertre +M: Philippe Cornu M: Benjamin Gaignard M: Vincent Abriou L: dri-de...@lists.freedesktop.org @@ -8196,7 +8196,7 @@ F:include/linux/hugetlb.h F: mm/hugetlb.c HVA ST MEDIA DRIVER -M: Jean-Christophe Trotin +M: Jean-Christophe Trotin L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -11101,7 +11101,7 @@ T: git git://linuxtv.org/media_tree.git F: drivers/media/dvb-frontends/stv6111* MEDIA DRIVERS FOR STM32 - DCMI -M: Hugues Fruchet +M: Hugues Fruchet L: linux-me...@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git @@ -16813,7 +16813,7 @@ F: Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt F: drivers/media/i2c/st-mipid02.c ST STM32 I2C/SMBUS DRIVER -M: Pierre-Yves MORDRET +M: Pierre-Yves MORDRET L: linux-...@vger.kernel.org S: Maintained F: drivers/i2c/busses/i2c-stm32* @@ -16944,7 +16944,7 @@ S: Maintained F: drivers/block/skd*[ch] STI AUDIO (ASoC) DRIVERS -M: Arnaud Pouliquen +M: Arnaud Pouliquen L: alsa-de...@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt @@ -16964,15 +16964,15 @@ T:git git://linuxtv.org/media_tree.git F: drivers/media/usb/stk1160/ STM32 AUDIO (ASoC) DRIVERS -M: Olivier Moysan -M: Arnaud Pouliquen +M: Olivier Moysan +M: Arnaud Pouliquen L: alsa-de...@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml F: sound/soc/stm/ STM32 TIMER/LPTIMER DRIVERS -M: Fabrice Gasnier +M: Fabrice Gasnier S: Maintained F: Documentation/ABI/testing/*timer-stm32 F: Documentation/devicetree/bindings/*/*stm32-*timer* @@ -16982,7 +16982,7 @@ F: include/linux/*/stm32-*tim* STMMAC ETHERNET DRIVER M: Giuseppe Cavallaro -M: Alexandre Torgue +M: Alexandre Torgue M: Jose Abreu L: net...@vger.kernel.org S: Supported -- 2.17.1
[RESEND PATCH 3/3] MAINTAINERS: Add Alain Volmat as STM32 I2C/SMBUS maintainer
From: Patrice Chotard Add Alain Volmat as STM32 I2C/SMBUS driver co-maintainer. Signed-off-by: Patrice Chotard Cc: alain.vol...@foss.st.com --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index c6266d311061..7de268e4aec0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16812,6 +16812,7 @@ F: drivers/media/i2c/st-mipid02.c ST STM32 I2C/SMBUS DRIVER M: Pierre-Yves MORDRET +M: Alain Volmat L: linux-...@vger.kernel.org S: Maintained F: drivers/i2c/busses/i2c-stm32* -- 2.17.1
[RESEND PATCH 0/3] MAINTAINERS: update STMicroelectronics email
From: Patrice Chotard This series: _ Update st.com to foss.st.com email for some maintainers. _ Remove Vincent Abriou as STI/STM DRM driver _ Add Alain Volmat as STM32 I2C/SMBUS driver maintainer Patrice Chotard (3): MAINTAINERS: Update some st.com email addresses to foss.st.com MAINTAINERS: Remove Vincent Abriou for STM/STI DRM drivers. MAINTAINERS: Add Alain Volmat as STM32 I2C/SMBUS maintainer MAINTAINERS | 31 +++ 1 file changed, 15 insertions(+), 16 deletions(-) -- 2.17.1
[RESEND PATCH 2/3] MAINTAINERS: Remove Vincent Abriou for STM/STI DRM drivers.
From: Patrice Chotard Remove Vincent Abriou's email as he has no more review activities on STM/STI DRM drivers. Signed-off-by: Patrice Chotard Cc: Vincent Abriou --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 98802b71385b..c6266d311061 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5966,7 +5966,6 @@ F:drivers/gpu/drm/rockchip/ DRM DRIVERS FOR STI M: Benjamin Gaignard -M: Vincent Abriou L: dri-de...@lists.freedesktop.org S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc @@ -5977,7 +5976,6 @@ DRM DRIVERS FOR STM M: Yannick Fertre M: Philippe Cornu M: Benjamin Gaignard -M: Vincent Abriou L: dri-de...@lists.freedesktop.org S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc -- 2.17.1
[PATCH 3/3] MAINTAINERS: Add Alain Volmat as STM32 I2C/SMBUS maintainer
From: Patrice Chotard Add Alain Volmat as STM32 I2C/SMBUS driver co-maintainer. Signed-off-by: Patrice Chotard Cc: alain.vol...@foss.st.com --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 98365c57ae37..f6d317449521 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -16812,6 +16812,7 @@ F: drivers/media/i2c/st-mipid02.c ST STM32 I2C/SMBUS DRIVER M: Pierre-Yves MORDRET +M: Alain Volmat L: linux-...@vger.kernel.org S: Maintained F: drivers/i2c/busses/i2c-stm32* -- 2.17.1
[PATCH 1/3] MAINTAINERS: Update some st.com email addresses to foss.st.com
From: Patrice Chotard Update some st.com to foss.st.com addresses related to STMicroelectronics drivers. All these people will now use this new email address for upstream activities. Signed-off-by: Patrice Chotard --- MAINTAINERS | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d3e847f7f3dc..8222e50a9902 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2504,7 +2504,7 @@ N:sc27xx N: sc2731 ARM/STI ARCHITECTURE -M: Patrice Chotard +M: Patrice Chotard L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) S: Maintained W: http://www.stlinux.com @@ -2537,7 +2537,7 @@ F:include/linux/remoteproc/st_slim_rproc.h ARM/STM32 ARCHITECTURE M: Maxime Coquelin -M: Alexandre Torgue +M: Alexandre Torgue L: linux-st...@st-md-mailman.stormreply.com (moderated for non-subscribers) L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -3149,7 +3149,7 @@ C:irc://irc.oftc.net/bcache F: drivers/md/bcache/ BDISP ST MEDIA DRIVER -M: Fabien Dessenne +M: Fabien Dessenne L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -5042,7 +5042,7 @@ S:Maintained F: drivers/platform/x86/dell-wmi.c DELTA ST MEDIA DRIVER -M: Hugues Fruchet +M: Hugues Fruchet L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -5974,8 +5974,8 @@ F: Documentation/devicetree/bindings/display/st,stih4xx.txt F: drivers/gpu/drm/sti DRM DRIVERS FOR STM -M: Yannick Fertre -M: Philippe Cornu +M: Yannick Fertre +M: Philippe Cornu M: Benjamin Gaignard M: Vincent Abriou L: dri-de...@lists.freedesktop.org @@ -8196,7 +8196,7 @@ F:include/linux/hugetlb.h F: mm/hugetlb.c HVA ST MEDIA DRIVER -M: Jean-Christophe Trotin +M: Jean-Christophe Trotin L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -11101,7 +11101,7 @@ T: git git://linuxtv.org/media_tree.git F: drivers/media/dvb-frontends/stv6111* MEDIA DRIVERS FOR STM32 - DCMI -M: Hugues Fruchet +M: Hugues Fruchet L: linux-me...@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git @@ -16813,7 +16813,7 @@ F: Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt F: drivers/media/i2c/st-mipid02.c ST STM32 I2C/SMBUS DRIVER -M: Pierre-Yves MORDRET +M: Pierre-Yves MORDRET L: linux-...@vger.kernel.org S: Maintained F: drivers/i2c/busses/i2c-stm32* @@ -16944,7 +16944,7 @@ S: Maintained F: drivers/block/skd*[ch] STI AUDIO (ASoC) DRIVERS -M: Arnaud Pouliquen +M: Arnaud Pouliquen L: alsa-de...@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt @@ -16964,15 +16964,15 @@ T:git git://linuxtv.org/media_tree.git F: drivers/media/usb/stk1160/ STM32 AUDIO (ASoC) DRIVERS -M: Olivier Moysan -M: Arnaud Pouliquen +M: Olivier Moysan +M: Arnaud Pouliquen L: alsa-de...@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/iio/adc/st,stm32-*.yaml F: sound/soc/stm/ STM32 TIMER/LPTIMER DRIVERS -M: Fabrice Gasnier +M: Fabrice Gasnier S: Maintained F: Documentation/ABI/testing/*timer-stm32 F: Documentation/devicetree/bindings/*/*stm32-*timer* @@ -16982,7 +16982,7 @@ F: include/linux/*/stm32-*tim* STMMAC ETHERNET DRIVER M: Giuseppe Cavallaro -M: Alexandre Torgue +M: Alexandre Torgue M: Jose Abreu L: net...@vger.kernel.org S: Supported -- 2.17.1
[PATCH 2/3] MAINTAINERS: Remove Vincent Abriou for STM/STI DRM drivers.
From: Patrice Chotard Remove Vincent Abriou's email as he has no more review activities on STM/STI DRM drivers. Signed-off-by: Patrice Chotard Cc: Vincent Abriou --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 8222e50a9902..98365c57ae37 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5966,7 +5966,6 @@ F:drivers/gpu/drm/rockchip/ DRM DRIVERS FOR STI M: Benjamin Gaignard -M: Vincent Abriou L: dri-de...@lists.freedesktop.org S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc @@ -5977,7 +5976,6 @@ DRM DRIVERS FOR STM M: Yannick Fertre M: Philippe Cornu M: Benjamin Gaignard -M: Vincent Abriou L: dri-de...@lists.freedesktop.org S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc -- 2.17.1
[PATCH 0/3] MAINTAINERS: update STMicroelectronics email
From: Patrice Chotard This series: _ Update st.com to foss.st.com email for some maintainers. _ Remove Vincent Abriou as STI/STM DRM driver _ Add Alain Volmat as I2C/SMBUS driver maintainer Patrice Chotard (3): MAINTAINERS: Update some st.com email addresses to foss.st.com MAINTAINERS: Remove Vincent Abriou for STM/STI DRM drivers. MAINTAINERS: Add Alain Volmat as STM32 I2C/SMBUS maintainer MAINTAINERS | 31 +++ 1 file changed, 15 insertions(+), 16 deletions(-) -- 2.17.1
[PATCH 2/2] MAINTAINERS: Remove Vincent Abriou for STM/STI DRM drivers.
From: Patrice Chotard Remove Vincent Abriou's email as he has no more review activities on STM/STI DRM drivers. Signed-off-by: Patrice Chotard Cc: Vincent Abriou --- MAINTAINERS | 2 -- 1 file changed, 2 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 685b72a22cee..010160a89a10 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5913,7 +5913,6 @@ F:drivers/gpu/drm/rockchip/ DRM DRIVERS FOR STI M: Benjamin Gaignard -M: Vincent Abriou L: dri-de...@lists.freedesktop.org S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc @@ -5924,7 +5923,6 @@ DRM DRIVERS FOR STM M: Yannick Fertre M: Philippe Cornu M: Benjamin Gaignard -M: Vincent Abriou L: dri-de...@lists.freedesktop.org S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc -- 2.17.1
[PATCH 1/2] MAINTAINERS: Update some st.com email addresses to foss.st.com
From: Patrice Chotard Update some st.com to foss.st.com addresses related to STMicroelectronics drivers. All these people will now use this new email address for upstream activities. Signed-off-by: Patrice Chotard --- MAINTAINERS | 28 ++-- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 281de213ef47..685b72a22cee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2497,7 +2497,7 @@ N:sc27xx N: sc2731 ARM/STI ARCHITECTURE -M: Patrice Chotard +M: Patrice Chotard L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) S: Maintained W: http://www.stlinux.com @@ -2530,7 +2530,7 @@ F:include/linux/remoteproc/st_slim_rproc.h ARM/STM32 ARCHITECTURE M: Maxime Coquelin -M: Alexandre Torgue +M: Alexandre Torgue L: linux-st...@st-md-mailman.stormreply.com (moderated for non-subscribers) L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) S: Maintained @@ -3143,7 +3143,7 @@ C:irc://irc.oftc.net/bcache F: drivers/md/bcache/ BDISP ST MEDIA DRIVER -M: Fabien Dessenne +M: Fabien Dessenne L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -5007,7 +5007,7 @@ S:Maintained F: drivers/platform/x86/dell-wmi.c DELTA ST MEDIA DRIVER -M: Hugues Fruchet +M: Hugues Fruchet L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -5921,8 +5921,8 @@ F: Documentation/devicetree/bindings/display/st,stih4xx.txt F: drivers/gpu/drm/sti DRM DRIVERS FOR STM -M: Yannick Fertre -M: Philippe Cornu +M: Yannick Fertre +M: Philippe Cornu M: Benjamin Gaignard M: Vincent Abriou L: dri-de...@lists.freedesktop.org @@ -8116,7 +8116,7 @@ F:include/linux/hugetlb.h F: mm/hugetlb.c HVA ST MEDIA DRIVER -M: Jean-Christophe Trotin +M: Jean-Christophe Trotin L: linux-me...@vger.kernel.org S: Supported W: https://linuxtv.org @@ -10972,7 +10972,7 @@ T: git git://linuxtv.org/media_tree.git F: drivers/media/dvb-frontends/stv6111* MEDIA DRIVERS FOR STM32 - DCMI -M: Hugues Fruchet +M: Hugues Fruchet L: linux-me...@vger.kernel.org S: Supported T: git git://linuxtv.org/media_tree.git @@ -16567,7 +16567,7 @@ F: Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt F: drivers/media/i2c/st-mipid02.c ST STM32 I2C/SMBUS DRIVER -M: Pierre-Yves MORDRET +M: Pierre-Yves MORDRET L: linux-...@vger.kernel.org S: Maintained F: drivers/i2c/busses/i2c-stm32* @@ -16682,7 +16682,7 @@ S: Maintained F: drivers/block/skd*[ch] STI AUDIO (ASoC) DRIVERS -M: Arnaud Pouliquen +M: Arnaud Pouliquen L: alsa-de...@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/st,sti-asoc-card.txt @@ -16702,15 +16702,15 @@ T:git git://linuxtv.org/media_tree.git F: drivers/media/usb/stk1160/ STM32 AUDIO (ASoC) DRIVERS -M: Olivier Moysan -M: Arnaud Pouliquen +M: Olivier Moysan +M: Arnaud Pouliquen L: alsa-de...@alsa-project.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/sound/st,stm32-*.txt F: sound/soc/stm/ STM32 TIMER/LPTIMER DRIVERS -M: Fabrice Gasnier +M: Fabrice Gasnier S: Maintained F: Documentation/ABI/testing/*timer-stm32 F: Documentation/devicetree/bindings/*/*stm32-*timer* @@ -16720,7 +16720,7 @@ F: include/linux/*/stm32-*tim* STMMAC ETHERNET DRIVER M: Giuseppe Cavallaro -M: Alexandre Torgue +M: Alexandre Torgue M: Jose Abreu L: net...@vger.kernel.org S: Supported -- 2.17.1
[PATCH 0/2] MAINTAINERS: update STMicroelectronics email
From: Patrice Chotard This series: _ update st.com to foss.st.com email for some maintainers. _ Remove Vincent Abriou as STI/STM DRM driver Patrice Chotard (2): MAINTAINERS: Update some st.com email addresses to foss.st.com MAINTAINERS: Remove Vincent Abriou for STM/STI DRM drivers. MAINTAINERS | 30 ++ 1 file changed, 14 insertions(+), 16 deletions(-) -- 2.17.1
MAINTAINERS: Update ARM/STI Arch maintainer
From: Patrice Chotard Update my email address with the one dedicated to upstream activities. Signed-off-by: Patrice Chotard --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index a008b70f3c16..e9bdd7f6e1d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2488,7 +2488,7 @@ N:sc27xx N: sc2731 ARM/STI ARCHITECTURE -M: Patrice Chotard +M: Patrice Chotard L: linux-arm-ker...@lists.infradead.org (moderated for non-subscribers) S: Maintained W: http://www.stlinux.com -- 2.17.1
[PATCH v2] PM: Add dev_wakeup_path() helper
From: Patrice Chotard Add dev_wakeup_path() helper to avoid to spread dev->power.wakeup_path test in drivers. Signed-off-by: Patrice Chotard Reviewed-by: Ulf Hansson --- Changes from v1: - Fold the 4 v1 patches into one - Add Ulf's Reviewed-by drivers/base/power/domain.c | 4 ++-- drivers/base/power/main.c| 4 ++-- drivers/i2c/busses/i2c-stm32f7.c | 4 ++-- include/linux/pm_wakeup.h| 10 ++ 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 743268996336..e0894ef8457c 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1142,7 +1142,7 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff) if (ret) return ret; - if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd)) + if (device_wakeup_path(dev) && genpd_is_active_wakeup(genpd)) return 0; if (genpd->dev_ops.stop && genpd->dev_ops.start && @@ -1196,7 +1196,7 @@ static int genpd_resume_noirq(struct device *dev) if (IS_ERR(genpd)) return -EINVAL; - if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd)) + if (device_wakeup_path(dev) && genpd_is_active_wakeup(genpd)) return pm_generic_resume_noirq(dev); genpd_lock(genpd); diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index c7ac49042cee..921c5b2ec30a 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1359,7 +1359,7 @@ static void dpm_propagate_wakeup_to_parent(struct device *dev) spin_lock_irq(>power.lock); - if (dev->power.wakeup_path && !parent->power.ignore_children) + if (device_wakeup_path(dev) && !parent->power.ignore_children) parent->power.wakeup_path = true; spin_unlock_irq(>power.lock); @@ -1627,7 +1627,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) goto Complete; /* Avoid direct_complete to let wakeup_path propagate. */ - if (device_may_wakeup(dev) || dev->power.wakeup_path) + if (device_may_wakeup(dev) || device_wakeup_path(dev)) dev->power.direct_complete = false; if (dev->power.direct_complete) { diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c index f41f51a176a1..9aa8e65b511e 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -2322,7 +2322,7 @@ static int stm32f7_i2c_suspend(struct device *dev) i2c_mark_adapter_suspended(_dev->adap); - if (!device_may_wakeup(dev) && !dev->power.wakeup_path) { + if (!device_may_wakeup(dev) && !device_wakeup_path(dev)) { ret = stm32f7_i2c_regs_backup(i2c_dev); if (ret < 0) { i2c_mark_adapter_resumed(_dev->adap); @@ -2341,7 +2341,7 @@ static int stm32f7_i2c_resume(struct device *dev) struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev); int ret; - if (!device_may_wakeup(dev) && !dev->power.wakeup_path) { + if (!device_may_wakeup(dev) && !device_wakeup_path(dev)) { ret = pm_runtime_force_resume(dev); if (ret < 0) return ret; diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h index aa3da6611533..196a157456aa 100644 --- a/include/linux/pm_wakeup.h +++ b/include/linux/pm_wakeup.h @@ -84,6 +84,11 @@ static inline bool device_may_wakeup(struct device *dev) return dev->power.can_wakeup && !!dev->power.wakeup; } +static inline bool device_wakeup_path(struct device *dev) +{ + return dev->power.wakeup_path; +} + static inline void device_set_wakeup_path(struct device *dev) { dev->power.wakeup_path = true; @@ -174,6 +179,11 @@ static inline bool device_may_wakeup(struct device *dev) return dev->power.can_wakeup && dev->power.should_wakeup; } +static inline bool device_wakeup_path(struct device *dev) +{ + return false; +} + static inline void device_set_wakeup_path(struct device *dev) {} static inline void __pm_stay_awake(struct wakeup_source *ws) {} -- 2.17.1
[PATCH v1 4/4] i2c: stm32f7: Make usage of dev_wakeup_path() helper
From: Patrice Chotard Make usage of dev_wakeup_path() helper. Signed-off-by: Patrice Chotard --- drivers/i2c/busses/i2c-stm32f7.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-stm32f7.c b/drivers/i2c/busses/i2c-stm32f7.c index f41f51a176a1..9aa8e65b511e 100644 --- a/drivers/i2c/busses/i2c-stm32f7.c +++ b/drivers/i2c/busses/i2c-stm32f7.c @@ -2322,7 +2322,7 @@ static int stm32f7_i2c_suspend(struct device *dev) i2c_mark_adapter_suspended(_dev->adap); - if (!device_may_wakeup(dev) && !dev->power.wakeup_path) { + if (!device_may_wakeup(dev) && !device_wakeup_path(dev)) { ret = stm32f7_i2c_regs_backup(i2c_dev); if (ret < 0) { i2c_mark_adapter_resumed(_dev->adap); @@ -2341,7 +2341,7 @@ static int stm32f7_i2c_resume(struct device *dev) struct stm32f7_i2c_dev *i2c_dev = dev_get_drvdata(dev); int ret; - if (!device_may_wakeup(dev) && !dev->power.wakeup_path) { + if (!device_may_wakeup(dev) && !device_wakeup_path(dev)) { ret = pm_runtime_force_resume(dev); if (ret < 0) return ret; -- 2.17.1
[PATCH v1 0/4] PM: Add dev_wakeup_path() helper
From: Patrice Chotard Add dev_wakeup_path() helper to avoid to spread dev->power.wakeup_path test in drivers. Cc: amelie.delau...@st.com, erwan_le...@st.com, fabrice.gasn...@st.com, alexandre.tor...@st.com, alain.vol...@st.com, pierre-yves.mord...@st.com *** BLURB HERE *** Patrice Chotard (4): PM / wakeup: Add dev_wakeup_path() helper PM: domains: Make usage of device_wakeup_path() helper PM: core: Make usage of device_wakeup_path() helper i2c: stm32f7: Make usage of dev_wakeup_path() helper drivers/base/power/domain.c | 4 ++-- drivers/base/power/main.c| 4 ++-- drivers/i2c/busses/i2c-stm32f7.c | 4 ++-- include/linux/pm_wakeup.h| 10 ++ 4 files changed, 16 insertions(+), 6 deletions(-) -- 2.17.1
[PATCH v1 1/4] PM / wakeup: Add dev_wakeup_path() helper
From: Patrice Chotard Add dev_wakeup_path() helper to avoid to spread dev->power.wakeup_path test in drivers. In case CONFIG_PM_SLEEP is not set, wakeup_path is not defined, dev_wakeup_path() is returning false. Signed-off-by: Patrice Chotard --- include/linux/pm_wakeup.h | 10 ++ 1 file changed, 10 insertions(+) diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h index aa3da6611533..196a157456aa 100644 --- a/include/linux/pm_wakeup.h +++ b/include/linux/pm_wakeup.h @@ -84,6 +84,11 @@ static inline bool device_may_wakeup(struct device *dev) return dev->power.can_wakeup && !!dev->power.wakeup; } +static inline bool device_wakeup_path(struct device *dev) +{ + return dev->power.wakeup_path; +} + static inline void device_set_wakeup_path(struct device *dev) { dev->power.wakeup_path = true; @@ -174,6 +179,11 @@ static inline bool device_may_wakeup(struct device *dev) return dev->power.can_wakeup && dev->power.should_wakeup; } +static inline bool device_wakeup_path(struct device *dev) +{ + return false; +} + static inline void device_set_wakeup_path(struct device *dev) {} static inline void __pm_stay_awake(struct wakeup_source *ws) {} -- 2.17.1
[PATCH v1 2/4] PM: domains: Make usage of device_wakeup_path() helper
From: Patrice Chotard Make usage of dev_wakeup_path() helper. Signed-off-by: Patrice Chotard --- drivers/base/power/domain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index 743268996336..e0894ef8457c 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c @@ -1142,7 +1142,7 @@ static int genpd_finish_suspend(struct device *dev, bool poweroff) if (ret) return ret; - if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd)) + if (device_wakeup_path(dev) && genpd_is_active_wakeup(genpd)) return 0; if (genpd->dev_ops.stop && genpd->dev_ops.start && @@ -1196,7 +1196,7 @@ static int genpd_resume_noirq(struct device *dev) if (IS_ERR(genpd)) return -EINVAL; - if (dev->power.wakeup_path && genpd_is_active_wakeup(genpd)) + if (device_wakeup_path(dev) && genpd_is_active_wakeup(genpd)) return pm_generic_resume_noirq(dev); genpd_lock(genpd); -- 2.17.1
[PATCH v1 3/4] PM: core: Make usage of device_wakeup_path() helper
From: Patrice Chotard Make usage of dev_wakeup_path() helper. Signed-off-by: Patrice Chotard --- drivers/base/power/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index c7ac49042cee..921c5b2ec30a 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1359,7 +1359,7 @@ static void dpm_propagate_wakeup_to_parent(struct device *dev) spin_lock_irq(>power.lock); - if (dev->power.wakeup_path && !parent->power.ignore_children) + if (device_wakeup_path(dev) && !parent->power.ignore_children) parent->power.wakeup_path = true; spin_unlock_irq(>power.lock); @@ -1627,7 +1627,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) goto Complete; /* Avoid direct_complete to let wakeup_path propagate. */ - if (device_may_wakeup(dev) || dev->power.wakeup_path) + if (device_may_wakeup(dev) || device_wakeup_path(dev)) dev->power.direct_complete = false; if (dev->power.direct_complete) { -- 2.17.1
[PATCH] Revert "ARM: sti: Implement dummy L2 cache's write_sec"
From: Patrice Chotard This reverts commit 7b8e0188fa717cd9abc4fb52587445b421835c2a. Initially, STiH410-B2260 was supposed to be secured, that's why l2c_write_sec was stubbed to avoid secure register access from non secure world. But by default, STiH410-B2260 is running in non secure mode, so L2 cache register accesses are authorized, l2c_write_sec stub is not needed. With this patch, L2 cache is configured and performance are enhanced. Signed-off-by: Patrice Chotard Cc: Alain Volmat --- arch/arm/mach-sti/board-dt.c | 9 - 1 file changed, 9 deletions(-) diff --git a/arch/arm/mach-sti/board-dt.c b/arch/arm/mach-sti/board-dt.c index dcb98937fcf5..ffecbf29646f 100644 --- a/arch/arm/mach-sti/board-dt.c +++ b/arch/arm/mach-sti/board-dt.c @@ -20,14 +20,6 @@ static const char *const stih41x_dt_match[] __initconst = { NULL }; -static void sti_l2_write_sec(unsigned long val, unsigned reg) -{ - /* -* We can't write to secure registers as we are in non-secure -* mode, until we have some SMI service available. -*/ -} - DT_MACHINE_START(STM, "STi SoC with Flattened Device Tree") .dt_compat = stih41x_dt_match, .l2c_aux_val= L2C_AUX_CTRL_SHARED_OVERRIDE | @@ -36,5 +28,4 @@ DT_MACHINE_START(STM, "STi SoC with Flattened Device Tree") L2C_AUX_CTRL_WAY_SIZE(4), .l2c_aux_mask = 0xcfff, .smp= smp_ops(sti_smp_ops), - .l2c_write_sec = sti_l2_write_sec, MACHINE_END -- 2.17.1
spi: stm32-qspi: Fix error path in case of -EPROBE_DEFER
From: Patrice Chotard In case of -EPROBE_DEFER, stm32_qspi_release() was called in any case which unregistered driver from pm_runtime framework even if it has not been registered yet to it. This leads to: stm32-qspi 58003000.spi: can't setup spi0.0, status -13 spi_master spi0: spi_device register error /soc/spi@58003000/mx66l51235l@0 spi_master spi0: Failed to create SPI device for /soc/spi@58003000/mx66l51235l@0 stm32-qspi 58003000.spi: can't setup spi0.1, status -13 spi_master spi0: spi_device register error /soc/spi@58003000/mx66l51235l@1 spi_master spi0: Failed to create SPI device for /soc/spi@58003000/mx66l51235l@1 On v5.7 kernel,this issue was not "visible", qspi driver was probed successfully. Fixes: 9d282c17b023 ("spi: stm32-qspi: Add pm_runtime support") Signed-off-by: Patrice Chotard --- drivers/spi/spi-stm32-qspi.c | 46 1 file changed, 26 insertions(+), 20 deletions(-) diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 3c44bb2fd9b1..a900962b4336 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -553,20 +553,6 @@ static const struct spi_controller_mem_ops stm32_qspi_mem_ops = { .exec_op = stm32_qspi_exec_op, }; -static void stm32_qspi_release(struct stm32_qspi *qspi) -{ - pm_runtime_get_sync(qspi->dev); - /* disable qspi */ - writel_relaxed(0, qspi->io_base + QSPI_CR); - stm32_qspi_dma_free(qspi); - mutex_destroy(>lock); - pm_runtime_put_noidle(qspi->dev); - pm_runtime_disable(qspi->dev); - pm_runtime_set_suspended(qspi->dev); - pm_runtime_dont_use_autosuspend(qspi->dev); - clk_disable_unprepare(qspi->clk); -} - static int stm32_qspi_probe(struct platform_device *pdev) { struct device *dev = >dev; @@ -642,7 +628,7 @@ static int stm32_qspi_probe(struct platform_device *pdev) if (IS_ERR(rstc)) { ret = PTR_ERR(rstc); if (ret == -EPROBE_DEFER) - goto err_qspi_release; + goto err_clk_disable; } else { reset_control_assert(rstc); udelay(2); @@ -653,7 +639,7 @@ static int stm32_qspi_probe(struct platform_device *pdev) platform_set_drvdata(pdev, qspi); ret = stm32_qspi_dma_setup(qspi); if (ret) - goto err_qspi_release; + goto err_dma_free; mutex_init(>lock); @@ -673,15 +659,26 @@ static int stm32_qspi_probe(struct platform_device *pdev) ret = devm_spi_register_master(dev, ctrl); if (ret) - goto err_qspi_release; + goto err_pm_runtime_free; pm_runtime_mark_last_busy(dev); pm_runtime_put_autosuspend(dev); return 0; -err_qspi_release: - stm32_qspi_release(qspi); +err_pm_runtime_free: + pm_runtime_get_sync(qspi->dev); + /* disable qspi */ + writel_relaxed(0, qspi->io_base + QSPI_CR); + mutex_destroy(>lock); + pm_runtime_put_noidle(qspi->dev); + pm_runtime_disable(qspi->dev); + pm_runtime_set_suspended(qspi->dev); + pm_runtime_dont_use_autosuspend(qspi->dev); +err_dma_free: + stm32_qspi_dma_free(qspi); +err_clk_disable: + clk_disable_unprepare(qspi->clk); err_master_put: spi_master_put(qspi->ctrl); @@ -692,7 +689,16 @@ static int stm32_qspi_remove(struct platform_device *pdev) { struct stm32_qspi *qspi = platform_get_drvdata(pdev); - stm32_qspi_release(qspi); + pm_runtime_get_sync(qspi->dev); + /* disable qspi */ + writel_relaxed(0, qspi->io_base + QSPI_CR); + stm32_qspi_dma_free(qspi); + mutex_destroy(>lock); + pm_runtime_put_noidle(qspi->dev); + pm_runtime_disable(qspi->dev); + pm_runtime_set_suspended(qspi->dev); + pm_runtime_dont_use_autosuspend(qspi->dev); + clk_disable_unprepare(qspi->clk); return 0; } -- 2.17.1
spi: stm32-qspi: Fix unbalanced pm_runtime_enable issue
From: Patrice Chotard Issue detected by unbinding/binding the stm32 qspi driver as following: root@stm32mp2:~# echo 4043.spi > /sys/bus/platform/drivers/stm32-qspi/404300 00.spi/driver/unbind root@stm32mp2:~# echo 4043.spi > /sys/bus/platform/drivers/stm32-qspi/bind [ 969.864021] stm32-qspi 4043.spi: Unbalanced pm_runtime_enable! [ 970.225161] spi-nor spi0.0: mx66u51235f (65536 Kbytes) [ 970.935721] spi-nor spi0.1: mx66u51235f (65536 Kbytes) Fixes: 9d282c17b023 ("spi: stm32-qspi: Add pm_runtime support") Signed-off-by: Patrice Chotard --- drivers/spi/spi-stm32-qspi.c | 5 + 1 file changed, 5 insertions(+) diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 2f2ea2c42d6e..3c44bb2fd9b1 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -555,10 +555,15 @@ static const struct spi_controller_mem_ops stm32_qspi_mem_ops = { static void stm32_qspi_release(struct stm32_qspi *qspi) { + pm_runtime_get_sync(qspi->dev); /* disable qspi */ writel_relaxed(0, qspi->io_base + QSPI_CR); stm32_qspi_dma_free(qspi); mutex_destroy(>lock); + pm_runtime_put_noidle(qspi->dev); + pm_runtime_disable(qspi->dev); + pm_runtime_set_suspended(qspi->dev); + pm_runtime_dont_use_autosuspend(qspi->dev); clk_disable_unprepare(qspi->clk); } -- 2.17.1
ARM: dts: stm32: relax qspi pins slew-rate for stm32mp157
From: Patrice Chotard Relax qspi pins slew-rate to minimize peak currents. Fixes: 844030057339 ("ARM: dts: stm32: add flash nor support on stm32mp157c eval board") Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi index e4a0d51ec3a8..0a3a7d66737b 100644 --- a/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32mp157-pinctrl.dtsi @@ -609,13 +609,13 @@ ; /* QSPI_BK1_IO3 */ bias-disable; drive-push-pull; - slew-rate = <3>; + slew-rate = <1>; }; pins2 { pinmux = ; /* QSPI_BK1_NCS */ bias-pull-up; drive-push-pull; - slew-rate = <3>; + slew-rate = <1>; }; }; @@ -637,13 +637,13 @@ ; /* QSPI_BK2_IO3 */ bias-disable; drive-push-pull; - slew-rate = <3>; + slew-rate = <1>; }; pins2 { pinmux = ; /* QSPI_BK2_NCS */ bias-pull-up; drive-push-pull; - slew-rate = <3>; + slew-rate = <1>; }; }; -- 2.17.1
ARM: multi_v7_defconfig: Fix SPI_STM32_QSPI support
From: Patrice Chotard SPI_STM32_QSPI must be set in buildin as rootfs can be located on QSPI memory device. Signed-off-by: Patrice Chotard --- arch/arm/configs/multi_v7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 13ba53286901..510ad7691a2e 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -415,7 +415,7 @@ CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SH_HSPI=y CONFIG_SPI_SIRF=y CONFIG_SPI_STM32=m -CONFIG_SPI_STM32_QSPI=m +CONFIG_SPI_STM32_QSPI=y CONFIG_SPI_SUN4I=y CONFIG_SPI_SUN6I=y CONFIG_SPI_TEGRA114=y -- 2.17.1
spi: stm32-qspi: Fix kernel oops when unbinding driver
From: Patrice Chotard spi_master_put() must only be called in .probe() in case of error. As devm_spi_register_master() is used during probe, spi_master_put() mustn't be called in .remove() callback. It fixes the following kernel WARNING/Oops when executing echo "58003000.spi" > /sys/bus/platform/drivers/stm32-qspi/unbind : [ cut here ] WARNING: CPU: 1 PID: 496 at fs/kernfs/dir.c:1504 kernfs_remove_by_name_ns+0x9c/0xa4 kernfs: can not remove 'uevent', no directory Modules linked in: CPU: 1 PID: 496 Comm: sh Not tainted 5.3.0-rc1-00219-ga0e07bb51a37 #62 Hardware name: STM32 (Device Tree Support) [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0xb4/0xc8) [] (dump_stack) from [] (__warn.part.3+0xbc/0xd8) [] (__warn.part.3) from [] (warn_slowpath_fmt+0x68/0x8c) [] (warn_slowpath_fmt) from [] (kernfs_remove_by_name_ns+0x9c/0xa4) [] (kernfs_remove_by_name_ns) from [] (device_del+0x128/0x358) [] (device_del) from [] (device_unregister+0x24/0x64) [] (device_unregister) from [] (spi_unregister_controller+0x88/0xe8) [] (spi_unregister_controller) from [] (release_nodes+0x1bc/0x200) [] (release_nodes) from [] (device_release_driver_internal+0xec/0x1ac) [] (device_release_driver_internal) from [] (unbind_store+0x60/0xd4) [] (unbind_store) from [] (kernfs_fop_write+0xe8/0x1c4) [] (kernfs_fop_write) from [] (__vfs_write+0x2c/0x1c0) [] (__vfs_write) from [] (vfs_write+0xa4/0x184) [] (vfs_write) from [] (ksys_write+0x58/0xd0) [] (ksys_write) from [] (ret_fast_syscall+0x0/0x54) Exception stack(0xdd289fa8 to 0xdd289ff0) 9fa0: 006c 000e20e8 0001 000e20e8 000d 9fc0: 006c 000e20e8 b6f87da0 0004 000d 000d 9fe0: 0004 bee639b0 b6f2286b b6eaf6c6 ---[ end trace 1b15df8a02d76aef ]--- [ cut here ] WARNING: CPU: 1 PID: 496 at fs/kernfs/dir.c:1504 kernfs_remove_by_name_ns+0x9c/0xa4 kernfs: can not remove 'online', no directory Modules linked in: CPU: 1 PID: 496 Comm: sh Tainted: GW 5.3.0-rc1-00219-ga0e07bb51a37 #62 Hardware name: STM32 (Device Tree Support) [] (unwind_backtrace) from [] (show_stack+0x10/0x14) [] (show_stack) from [] (dump_stack+0xb4/0xc8) [] (dump_stack) from [] (__warn.part.3+0xbc/0xd8) [] (__warn.part.3) from [] (warn_slowpath_fmt+0x68/0x8c) [] (warn_slowpath_fmt) from [] (kernfs_remove_by_name_ns+0x9c/0xa4) [] (kernfs_remove_by_name_ns) from [] (device_remove_attrs+0x20/0x5c) [] (device_remove_attrs) from [] (device_del+0x134/0x358) [] (device_del) from [] (device_unregister+0x24/0x64) [] (device_unregister) from [] (spi_unregister_controller+0x88/0xe8) [] (spi_unregister_controller) from [] (release_nodes+0x1bc/0x200) [] (release_nodes) from [] (device_release_driver_internal+0xec/0x1ac) [] (device_release_driver_internal) from [] (unbind_store+0x60/0xd4) [] (unbind_store) from [] (kernfs_fop_write+0xe8/0x1c4) [] (kernfs_fop_write) from [] (__vfs_write+0x2c/0x1c0) [] (__vfs_write) from [] (vfs_write+0xa4/0x184) [] (vfs_write) from [] (ksys_write+0x58/0xd0) [] (ksys_write) from [] (ret_fast_syscall+0x0/0x54) Exception stack(0xdd289fa8 to 0xdd289ff0) 9fa0: 006c 000e20e8 0001 000e20e8 000d 9fc0: 006c 000e20e8 b6f87da0 0004 000d 000d 9fe0: 0004 bee639b0 b6f2286b b6eaf6c6 ---[ end trace 1b15df8a02d76af0 ]--- 8<--- cut here --- Unable to handle kernel NULL pointer dereference at virtual address 0050 pgd = e612f14d [0050] *pgd=ff1f5835 Internal error: Oops: 17 [#1] SMP ARM Modules linked in: CPU: 1 PID: 496 Comm: sh Tainted: GW 5.3.0-rc1-00219-ga0e07bb51a37 #62 Hardware name: STM32 (Device Tree Support) PC is at kernfs_find_ns+0x8/0xfc LR is at kernfs_find_and_get_ns+0x30/0x48 pc : []lr : []psr: 40010013 sp : dd289dac ip : fp : r10: r9 : def6ec58 r8 : dd289e54 r7 : r6 : c0abb234 r5 : r4 : c0d26a30 r3 : ddab5080 r2 : r1 : c0abb234 r0 : Flags: nZcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment none Control: 10c5387d Table: dd11c06a DAC: 0051 Process sh (pid: 496, stack limit = 0xe13a592d) Stack: (0xdd289dac to 0xdd28a000) 9da0:c0d26a30 c0abb234 c02e4ac8 9dc0: c0976b44 def6ec00 dea53810 dd289e54 c02e864c c0a61a48 c0a4a5ec 9de0: c0d630a8 def6ec00 c0d04c48 c02e86e0 def6ec00 de909338 c0d04c48 c05833b0 9e00: c0638144 dd289e54 def59900 475b3ee5 def6ec00 9e20: def6ec00 def59b80 dd289e54 def59900 c05835f8 def6ec00 c0638dac 9e40: 000a dea53810 c0d04c48 c058c580 dea53810 def59500 def59b80 475b3ee5 9e60: ddc63e00 dea53810 dea3fe10 c0d63a0c dea53810 ddc63e00 dd289f78 dd240d10 9e80: c0588a44 c0d59a20 000d c0d63a0c c0586840 000d dd240d00 9ea0: ddc63e00 c02e64e8 c0d04c48 dd9bbcc0 9ec0: c02e6400 dd289f78
ARM: multi_v7_defconfig: Enable SPI_STM32_QSPI support
From: Patrice Chotard Enable support for QSPI block on STM32 SoCs. Signed-off-by: Patrice Chotard --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 6a40bc2ef271..78d1d93298af 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -403,6 +403,7 @@ CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SH_HSPI=y CONFIG_SPI_SIRF=y CONFIG_SPI_STM32=m +CONFIG_SPI_STM32_QSPI=m CONFIG_SPI_SUN4I=y CONFIG_SPI_SUN6I=y CONFIG_SPI_TEGRA114=y -- 2.17.1
ARM: multi_v7_defconfig: Enable SPI_STM32_QSPI support
From: Patrice Chotard Enable support for QSPI block on STM32 SoCs. Signed-off-by: Patrice Chotard --- arch/arm/configs/multi_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 6a40bc2ef271..78d1d93298af 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -403,6 +403,7 @@ CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SH_HSPI=y CONFIG_SPI_SIRF=y CONFIG_SPI_STM32=m +CONFIG_SPI_STM32_QSPI=m CONFIG_SPI_SUN4I=y CONFIG_SPI_SUN6I=y CONFIG_SPI_TEGRA114=y -- 2.17.1
[PATCH 1/1] spi: spi-stm32-qspi: Remove CR_FTHRES_MASK usage
From: Patrice Chotard On STM32 F4/F7/H7 SoCs, FTHRES is a 5 bits field in QSPI_CR register, but for STM32MP1 SoCs, FTHRES is a 4 bits field long. CR_FTHRES_MASK definition is not correct. As for all these SoCs, FTHRES field is set to 3, FIELD_PREP() macro is used with a constant as second parameter which make its usage useless. CR_FTHRES_MASK and FIELD_PREP() can be removed. Signed-off-by: Patrice Chotard --- drivers/spi/spi-stm32-qspi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-stm32-qspi.c b/drivers/spi/spi-stm32-qspi.c index 42f8e3c6aa1f..5dbb6a8e893c 100644 --- a/drivers/spi/spi-stm32-qspi.c +++ b/drivers/spi/spi-stm32-qspi.c @@ -29,7 +29,7 @@ #define CR_SSHIFT BIT(4) #define CR_DFM BIT(6) #define CR_FSELBIT(7) -#define CR_FTHRES_MASK GENMASK(12, 8) +#define CR_FTHRES_SHIFT8 #define CR_TEIEBIT(16) #define CR_TCIEBIT(17) #define CR_FTIEBIT(18) @@ -463,7 +463,7 @@ static int stm32_qspi_setup(struct spi_device *spi) flash->presc = presc; mutex_lock(>lock); - qspi->cr_reg = FIELD_PREP(CR_FTHRES_MASK, 3) | CR_SSHIFT | CR_EN; + qspi->cr_reg = 3 << CR_FTHRES_SHIFT | CR_SSHIFT | CR_EN; writel_relaxed(qspi->cr_reg, qspi->io_base + QSPI_CR); /* set dcr fsize to max address */ -- 2.17.1
[PATCH v2 1/1] ARM: sti: remove pen_release and boot_lock
From: Patrice Chotard The pen_release implementation was created for Versatile platforms to work around boot loaders that did not differentiate between the various different secondary CPUs on this ARM development platform. This should not be true of modern platforms where we send IPIs to specific CPUs to wake them up. Remove the pen_release stuff from SoCs that make use of the per-CPU IPI mechanism. The boot_lock is something that was required for ARM development platforms to ensure that the delay calibration worked properly. This is not necessary for modern platforms that have better bus bandwidth and do not need to calibrate the delay loop for secondary cores. Remove the boot_lock entirely. Due to pen_release and boot_lock removal, .smp_prepare_cpus and .smp_boot_secondary STi callbacks must be reworked properly to allow secondary CPU bring up. Secondary CPU is initialized and started by a U-BOOTROM firmware. Secondary CPU is spinning and waiting for a write at cpu_strt_ptr. Writing secondary_startup address at cpu_strt_ptr makes it to jump directly to secondary_startup(). This write must be done in .smp_boot_secondary callback and not in .smp_prepare_cpus as previously, this insures that secondary_data struct is populated in __cpu_up() (stack, pgdir and swapper_pg_dir fields). The IPI in sti_boot_secondary() is useless, so remove it. Signed-off-by: Russell King Signed-off-by: Patrice Chotard --- arch/arm/mach-sti/Makefile | 2 +- arch/arm/mach-sti/headsmp.S | 43 -- arch/arm/mach-sti/platsmp.c | 88 - 3 files changed, 15 insertions(+), 118 deletions(-) delete mode 100644 arch/arm/mach-sti/headsmp.S diff --git a/arch/arm/mach-sti/Makefile b/arch/arm/mach-sti/Makefile index acb3309..f85ff05 100644 --- a/arch/arm/mach-sti/Makefile +++ b/arch/arm/mach-sti/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_SMP) += platsmp.o headsmp.o +obj-$(CONFIG_SMP) += platsmp.o obj-$(CONFIG_ARCH_STI) += board-dt.o diff --git a/arch/arm/mach-sti/headsmp.S b/arch/arm/mach-sti/headsmp.S deleted file mode 100644 index e0ad4517..000 --- a/arch/arm/mach-sti/headsmp.S +++ /dev/null @@ -1,43 +0,0 @@ -/* - * arch/arm/mach-sti/headsmp.S - * - * Copyright (C) 2013 STMicroelectronics (R) Limited. - * http://www.st.com - * - * Cloned from linux/arch/arm/mach-vexpress/headsmp.S - * - * Copyright (c) 2003 ARM Limited - * All Rights Reserved - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ -#include -#include - -/* - * ST specific entry point for secondary CPUs. This provides - * a "holding pen" into which all secondary cores are held until we're - * ready for them to initialise. - */ -ENTRY(sti_secondary_startup) - mrc p15, 0, r0, c0, c0, 5 - and r0, r0, #15 - adr r4, 1f - ldmia r4, {r5, r6} - sub r4, r4, r5 - add r6, r6, r4 -pen: ldr r7, [r6] - cmp r7, r0 - bne pen - - /* -* we've been released from the holding pen: secondary_stack -* should now contain the SVC stack for this core -*/ - b secondary_startup -ENDPROC(sti_secondary_startup) - -1: .long . - .long pen_release diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c index 231f19e..d0272a8 100644 --- a/arch/arm/mach-sti/platsmp.c +++ b/arch/arm/mach-sti/platsmp.c @@ -28,82 +28,33 @@ #include "smp.h" -static void write_pen_release(int val) -{ - pen_release = val; - smp_wmb(); - sync_cache_w(_release); -} - -static DEFINE_SPINLOCK(boot_lock); - -static void sti_secondary_init(unsigned int cpu) -{ - /* -* let the primary processor know we're out of the -* pen, then head off into the C entry point -*/ - write_pen_release(-1); - - /* -* Synchronise with the boot thread. -*/ - spin_lock(_lock); - spin_unlock(_lock); -} +static u32 __iomem *cpu_strt_ptr; static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) { - unsigned long timeout; - - /* -* set synchronisation state between this boot processor -* and the secondary one -*/ - spin_lock(_lock); + unsigned long entry_pa = __pa_symbol(secondary_startup); /* -* The secondary processor is waiting to be released from -* the holding pen - release it, then wait for it to flag -* that it has been released by resetting pen_release. -* -* Note that "pen_release" is the hardware CPU ID, whereas -* "cpu" is Linux's internal ID. +* Secondary CPU is initialised and started by a U-BOOTROM firmware. +* Secondary CPU is spinning and waiting for a write at cpu_strt_ptr. +*
[PATCH 1/1] ARM: STi: Restore secondary CPU's bringup
From: Patrice Chotard Due to pen_release and boot_lock removal, secondary CPU's bringup was broken. Restore CPU's bringup by reworking properly .smp_prepare_cpus and .smp_boot_secondary STi callbacks. Signed-off-by: Patrice Chotard --- arch/arm/mach-sti/platsmp.c | 31 --- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c index 2166850..9bfc93a 100644 --- a/arch/arm/mach-sti/platsmp.c +++ b/arch/arm/mach-sti/platsmp.c @@ -28,8 +28,21 @@ #include "smp.h" +static u32 __iomem *cpu_strt_ptr; + static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle) { + unsigned long entry_pa = __pa_symbol(secondary_startup); + + __raw_writel(entry_pa, cpu_strt_ptr); + + /* +* wmb so that data is actually written +* before cache flush is done +*/ + smp_wmb(); + sync_cache_w(cpu_strt_ptr); + /* * Send the secondary CPU a soft interrupt, thereby causing * it to jump to the secondary entrypoint. @@ -43,10 +56,8 @@ static void __init sti_smp_prepare_cpus(unsigned int max_cpus) { struct device_node *np; void __iomem *scu_base; - u32 __iomem *cpu_strt_ptr; u32 release_phys; int cpu; - unsigned long entry_pa = __pa_symbol(secondary_startup); np = of_find_compatible_node(NULL, NULL, "arm,cortex-a9-scu"); @@ -74,8 +85,8 @@ static void __init sti_smp_prepare_cpus(unsigned int max_cpus) } /* -* holding pen is usually configured in SBC DMEM but can also be -* in RAM. +* cpu-release-addr is usually configured in SBC DMEM but can +* also be in RAM. */ if (!memblock_is_memory(release_phys)) @@ -85,17 +96,7 @@ static void __init sti_smp_prepare_cpus(unsigned int max_cpus) cpu_strt_ptr = (u32 __iomem *)phys_to_virt(release_phys); - __raw_writel(entry_pa, cpu_strt_ptr); - - /* -* wmb so that data is actually written -* before cache flush is done -*/ - smp_wmb(); - sync_cache_w(cpu_strt_ptr); - - if (!memblock_is_memory(release_phys)) - iounmap(cpu_strt_ptr); + set_cpu_possible(cpu, true); } } -- 1.9.1
[PATCH] ARM: dts: stih410: change syntax of multiple DAI
From: Christophe Priouzeau With change of syntax for 'simple-audio-card,dai-link' containers, devicetrees of stih410 must be updated. This fixes the following error: [3.839466] asoc-simple-card sound: asoc_simple_card_dai_link_of: Can't find simple-audio-card,cpu DT node [3.849150] asoc-simple-card sound: parse error -22 Signed-off-by: Christophe Priouzeau Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih410-b2260.dts | 5 - arch/arm/boot/dts/stihxxx-b2120.dtsi | 11 --- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 155caa8..4ee6d51 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -61,8 +61,11 @@ compatible = "simple-audio-card"; simple-audio-card,name = "STI-B2260"; status = "okay"; + #address-cells = <1>; + #size-cells = <0>; - simple-audio-card,dai-link0 { + simple-audio-card,dai-link@0 { + reg = <0>; /* DAC */ format = "i2s"; mclk-fs = <128>; diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi index 4dedfcb..97e05f5 100644 --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi @@ -27,8 +27,11 @@ compatible = "simple-audio-card"; simple-audio-card,name = "STI-B2120"; status = "okay"; + #address-cells = <1>; + #size-cells = <0>; - simple-audio-card,dai-link0 { + simple-audio-card,dai-link@0 { + reg = <0>; /* HDMI */ format = "i2s"; mclk-fs = <128>; @@ -41,7 +44,8 @@ }; }; - simple-audio-card,dai-link1 { + simple-audio-card,dai-link@1 { + reg = <1>; /* DAC */ format = "i2s"; mclk-fs = <256>; @@ -55,7 +59,8 @@ }; }; - simple-audio-card,dai-link2 { + simple-audio-card,dai-link@2 { + reg = <2>; /* SPDIF */ format = "left_j"; mclk-fs = <128>; -- 1.9.1
[PATCH] ARM: dts: stih410: change syntax of multiple DAI
From: Christophe Priouzeau With change of syntax for 'simple-audio-card,dai-link' containers, devicetrees of stih410 must be updated. This fixes the following error: [3.839466] asoc-simple-card sound: asoc_simple_card_dai_link_of: Can't find simple-audio-card,cpu DT node [3.849150] asoc-simple-card sound: parse error -22 Signed-off-by: Christophe Priouzeau Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih410-b2260.dts | 5 - arch/arm/boot/dts/stihxxx-b2120.dtsi | 11 --- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 155caa8..4ee6d51 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -61,8 +61,11 @@ compatible = "simple-audio-card"; simple-audio-card,name = "STI-B2260"; status = "okay"; + #address-cells = <1>; + #size-cells = <0>; - simple-audio-card,dai-link0 { + simple-audio-card,dai-link@0 { + reg = <0>; /* DAC */ format = "i2s"; mclk-fs = <128>; diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi index 4dedfcb..97e05f5 100644 --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi @@ -27,8 +27,11 @@ compatible = "simple-audio-card"; simple-audio-card,name = "STI-B2120"; status = "okay"; + #address-cells = <1>; + #size-cells = <0>; - simple-audio-card,dai-link0 { + simple-audio-card,dai-link@0 { + reg = <0>; /* HDMI */ format = "i2s"; mclk-fs = <128>; @@ -41,7 +44,8 @@ }; }; - simple-audio-card,dai-link1 { + simple-audio-card,dai-link@1 { + reg = <1>; /* DAC */ format = "i2s"; mclk-fs = <256>; @@ -55,7 +59,8 @@ }; }; - simple-audio-card,dai-link2 { + simple-audio-card,dai-link@2 { + reg = <2>; /* SPDIF */ format = "left_j"; mclk-fs = <128>; -- 1.9.1
[PATCH v2 3/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f4
From: Patrice Chotard Fix the following DT dtc warnings for stm32f429 and stm32f469 boards: Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@1: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_hs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart3@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/mii@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/adc@200: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@3: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/ltdc@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/dcmi@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /gpio_keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- Change since v1: - update nodes name as following: @0 to -0 arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++--- arch/arm/boot/dts/stm32f429-disco.dts| 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++ arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts| 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++- 7 files changed, 102 insertions(+), 115 deletions(-) diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts index 7eb786a2d624..116232b589e4 100644 --- a/arch/arm/boot/dts/stm32429i-eval.dts +++ b/arch/arm/boot/dts/stm32429i-eval.dts @@ -60,7 +60,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@0 { reg = <0x 0x200>; }; @@ -111,17 +111,16 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "Wake up"; linux,code = ; gpios = < 0 0>; }; - button@1 { + button-1 { label = "Tamper"; linux,code = ; gpios = < 13 0>; @@ -145,7 +144,7 @@ }; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <330>; diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi index 35202896c093..244c7ab8c76d 100644 --- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi @@ -45,7 +45,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@4002 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4002 0x3000>; @@ -163,7 +163,7 @@
[PATCH v2 1/3] ARM: dts: stm32: Fix DT dtc warnings for stm32h7
From: Patrice Chotard Fix the following DT dtc warnings: Warning (node_name_chars_strict): /clocks/i2s_ckin: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart1@0) Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0) Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0) Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unique_unit_address): /soc/pin-controller/usart2@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /soc/timer@58002c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timer@58003000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- Change since v1: - update nodes name as following: @0 to -0 arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 +- arch/arm/boot/dts/stm32h743.dtsi | 8 arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/stm32h743i-eval.dts| 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi index 24be8e63dec8..fa0cde73dbe9 100644 --- a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi @@ -44,7 +44,7 @@ / { soc { - pin-controller { + pin-controller@5802 { #address-cells = <1>; #size-cells = <1>; compatible = "st,stm32h743-pinctrl"; @@ -163,7 +163,7 @@ #interrupt-cells = <2>; }; - i2c1_pins_a: i2c1@0 { + i2c1_pins_a: i2c1-0 { pins { pinmux = , /* I2C1_SCL */ ; /* I2C1_SDA */ @@ -173,7 +173,7 @@ }; }; - usart1_pins: usart1@0 { + usart1_pins: usart1-0 { pins1 { pinmux = ; /* USART1_TX */ bias-disable; @@ -186,7 +186,7 @@ }; }; - usart2_pins: usart2@0 { + usart2_pins: usart2-0 { pins1 { pinmux = ; /* USART2_TX */ bias-disable; @@ -199,7 +199,7 @@ }; }; - usbotg_hs_pins_a: usbotg-hs@0 { + usbotg_hs_pins_a: usbotg-hs-0 { pins { pinmux = , /* ULPI_NXT */ , /* ULPI_DIR> */ diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 637beffe5067..b2d4e0b5a9c3 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -40,13 +40,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" #include #include #include / { + #address-cells = <1>; + #size-cells = <1>; + clocks { clk_hse: clk-hse { #clock-cells = <0>; @@ -60,7 +62,7 @@ clock-frequency = <32768>; }; - clk_i2s: i2s_ckin { + clk_i2s: i2s-ckin { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <0>; @@ -422,7 +424,6 @@ }; lptimer4: timer@58002c00 { - #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32-lptimer"; reg = <0x58002c00 0x400>; @@ -438,7 +439,6 @@ };
[PATCH v2 3/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f4
From: Patrice Chotard Fix the following DT dtc warnings for stm32f429 and stm32f469 boards: Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@1: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_hs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart3@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/mii@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/adc@200: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@3: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/ltdc@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/dcmi@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /gpio_keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- Change since v1: - update nodes name as following: @0 to -0 arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++--- arch/arm/boot/dts/stm32f429-disco.dts| 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++ arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts| 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++- 7 files changed, 102 insertions(+), 115 deletions(-) diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts index 7eb786a2d624..116232b589e4 100644 --- a/arch/arm/boot/dts/stm32429i-eval.dts +++ b/arch/arm/boot/dts/stm32429i-eval.dts @@ -60,7 +60,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@0 { reg = <0x 0x200>; }; @@ -111,17 +111,16 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "Wake up"; linux,code = ; gpios = < 0 0>; }; - button@1 { + button-1 { label = "Tamper"; linux,code = ; gpios = < 13 0>; @@ -145,7 +144,7 @@ }; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <330>; diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi index 35202896c093..244c7ab8c76d 100644 --- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi @@ -45,7 +45,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@4002 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4002 0x3000>; @@ -163,7 +163,7 @@
[PATCH v2 1/3] ARM: dts: stm32: Fix DT dtc warnings for stm32h7
From: Patrice Chotard Fix the following DT dtc warnings: Warning (node_name_chars_strict): /clocks/i2s_ckin: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart1@0) Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0) Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0) Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unique_unit_address): /soc/pin-controller/usart2@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /soc/timer@58002c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timer@58003000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- Change since v1: - update nodes name as following: @0 to -0 arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 +- arch/arm/boot/dts/stm32h743.dtsi | 8 arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/stm32h743i-eval.dts| 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi index 24be8e63dec8..fa0cde73dbe9 100644 --- a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi @@ -44,7 +44,7 @@ / { soc { - pin-controller { + pin-controller@5802 { #address-cells = <1>; #size-cells = <1>; compatible = "st,stm32h743-pinctrl"; @@ -163,7 +163,7 @@ #interrupt-cells = <2>; }; - i2c1_pins_a: i2c1@0 { + i2c1_pins_a: i2c1-0 { pins { pinmux = , /* I2C1_SCL */ ; /* I2C1_SDA */ @@ -173,7 +173,7 @@ }; }; - usart1_pins: usart1@0 { + usart1_pins: usart1-0 { pins1 { pinmux = ; /* USART1_TX */ bias-disable; @@ -186,7 +186,7 @@ }; }; - usart2_pins: usart2@0 { + usart2_pins: usart2-0 { pins1 { pinmux = ; /* USART2_TX */ bias-disable; @@ -199,7 +199,7 @@ }; }; - usbotg_hs_pins_a: usbotg-hs@0 { + usbotg_hs_pins_a: usbotg-hs-0 { pins { pinmux = , /* ULPI_NXT */ , /* ULPI_DIR> */ diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 637beffe5067..b2d4e0b5a9c3 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -40,13 +40,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" #include #include #include / { + #address-cells = <1>; + #size-cells = <1>; + clocks { clk_hse: clk-hse { #clock-cells = <0>; @@ -60,7 +62,7 @@ clock-frequency = <32768>; }; - clk_i2s: i2s_ckin { + clk_i2s: i2s-ckin { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <0>; @@ -422,7 +424,6 @@ }; lptimer4: timer@58002c00 { - #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32-lptimer"; reg = <0x58002c00 0x400>; @@ -438,7 +439,6 @@ };
[PATCH v2 0/3] ARM: dts: stm32: Fix DT dtc warnings for STM32 MCU's
From: Patrice Chotard Change since v1: - update nodes name as following: @0 to -0 This series fixes DT dtc warnings for following STM32 MCU's boards: - stm32f429i evaluation - stm32f429 discovery - stm32f469 discovery - stm32746g evaluation - stm32f746 discovery - stm32h743i discovery - stm32h743i evaluation Patrice Chotard (3): ARM: dts: stm32: Fix DT dtc warnings for stm32h7 ARM: dts: stm32: Fix DT dtc warnings for stm32f7 ARM: dts: stm32: Fix DT dtc warnings for stm32f4 arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32746g-eval.dts | 9 ++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++--- arch/arm/boot/dts/stm32f429-disco.dts| 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++ arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts| 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++- arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 +- arch/arm/boot/dts/stm32f746-disco.dts| 6 +-- arch/arm/boot/dts/stm32f746.dtsi | 8 ++-- arch/arm/boot/dts/stm32f769-disco.dts| 11 +++-- arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 ++--- arch/arm/boot/dts/stm32h743.dtsi | 8 ++-- arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/stm32h743i-eval.dts| 2 +- 16 files changed, 140 insertions(+), 157 deletions(-) -- 1.9.1
[PATCH v2 0/3] ARM: dts: stm32: Fix DT dtc warnings for STM32 MCU's
From: Patrice Chotard Change since v1: - update nodes name as following: @0 to -0 This series fixes DT dtc warnings for following STM32 MCU's boards: - stm32f429i evaluation - stm32f429 discovery - stm32f469 discovery - stm32746g evaluation - stm32f746 discovery - stm32h743i discovery - stm32h743i evaluation Patrice Chotard (3): ARM: dts: stm32: Fix DT dtc warnings for stm32h7 ARM: dts: stm32: Fix DT dtc warnings for stm32f7 ARM: dts: stm32: Fix DT dtc warnings for stm32f4 arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32746g-eval.dts | 9 ++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++--- arch/arm/boot/dts/stm32f429-disco.dts| 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++ arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts| 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++- arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 +- arch/arm/boot/dts/stm32f746-disco.dts| 6 +-- arch/arm/boot/dts/stm32f746.dtsi | 8 ++-- arch/arm/boot/dts/stm32f769-disco.dts| 11 +++-- arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 ++--- arch/arm/boot/dts/stm32h743.dtsi | 8 ++-- arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/stm32h743i-eval.dts| 2 +- 16 files changed, 140 insertions(+), 157 deletions(-) -- 1.9.1
[PATCH v2 2/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f7
From: Patrice Chotard Fix the following DT dtc warnings for stm32f746 and stm32f769 boards: Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_a@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_a@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_b@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_b@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (node_name_chars_strict): /mmc_vcard: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/cec@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_a@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_a@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_b@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_b@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /soc/timers@40001c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40002000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40014400: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40014800: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- Change since v1: - update nodes name as following: @0 to -0 arch/arm/boot/dts/stm32746g-eval.dts | 9 - arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 arch/arm/boot/dts/stm32f746-disco.dts | 6 +++--- arch/arm/boot/dts/stm32f746.dtsi | 8 +++- arch/arm/boot/dts/stm32f769-disco.dts | 11 +-- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts index 8c081eaf20fe..b8a8e06d1427 100644 --- a/arch/arm/boot/dts/stm32746g-eval.dts +++ b/arch/arm/boot/dts/stm32746g-eval.dts @@ -54,7 +54,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@c000 { reg = <0xc000 0x200>; }; @@ -73,12 +73,11 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "Wake up"; linux,code = ; gpios = < 13 0>; @@ -92,7 +91,7 @@ clock-names = "main_clk"; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <330>; diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi index 9314128df185..1cf8a23c2644 100644 --- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi @@ -9,7 +9,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@4002 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4002 0x3000>; @@ -127,7 +127,7 @@ st,bank-name = "GPIOK"; }; - cec_pins_a: cec@0 { + cec_pins_a: cec-0 { pins { pinmux = ; /* HDMI
[PATCH v2 2/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f7
From: Patrice Chotard Fix the following DT dtc warnings for stm32f746 and stm32f769 boards: Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_a@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_a@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_b@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_b@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (node_name_chars_strict): /mmc_vcard: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/cec@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_a@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_a@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_b@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_b@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /soc/timers@40001c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40002000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40014400: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40014800: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- Change since v1: - update nodes name as following: @0 to -0 arch/arm/boot/dts/stm32746g-eval.dts | 9 - arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 arch/arm/boot/dts/stm32f746-disco.dts | 6 +++--- arch/arm/boot/dts/stm32f746.dtsi | 8 +++- arch/arm/boot/dts/stm32f769-disco.dts | 11 +-- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts index 8c081eaf20fe..b8a8e06d1427 100644 --- a/arch/arm/boot/dts/stm32746g-eval.dts +++ b/arch/arm/boot/dts/stm32746g-eval.dts @@ -54,7 +54,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@c000 { reg = <0xc000 0x200>; }; @@ -73,12 +73,11 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button-0 { label = "Wake up"; linux,code = ; gpios = < 13 0>; @@ -92,7 +91,7 @@ clock-names = "main_clk"; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <330>; diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi index 9314128df185..1cf8a23c2644 100644 --- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi @@ -9,7 +9,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@4002 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4002 0x3000>; @@ -127,7 +127,7 @@ st,bank-name = "GPIOK"; }; - cec_pins_a: cec@0 { + cec_pins_a: cec-0 { pins { pinmux = ; /* HDMI
[PATCH 1/3] ARM: dts: stm32: Fix DT dtc warnings for stm32h7
From: Patrice Chotard Fix the following DT dtc warnings for stm32h743 boards: Warning (node_name_chars_strict): /clocks/i2s_ckin: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart1@0) Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0) Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0) Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unique_unit_address): /soc/pin-controller/usart2@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /soc/timer@58002c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timer@58003000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 +- arch/arm/boot/dts/stm32h743.dtsi | 8 arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/stm32h743i-eval.dts| 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi index 24be8e63dec8..9d3ad89a4833 100644 --- a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi @@ -44,7 +44,7 @@ / { soc { - pin-controller { + pin-controller@5802 { #address-cells = <1>; #size-cells = <1>; compatible = "st,stm32h743-pinctrl"; @@ -163,7 +163,7 @@ #interrupt-cells = <2>; }; - i2c1_pins_a: i2c1@0 { + i2c1_pins_a: i2c1 { pins { pinmux = , /* I2C1_SCL */ ; /* I2C1_SDA */ @@ -173,7 +173,7 @@ }; }; - usart1_pins: usart1@0 { + usart1_pins: usart1 { pins1 { pinmux = ; /* USART1_TX */ bias-disable; @@ -186,7 +186,7 @@ }; }; - usart2_pins: usart2@0 { + usart2_pins: usart2 { pins1 { pinmux = ; /* USART2_TX */ bias-disable; @@ -199,7 +199,7 @@ }; }; - usbotg_hs_pins_a: usbotg-hs@0 { + usbotg_hs_pins_a: usbotg-hs { pins { pinmux = , /* ULPI_NXT */ , /* ULPI_DIR> */ diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 637beffe5067..b2d4e0b5a9c3 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -40,13 +40,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" #include #include #include / { + #address-cells = <1>; + #size-cells = <1>; + clocks { clk_hse: clk-hse { #clock-cells = <0>; @@ -60,7 +62,7 @@ clock-frequency = <32768>; }; - clk_i2s: i2s_ckin { + clk_i2s: i2s-ckin { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <0>; @@ -422,7 +424,6 @@ }; lptimer4: timer@58002c00 { - #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32-lptimer"; reg = <0x58002c00 0x400>; @@ -438,7 +439,6 @@ }; lptimer5: timer@58003000 { -
[PATCH 1/3] ARM: dts: stm32: Fix DT dtc warnings for stm32h7
From: Patrice Chotard Fix the following DT dtc warnings for stm32h743 boards: Warning (node_name_chars_strict): /clocks/i2s_ckin: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart1@0) Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0) Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usart2@0) Warning (unique_unit_address): /soc/pin-controller/i2c1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unique_unit_address): /soc/pin-controller/usart1@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unique_unit_address): /soc/pin-controller/usart2@0: duplicate unit-address (also used in node /soc/pin-controller/usbotg-hs@0) Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /soc/timer@58002c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timer@58003000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 +- arch/arm/boot/dts/stm32h743.dtsi | 8 arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/stm32h743i-eval.dts| 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi index 24be8e63dec8..9d3ad89a4833 100644 --- a/arch/arm/boot/dts/stm32h743-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32h743-pinctrl.dtsi @@ -44,7 +44,7 @@ / { soc { - pin-controller { + pin-controller@5802 { #address-cells = <1>; #size-cells = <1>; compatible = "st,stm32h743-pinctrl"; @@ -163,7 +163,7 @@ #interrupt-cells = <2>; }; - i2c1_pins_a: i2c1@0 { + i2c1_pins_a: i2c1 { pins { pinmux = , /* I2C1_SCL */ ; /* I2C1_SDA */ @@ -173,7 +173,7 @@ }; }; - usart1_pins: usart1@0 { + usart1_pins: usart1 { pins1 { pinmux = ; /* USART1_TX */ bias-disable; @@ -186,7 +186,7 @@ }; }; - usart2_pins: usart2@0 { + usart2_pins: usart2 { pins1 { pinmux = ; /* USART2_TX */ bias-disable; @@ -199,7 +199,7 @@ }; }; - usbotg_hs_pins_a: usbotg-hs@0 { + usbotg_hs_pins_a: usbotg-hs { pins { pinmux = , /* ULPI_NXT */ , /* ULPI_DIR> */ diff --git a/arch/arm/boot/dts/stm32h743.dtsi b/arch/arm/boot/dts/stm32h743.dtsi index 637beffe5067..b2d4e0b5a9c3 100644 --- a/arch/arm/boot/dts/stm32h743.dtsi +++ b/arch/arm/boot/dts/stm32h743.dtsi @@ -40,13 +40,15 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#include "skeleton.dtsi" #include "armv7-m.dtsi" #include #include #include / { + #address-cells = <1>; + #size-cells = <1>; + clocks { clk_hse: clk-hse { #clock-cells = <0>; @@ -60,7 +62,7 @@ clock-frequency = <32768>; }; - clk_i2s: i2s_ckin { + clk_i2s: i2s-ckin { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <0>; @@ -422,7 +424,6 @@ }; lptimer4: timer@58002c00 { - #address-cells = <1>; #size-cells = <0>; compatible = "st,stm32-lptimer"; reg = <0x58002c00 0x400>; @@ -438,7 +439,6 @@ }; lptimer5: timer@58003000 { -
[PATCH 2/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f7
From: Patrice Chotard Fix the following DT dtc warnings for stm32f746 and stm32f769 boards: Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_a@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_a@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_b@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_b@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (node_name_chars_strict): /mmc_vcard: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/cec@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_a@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_a@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_b@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_b@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /soc/timers@40001c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40002000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40014400: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40014800: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32746g-eval.dts | 9 - arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 arch/arm/boot/dts/stm32f746-disco.dts | 6 +++--- arch/arm/boot/dts/stm32f746.dtsi | 8 +++- arch/arm/boot/dts/stm32f769-disco.dts | 11 +-- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts index 8c081eaf20fe..a2edf6fccc2c 100644 --- a/arch/arm/boot/dts/stm32746g-eval.dts +++ b/arch/arm/boot/dts/stm32746g-eval.dts @@ -54,7 +54,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@c000 { reg = <0xc000 0x200>; }; @@ -73,12 +73,11 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button { label = "Wake up"; linux,code = ; gpios = < 13 0>; @@ -92,7 +91,7 @@ clock-names = "main_clk"; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <330>; diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi index 9314128df185..702f1c12c22b 100644 --- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi @@ -9,7 +9,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@4002 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4002 0x3000>; @@ -127,7 +127,7 @@ st,bank-name = "GPIOK"; }; - cec_pins_a: cec@0 { + cec_pins_a: cec { pins { pinmux = ; /* HDMI CEC */ slew-rate = <0>; @@ -136,7
[PATCH 2/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f7
From: Patrice Chotard Fix the following DT dtc warnings for stm32f746 and stm32f769 boards: Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_a@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_a@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_b@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od_b@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (node_name_chars_strict): /mmc_vcard: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/cec@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-hs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg-fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_a@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_a@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_b@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od_b@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /soc/timers@40001c00: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40002000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40014400: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Warning (avoid_unnecessary_addr_size): /soc/timers@40014800: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32746g-eval.dts | 9 - arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 arch/arm/boot/dts/stm32f746-disco.dts | 6 +++--- arch/arm/boot/dts/stm32f746.dtsi | 8 +++- arch/arm/boot/dts/stm32f769-disco.dts | 11 +-- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/arch/arm/boot/dts/stm32746g-eval.dts b/arch/arm/boot/dts/stm32746g-eval.dts index 8c081eaf20fe..a2edf6fccc2c 100644 --- a/arch/arm/boot/dts/stm32746g-eval.dts +++ b/arch/arm/boot/dts/stm32746g-eval.dts @@ -54,7 +54,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@c000 { reg = <0xc000 0x200>; }; @@ -73,12 +73,11 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button { label = "Wake up"; linux,code = ; gpios = < 13 0>; @@ -92,7 +91,7 @@ clock-names = "main_clk"; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <330>; diff --git a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi index 9314128df185..702f1c12c22b 100644 --- a/arch/arm/boot/dts/stm32f7-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f7-pinctrl.dtsi @@ -9,7 +9,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@4002 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4002 0x3000>; @@ -127,7 +127,7 @@ st,bank-name = "GPIOK"; }; - cec_pins_a: cec@0 { + cec_pins_a: cec { pins { pinmux = ; /* HDMI CEC */ slew-rate = <0>; @@ -136,7
[PATCH 3/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f4
From: Patrice Chotard Fix the following DT dtc warnings for stm32f429 and stm32f469 boards: Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@1: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_hs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart3@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/mii@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/adc@200: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@3: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/ltdc@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/dcmi@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /gpio_keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++--- arch/arm/boot/dts/stm32f429-disco.dts| 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++ arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts| 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++- 7 files changed, 102 insertions(+), 115 deletions(-) diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts index 7eb786a2d624..b5af6feb95a4 100644 --- a/arch/arm/boot/dts/stm32429i-eval.dts +++ b/arch/arm/boot/dts/stm32429i-eval.dts @@ -60,7 +60,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@0 { reg = <0x 0x200>; }; @@ -111,17 +111,16 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button0 { label = "Wake up"; linux,code = ; gpios = < 0 0>; }; - button@1 { + button1 { label = "Tamper"; linux,code = ; gpios = < 13 0>; @@ -145,7 +144,7 @@ }; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <330>; diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi index 35202896c093..73061fee60f6 100644 --- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi @@ -45,7 +45,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@4002 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4002 0x3000>; @@ -163,7 +163,7 @@ st,bank-name = "GPIOK";
[PATCH 3/3] ARM: dts: stm32: Fix DT dtc warnings for stm32f4
From: Patrice Chotard Fix the following DT dtc warnings for stm32f429 and stm32f469 boards: Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_fs@1: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/usbotg_hs@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /soc/pin-controller/sdio_pins_od@0: Character '_' not recommended in node name Warning (node_name_chars_strict): /gpio_keys: Character '_' not recommended in node name Warning (unit_address_vs_reg): /memory: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller: node has a reg or ranges property, but no unit name Warning (unit_address_vs_reg): /soc/pin-controller/usart1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usart3@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_fs@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/usbotg_hs@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/mii@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/adc@200: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@1: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/pwm@3: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/i2c1@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/ltdc@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/dcmi@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /soc/pin-controller/sdio_pins_od@0: node has a unit name, but no reg property Warning (unit_address_vs_reg): /gpio_keys/button@0: node has a unit name, but no reg property Warning (avoid_unnecessary_addr_size): /gpio_keys: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++--- arch/arm/boot/dts/stm32f429-disco.dts| 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++ arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts| 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++- 7 files changed, 102 insertions(+), 115 deletions(-) diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts index 7eb786a2d624..b5af6feb95a4 100644 --- a/arch/arm/boot/dts/stm32429i-eval.dts +++ b/arch/arm/boot/dts/stm32429i-eval.dts @@ -60,7 +60,7 @@ stdout-path = "serial0:115200n8"; }; - memory { + memory@0 { reg = <0x 0x200>; }; @@ -111,17 +111,16 @@ }; }; - gpio_keys { + gpio-keys { compatible = "gpio-keys"; - #address-cells = <1>; #size-cells = <0>; autorepeat; - button@0 { + button0 { label = "Wake up"; linux,code = ; gpios = < 0 0>; }; - button@1 { + button1 { label = "Tamper"; linux,code = ; gpios = < 13 0>; @@ -145,7 +144,7 @@ }; }; - mmc_vcard: mmc_vcard { + mmc_vcard: mmc-vcard { compatible = "regulator-fixed"; regulator-name = "mmc_vcard"; regulator-min-microvolt = <330>; diff --git a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi index 35202896c093..73061fee60f6 100644 --- a/arch/arm/boot/dts/stm32f4-pinctrl.dtsi +++ b/arch/arm/boot/dts/stm32f4-pinctrl.dtsi @@ -45,7 +45,7 @@ / { soc { - pinctrl: pin-controller { + pinctrl: pin-controller@4002 { #address-cells = <1>; #size-cells = <1>; ranges = <0 0x4002 0x3000>; @@ -163,7 +163,7 @@ st,bank-name = "GPIOK";
[PATCH 0/3] ARM: dts: stm32: Fix DT dtc warnings for STM32 MCU's
From: Patrice Chotard This series fixes DT dtc warnings for following STM32 MCU's boards: - stm32f429i evaluation - stm32f429 discovery - stm32f469 discovery - stm32746g evaluation - stm32f746 discovery - stm32h743i discovery - stm32h743i evaluation Patrice Chotard (3): ARM: dts: stm32: Fix DT dtc warnings for stm32h7 ARM: dts: stm32: Fix DT dtc warnings for stm32f7 ARM: dts: stm32: Fix DT dtc warnings for stm32f4 arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32746g-eval.dts | 9 ++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++--- arch/arm/boot/dts/stm32f429-disco.dts| 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++ arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts| 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++- arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 +- arch/arm/boot/dts/stm32f746-disco.dts| 6 +-- arch/arm/boot/dts/stm32f746.dtsi | 8 ++-- arch/arm/boot/dts/stm32f769-disco.dts| 11 +++-- arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 ++--- arch/arm/boot/dts/stm32h743.dtsi | 8 ++-- arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/stm32h743i-eval.dts| 2 +- 16 files changed, 140 insertions(+), 157 deletions(-) -- 1.9.1
[PATCH 0/3] ARM: dts: stm32: Fix DT dtc warnings for STM32 MCU's
From: Patrice Chotard This series fixes DT dtc warnings for following STM32 MCU's boards: - stm32f429i evaluation - stm32f429 discovery - stm32f469 discovery - stm32746g evaluation - stm32f746 discovery - stm32h743i discovery - stm32h743i evaluation Patrice Chotard (3): ARM: dts: stm32: Fix DT dtc warnings for stm32h7 ARM: dts: stm32: Fix DT dtc warnings for stm32f7 ARM: dts: stm32: Fix DT dtc warnings for stm32f4 arch/arm/boot/dts/stm32429i-eval.dts | 11 +++-- arch/arm/boot/dts/stm32746g-eval.dts | 9 ++-- arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 30 ++--- arch/arm/boot/dts/stm32f429-disco.dts| 7 ++- arch/arm/boot/dts/stm32f429-pinctrl.dtsi | 74 +++ arch/arm/boot/dts/stm32f429.dtsi | 8 ++-- arch/arm/boot/dts/stm32f469-disco.dts| 11 +++-- arch/arm/boot/dts/stm32f469-pinctrl.dtsi | 76 +++- arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 24 +- arch/arm/boot/dts/stm32f746-disco.dts| 6 +-- arch/arm/boot/dts/stm32f746.dtsi | 8 ++-- arch/arm/boot/dts/stm32f769-disco.dts| 11 +++-- arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 ++--- arch/arm/boot/dts/stm32h743.dtsi | 8 ++-- arch/arm/boot/dts/stm32h743i-disco.dts | 2 +- arch/arm/boot/dts/stm32h743i-eval.dts| 2 +- 16 files changed, 140 insertions(+), 157 deletions(-) -- 1.9.1
[PATCH 4/4] ARM: dts: stm32: Remove cd-inverted property for stm32f746-disco
From: Patrice Chotard Remove cd-inverted property and update cd-gpios active level accordingly Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f746-disco.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32f746-disco.dts b/arch/arm/boot/dts/stm32f746-disco.dts index f9ad71f7c807..e3a7bd338d61 100644 --- a/arch/arm/boot/dts/stm32f746-disco.dts +++ b/arch/arm/boot/dts/stm32f746-disco.dts @@ -101,8 +101,7 @@ { status = "okay"; vmmc-supply = <_vcard>; - cd-gpios = < 13 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = < 13 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "opendrain"; pinctrl-0 = <_pins_a>; pinctrl-1 = <_pins_od_a>; -- 1.9.1
[PATCH 4/4] ARM: dts: stm32: Remove cd-inverted property for stm32f746-disco
From: Patrice Chotard Remove cd-inverted property and update cd-gpios active level accordingly Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f746-disco.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32f746-disco.dts b/arch/arm/boot/dts/stm32f746-disco.dts index f9ad71f7c807..e3a7bd338d61 100644 --- a/arch/arm/boot/dts/stm32f746-disco.dts +++ b/arch/arm/boot/dts/stm32f746-disco.dts @@ -101,8 +101,7 @@ { status = "okay"; vmmc-supply = <_vcard>; - cd-gpios = < 13 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = < 13 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "opendrain"; pinctrl-0 = <_pins_a>; pinctrl-1 = <_pins_od_a>; -- 1.9.1
[PATCH 3/4] ARM: dts: stm32: Remove cd-inverted property for stm32f769-disco
From: Patrice Chotard Remove cd-inverted property and update cd-gpios active level accordingly Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f769-disco.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32f769-disco.dts b/arch/arm/boot/dts/stm32f769-disco.dts index 360d3bb7da66..cd6ddef4c1da 100644 --- a/arch/arm/boot/dts/stm32f769-disco.dts +++ b/arch/arm/boot/dts/stm32f769-disco.dts @@ -139,8 +139,7 @@ { status = "okay"; vmmc-supply = <_vcard>; - cd-gpios = < 15 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = < 15 GPIO_ACTIVE_LOW>; broken-cd; pinctrl-names = "default", "opendrain"; pinctrl-0 = <_pins_b>; -- 1.9.1
[PATCH 0/4] Remove cd-inverted property for STM32Fx boards
From: Patrice Chotard This series remove cd-inverted property from STM32Fx boards DT files. As GPIOS are used for card detect, the polarity can be indicated using GPIO_ACTIVE_(HIGH|LOW), so cd-inverted becomes useless. Patrice Chotard (4): ARM: dts: stm32: Remove cd-inverted property for stm32429i-eval ARM: dts: stm32: Remove cd-inverted property for stm32f469-disco ARM: dts: stm32: Remove cd-inverted property for stm32f769-disco ARM: dts: stm32: Remove cd-inverted property for stm32f746-disco arch/arm/boot/dts/stm32429i-eval.dts | 3 +-- arch/arm/boot/dts/stm32f469-disco.dts | 3 +-- arch/arm/boot/dts/stm32f746-disco.dts | 3 +-- arch/arm/boot/dts/stm32f769-disco.dts | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) -- 1.9.1
[PATCH 3/4] ARM: dts: stm32: Remove cd-inverted property for stm32f769-disco
From: Patrice Chotard Remove cd-inverted property and update cd-gpios active level accordingly Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f769-disco.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32f769-disco.dts b/arch/arm/boot/dts/stm32f769-disco.dts index 360d3bb7da66..cd6ddef4c1da 100644 --- a/arch/arm/boot/dts/stm32f769-disco.dts +++ b/arch/arm/boot/dts/stm32f769-disco.dts @@ -139,8 +139,7 @@ { status = "okay"; vmmc-supply = <_vcard>; - cd-gpios = < 15 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = < 15 GPIO_ACTIVE_LOW>; broken-cd; pinctrl-names = "default", "opendrain"; pinctrl-0 = <_pins_b>; -- 1.9.1
[PATCH 0/4] Remove cd-inverted property for STM32Fx boards
From: Patrice Chotard This series remove cd-inverted property from STM32Fx boards DT files. As GPIOS are used for card detect, the polarity can be indicated using GPIO_ACTIVE_(HIGH|LOW), so cd-inverted becomes useless. Patrice Chotard (4): ARM: dts: stm32: Remove cd-inverted property for stm32429i-eval ARM: dts: stm32: Remove cd-inverted property for stm32f469-disco ARM: dts: stm32: Remove cd-inverted property for stm32f769-disco ARM: dts: stm32: Remove cd-inverted property for stm32f746-disco arch/arm/boot/dts/stm32429i-eval.dts | 3 +-- arch/arm/boot/dts/stm32f469-disco.dts | 3 +-- arch/arm/boot/dts/stm32f746-disco.dts | 3 +-- arch/arm/boot/dts/stm32f769-disco.dts | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) -- 1.9.1
[PATCH 2/4] ARM: dts: stm32: Remove cd-inverted property for stm32f469-disco
From: Patrice Chotard Remove cd-inverted property and update cd-gpios active level accordingly Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f469-disco.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts index 3ee768cb86fc..7937b43d7788 100644 --- a/arch/arm/boot/dts/stm32f469-disco.dts +++ b/arch/arm/boot/dts/stm32f469-disco.dts @@ -210,8 +210,7 @@ { status = "okay"; vmmc-supply = <_vcard>; - cd-gpios = < 2 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = < 2 GPIO_ACTIVE_LOW>; broken-cd; pinctrl-names = "default", "opendrain"; pinctrl-0 = <_pins>; -- 1.9.1
[PATCH 2/4] ARM: dts: stm32: Remove cd-inverted property for stm32f469-disco
From: Patrice Chotard Remove cd-inverted property and update cd-gpios active level accordingly Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f469-disco.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32f469-disco.dts b/arch/arm/boot/dts/stm32f469-disco.dts index 3ee768cb86fc..7937b43d7788 100644 --- a/arch/arm/boot/dts/stm32f469-disco.dts +++ b/arch/arm/boot/dts/stm32f469-disco.dts @@ -210,8 +210,7 @@ { status = "okay"; vmmc-supply = <_vcard>; - cd-gpios = < 2 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = < 2 GPIO_ACTIVE_LOW>; broken-cd; pinctrl-names = "default", "opendrain"; pinctrl-0 = <_pins>; -- 1.9.1
[PATCH 1/4] ARM: dts: stm32: Remove cd-inverted property for stm32429i-eval
From: Patrice Chotard Remove cd-inverted property and update cd-gpios active level accordingly Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32429i-eval.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts index 7eb786a2d624..ed7d7f46465e 100644 --- a/arch/arm/boot/dts/stm32429i-eval.dts +++ b/arch/arm/boot/dts/stm32429i-eval.dts @@ -264,8 +264,7 @@ { status = "okay"; vmmc-supply = <_vcard>; - cd-gpios = < 15 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = < 15 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "opendrain"; pinctrl-0 = <_pins>; pinctrl-1 = <_pins_od>; -- 1.9.1
[PATCH 1/4] ARM: dts: stm32: Remove cd-inverted property for stm32429i-eval
From: Patrice Chotard Remove cd-inverted property and update cd-gpios active level accordingly Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32429i-eval.dts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stm32429i-eval.dts b/arch/arm/boot/dts/stm32429i-eval.dts index 7eb786a2d624..ed7d7f46465e 100644 --- a/arch/arm/boot/dts/stm32429i-eval.dts +++ b/arch/arm/boot/dts/stm32429i-eval.dts @@ -264,8 +264,7 @@ { status = "okay"; vmmc-supply = <_vcard>; - cd-gpios = < 15 GPIO_ACTIVE_HIGH>; - cd-inverted; + cd-gpios = < 15 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "opendrain"; pinctrl-0 = <_pins>; pinctrl-1 = <_pins_od>; -- 1.9.1
[PATCH] ARM: dts: stm32: Add clk-lse node's label on stm32f429
From: Patrice Chotard Add missing clk_lse label for node clk-lse. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f429.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index ede77e0f1c41..64278e81bc08 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -58,7 +58,7 @@ clock-frequency = <0>; }; - clk-lse { + clk_lse: clk-lse { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <32768>; -- 1.9.1
[PATCH] ARM: dts: stm32: Add clk-lse node's label on stm32f429
From: Patrice Chotard Add missing clk_lse label for node clk-lse. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f429.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index ede77e0f1c41..64278e81bc08 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -58,7 +58,7 @@ clock-frequency = <0>; }; - clk-lse { + clk_lse: clk-lse { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <32768>; -- 1.9.1
[U-BOOT internal] ARM: dts: stm32: Add clk-lse node's label on stm32f429
From: Patrice Chotard Add missing clk_lse label for node clk-lse. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f429.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index ede77e0f1c41..64278e81bc08 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -58,7 +58,7 @@ clock-frequency = <0>; }; - clk-lse { + clk_lse: clk-lse { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <32768>; -- 1.9.1
[U-BOOT internal] ARM: dts: stm32: Add clk-lse node's label on stm32f429
From: Patrice Chotard Add missing clk_lse label for node clk-lse. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stm32f429.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stm32f429.dtsi b/arch/arm/boot/dts/stm32f429.dtsi index ede77e0f1c41..64278e81bc08 100644 --- a/arch/arm/boot/dts/stm32f429.dtsi +++ b/arch/arm/boot/dts/stm32f429.dtsi @@ -58,7 +58,7 @@ clock-frequency = <0>; }; - clk-lse { + clk_lse: clk-lse { #clock-cells = <0>; compatible = "fixed-clock"; clock-frequency = <32768>; -- 1.9.1
[PATCH 4/5] ARM: dts: stih410: Fix complain about IRQ_TYPE_NONE usage
From: Patrice ChotardSince commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih410.dtsi | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index 3313005ee15c..888548ea9b5c 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -43,7 +43,7 @@ ohci0: usb@9a03c00 { compatible = "st,st-ohci-300x"; reg = <0x9a03c00 0x100>; - interrupts = ; + interrupts = ; clocks = <_s_c0_flexgen CLK_TX_ICN_DISP_0>, <_s_c0_flexgen CLK_RX_ICN_DISP_0>; resets = < STIH407_USB2_PORT0_POWERDOWN>, @@ -58,7 +58,7 @@ ehci0: usb@9a03e00 { compatible = "st,st-ehci-300x"; reg = <0x9a03e00 0x100>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_usb0>; clocks = <_s_c0_flexgen CLK_TX_ICN_DISP_0>, @@ -75,7 +75,7 @@ ohci1: usb@9a83c00 { compatible = "st,st-ohci-300x"; reg = <0x9a83c00 0x100>; - interrupts = ; + interrupts = ; clocks = <_s_c0_flexgen CLK_TX_ICN_DISP_0>, <_s_c0_flexgen CLK_RX_ICN_DISP_0>; resets = < STIH407_USB2_PORT1_POWERDOWN>, @@ -90,7 +90,7 @@ ehci1: usb@9a83e00 { compatible = "st,st-ehci-300x"; reg = <0x9a83e00 0x100>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_usb1>; clocks = <_s_c0_flexgen CLK_TX_ICN_DISP_0>, @@ -202,7 +202,7 @@ reg = <0x8d04000 0x1000>; reg-names = "hdmi-reg"; #sound-dai-cells = <0>; - interrupts = ; + interrupts = ; interrupt-names = "irq"; clock-names = "pix", "tmds", @@ -254,7 +254,7 @@ bdisp0:bdisp@9f1 { compatible = "st,stih407-bdisp"; reg = <0x9f1 0x1000>; - interrupts = ; + interrupts = ; clock-names = "bdisp"; clocks = <_s_c0_flexgen CLK_IC_BDISP_0>; }; @@ -263,8 +263,8 @@ compatible = "st,st-hva"; reg = <0x8c85000 0x400>, <0x600 0x4>; reg-names = "hva_registers", "hva_esram"; - interrupts = , -; + interrupts = , +; clock-names = "clk_hva"; clocks = <_s_c0_flexgen CLK_HVA>; }; @@ -292,7 +292,7 @@ reg = <0x94a087c 0x64>; clocks = <_sysin>; clock-names = "cec-clk"; - interrupts = ; + interrupts = ; interrupt-names = "cec-irq"; pinctrl-names = "default"; pinctrl-0 = <_cec0_default>; -- 1.9.1
[PATCH 4/5] ARM: dts: stih410: Fix complain about IRQ_TYPE_NONE usage
From: Patrice Chotard Since commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih410.dtsi | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/stih410.dtsi b/arch/arm/boot/dts/stih410.dtsi index 3313005ee15c..888548ea9b5c 100644 --- a/arch/arm/boot/dts/stih410.dtsi +++ b/arch/arm/boot/dts/stih410.dtsi @@ -43,7 +43,7 @@ ohci0: usb@9a03c00 { compatible = "st,st-ohci-300x"; reg = <0x9a03c00 0x100>; - interrupts = ; + interrupts = ; clocks = <_s_c0_flexgen CLK_TX_ICN_DISP_0>, <_s_c0_flexgen CLK_RX_ICN_DISP_0>; resets = < STIH407_USB2_PORT0_POWERDOWN>, @@ -58,7 +58,7 @@ ehci0: usb@9a03e00 { compatible = "st,st-ehci-300x"; reg = <0x9a03e00 0x100>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_usb0>; clocks = <_s_c0_flexgen CLK_TX_ICN_DISP_0>, @@ -75,7 +75,7 @@ ohci1: usb@9a83c00 { compatible = "st,st-ohci-300x"; reg = <0x9a83c00 0x100>; - interrupts = ; + interrupts = ; clocks = <_s_c0_flexgen CLK_TX_ICN_DISP_0>, <_s_c0_flexgen CLK_RX_ICN_DISP_0>; resets = < STIH407_USB2_PORT1_POWERDOWN>, @@ -90,7 +90,7 @@ ehci1: usb@9a83e00 { compatible = "st,st-ehci-300x"; reg = <0x9a83e00 0x100>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_usb1>; clocks = <_s_c0_flexgen CLK_TX_ICN_DISP_0>, @@ -202,7 +202,7 @@ reg = <0x8d04000 0x1000>; reg-names = "hdmi-reg"; #sound-dai-cells = <0>; - interrupts = ; + interrupts = ; interrupt-names = "irq"; clock-names = "pix", "tmds", @@ -254,7 +254,7 @@ bdisp0:bdisp@9f1 { compatible = "st,stih407-bdisp"; reg = <0x9f1 0x1000>; - interrupts = ; + interrupts = ; clock-names = "bdisp"; clocks = <_s_c0_flexgen CLK_IC_BDISP_0>; }; @@ -263,8 +263,8 @@ compatible = "st,st-hva"; reg = <0x8c85000 0x400>, <0x600 0x4>; reg-names = "hva_registers", "hva_esram"; - interrupts = , -; + interrupts = , +; clock-names = "clk_hva"; clocks = <_s_c0_flexgen CLK_HVA>; }; @@ -292,7 +292,7 @@ reg = <0x94a087c 0x64>; clocks = <_sysin>; clock-names = "cec-clk"; - interrupts = ; + interrupts = ; interrupt-names = "cec-irq"; pinctrl-names = "default"; pinctrl-0 = <_cec0_default>; -- 1.9.1
[PATCH 5/5] ARM: dts: stihxxx-b2120: Fix complain about IRQ_TYPE_NONE usage
From: Patrice ChotardSince commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stihxxx-b2120.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi index c67edb1a8121..4dedfcb0fcb3 100644 --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi @@ -154,8 +154,8 @@ reg = <0x08a2 0x1>, <0x08a0 0x4000>; reg-names = "c8sectpfe", "c8sectpfe-ram"; - interrupts = , - ; + interrupts = , + ; interrupt-names = "c8sectpfe-error-irq", "c8sectpfe-idle-irq"; pinctrl-0 = <_tsin0_serial>; -- 1.9.1
[PATCH 5/5] ARM: dts: stihxxx-b2120: Fix complain about IRQ_TYPE_NONE usage
From: Patrice Chotard Since commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stihxxx-b2120.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi index c67edb1a8121..4dedfcb0fcb3 100644 --- a/arch/arm/boot/dts/stihxxx-b2120.dtsi +++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi @@ -154,8 +154,8 @@ reg = <0x08a2 0x1>, <0x08a0 0x4000>; reg-names = "c8sectpfe", "c8sectpfe-ram"; - interrupts = , - ; + interrupts = , + ; interrupt-names = "c8sectpfe-error-irq", "c8sectpfe-idle-irq"; pinctrl-0 = <_tsin0_serial>; -- 1.9.1
[PATCH 0/5] ARM: dts: STi: Fix complain about IRQ_TYPE_NONE_usage
From: Patrice ChotardFix the STi following DT files which make usage of IRQ_TYPE_NONE flag: _ stih407-family.dtsi _ stih407-pinctrl.dtsi _ stih407.dtsi _ stih410.dtsi _ stihxxx-b2120.dtsi Patrice Chotard (5): ARM: dts: stih407-family: Fix complain about IRQ_TYPE_NONE usage ARM: dts: stih407-pinctrl: Fix complain about IRQ_TYPE_NONE usage ARM: dts: stih407: Fix complain about IRQ_TYPE_NONE usage ARM: dts: stih410: Fix complain about IRQ_TYPE_NONE usage ARM: dts: stihxxx-b2120: Fix complain about IRQ_TYPE_NONE usage arch/arm/boot/dts/stih407-family.dtsi | 52 +- arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 +++ arch/arm/boot/dts/stih407.dtsi | 2 +- arch/arm/boot/dts/stih410.dtsi | 18 ++-- arch/arm/boot/dts/stihxxx-b2120.dtsi | 4 +-- 5 files changed, 43 insertions(+), 43 deletions(-) -- 1.9.1
[PATCH 1/5] ARM: dts: stih407-family: Fix complain about IRQ_TYPE_NONE usage
From: Patrice ChotardSince commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 52 +-- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index f7362c31de29..9e29a4499938 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -206,19 +206,19 @@ vtg_main: sti-vtg-main@8d02800 { compatible = "st,vtg"; reg = <0x8d02800 0x200>; - interrupts = ; + interrupts = ; }; vtg_aux: sti-vtg-aux@8d00200 { compatible = "st,vtg"; reg = <0x8d00200 0x100>; - interrupts = ; + interrupts = ; }; serial@983 { compatible = "st,asc"; reg = <0x983 0x2c>; - interrupts = ; + interrupts = ; clocks = <_s_c0_flexgen CLK_EXT2F_A9>; /* Pinctrl moved out to a per-board configuration */ @@ -228,7 +228,7 @@ serial@9831000 { compatible = "st,asc"; reg = <0x9831000 0x2c>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_serial1>; clocks = <_s_c0_flexgen CLK_EXT2F_A9>; @@ -239,7 +239,7 @@ serial@9832000 { compatible = "st,asc"; reg = <0x9832000 0x2c>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_serial2>; clocks = <_s_c0_flexgen CLK_EXT2F_A9>; @@ -251,7 +251,7 @@ sbc_serial0: serial@953 { compatible = "st,asc"; reg = <0x953 0x2c>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_sbc_serial0>; clocks = <_sysin>; @@ -262,7 +262,7 @@ serial@9531000 { compatible = "st,asc"; reg = <0x9531000 0x2c>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_sbc_serial1>; clocks = <_sysin>; @@ -574,7 +574,7 @@ status = "disabled"; reg = <0x0906 0x7ff>, <0x9061008 0x20>; reg-names = "mmc", "top-mmc-delay"; - interrupts = ; + interrupts = ; interrupt-names = "mmcirq"; pinctrl-names = "default"; pinctrl-0 = <_mmc0>; @@ -589,7 +589,7 @@ status = "disabled"; reg = <0x0908 0x7ff>; reg-names = "mmc"; - interrupts = ; + interrupts = ; interrupt-names = "mmcirq"; pinctrl-names = "default"; pinctrl-0 = <_sd1>; @@ -623,7 +623,7 @@ compatible = "st,ahci"; reg = <0x9b2 0x1000>; - interrupts = ; + interrupts = ; interrupt-names = "hostc"; phys = <_port0 PHY_TYPE_SATA>; @@ -646,7 +646,7 @@ compatible = "st,ahci"; reg = <0x9b28000 0x1000>; - interrupts = ; + interrupts = ; interrupt-names = "hostc"; phys = <_port1 PHY_TYPE_SATA>; @@ -687,7 +687,7 @@ dwc3: dwc3@990 { compatible = "snps,dwc3"; reg = <0x0990 0x10>; - interrupts = ; + interrupts = ; dr_mode = "host"; phy-names = "usb2-phy", "usb3-phy"; phys= <_picophy0>, @@ -701,7 +701,7 @@
[PATCH 0/5] ARM: dts: STi: Fix complain about IRQ_TYPE_NONE_usage
From: Patrice Chotard Fix the STi following DT files which make usage of IRQ_TYPE_NONE flag: _ stih407-family.dtsi _ stih407-pinctrl.dtsi _ stih407.dtsi _ stih410.dtsi _ stihxxx-b2120.dtsi Patrice Chotard (5): ARM: dts: stih407-family: Fix complain about IRQ_TYPE_NONE usage ARM: dts: stih407-pinctrl: Fix complain about IRQ_TYPE_NONE usage ARM: dts: stih407: Fix complain about IRQ_TYPE_NONE usage ARM: dts: stih410: Fix complain about IRQ_TYPE_NONE usage ARM: dts: stihxxx-b2120: Fix complain about IRQ_TYPE_NONE usage arch/arm/boot/dts/stih407-family.dtsi | 52 +- arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 +++ arch/arm/boot/dts/stih407.dtsi | 2 +- arch/arm/boot/dts/stih410.dtsi | 18 ++-- arch/arm/boot/dts/stihxxx-b2120.dtsi | 4 +-- 5 files changed, 43 insertions(+), 43 deletions(-) -- 1.9.1
[PATCH 1/5] ARM: dts: stih407-family: Fix complain about IRQ_TYPE_NONE usage
From: Patrice Chotard Since commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-family.dtsi | 52 +-- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi index f7362c31de29..9e29a4499938 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi @@ -206,19 +206,19 @@ vtg_main: sti-vtg-main@8d02800 { compatible = "st,vtg"; reg = <0x8d02800 0x200>; - interrupts = ; + interrupts = ; }; vtg_aux: sti-vtg-aux@8d00200 { compatible = "st,vtg"; reg = <0x8d00200 0x100>; - interrupts = ; + interrupts = ; }; serial@983 { compatible = "st,asc"; reg = <0x983 0x2c>; - interrupts = ; + interrupts = ; clocks = <_s_c0_flexgen CLK_EXT2F_A9>; /* Pinctrl moved out to a per-board configuration */ @@ -228,7 +228,7 @@ serial@9831000 { compatible = "st,asc"; reg = <0x9831000 0x2c>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_serial1>; clocks = <_s_c0_flexgen CLK_EXT2F_A9>; @@ -239,7 +239,7 @@ serial@9832000 { compatible = "st,asc"; reg = <0x9832000 0x2c>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_serial2>; clocks = <_s_c0_flexgen CLK_EXT2F_A9>; @@ -251,7 +251,7 @@ sbc_serial0: serial@953 { compatible = "st,asc"; reg = <0x953 0x2c>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_sbc_serial0>; clocks = <_sysin>; @@ -262,7 +262,7 @@ serial@9531000 { compatible = "st,asc"; reg = <0x9531000 0x2c>; - interrupts = ; + interrupts = ; pinctrl-names = "default"; pinctrl-0 = <_sbc_serial1>; clocks = <_sysin>; @@ -574,7 +574,7 @@ status = "disabled"; reg = <0x0906 0x7ff>, <0x9061008 0x20>; reg-names = "mmc", "top-mmc-delay"; - interrupts = ; + interrupts = ; interrupt-names = "mmcirq"; pinctrl-names = "default"; pinctrl-0 = <_mmc0>; @@ -589,7 +589,7 @@ status = "disabled"; reg = <0x0908 0x7ff>; reg-names = "mmc"; - interrupts = ; + interrupts = ; interrupt-names = "mmcirq"; pinctrl-names = "default"; pinctrl-0 = <_sd1>; @@ -623,7 +623,7 @@ compatible = "st,ahci"; reg = <0x9b2 0x1000>; - interrupts = ; + interrupts = ; interrupt-names = "hostc"; phys = <_port0 PHY_TYPE_SATA>; @@ -646,7 +646,7 @@ compatible = "st,ahci"; reg = <0x9b28000 0x1000>; - interrupts = ; + interrupts = ; interrupt-names = "hostc"; phys = <_port1 PHY_TYPE_SATA>; @@ -687,7 +687,7 @@ dwc3: dwc3@990 { compatible = "snps,dwc3"; reg = <0x0990 0x10>; - interrupts = ; + interrupts = ; dr_mode = "host"; phy-names = "usb2-phy", "usb3-phy"; phys= <_picophy0>, @@ -701,7 +701,7 @@ compatible = "st,sti-pwm";
[PATCH 2/5] ARM: dts: stih407-pinctrl: Fix complain about IRQ_TYPE_NONE usage
From: Patrice ChotardSince commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi index 53c6888d1fc0..e393519fb84c 100644 --- a/arch/arm/boot/dts/stih407-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi @@ -52,7 +52,7 @@ st,syscfg = <_sbc>; reg = <0x0961f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0961 0x6000>; @@ -376,7 +376,7 @@ st,syscfg = <_front>; reg = <0x0920f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0920 0x1>; @@ -936,7 +936,7 @@ st,syscfg = <_front>; reg = <0x0921f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0921 0x1>; @@ -969,7 +969,7 @@ st,syscfg = <_rear>; reg = <0x0922f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0922 0x6000>; @@ -1164,7 +1164,7 @@ st,syscfg = <_flash>; reg = <0x0923f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0923 0x3000>; -- 1.9.1
[PATCH 2/5] ARM: dts: stih407-pinctrl: Fix complain about IRQ_TYPE_NONE usage
From: Patrice Chotard Since commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/stih407-pinctrl.dtsi b/arch/arm/boot/dts/stih407-pinctrl.dtsi index 53c6888d1fc0..e393519fb84c 100644 --- a/arch/arm/boot/dts/stih407-pinctrl.dtsi +++ b/arch/arm/boot/dts/stih407-pinctrl.dtsi @@ -52,7 +52,7 @@ st,syscfg = <_sbc>; reg = <0x0961f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0961 0x6000>; @@ -376,7 +376,7 @@ st,syscfg = <_front>; reg = <0x0920f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0920 0x1>; @@ -936,7 +936,7 @@ st,syscfg = <_front>; reg = <0x0921f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0921 0x1>; @@ -969,7 +969,7 @@ st,syscfg = <_rear>; reg = <0x0922f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0922 0x6000>; @@ -1164,7 +1164,7 @@ st,syscfg = <_flash>; reg = <0x0923f080 0x4>; reg-names = "irqmux"; - interrupts = ; + interrupts = ; interrupt-names = "irqmux"; ranges = <0 0x0923 0x3000>; -- 1.9.1
[PATCH 3/5] ARM: dts: stih407: Fix complain about IRQ_TYPE_NONE usage
From: Patrice ChotardSince commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi index 57efc87dec2b..5b7951ffc350 100644 --- a/arch/arm/boot/dts/stih407.dtsi +++ b/arch/arm/boot/dts/stih407.dtsi @@ -108,7 +108,7 @@ reg = <0x8d04000 0x1000>; reg-names = "hdmi-reg"; #sound-dai-cells = <0>; - interrupts = ; + interrupts = ; interrupt-names = "irq"; clock-names = "pix", "tmds", -- 1.9.1
[PATCH 3/5] ARM: dts: stih407: Fix complain about IRQ_TYPE_NONE usage
From: Patrice Chotard Since commit 83a86fbb5b56 ("irqchip/gic: Loudly complain about the use of IRQ_TYPE_NONE") kernel is complaining about the IRQ_TYPE_NONE usage which shouldn't be used. Use IRQ_TYPE_LEVEL_HIGH instead. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/stih407.dtsi b/arch/arm/boot/dts/stih407.dtsi index 57efc87dec2b..5b7951ffc350 100644 --- a/arch/arm/boot/dts/stih407.dtsi +++ b/arch/arm/boot/dts/stih407.dtsi @@ -108,7 +108,7 @@ reg = <0x8d04000 0x1000>; reg-names = "hdmi-reg"; #sound-dai-cells = <0>; - interrupts = ; + interrupts = ; interrupt-names = "irq"; clock-names = "pix", "tmds", -- 1.9.1
[RESEND PATCH v4 3/3]] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
From: Patrice ChotardAs serial interface is already specified into stdout-path property, "console=ttyASN,115200" from bootargs can be removed. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index 37f2ddbfa099..a7a0f76e9cbc 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index a6f00a6687a9..6c6b4cc37e97 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 62770496e328..50d36758391c 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=ttyAS1,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 36f40f58155d..7f5f3252bfc7 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; -- 1.9.1
[RESEND PATCH v4 3/3]] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
From: Patrice Chotard As serial interface is already specified into stdout-path property, "console=ttyASN,115200" from bootargs can be removed. Signed-off-by: Patrice Chotard --- arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index 37f2ddbfa099..a7a0f76e9cbc 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index a6f00a6687a9..6c6b4cc37e97 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 62770496e328..50d36758391c 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=ttyAS1,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 36f40f58155d..7f5f3252bfc7 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; -- 1.9.1
[RESEND PATCH v4 3/3] ARM: dts: STi: Remove console=ttyASN from bootargs for STi boards] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
From: Patrice ChotardAs serial interface is already specified into stdout-path property, "console=ttyASN,115200" from bootargs can be removed. Signed-off-by: Patrice Chotard --- v4: _ none v3: _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property v2: _ none arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index 37f2ddbfa099..a7a0f76e9cbc 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index a6f00a6687a9..6c6b4cc37e97 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 62770496e328..50d36758391c 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=ttyAS1,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 36f40f58155d..7f5f3252bfc7 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; -- 1.9.1
[RESEND PATCH v4 3/3] ARM: dts: STi: Remove console=ttyASN from bootargs for STi boards] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
From: Patrice Chotard As serial interface is already specified into stdout-path property, "console=ttyASN,115200" from bootargs can be removed. Signed-off-by: Patrice Chotard --- v4: _ none v3: _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property v2: _ none arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index 37f2ddbfa099..a7a0f76e9cbc 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index a6f00a6687a9..6c6b4cc37e97 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 62770496e328..50d36758391c 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=ttyAS1,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 36f40f58155d..7f5f3252bfc7 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; linux,stdout-path = _serial0; }; -- 1.9.1
[RESEND PATCH] clk: stm32: Add clk entry for SDMMC2 on stm32F769
From: Patrice ChotardSTM32F769 has 2 SDMMC port, add clock entry for the second one. Signed-off-by: Alexandre TORGUE Signed-off-by: Patrice Chotard Acked-by: Stephen Boyd --- drivers/clk/clk-stm32f4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c index da44f8dc1d29..e7e3965c7aae 100644 --- a/drivers/clk/clk-stm32f4.c +++ b/drivers/clk/clk-stm32f4.c @@ -282,6 +282,7 @@ struct stm32f4_gate_data { { STM32F4_RCC_APB2ENR, 0, "tim1", "apb2_mul" }, { STM32F4_RCC_APB2ENR, 1, "tim8", "apb2_mul" }, + { STM32F4_RCC_APB2ENR, 7, "sdmmc2", "sdmux"}, { STM32F4_RCC_APB2ENR, 8, "adc1", "apb2_div" }, { STM32F4_RCC_APB2ENR, 9, "adc2", "apb2_div" }, { STM32F4_RCC_APB2ENR, 10, "adc3", "apb2_div" }, @@ -315,7 +316,7 @@ struct stm32f4_gate_data { static const u64 stm32f746_gate_map[MAX_GATE_MAP] = { 0x00f17ef417ffull, 0x0003ull, - 0x04f77f033e01c9ffull }; + 0x04f77f833e01c9ffull }; static const u64 *stm32f4_gate_map; -- 1.9.1
[RESEND PATCH] clk: stm32: Add clk entry for SDMMC2 on stm32F769
From: Patrice Chotard STM32F769 has 2 SDMMC port, add clock entry for the second one. Signed-off-by: Alexandre TORGUE Signed-off-by: Patrice Chotard Acked-by: Stephen Boyd --- drivers/clk/clk-stm32f4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/clk/clk-stm32f4.c b/drivers/clk/clk-stm32f4.c index da44f8dc1d29..e7e3965c7aae 100644 --- a/drivers/clk/clk-stm32f4.c +++ b/drivers/clk/clk-stm32f4.c @@ -282,6 +282,7 @@ struct stm32f4_gate_data { { STM32F4_RCC_APB2ENR, 0, "tim1", "apb2_mul" }, { STM32F4_RCC_APB2ENR, 1, "tim8", "apb2_mul" }, + { STM32F4_RCC_APB2ENR, 7, "sdmmc2", "sdmux"}, { STM32F4_RCC_APB2ENR, 8, "adc1", "apb2_div" }, { STM32F4_RCC_APB2ENR, 9, "adc2", "apb2_div" }, { STM32F4_RCC_APB2ENR, 10, "adc3", "apb2_div" }, @@ -315,7 +316,7 @@ struct stm32f4_gate_data { static const u64 stm32f746_gate_map[MAX_GATE_MAP] = { 0x00f17ef417ffull, 0x0003ull, - 0x04f77f033e01c9ffull }; + 0x04f77f833e01c9ffull }; static const u64 *stm32f4_gate_map; -- 1.9.1
[PATCH v4 0/3] Fix STi aliases property name
From: Patrice ChotardSince dtc v1.4.6-9-gaadd0b65c987, when compiling dtb with W=1 option, the following warnings are triggered : arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' _ Patch 1, convert the aliases property name in lowercase in all STi board dts files. _ Patch 2, remove "console=serialN" from bootargs property _ Patch 3, rework the tty driver st-asc accordingly, as aliases id is retrieved using of_alias_get_id() with a defined string with is not lowercase only. v4: Fix Rob Herring's remarks : _ reorder patches, first st-asc driver update and the DTS patches in order to not break boot. _ squash chunks of previous patch 1 into previous patch 2 v3: Fix Rob Herring's remarks : _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice v2: Fix Rob Herring's remarks : _ use serialN instead of ttyasN aliases to not break ABI _ remove useless stdout-path property _ update st-asc driver with "serial" alias prefix Patrice Chotard (3): tty: st-asc: Update tty alias ARM: dts: STi: Fix aliases property name for STi boards ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards arch/arm/boot/dts/stih407-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2260.dts | 4 ++-- arch/arm/boot/dts/stih418-b2199.dts | 4 ++-- drivers/tty/serial/st-asc.c | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) -- 1.9.1
[PATCH v4 0/3] Fix STi aliases property name
From: Patrice Chotard Since dtc v1.4.6-9-gaadd0b65c987, when compiling dtb with W=1 option, the following warnings are triggered : arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' _ Patch 1, convert the aliases property name in lowercase in all STi board dts files. _ Patch 2, remove "console=serialN" from bootargs property _ Patch 3, rework the tty driver st-asc accordingly, as aliases id is retrieved using of_alias_get_id() with a defined string with is not lowercase only. v4: Fix Rob Herring's remarks : _ reorder patches, first st-asc driver update and the DTS patches in order to not break boot. _ squash chunks of previous patch 1 into previous patch 2 v3: Fix Rob Herring's remarks : _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice v2: Fix Rob Herring's remarks : _ use serialN instead of ttyasN aliases to not break ABI _ remove useless stdout-path property _ update st-asc driver with "serial" alias prefix Patrice Chotard (3): tty: st-asc: Update tty alias ARM: dts: STi: Fix aliases property name for STi boards ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards arch/arm/boot/dts/stih407-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2260.dts | 4 ++-- arch/arm/boot/dts/stih418-b2199.dts | 4 ++-- drivers/tty/serial/st-asc.c | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) -- 1.9.1
[PATCH v4 2/3] ARM: dts: STi: Fix aliases property name for STi boards
From: Patrice ChotardUpdate serial aliases from "ttyASN" to more common "serialN". Since dtc v1.4.6-9-gaadd0b65c987, aliases property name must be lowercase only. This allows to fix following dtc warnings: arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' Signed-off-by: Patrice Chotard --- v4: _ remove bootargs chunks v3: _ none v2: _ use serialN instead of ttyasN aliases to not break ABI arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index de3c8bf129b5..00de810a3bcc 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 0a59b7b0f4b2..07d7969923ea 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index feb8834478fa..0b2129712bef 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -25,7 +25,7 @@ }; aliases { - ttyAS1 = + serial1 = ethernet0 = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 39b4db2e3507..f88856c36a3f 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; -- 1.9.1
[PATCH v4 2/3] ARM: dts: STi: Fix aliases property name for STi boards
From: Patrice Chotard Update serial aliases from "ttyASN" to more common "serialN". Since dtc v1.4.6-9-gaadd0b65c987, aliases property name must be lowercase only. This allows to fix following dtc warnings: arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' Signed-off-by: Patrice Chotard --- v4: _ remove bootargs chunks v3: _ none v2: _ use serialN instead of ttyasN aliases to not break ABI arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index de3c8bf129b5..00de810a3bcc 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 0a59b7b0f4b2..07d7969923ea 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index feb8834478fa..0b2129712bef 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -25,7 +25,7 @@ }; aliases { - ttyAS1 = + serial1 = ethernet0 = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 39b4db2e3507..f88856c36a3f 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; -- 1.9.1
[PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
From: Patrice ChotardAs serial interface is already specified into stdout-path property, "console=ttyASN,115200" from bootargs can be removed. Signed-off-by: Patrice Chotard --- v4: _ none v3: _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property v2: _ none arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index 00de810a3bcc..62ce1cecbb1f 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 07d7969923ea..2a5a9802a5ec 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 0b2129712bef..155caa8c002a 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=ttyAS1,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index f88856c36a3f..cd0d719e31b7 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; -- 1.9.1
[PATCH v4 3/3] ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
From: Patrice Chotard As serial interface is already specified into stdout-path property, "console=ttyASN,115200" from bootargs can be removed. Signed-off-by: Patrice Chotard --- v4: _ none v3: _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property v2: _ none arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index 00de810a3bcc..62ce1cecbb1f 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 07d7969923ea..2a5a9802a5ec 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index 0b2129712bef..155caa8c002a 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=ttyAS1,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index f88856c36a3f..cd0d719e31b7 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; -- 1.9.1
[PATCH v4 1/3] tty: st-asc: Update tty alias
From: Patrice ChotardSince dtc v1.4.6-9-gaadd0b65c987, aliases property name must include only lowercase and '-'. After having updated all STi boards serial aliases from "ttyASN" to "serialN", st-asc driver need to be updated accordingly as tty aliases id is retrieved using of_alias_get_id(). Signed-off-by: Patrice Chotard Reviewed-by: Rob Herring --- v4: _ add Reviewed-by v3: _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice v2: _ update st-asc driver with "serial" alias prefix drivers/tty/serial/st-asc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c index c763253514e9..5f9f01fac6dd 100644 --- a/drivers/tty/serial/st-asc.c +++ b/drivers/tty/serial/st-asc.c @@ -782,7 +782,9 @@ static struct asc_port *asc_of_get_asc_port(struct platform_device *pdev) if (!np) return NULL; - id = of_alias_get_id(np, ASC_SERIAL_NAME); + id = of_alias_get_id(np, "serial"); + if (id < 0) + id = of_alias_get_id(np, ASC_SERIAL_NAME); if (id < 0) id = 0; -- 1.9.1
[PATCH v4 1/3] tty: st-asc: Update tty alias
From: Patrice Chotard Since dtc v1.4.6-9-gaadd0b65c987, aliases property name must include only lowercase and '-'. After having updated all STi boards serial aliases from "ttyASN" to "serialN", st-asc driver need to be updated accordingly as tty aliases id is retrieved using of_alias_get_id(). Signed-off-by: Patrice Chotard Reviewed-by: Rob Herring --- v4: _ add Reviewed-by v3: _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice v2: _ update st-asc driver with "serial" alias prefix drivers/tty/serial/st-asc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c index c763253514e9..5f9f01fac6dd 100644 --- a/drivers/tty/serial/st-asc.c +++ b/drivers/tty/serial/st-asc.c @@ -782,7 +782,9 @@ static struct asc_port *asc_of_get_asc_port(struct platform_device *pdev) if (!np) return NULL; - id = of_alias_get_id(np, ASC_SERIAL_NAME); + id = of_alias_get_id(np, "serial"); + if (id < 0) + id = of_alias_get_id(np, ASC_SERIAL_NAME); if (id < 0) id = 0; -- 1.9.1
[PATCH v3 1/3] ARM: dts: STi: Fix aliases property name for STi boards
From: Patrice ChotardUpdate serial aliases from "ttyASN" to more common "serialN". Since dtc v1.4.6-9-gaadd0b65c987, aliases property name must be lowercase only. This allows to fix following dtc warnings: arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' Signed-off-by: Patrice Chotard --- v3: _ none v2: _ use serialN instead of ttyasN aliases to not break ABI arch/arm/boot/dts/stih407-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2260.dts | 4 ++-- arch/arm/boot/dts/stih418-b2199.dts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index de3c8bf129b5..2c4d6033b448 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "console=serial0,115200 clk_ignore_unused"; stdout-path = _serial0; }; @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 0a59b7b0f4b2..5422850641e8 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "console=serial0,115200 clk_ignore_unused"; stdout-path = _serial0; }; @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index feb8834478fa..ca347160e35d 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=ttyAS1,115200 clk_ignore_unused"; + bootargs = "console=serial1,115200 clk_ignore_unused"; stdout-path = }; @@ -25,7 +25,7 @@ }; aliases { - ttyAS1 = + serial1 = ethernet0 = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 39b4db2e3507..dbf7bb704a1a 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "console=serial0,115200 clk_ignore_unused"; stdout-path = _serial0; }; @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; -- 1.9.1
[PATCH v3 0/3] Fix STi aliases property name
From: Patrice ChotardSince dtc v1.4.6-9-gaadd0b65c987, when compiling dtb with W=1 option, the following warnings are triggered : arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' _ Patch 1, convert the aliases property name in lowercase in all STi board dts files. _ Patch 2, remove "console=serialN" from bootargs property _ Patch 3, rework the tty driver st-asc accordingly, as aliases id is retrieved using of_alias_get_id() with a defined string with is not lowercase only. v3: Fix Rob Herring's remarks : _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice v2: Fix Rob Herring's remarks : _ use serialN instead of ttyasN aliases to not break ABI _ remove useless stdout-path property _ update st-asc driver with "serial" alias prefix Patrice Chotard (3): ARM: dts: STi: Fix aliases property name for STi boards ARM: dts: STi: Remove console=serialN from bootargs for STi boards tty: st-asc: Update tty alias arch/arm/boot/dts/stih407-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2260.dts | 4 ++-- arch/arm/boot/dts/stih418-b2199.dts | 4 ++-- drivers/tty/serial/st-asc.c | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) -- 1.9.1
[PATCH v3 1/3] ARM: dts: STi: Fix aliases property name for STi boards
From: Patrice Chotard Update serial aliases from "ttyASN" to more common "serialN". Since dtc v1.4.6-9-gaadd0b65c987, aliases property name must be lowercase only. This allows to fix following dtc warnings: arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' Signed-off-by: Patrice Chotard --- v3: _ none v2: _ use serialN instead of ttyasN aliases to not break ABI arch/arm/boot/dts/stih407-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2260.dts | 4 ++-- arch/arm/boot/dts/stih418-b2199.dts | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index de3c8bf129b5..2c4d6033b448 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "console=serial0,115200 clk_ignore_unused"; stdout-path = _serial0; }; @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 0a59b7b0f4b2..5422850641e8 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "console=serial0,115200 clk_ignore_unused"; stdout-path = _serial0; }; @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index feb8834478fa..ca347160e35d 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=ttyAS1,115200 clk_ignore_unused"; + bootargs = "console=serial1,115200 clk_ignore_unused"; stdout-path = }; @@ -25,7 +25,7 @@ }; aliases { - ttyAS1 = + serial1 = ethernet0 = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index 39b4db2e3507..dbf7bb704a1a 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=ttyAS0,115200 clk_ignore_unused"; + bootargs = "console=serial0,115200 clk_ignore_unused"; stdout-path = _serial0; }; @@ -24,7 +24,7 @@ }; aliases { - ttyAS0 = _serial0; + serial0 = _serial0; ethernet0 = }; -- 1.9.1
[PATCH v3 0/3] Fix STi aliases property name
From: Patrice Chotard Since dtc v1.4.6-9-gaadd0b65c987, when compiling dtb with W=1 option, the following warnings are triggered : arch/arm/boot/dts/stih418-b2199.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih407-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2260.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' arch/arm/boot/dts/stih410-b2120.dtb: Warning (alias_paths): /aliases: aliases property name must include only lowercase and '-' _ Patch 1, convert the aliases property name in lowercase in all STi board dts files. _ Patch 2, remove "console=serialN" from bootargs property _ Patch 3, rework the tty driver st-asc accordingly, as aliases id is retrieved using of_alias_get_id() with a defined string with is not lowercase only. v3: Fix Rob Herring's remarks : _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice v2: Fix Rob Herring's remarks : _ use serialN instead of ttyasN aliases to not break ABI _ remove useless stdout-path property _ update st-asc driver with "serial" alias prefix Patrice Chotard (3): ARM: dts: STi: Fix aliases property name for STi boards ARM: dts: STi: Remove console=serialN from bootargs for STi boards tty: st-asc: Update tty alias arch/arm/boot/dts/stih407-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2120.dts | 4 ++-- arch/arm/boot/dts/stih410-b2260.dts | 4 ++-- arch/arm/boot/dts/stih418-b2199.dts | 4 ++-- drivers/tty/serial/st-asc.c | 4 +++- 5 files changed, 11 insertions(+), 9 deletions(-) -- 1.9.1
[PATCH v3 2/3] ARM: dts: STi: Remove console=serialN from bootargs for STi boards
From: Patrice ChotardAs serial interface is already specified into stdout-path property, "console=serialN,115200" from bootargs can be removed. Signed-off-by: Patrice Chotard --- v3: _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property v2: _ none arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index 2c4d6033b448..62ce1cecbb1f 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=serial0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 5422850641e8..2a5a9802a5ec 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=serial0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index ca347160e35d..155caa8c002a 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=serial1,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index dbf7bb704a1a..cd0d719e31b7 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=serial0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; -- 1.9.1
[PATCH v3 2/3] ARM: dts: STi: Remove console=serialN from bootargs for STi boards
From: Patrice Chotard As serial interface is already specified into stdout-path property, "console=serialN,115200" from bootargs can be removed. Signed-off-by: Patrice Chotard --- v3: _ remove "console=serialN,115200" from bootargs and use prefered stdout-path property v2: _ none arch/arm/boot/dts/stih407-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2120.dts | 2 +- arch/arm/boot/dts/stih410-b2260.dts | 2 +- arch/arm/boot/dts/stih418-b2199.dts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/stih407-b2120.dts b/arch/arm/boot/dts/stih407-b2120.dts index 2c4d6033b448..62ce1cecbb1f 100644 --- a/arch/arm/boot/dts/stih407-b2120.dts +++ b/arch/arm/boot/dts/stih407-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih407-b2120", "st,stih407"; chosen { - bootargs = "console=serial0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2120.dts b/arch/arm/boot/dts/stih410-b2120.dts index 5422850641e8..2a5a9802a5ec 100644 --- a/arch/arm/boot/dts/stih410-b2120.dts +++ b/arch/arm/boot/dts/stih410-b2120.dts @@ -14,7 +14,7 @@ compatible = "st,stih410-b2120", "st,stih410"; chosen { - bootargs = "console=serial0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; diff --git a/arch/arm/boot/dts/stih410-b2260.dts b/arch/arm/boot/dts/stih410-b2260.dts index ca347160e35d..155caa8c002a 100644 --- a/arch/arm/boot/dts/stih410-b2260.dts +++ b/arch/arm/boot/dts/stih410-b2260.dts @@ -15,7 +15,7 @@ compatible = "st,stih410-b2260", "st,stih410"; chosen { - bootargs = "console=serial1,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = }; diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts index dbf7bb704a1a..cd0d719e31b7 100644 --- a/arch/arm/boot/dts/stih418-b2199.dts +++ b/arch/arm/boot/dts/stih418-b2199.dts @@ -14,7 +14,7 @@ compatible = "st,stih418-b2199", "st,stih418"; chosen { - bootargs = "console=serial0,115200 clk_ignore_unused"; + bootargs = "clk_ignore_unused"; stdout-path = _serial0; }; -- 1.9.1
[PATCH v3 3/3] tty: st-asc: Update tty alias
From: Patrice ChotardSince dtc v1.4.6-9-gaadd0b65c987, aliases property name must include only lowercase and '-'. After having updated all STi boards serial aliases from "ttyASN" to "serialN", st-asc driver need to be updated accordingly as tty aliases id is retrieved using of_alias_get_id(). Signed-off-by: Patrice Chotard --- v3: _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice v2: _ update st-asc driver with "serial" alias prefix drivers/tty/serial/st-asc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c index c763253514e9..5f9f01fac6dd 100644 --- a/drivers/tty/serial/st-asc.c +++ b/drivers/tty/serial/st-asc.c @@ -782,7 +782,9 @@ static struct asc_port *asc_of_get_asc_port(struct platform_device *pdev) if (!np) return NULL; - id = of_alias_get_id(np, ASC_SERIAL_NAME); + id = of_alias_get_id(np, "serial"); + if (id < 0) + id = of_alias_get_id(np, ASC_SERIAL_NAME); if (id < 0) id = 0; -- 1.9.1
[PATCH v3 3/3] tty: st-asc: Update tty alias
From: Patrice Chotard Since dtc v1.4.6-9-gaadd0b65c987, aliases property name must include only lowercase and '-'. After having updated all STi boards serial aliases from "ttyASN" to "serialN", st-asc driver need to be updated accordingly as tty aliases id is retrieved using of_alias_get_id(). Signed-off-by: Patrice Chotard --- v3: _ update st-asc driver with "serial" alias prefix and keep "ttyAS" in second choice v2: _ update st-asc driver with "serial" alias prefix drivers/tty/serial/st-asc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/tty/serial/st-asc.c b/drivers/tty/serial/st-asc.c index c763253514e9..5f9f01fac6dd 100644 --- a/drivers/tty/serial/st-asc.c +++ b/drivers/tty/serial/st-asc.c @@ -782,7 +782,9 @@ static struct asc_port *asc_of_get_asc_port(struct platform_device *pdev) if (!np) return NULL; - id = of_alias_get_id(np, ASC_SERIAL_NAME); + id = of_alias_get_id(np, "serial"); + if (id < 0) + id = of_alias_get_id(np, ASC_SERIAL_NAME); if (id < 0) id = 0; -- 1.9.1