Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bd1c881 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (28 commits)
  ARM: sa1100: fix build error
  ARM: OMAP1: recalculate loops per jiffy after dpll1 reprogram
  ARM: davinci: dm365 evm: align nand partition table to u-boot
  ARM: davinci: da850 evm: change audio edma event queue to EVENTQ_0
  ARM: davinci: dm646x evm: wrong register used in setup_vpif_input_channel_mode
  ARM: davinci: dm646x does not have a DSP domain
  ARM: davinci: psc: fix incorrect offsets
  ARM: davinci: psc: fix incorrect mask
  ARM: mx28: LRADC macro rename
  arm: mx23: recognise stmp378x as mx23
  ARM: mxs: fix machines' initializers order
  ARM: mxs/tx28: add __initconst for fec pdata
  ARM: S3C64XX: Staticise s3c6400_sysclass
  ARM: S3C64XX: Add linux/export.h to dev-spi.c
  ARM: S3C64XX: Remove extern from definition of framebuffer setup call
  MAINTAINERS: Extend Samsung patterns to cover SPI and ASoC drivers
  MAINTAINERS: Add linux-samsung-soc mailing list for Samsung
  MAINTAINERS: Consolidate Samsung MAINTAINERS
  ARM: CSR: PM: fix build error due to undeclared 'THIS_MODULE'
  ARM: CSR: fix build error due to new mdesc->dma_zone_size
  ...
parents 1418a3e5 073c4603

MAINTAINERS

+5 −22
Original line number Diff line number Diff line
@@ -1054,35 +1054,18 @@ ARM/SAMSUNG ARM ARCHITECTURES 
M:	Ben Dooks <ben-linux@fluff.org>

M:	Kukjin Kim <kgene.kim@samsung.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/plat-samsung/

F:	arch/arm/plat-s3c24xx/

F:	arch/arm/plat-s5p/

F:	arch/arm/mach-s3c24*/

F:	arch/arm/mach-s3c64xx/

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*



ARM/S3C2410 ARM ARCHITECTURE

M:	Ben Dooks <ben-linux@fluff.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c2410/



ARM/S3C244x ARM ARCHITECTURE

M:	Ben Dooks <ben-linux@fluff.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c2440/

F:	arch/arm/mach-s3c2443/



ARM/S3C64xx ARM ARCHITECTURE

M:	Ben Dooks <ben-linux@fluff.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.fluff.org/ben/linux/

S:	Maintained

F:	arch/arm/mach-s3c64xx/

F:	drivers/spi/spi-s3c*

F:	sound/soc/samsung/*



ARM/S5P EXYNOS ARM ARCHITECTURES

M:	Kukjin Kim <kgene.kim@samsung.com>

arch/arm/configs/omap1_defconfig

+0 −5
Original line number Diff line number Diff line
@@ -48,12 +48,7 @@ CONFIG_MACH_SX1=y 
CONFIG_MACH_NOKIA770=y

CONFIG_MACH_AMS_DELTA=y

CONFIG_MACH_OMAP_GENERIC=y

CONFIG_OMAP_ARM_216MHZ=y

CONFIG_OMAP_ARM_195MHZ=y

CONFIG_OMAP_ARM_192MHZ=y

CONFIG_OMAP_ARM_182MHZ=y

CONFIG_OMAP_ARM_168MHZ=y

# CONFIG_OMAP_ARM_60MHZ is not set

# CONFIG_ARM_THUMB is not set

CONFIG_PCCARD=y

CONFIG_OMAP_CF=y

arch/arm/mach-at91/at91rm9200_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_GADGET_AT91

#ifdef CONFIG_USB_AT91

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {

arch/arm/mach-at91/at91sam9260.c

+3 −3
Original line number Diff line number Diff line
@@ -195,9 +195,9 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tc0_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.0", &tc1_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.0", &tc2_clk),

	CLKDEV_CON_DEV_ID("t3_clk", "atmel_tcb.1", &tc3_clk),

	CLKDEV_CON_DEV_ID("t4_clk", "atmel_tcb.1", &tc4_clk),

	CLKDEV_CON_DEV_ID("t5_clk", "atmel_tcb.1", &tc5_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.1", &tc3_clk),

	CLKDEV_CON_DEV_ID("t1_clk", "atmel_tcb.1", &tc4_clk),

	CLKDEV_CON_DEV_ID("t2_clk", "atmel_tcb.1", &tc5_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc_clk),

	/* more usart lookup table for DT entries */

	CLKDEV_CON_DEV_ID("usart", "fffff200.serial", &mck),

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ void __init at91_add_device_usbh(struct at91_usbh_data *data) {} 
 *  USB Device (Gadget)

 * -------------------------------------------------------------------- */



#ifdef CONFIG_USB_GADGET_AT91

#ifdef CONFIG_USB_AT91

static struct at91_udc_data udc_data;



static struct resource udc_resources[] = {