Commit 25e6bed5 authored Aug 04, 2022 by Linus Torvalds

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/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

parents 7447691e 2fb0ec4a

Documentation/devicetree/bindings/display/atmel,lcdc.txt

+0 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,6 @@ Required properties:
		"atmel,at91sam9g45-lcdc" ,
		"atmel,at91sam9g45es-lcdc" ,
		"atmel,at91sam9rl-lcdc" ,
		"atmel,at32ap-lcdc"
		- reg : Should contain 1 register ranges(address and length).
		Can contain an additional register range(address and length)
		for fixed framebuffer memory. Useful for dedicated memories.

Documentation/devicetree/bindings/net/cdns,macb.yaml

+1 −2

Original line number	Diff line number	Diff line
		@@ -51,7 +51,6 @@ properties:
		- atmel,sama5d2-gem # GEM IP (10/100) on Atmel sama5d2 SoCs
		- atmel,sama5d3-gem # Gigabit IP on Atmel sama5d3 SoCs
		- atmel,sama5d4-gem # GEM IP (10/100) on Atmel sama5d4 SoCs
		- cdns,at32ap7000-macb # Other 10/100 usage or use the generic form
		- cdns,np4-macb # NP4 SoC devices
		- microchip,sama7g5-emac # Microchip SAMA7G5 ethernet interface
		- microchip,sama7g5-gem # Microchip SAMA7G5 gigabit ethernet interface
		@@ -164,7 +163,7 @@ unevaluatedProperties: false
		examples:
		- \|
		macb0: ethernet@fffc4000 {
		compatible = "cdns,at32ap7000-macb";
		compatible = "cdns,macb";
		reg = <0xfffc4000 0x4000>;
		interrupts = <21>;
		phy-mode = "rmii";

drivers/dma/dw/core.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -29,9 +29,6 @@
		* (DW_ahb_dmac) which is used with various AMBA 2.0 systems (not all
		* of which use ARM any more). See the "Databook" from Synopsys for
		* information beyond what licensees probably provide.
		*
		* The driver has been tested with the Atmel AT32AP7000, which does not
		* support descriptor writeback.
		*/

		/* The set of bus widths supported by the DMA controller */

drivers/mfd/atmel-smc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -240,7 +240,7 @@ EXPORT_SYMBOL_GPL(atmel_smc_cs_conf_set_cycle);
		* @conf: the SMC CS conf to apply
		*
		* Applies an SMC CS configuration.
		* Only valid on at91sam9/avr32 SoCs.
		* Only valid on at91sam9 SoCs.
		*/
		void atmel_smc_cs_conf_apply(struct regmap *regmap, int cs,
		const struct atmel_smc_cs_conf *conf)
		@@ -281,7 +281,7 @@ EXPORT_SYMBOL_GPL(atmel_hsmc_cs_conf_apply);
		* @conf: the SMC CS conf object to store the current conf
		*
		* Retrieve the SMC CS configuration.
		* Only valid on at91sam9/avr32 SoCs.
		* Only valid on at91sam9 SoCs.
		*/
		void atmel_smc_cs_conf_get(struct regmap *regmap, int cs,
		struct atmel_smc_cs_conf *conf)

drivers/misc/atmel-ssc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -276,7 +276,7 @@ static struct platform_driver ssc_driver = {
		};
		module_platform_driver(ssc_driver);

		MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>");
		MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");
		MODULE_AUTHOR("Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>");
		MODULE_DESCRIPTION("SSC driver for Atmel AT91");
		MODULE_LICENSE("GPL");
		MODULE_ALIAS("platform:ssc");