diff mbox series

[RESEND,7/8] spi: bcm63xx-hsspi: bcmbca: Replace ARCH_BCM_63XX with ARCH_BCMBCA

Message ID 20220707065800.261269-7-william.zhang@broadcom.com
State Accepted
Commit 16f3c221646b39d9ad0a0cef05f14133bdf70165
Headers show
Series None | expand

Commit Message

William Zhang July 7, 2022, 6:57 a.m. UTC
Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
SPI_BCM63XX_HSSPI depending on ARCH_BCMBCA.

Signed-off-by: William Zhang <william.zhang@broadcom.com>
---

 drivers/spi/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Florian Fainelli July 11, 2022, 2:11 a.m. UTC | #1
On Wed,  6 Jul 2022 23:57:58 -0700, William Zhang <william.zhang@broadcom.com> wrote:
> Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
> SPI_BCM63XX_HSSPI depending on ARCH_BCMBCA.
> 
> Signed-off-by: William Zhang <william.zhang@broadcom.com>
> ---

Applied to https://github.com/Broadcom/stblinux/commits/drivers/next, thanks!
--
Florian
Mark Brown July 11, 2022, 10:45 a.m. UTC | #2
On Sun, Jul 10, 2022 at 07:11:31PM -0700, Florian Fainelli wrote:
> On Wed,  6 Jul 2022 23:57:58 -0700, William Zhang <william.zhang@broadcom.com> wrote:
> > Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
> > SPI_BCM63XX_HSSPI depending on ARCH_BCMBCA.

> Applied to https://github.com/Broadcom/stblinux/commits/drivers/next, thanks!

I was rather hoping for an answer on what the situation with
dependencies was here...
Florian Fainelli July 11, 2022, 4:04 p.m. UTC | #3
On 7/11/22 03:45, Mark Brown wrote:
> On Sun, Jul 10, 2022 at 07:11:31PM -0700, Florian Fainelli wrote:
>> On Wed,  6 Jul 2022 23:57:58 -0700, William Zhang <william.zhang@broadcom.com> wrote:
>>> Prepare for the BCM63138 ARCH_BCM_63XX migration to ARCH_BCMBCA. Make
>>> SPI_BCM63XX_HSSPI depending on ARCH_BCMBCA.
> 
>> Applied to https://github.com/Broadcom/stblinux/commits/drivers/next, thanks!
> 
> I was rather hoping for an answer on what the situation with
> dependencies was here...

Each patch is independent from one another and there are not 
dependencies on the Broadcom arm-soc tree(s) other than for 
CONFIG_ARCH_BCMBCA which was introduced with v5.19 with 
b32c613b3fda3e1c26119609f1ad6b19178f82f5. That said, I prefer to take 
all patches via the Broadcom arm-soc tree(s) to ensure a timely 
inclusion for our upcoming v5.20 pull request, and ensure that all 
drivers are converted in one release cycle.

If you want to give me your Acked-by or that I drop this and take it via 
the spi tree, please let me know.

Thanks!
Mark Brown July 11, 2022, 4:09 p.m. UTC | #4
On Mon, Jul 11, 2022 at 09:04:39AM -0700, Florian Fainelli wrote:

> Each patch is independent from one another and there are not dependencies on
> the Broadcom arm-soc tree(s) other than for CONFIG_ARCH_BCMBCA which was
> introduced with v5.19 with b32c613b3fda3e1c26119609f1ad6b19178f82f5. That
> said, I prefer to take all patches via the Broadcom arm-soc tree(s) to
> ensure a timely inclusion for our upcoming v5.20 pull request, and ensure
> that all drivers are converted in one release cycle.

> If you want to give me your Acked-by or that I drop this and take it via the
> spi tree, please let me know.

Acked-by: Mark Brown <broonie@kernel.org>
Florian Fainelli July 13, 2022, 4:11 p.m. UTC | #5
On 7/11/22 09:09, Mark Brown wrote:
> On Mon, Jul 11, 2022 at 09:04:39AM -0700, Florian Fainelli wrote:
> 
>> Each patch is independent from one another and there are not dependencies on
>> the Broadcom arm-soc tree(s) other than for CONFIG_ARCH_BCMBCA which was
>> introduced with v5.19 with b32c613b3fda3e1c26119609f1ad6b19178f82f5. That
>> said, I prefer to take all patches via the Broadcom arm-soc tree(s) to
>> ensure a timely inclusion for our upcoming v5.20 pull request, and ensure
>> that all drivers are converted in one release cycle.
> 
>> If you want to give me your Acked-by or that I drop this and take it via the
>> spi tree, please let me know.
> 
> Acked-by: Mark Brown <broonie@kernel.org>

Thanks, FWIW, I had amended that patch with your ACked-by before sending 
it to the arm-soc maintainers.
diff mbox series

Patch

diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig
index 2d034459e79f..8e550269d488 100644
--- a/drivers/spi/Kconfig
+++ b/drivers/spi/Kconfig
@@ -183,7 +183,7 @@  config SPI_BCM63XX
 
 config SPI_BCM63XX_HSSPI
 	tristate "Broadcom BCM63XX HS SPI controller driver"
-	depends on BCM63XX || BMIPS_GENERIC || ARCH_BCM_63XX || COMPILE_TEST
+	depends on BCM63XX || BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST
 	help
 	  This enables support for the High Speed SPI controller present on
 	  newer Broadcom BCM63XX SoCs.