From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Aug 2022 22:20:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt... 
X-Git-Tag: v6.6.17~6902
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=25e6bed5a64836621e41bc9f9d97eb79f1bdfa1e;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'for-linus' of git://git./linux/kernel/git/egtvedt/linux-avr32

Pull AVR32 updates from Hans-Christian Noren Egtvedt:
 "Mostly changes to documentation and comments"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  video:backlight: remove reference to AVR32 architecture in ltv350qv
  video: remove support for non-existing atmel,at32ap-lcdc in atmel_lcdfb
  usb:udc: remove reference to AVR32 architecture in Atmel USBA Kconfig
  sound:spi: remove reference to AVR32 in Atmel AT73C213 DAC driver
  net: remove cdns,at32ap7000-macb device tree entry
  misc: update maintainer email address and description for atmel-ssc
  mfd: remove reference to AVR32 architecture in atmel-smc.c
  dma:dw: remove reference to AVR32 architecture in core.c
---

25e6bed5a64836621e41bc9f9d97eb79f1bdfa1e
diff --cc drivers/net/ethernet/cadence/macb_main.c
index 494fe96,9dff6db..66c7d08
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@@ -4773,18 -4769,7 +4773,17 @@@ static const struct macb_config sama7g5
  	.usrio = &sama7g5_usrio,
  };
  
 +static const struct macb_config versal_config = {
 +	.caps = MACB_CAPS_GIGABIT_MODE_AVAILABLE | MACB_CAPS_JUMBO |
 +		MACB_CAPS_GEM_HAS_PTP | MACB_CAPS_BD_RD_PREFETCH | MACB_CAPS_NEED_TSUCLK,
 +	.dma_burst_length = 16,
 +	.clk_init = macb_clk_init,
 +	.init = init_reset_optional,
 +	.jumbo_max_len = 10240,
 +	.usrio = &macb_default_usrio,
 +};
 +
  static const struct of_device_id macb_dt_ids[] = {
- 	{ .compatible = "cdns,at32ap7000-macb" },
  	{ .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
  	{ .compatible = "cdns,macb" },
  	{ .compatible = "cdns,np4-macb", .data = &np4_config },