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

-1

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

··· 9 9 "atmel,at91sam9g45-lcdc" , 10 10 "atmel,at91sam9g45es-lcdc" , 11 11 "atmel,at91sam9rl-lcdc" , 12 - "atmel,at32ap-lcdc" 13 12 - reg : Should contain 1 register ranges(address and length). 14 13 Can contain an additional register range(address and length) 15 14 for fixed framebuffer memory. Useful for dedicated memories.

+1 -2

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

··· 51 51 - atmel,sama5d2-gem # GEM IP (10/100) on Atmel sama5d2 SoCs 52 52 - atmel,sama5d3-gem # Gigabit IP on Atmel sama5d3 SoCs 53 53 - atmel,sama5d4-gem # GEM IP (10/100) on Atmel sama5d4 SoCs 54 - - cdns,at32ap7000-macb # Other 10/100 usage or use the generic form 55 54 - cdns,np4-macb # NP4 SoC devices 56 55 - microchip,sama7g5-emac # Microchip SAMA7G5 ethernet interface 57 56 - microchip,sama7g5-gem # Microchip SAMA7G5 gigabit ethernet interface ··· 163 164 examples: 164 165 - | 165 166 macb0: ethernet@fffc4000 { 166 - compatible = "cdns,at32ap7000-macb"; 167 + compatible = "cdns,macb"; 167 168 reg = <0xfffc4000 0x4000>; 168 169 interrupts = <21>; 169 170 phy-mode = "rmii";

-3

drivers/dma/dw/core.c

··· 29 29 * (DW_ahb_dmac) which is used with various AMBA 2.0 systems (not all 30 30 * of which use ARM any more). See the "Databook" from Synopsys for 31 31 * information beyond what licensees probably provide. 32 - * 33 - * The driver has been tested with the Atmel AT32AP7000, which does not 34 - * support descriptor writeback. 35 32 */ 36 33 37 34 /* The set of bus widths supported by the DMA controller */

+2 -2

drivers/mfd/atmel-smc.c

··· 240 240 * @conf: the SMC CS conf to apply 241 241 * 242 242 * Applies an SMC CS configuration. 243 - * Only valid on at91sam9/avr32 SoCs. 243 + * Only valid on at91sam9 SoCs. 244 244 */ 245 245 void atmel_smc_cs_conf_apply(struct regmap *regmap, int cs, 246 246 const struct atmel_smc_cs_conf *conf) ··· 281 281 * @conf: the SMC CS conf object to store the current conf 282 282 * 283 283 * Retrieve the SMC CS configuration. 284 - * Only valid on at91sam9/avr32 SoCs. 284 + * Only valid on at91sam9 SoCs. 285 285 */ 286 286 void atmel_smc_cs_conf_get(struct regmap *regmap, int cs, 287 287 struct atmel_smc_cs_conf *conf)

+2 -2

drivers/misc/atmel-ssc.c

··· 276 276 }; 277 277 module_platform_driver(ssc_driver); 278 278 279 - MODULE_AUTHOR("Hans-Christian Egtvedt <hcegtvedt@atmel.com>"); 280 - MODULE_DESCRIPTION("SSC driver for Atmel AVR32 and AT91"); 279 + MODULE_AUTHOR("Hans-Christian Noren Egtvedt <egtvedt@samfundet.no>"); 280 + MODULE_DESCRIPTION("SSC driver for Atmel AT91"); 281 281 MODULE_LICENSE("GPL"); 282 282 MODULE_ALIAS("platform:ssc");

-1

drivers/net/ethernet/cadence/macb_main.c

··· 4784 4784 }; 4785 4785 4786 4786 static const struct of_device_id macb_dt_ids[] = { 4787 - { .compatible = "cdns,at32ap7000-macb" }, 4788 4787 { .compatible = "cdns,at91sam9260-macb", .data = &at91sam9260_config }, 4789 4788 { .compatible = "cdns,macb" }, 4790 4789 { .compatible = "cdns,np4-macb", .data = &np4_config },

+2 -2

drivers/usb/gadget/udc/Kconfig

··· 59 59 tristate "Atmel USBA" 60 60 depends on ARCH_AT91 61 61 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. 64 64 65 65 The fifo_mode parameter is used to select endpoint allocation mode. 66 66 fifo_mode = 0 is used to let the driver autoconfigure the endpoints.

+1 -2

drivers/video/backlight/ltv350qv.c

··· 27 27 /* 28 28 * The power-on and power-off sequences are taken from the 29 29 * 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. 32 31 * 33 32 * There's still some voodoo going on here, but it's a lot better than 34 33 * in the first incarnation of the driver where all we had was the raw

+1 -1

sound/spi/Kconfig

··· 19 19 DAC can be found on Atmel development boards. 20 20 21 21 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. 23 23 24 24 To compile this driver as a module, choose M here: the module will be 25 25 called snd-at73c213.

Configure Feed

Configure Feed