[PATCH 1/4] dt-bindings: spi: Add compatible string for brcmstb SoCs

[PATCH 1/4] dt-bindings: spi: Add compatible string for brcmstb SoCs

[Ray Jui]

Add compatible string for brcmstb 7445 SoCs.

Signed-off-by: Ray Jui <ray.jui@broadcom.com>
---
 Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt b/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
index f5e518d099f2..9d4d5d866fa0 100644
--- a/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
+++ b/Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
@@ -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
-- 
2.17.1

[PATCH 2/4] spi: bcm-qspi: Add compatible string for BRCMSTB 7445 SoCs

[Ray Jui]

Add compatible string for BRCMSTB 7445 SoCs and indicate it has MSPI rev
support.

Signed-off-by: Ray Jui <ray.jui@broadcom.com>
---
 drivers/spi/spi-bcm-qspi.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index 681d09085175..c5209b42b0d2 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -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,
-- 
2.17.1

[PATCH 3/4] spi: bcm-qspi: Fix probe regression on iProc platforms

[Ray Jui]

iProc 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.

Fixes: 3a01f04d74ef ("spi: bcm-qspi: Handle lack of MSPI_REV offset")
Link: https://lore.kernel.org/linux-arm-kernel/20200909211857.4144718-1-f.fainelli@gmail.com/T/#u
Signed-off-by: Ray Jui <ray.jui@broadcom.com>
---
 drivers/spi/spi-bcm-qspi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index c5209b42b0d2..b78d47a4403c 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -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",
-- 
2.17.1

[PATCH 4/4] spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings

[Ray Jui]

The 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.

Signed-off-by: Ray Jui <ray.jui@broadcom.com>
---
 drivers/spi/spi-bcm-qspi.c | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c
index b78d47a4403c..14c9d0133bce 100644
--- a/drivers/spi/spi-bcm-qspi.c
+++ b/drivers/spi/spi-bcm-qspi.c
@@ -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,
-- 
2.17.1

Re: [PATCH 1/4] dt-bindings: spi: Add compatible string for brcmstb SoCs

[Florian Fainelli]

On 9/10/2020 8:25 AM, Ray Jui wrote:
> Add compatible string for brcmstb 7445 SoCs.
> 
> Signed-off-by: Ray Jui <ray.jui@broadcom.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH 2/4] spi: bcm-qspi: Add compatible string for BRCMSTB 7445 SoCs

[Florian Fainelli]

On 9/10/2020 8:25 AM, Ray Jui wrote:
> Add compatible string for BRCMSTB 7445 SoCs and indicate it has MSPI rev
> support.
> 
> Signed-off-by: Ray Jui <ray.jui@broadcom.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH 3/4] spi: bcm-qspi: Fix probe regression on iProc platforms

[Florian Fainelli]

On 9/10/2020 8:25 AM, Ray Jui wrote:
> iProc 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.
> 
> Fixes: 3a01f04d74ef ("spi: bcm-qspi: Handle lack of MSPI_REV offset")
> Link: https://lore.kernel.org/linux-arm-kernel/20200909211857.4144718-1-f.fainelli@gmail.com/T/#u
> Signed-off-by: Ray Jui <ray.jui@broadcom.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH 4/4] spi: bcm-qspi: Clean up 7425, 7429, and 7435 settings

[Florian Fainelli]

On 9/10/2020 8:25 AM, Ray Jui wrote:
> The 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.
> 
> Signed-off-by: Ray Jui <ray.jui@broadcom.com>

Acked-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH 1/4] dt-bindings: spi: Add compatible string for brcmstb SoCs

[Mark Brown]

On Thu, 10 Sep 2020 08:25:36 -0700, Ray Jui wrote:
> 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: 3cf5d198785a6b454e6a97246795b0043aff9ac1

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

Re: [PATCH 1/4] dt-bindings: spi: Add compatible string for brcmstb SoCs

[Florian Fainelli]

On 9/14/20 7:52 AM, Mark Brown wrote:
> On Thu, 10 Sep 2020 08:25:36 -0700, Ray Jui wrote:
>> 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: 3cf5d198785a6b454e6a97246795b0043aff9ac1
> 
> 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.

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
-- 
Florian

Re: [PATCH 1/4] dt-bindings: spi: Add compatible string for brcmstb SoCs

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1092 bytes --]

On Wed, Sep 23, 2020 at 01:38:55PM -0700, Florian Fainelli wrote:
> On 9/14/20 7:52 AM, Mark Brown wrote:

> > [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

> 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.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH 1/4] dt-bindings: spi: Add compatible string for brcmstb SoCs

[Mark Brown]

On Thu, 10 Sep 2020 08:25:36 -0700, Ray Jui wrote:
> 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