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

Commit e3a36c41 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'samsung-fixes-2' of... 

Merge branch 'samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
parents 24e71ef6 62f05787

MAINTAINERS

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

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

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

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

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

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/

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

S:	Maintained

S:	Maintained

F:	arch/arm/plat-samsung/

F:	arch/arm/plat-samsung/

F:	arch/arm/plat-s3c24xx/

F:	arch/arm/plat-s3c24xx/

F:	arch/arm/plat-s5p/

F:	arch/arm/plat-s5p/

F:	arch/arm/mach-s3c24*/

F:	arch/arm/mach-s3c64xx/

F:	drivers/*/*s3c2410*

F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*

F:	drivers/*/*/*s3c2410*



F:	drivers/spi/spi-s3c*

ARM/S3C2410 ARM ARCHITECTURE

F:	sound/soc/samsung/*

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/





ARM/S5P EXYNOS ARM ARCHITECTURES

ARM/S5P EXYNOS ARM ARCHITECTURES

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

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

arch/arm/mach-s3c64xx/dev-spi.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 




#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/string.h>

#include <linux/string.h>

#include <linux/export.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/gpio.h>

#include <linux/gpio.h>

arch/arm/mach-s3c64xx/s3c6400.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ void __init s3c6400_init_irq(void) 
	s3c64xx_init_irq(~0 & ~(0xf << 5), ~0);

	s3c64xx_init_irq(~0 & ~(0xf << 5), ~0);

}

}





struct sysdev_class s3c6400_sysclass = {

static struct sysdev_class s3c6400_sysclass = {

	.name	= "s3c6400-core",

	.name	= "s3c6400-core",

};

};

arch/arm/mach-s3c64xx/setup-fb-24bpp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <plat/fb.h>

#include <plat/fb.h>

#include <plat/gpio-cfg.h>

#include <plat/gpio-cfg.h>





extern void s3c64xx_fb_gpio_setup_24bpp(void)

void s3c64xx_fb_gpio_setup_24bpp(void)

{

{

	s3c_gpio_cfgrange_nopull(S3C64XX_GPI(0), 16, S3C_GPIO_SFN(2));

	s3c_gpio_cfgrange_nopull(S3C64XX_GPI(0), 16, S3C_GPIO_SFN(2));

	s3c_gpio_cfgrange_nopull(S3C64XX_GPJ(0), 12, S3C_GPIO_SFN(2));

	s3c_gpio_cfgrange_nopull(S3C64XX_GPJ(0), 12, S3C_GPIO_SFN(2));