From: Ryan Wanner <Ryan.Wanner@microchip.com>
Remove USARIO_CLKEN flag since this is now a device tree argument and
not fixed to the SoC.
This will instead be selected by the "cdns,refclk-ext"
device tree property.
Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com>
---
drivers/net/ethernet/cadence/macb_main.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 51667263c01d..cd54e4065690 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -5113,8 +5113,7 @@ static const struct macb_config sama7g5_gem_config = {
static const struct macb_config sama7g5_emac_config = {
.caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII |
- MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_MIIONRGMII |
- MACB_CAPS_GEM_HAS_PTP,
+ MACB_CAPS_MIIONRGMII | MACB_CAPS_GEM_HAS_PTP,
.dma_burst_length = 16,
.clk_init = macb_clk_init,
.init = macb_init,
--
2.43.0
Hi, Ryan, On 14.07.2025 19:37, Ryan.Wanner@microchip.com wrote: > From: Ryan Wanner <Ryan.Wanner@microchip.com> > > Remove USARIO_CLKEN flag since this is now a device tree argument and s/USARIO_CLKEN/USRIO_HAS_CLKEN here and in title as well. > not fixed to the SoC. > > This will instead be selected by the "cdns,refclk-ext" > device tree property. > > Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com> > --- > drivers/net/ethernet/cadence/macb_main.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index 51667263c01d..cd54e4065690 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -5113,8 +5113,7 @@ static const struct macb_config sama7g5_gem_config = { > > static const struct macb_config sama7g5_emac_config = { > .caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | > - MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_MIIONRGMII | Will old DTBs still work with new kernels with this change? Thank you, Claudiu > - MACB_CAPS_GEM_HAS_PTP, > + MACB_CAPS_MIIONRGMII | MACB_CAPS_GEM_HAS_PTP, > .dma_burst_length = 16, > .clk_init = macb_clk_init, > .init = macb_init,
On 7/18/25 04:00, Claudiu Beznea wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe > > Hi, Ryan, > > On 14.07.2025 19:37, Ryan.Wanner@microchip.com wrote: >> From: Ryan Wanner <Ryan.Wanner@microchip.com> >> >> Remove USARIO_CLKEN flag since this is now a device tree argument and > > s/USARIO_CLKEN/USRIO_HAS_CLKEN here and in title as well. > >> not fixed to the SoC. >> >> This will instead be selected by the "cdns,refclk-ext" >> device tree property. >> >> Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com> >> --- >> drivers/net/ethernet/cadence/macb_main.c | 3 +-- >> 1 file changed, 1 insertion(+), 2 deletions(-) >> >> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c >> index 51667263c01d..cd54e4065690 100644 >> --- a/drivers/net/ethernet/cadence/macb_main.c >> +++ b/drivers/net/ethernet/cadence/macb_main.c >> @@ -5113,8 +5113,7 @@ static const struct macb_config sama7g5_gem_config = { >> >> static const struct macb_config sama7g5_emac_config = { >> .caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | >> - MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_MIIONRGMII | > > Will old DTBs still work with new kernels with this change? That was my assumption, but it seems it would be safer to keep this property for this IP and implement this dt flag property on IPs that do not already have MACB_CAPS_USRIO_HAS_CLKEN property. Ryan > > Thank you, > Claudiu > >> - MACB_CAPS_GEM_HAS_PTP, >> + MACB_CAPS_MIIONRGMII | MACB_CAPS_GEM_HAS_PTP, >> .dma_burst_length = 16, >> .clk_init = macb_clk_init, >> .init = macb_init, >
Hi, Ryan, On 7/21/25 18:39, Ryan.Wanner@microchip.com wrote: > On 7/18/25 04:00, Claudiu Beznea wrote: >> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe >> >> Hi, Ryan, >> >> On 14.07.2025 19:37, Ryan.Wanner@microchip.com wrote: >>> From: Ryan Wanner <Ryan.Wanner@microchip.com> >>> >>> Remove USARIO_CLKEN flag since this is now a device tree argument and >> >> s/USARIO_CLKEN/USRIO_HAS_CLKEN here and in title as well. >> >>> not fixed to the SoC. >>> >>> This will instead be selected by the "cdns,refclk-ext" >>> device tree property. >>> >>> Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com> >>> --- >>> drivers/net/ethernet/cadence/macb_main.c | 3 +-- >>> 1 file changed, 1 insertion(+), 2 deletions(-) >>> >>> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c >>> index 51667263c01d..cd54e4065690 100644 >>> --- a/drivers/net/ethernet/cadence/macb_main.c >>> +++ b/drivers/net/ethernet/cadence/macb_main.c >>> @@ -5113,8 +5113,7 @@ static const struct macb_config sama7g5_gem_config = { >>> >>> static const struct macb_config sama7g5_emac_config = { >>> .caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | >>> - MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_MIIONRGMII | >> >> Will old DTBs still work with new kernels with this change? > > That was my assumption, but it seems it would be safer to keep this > property for this IP and implement this dt flag property on IPs that do > not already have MACB_CAPS_USRIO_HAS_CLKEN property. So, this patch should be reverted, right? Thank you, Claudiu > > Ryan >> >> Thank you, >> Claudiu >> >>> - MACB_CAPS_GEM_HAS_PTP, >>> + MACB_CAPS_MIIONRGMII | MACB_CAPS_GEM_HAS_PTP, >>> .dma_burst_length = 16, >>> .clk_init = macb_clk_init, >>> .init = macb_init, >> >
On 7/26/25 05:56, claudiu beznea wrote: > EXTERNAL EMAIL: Do not click links or open attachments unless you know > the content is safe > > Hi, Ryan, > > On 7/21/25 18:39, Ryan.Wanner@microchip.com wrote: >> On 7/18/25 04:00, Claudiu Beznea wrote: >>> EXTERNAL EMAIL: Do not click links or open attachments unless you >>> know the content is safe >>> >>> Hi, Ryan, >>> >>> On 14.07.2025 19:37, Ryan.Wanner@microchip.com wrote: >>>> From: Ryan Wanner <Ryan.Wanner@microchip.com> >>>> >>>> Remove USARIO_CLKEN flag since this is now a device tree argument and >>> >>> s/USARIO_CLKEN/USRIO_HAS_CLKEN here and in title as well. >>> >>>> not fixed to the SoC. >>>> >>>> This will instead be selected by the "cdns,refclk-ext" >>>> device tree property. >>>> >>>> Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com> >>>> --- >>>> drivers/net/ethernet/cadence/macb_main.c | 3 +-- >>>> 1 file changed, 1 insertion(+), 2 deletions(-) >>>> >>>> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ >>>> ethernet/cadence/macb_main.c >>>> index 51667263c01d..cd54e4065690 100644 >>>> --- a/drivers/net/ethernet/cadence/macb_main.c >>>> +++ b/drivers/net/ethernet/cadence/macb_main.c >>>> @@ -5113,8 +5113,7 @@ static const struct macb_config >>>> sama7g5_gem_config = { >>>> >>>> static const struct macb_config sama7g5_emac_config = { >>>> .caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | >>>> - MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_MIIONRGMII | >>> >>> Will old DTBs still work with new kernels with this change? >> >> That was my assumption, but it seems it would be safer to keep this >> property for this IP and implement this dt flag property on IPs that do >> not already have MACB_CAPS_USRIO_HAS_CLKEN property. > > So, this patch should be reverted, right? Yes you are right, more testing I see that this could break older DTs. I am new to reverting patches, do I send a patch to revert this and would it be an issue now? Ryan > > Thank you, > Claudiu > >> >> Ryan >>> >>> Thank you, >>> Claudiu >>> >>>> - MACB_CAPS_GEM_HAS_PTP, >>>> + MACB_CAPS_MIIONRGMII | MACB_CAPS_GEM_HAS_PTP, >>>> .dma_burst_length = 16, >>>> .clk_init = macb_clk_init, >>>> .init = macb_init, >>> >> >
On 29.07.2025 18:51, Ryan Wanner wrote: > On 7/26/25 05:56, claudiu beznea wrote: >> EXTERNAL EMAIL: Do not click links or open attachments unless you know >> the content is safe >> >> Hi, Ryan, >> >> On 7/21/25 18:39, Ryan.Wanner@microchip.com wrote: >>> On 7/18/25 04:00, Claudiu Beznea wrote: >>>> EXTERNAL EMAIL: Do not click links or open attachments unless you >>>> know the content is safe >>>> >>>> Hi, Ryan, >>>> >>>> On 14.07.2025 19:37, Ryan.Wanner@microchip.com wrote: >>>>> From: Ryan Wanner <Ryan.Wanner@microchip.com> >>>>> >>>>> Remove USARIO_CLKEN flag since this is now a device tree argument and >>>> >>>> s/USARIO_CLKEN/USRIO_HAS_CLKEN here and in title as well. >>>> >>>>> not fixed to the SoC. >>>>> >>>>> This will instead be selected by the "cdns,refclk-ext" >>>>> device tree property. >>>>> >>>>> Signed-off-by: Ryan Wanner <Ryan.Wanner@microchip.com> >>>>> --- >>>>> drivers/net/ethernet/cadence/macb_main.c | 3 +-- >>>>> 1 file changed, 1 insertion(+), 2 deletions(-) >>>>> >>>>> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ >>>>> ethernet/cadence/macb_main.c >>>>> index 51667263c01d..cd54e4065690 100644 >>>>> --- a/drivers/net/ethernet/cadence/macb_main.c >>>>> +++ b/drivers/net/ethernet/cadence/macb_main.c >>>>> @@ -5113,8 +5113,7 @@ static const struct macb_config >>>>> sama7g5_gem_config = { >>>>> >>>>> static const struct macb_config sama7g5_emac_config = { >>>>> .caps = MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII | >>>>> - MACB_CAPS_USRIO_HAS_CLKEN | MACB_CAPS_MIIONRGMII | >>>> >>>> Will old DTBs still work with new kernels with this change? >>> >>> That was my assumption, but it seems it would be safer to keep this >>> property for this IP and implement this dt flag property on IPs that do >>> not already have MACB_CAPS_USRIO_HAS_CLKEN property. >> >> So, this patch should be reverted, right? > > Yes you are right, more testing I see that this could break older DTs. I > am new to reverting patches, do I send a patch to revert this and would > it be an issue now? Not sure about the approach now! Looks like this has already been merged https://lore.kernel.org/all/20250727013451.2436467-1-kuba@kernel.org/ Thank you, Claudiu > > Ryan >> >> Thank you, >> Claudiu >> >>> >>> Ryan >>>> >>>> Thank you, >>>> Claudiu >>>> >>>>> - MACB_CAPS_GEM_HAS_PTP, >>>>> + MACB_CAPS_MIIONRGMII | MACB_CAPS_GEM_HAS_PTP, >>>>> .dma_burst_length = 16, >>>>> .clk_init = macb_clk_init, >>>>> .init = macb_init, >>>> >>> >> >
© 2016 - 2025 Red Hat, Inc.