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
This commit is contained in:
Коммит
25e6bed5a6
|
@ -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.
|
||||
|
|
|
@ -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";
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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");
|
||||
|
|
|
@ -4784,7 +4784,6 @@ static const struct macb_config versal_config = {
|
|||
};
|
||||
|
||||
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 },
|
||||
|
|
|
@ -59,8 +59,8 @@ config USB_ATMEL_USBA
|
|||
tristate "Atmel USBA"
|
||||
depends on ARCH_AT91
|
||||
help
|
||||
USBA is the integrated high-speed USB Device controller on
|
||||
the AT32AP700x, some AT91SAM9 and AT91CAP9 processors from Atmel.
|
||||
USBA is the integrated high-speed USB Device controller on some
|
||||
AT91SAM9 and AT91CAP9 processors from Atmel.
|
||||
|
||||
The fifo_mode parameter is used to select endpoint allocation mode.
|
||||
fifo_mode = 0 is used to let the driver autoconfigure the endpoints.
|
||||
|
|
|
@ -27,8 +27,7 @@ struct ltv350qv {
|
|||
/*
|
||||
* The power-on and power-off sequences are taken from the
|
||||
* LTV350QV-F04 data sheet from Samsung. The register definitions are
|
||||
* taken from the S6F2002 command list also from Samsung. Both
|
||||
* documents are distributed with the AVR32 Linux BSP CD from Atmel.
|
||||
* taken from the S6F2002 command list also from Samsung.
|
||||
*
|
||||
* There's still some voodoo going on here, but it's a lot better than
|
||||
* in the first incarnation of the driver where all we had was the raw
|
||||
|
|
|
@ -19,7 +19,7 @@ config SND_AT73C213
|
|||
DAC can be found on Atmel development boards.
|
||||
|
||||
This driver requires the Atmel SSC driver for sound sink, a
|
||||
peripheral found on most AT91 and AVR32 microprocessors.
|
||||
peripheral found on most AT91 microprocessors.
|
||||
|
||||
To compile this driver as a module, choose M here: the module will be
|
||||
called snd-at73c213.
|
||||
|
|
Загрузка…
Ссылка в новой задаче