dt-bindings: spi: Add compatible string for brcmstb SoCs
Subsystems (3)
PATCH 1/4 dt-bindings: spi: Add compatible string for brcmstb SoCs
Add compatible string for brcmstb 7445 SoCs.
--- Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt +2 -0
@@ -32,6 +32,8 @@ Required properties: BRCMSTB SoCs "brcm,spi-bcm7435-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI BRCMSTB SoCs + "brcm,spi-bcm7445-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI + BRCMSTB SoCs "brcm,spi-bcm7216-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI BRCMSTB SoCs "brcm,spi-bcm7278-qspi", "brcm,spi-bcm-qspi", "brcm,spi-brcmstb-mspi" : Second Instance of MSPI
Signature · 1 line
2.17.1
PATCH 2/4 spi: bcm-qspi: Add compatible string for BRCMSTB 7445 SoCs
Add compatible string for BRCMSTB 7445 SoCs and indicate it has MSPI rev support.
--- drivers/spi/spi-bcm-qspi.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/spi/spi-bcm-qspi.c +5 -0
@@ -1293,6 +1293,11 @@ static const struct of_device_id bcm_qspi_of_match[] = { .compatible = "brcm,spi-bcm7435-qspi", .data = &bcm_qspi_no_rev_data, }, + { + .compatible = "brcm,spi-bcm7445-qspi", + .data = &bcm_qspi_rev_data, + + }, { .compatible = "brcm,spi-bcm-qspi", .data = &bcm_qspi_rev_data,
Signature · 1 line
2.17.1
Re: [PATCH 2/4] spi: bcm-qspi: Add compatible string for BRCMSTB 7445 SoCs
Quoted 4 lines · Ray Jui
Add compatible string for BRCMSTB 7445 SoCs and indicate it has MSPI rev support.
Signed-off-by Ray Jui <[email protected]>
Signature · 1 line
Florian
PATCH 3/4 spi: bcm-qspi: Fix probe regression on iProc platforms
In reply to Ray JuiiProc chips have QSPI controller that does not have the MSPI_REV offset. Reading from that offset will cause a bus error. Fix it by having MSPI_REV query disabled in the generic compatible string.
--- drivers/spi/spi-bcm-qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/spi/spi-bcm-qspi.c +1 -1
@@ -1300,7 +1300,7 @@ static const struct of_device_id bcm_qspi_of_match[] = { }, { .compatible = "brcm,spi-bcm-qspi", - .data = &bcm_qspi_rev_data, + .data = &bcm_qspi_no_rev_data, }, { .compatible = "brcm,spi-bcm7216-qspi",
Signature · 1 line
2.17.1
Re: [PATCH 3/4] spi: bcm-qspi: Fix probe regression on iProc platforms
Quoted 7 lines · Ray Jui
iProc chips have QSPI controller that does not have the
MSPI_REVoffset. Reading from that offset will cause a bus error. Fix it by havingMSPI_REVquery disabled in the generic compatible string.Fixes 3a01f04d74ef ("spi: bcm-qspi: Handle lack of MSPI_REV offset")Signed-off-by Ray Jui <[email protected]>
Signature · 1 line
Florian
Quoted 3 lines · Ray Jui
Add compatible string for brcmstb 7445 SoCs.
Signed-off-by Ray Jui <[email protected]>
Signature · 1 line
Florian
PATCH 4/4 spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings
In reply to Ray JuiThe Broadcom QSPI driver now falls back to no MSPI_DEV support as the default setting in the generic compatible string, explicit settings for STB chips 7425, 7429, and 7435 can be removed.
--- drivers/spi/spi-bcm-qspi.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/spi/spi-bcm-qspi.c +0 -12
@@ -1281,18 +1281,6 @@ static const struct bcm_qspi_data bcm_qspi_spcr3_data = { };static const struct of_device_id bcm_qspi_of_match[] = { - { - .compatible ="brcm,spi-bcm7425-qspi" , - .data = &bcm_qspi_no_rev_data, - }, - { - .compatible ="brcm,spi-bcm7429-qspi" , - .data = &bcm_qspi_no_rev_data, - }, - { - .compatible ="brcm,spi-bcm7435-qspi" , - .data = &bcm_qspi_no_rev_data, - }, { .compatible ="brcm,spi-bcm7445-qspi" , .data = &bcm_qspi_rev_data,
Signature · 1 line
2.17.1
Re: [PATCH 4/4] spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings
Quoted 5 lines · Ray Jui
The Broadcom QSPI driver now falls back to no
MSPI_DEVsupport as the default setting in the generic compatible string, explicit settings for STB chips 7425, 7429, and 7435 can be removed.Signed-off-by Ray Jui <[email protected]>
Signature · 1 line
Florian
Mark Brown
maintainerQuoted 1 line · Ray Jui
Add compatible string for brcmstb 7445 SoCs.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/4] spi: Add compatible string for brcmstb SoCs
commit: d9f0cf9f1176d36d3824459d5b061f4719fcbb8a
[2/4] spi: bcm-qspi: Add compatible string for BRCMSTB 7445 SoCs
commit: e0eeb76b818ad93718f9640b0bdad909b453a3b8
[3/4] spi: bcm-qspi: Fix probe regression on iProc platforms
commit: 9a852d44b26f8e60e2ae13df563824c0f8489135
[4/4] spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings
commit: 3cf5d198785a6b454e6a97246795b0043aff9ac1All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 27 lines · Mark Brown
Quoted 1 line · Ray Jui
Add compatible string for brcmstb 7445 SoCs.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/4] spi: Add compatible string for brcmstb SoCs
commit: d9f0cf9f1176d36d3824459d5b061f4719fcbb8a [2/4] spi: bcm-qspi: Add compatible string for BRCMSTB 7445 SoCs commit: e0eeb76b818ad93718f9640b0bdad909b453a3b8 [3/4] spi: bcm-qspi: Fix probe regression on iProc platforms commit: 9a852d44b26f8e60e2ae13df563824c0f8489135 [4/4] spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings commit: 3cf5d198785a6b454e6a97246795b0043aff9ac1All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
Quoted 6 lines
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Mark, can you also submit "spi: bcm-qspi: Fix probe regression on iProc platforms" towards Linus because this is a bug fix that is currently affecting the 5.9 kernel.
Thanks
Signature · 1 line
Florian
Mark Brown
maintainerQuoted 11 lines · Florian Fainelli
Quoted 8 lines · Mark Brown
[1/4] spi: Add compatible string for brcmstb SoCs
commit: d9f0cf9f1176d36d3824459d5b061f4719fcbb8a [2/4] spi: bcm-qspi: Add compatible string for BRCMSTB 7445 SoCs commit: e0eeb76b818ad93718f9640b0bdad909b453a3b8 [3/4] spi: bcm-qspi: Fix probe regression on iProc platforms commit: 9a852d44b26f8e60e2ae13df563824c0f8489135 [4/4] spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings commit: 3cf5d198785a6b454e6a97246795b0043aff9ac1
Quoted 3 lines
Mark, can you also submit "spi: bcm-qspi: Fix probe regression on iProc platforms" towards Linus because this is a bug fix that is currently affecting the 5.9 kernel.
*sigh*, OK. Please don't send fixes in the middle of serieses, send them at the start of the series before any cleanups or new features. This ensures that they don't have any dependencies on other patches in the series and means that they can easily be sent as fixes without getting tangled up with the development work.
Mark Brown
maintainerQuoted 1 line · Ray Jui
Add compatible string for brcmstb 7445 SoCs.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: bcm-qspi: Fix probe regression on iProc platforms
commit: 00fb259c618ea1198fc51b53a6167aa0d78672a9
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark