Skip to content

Commit 25e6bed

Browse files
committed
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
2 parents 7447691 + 2fb0ec4 commit 25e6bed

File tree

9 files changed

+9
-16
lines changed

9 files changed

+9
-16
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Required properties:
99
"atmel,at91sam9g45-lcdc" ,
1010
"atmel,at91sam9g45es-lcdc" ,
1111
"atmel,at91sam9rl-lcdc" ,
12-
"atmel,at32ap-lcdc"
1312
- reg : Should contain 1 register ranges(address and length).
1413
Can contain an additional register range(address and length)
1514
for fixed framebuffer memory. Useful for dedicated memories.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ properties:
5151
- atmel,sama5d2-gem # GEM IP (10/100) on Atmel sama5d2 SoCs
5252
- atmel,sama5d3-gem # Gigabit IP on Atmel sama5d3 SoCs
5353
- atmel,sama5d4-gem # GEM IP (10/100) on Atmel sama5d4 SoCs
54-
- cdns,at32ap7000-macb # Other 10/100 usage or use the generic form
5554
- cdns,np4-macb # NP4 SoC devices
5655
- microchip,sama7g5-emac # Microchip SAMA7G5 ethernet interface
5756
- microchip,sama7g5-gem # Microchip SAMA7G5 gigabit ethernet interface
@@ -164,7 +163,7 @@ unevaluatedProperties: false
164163
examples:
165164
- |
166165
macb0: ethernet@fffc4000 {
167-
compatible = "cdns,at32ap7000-macb";
166+
compatible = "cdns,macb";
168167
reg = <0xfffc4000 0x4000>;
169168
interrupts = <21>;
170169
phy-mode = "rmii";

drivers/dma/dw/core.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@
2929
* (DW_ahb_dmac) which is used with various AMBA 2.0 systems (not all
3030
* of which use ARM any more). See the "Databook" from Synopsys for
3131
* information beyond what licensees probably provide.
32-
*
33-
* The driver has been tested with the Atmel AT32AP7000, which does not
34-
* support descriptor writeback.
3532
*/
3633

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

drivers/mfd/atmel-smc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ EXPORT_SYMBOL_GPL(atmel_smc_cs_conf_set_cycle);
240240
* @conf: the SMC CS conf to apply
241241
*
242242
* Applies an SMC CS configuration.
243-
* Only valid on at91sam9/avr32 SoCs.
243+
* Only valid on at91sam9 SoCs.
244244
*/
245245
void atmel_smc_cs_conf_apply(struct regmap *regmap, int cs,
246246
const struct atmel_smc_cs_conf *conf)
@@ -281,7 +281,7 @@ EXPORT_SYMBOL_GPL(atmel_hsmc_cs_conf_apply);
281281
* @conf: the SMC CS conf object to store the current conf
282282
*
283283
* Retrieve the SMC CS configuration.
284-
* Only valid on at91sam9/avr32 SoCs.
284+
* Only valid on at91sam9 SoCs.
285285
*/
286286
void atmel_smc_cs_conf_get(struct regmap *regmap, int cs,
287287
struct atmel_smc_cs_conf *conf)

drivers/misc/atmel-ssc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ static struct platform_driver ssc_driver = {
276276
};
277277
module_platform_driver(ssc_driver);
278278

279-
MODULE_AUTHOR("Hans-Christian Egtvedt <[email protected]>");
280-
MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91");
279+
MODULE_AUTHOR("Hans-Christian Noren Egtvedt <[email protected]>");
280+
MODULE_DESCRIPTION("SSC driver for Atmel AT91");
281281
MODULE_LICENSE("GPL");
282282
MODULE_ALIAS("platform:ssc");

drivers/net/ethernet/cadence/macb_main.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4784,7 +4784,6 @@ static const struct macb_config versal_config = {
47844784
};
47854785

47864786
static const struct of_device_id macb_dt_ids[] = {
4787-
{ .compatible = "cdns,at32ap7000-macb" },
47884787
{ .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config },
47894788
{ .compatible = "cdns,macb" },
47904789
{ .compatible = "cdns,np4-macb", .data = &np4_config },

drivers/usb/gadget/udc/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ config USB_ATMEL_USBA
5959
tristate "Atmel USBA"
6060
depends on ARCH_AT91
6161
help
62-
USBA is the integrated high-speed USB Device controller on
63-
the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
62+
USBA is the integrated high-speed USB Device controller on some
63+
AT91SAM9 and AT91CAP9 processors from Atmel.
6464

6565
The fifo_mode parameter is used to select endpoint allocation mode.
6666
fifo_mode = 0 is used to let the driver autoconfigure the endpoints.

drivers/video/backlight/ltv350qv.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,7 @@ struct ltv350qv {
2727
/*
2828
* The power-on and power-off sequences are taken from the
2929
* LTV350QV-F04 data sheet from Samsung. The register definitions are
30-
* taken from the S6F2002 command list also from Samsung. Both
31-
* documents are distributed with the AVR32 Linux BSP CD from Atmel.
30+
* taken from the S6F2002 command list also from Samsung.
3231
*
3332
* There's still some voodoo going on here, but it's a lot better than
3433
* in the first incarnation of the driver where all we had was the raw

sound/spi/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ config SND_AT73C213
1919
DAC can be found on Atmel development boards.
2020

2121
This driver requires the Atmel SSC driver for sound sink, a
22-
peripheral found on most AT91 and AVR32 microprocessors.
22+
peripheral found on most AT91 microprocessors.
2323

2424
To compile this driver as a module, choose M here: the module will be
2525
called snd-at73c213.

0 commit comments

Comments
 (0)