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

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

Merge tag 'samsung-fixes' of... 

Merge tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/fixes-non-critical

Merge "Samsung non-critical fixes for v3.15" from Kukjin Kim:

- fix typo CONFIG_CPU_S3C2443 in Kconfig
- fix G3D regulator on because of entering low power mode
  for exynos5250-arndale
- fix CONFIG_USB_EHCI_EXYNOS for exynos_defconfig
- fix initcall of mach-crag6410-module.c

* tag 'samsung-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: S3C64XX: mach-crag6410-module.c is not modular
  ARM: exynos_defconfig: Update EHCI config entry
  ARM: dts: Keep G3D regulator always on for exynos5250-arndale
  ARM: S3C24XX: Fix typo CONFIG_CPUS_3C2443

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 35240808 baf64abc

arch/arm/boot/dts/exynos5250-arndale.dts

+1 −0
Original line number Diff line number Diff line
@@ -287,6 +287,7 @@ 
					regulator-name = "vdd_g3d";

					regulator-min-microvolt = <1000000>;

					regulator-max-microvolt = <1000000>;

					regulator-always-on;

					regulator-boot-on;

					op_mode = <1>;

				};

arch/arm/configs/exynos_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ CONFIG_FONT_7x14=y 
CONFIG_LOGO=y

CONFIG_USB=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_EHCI_S5P=y

CONFIG_USB_EHCI_EXYNOS=y

CONFIG_USB_STORAGE=y

CONFIG_USB_DWC3=y

CONFIG_USB_PHY=y

arch/arm/mach-s3c24xx/common.c

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ struct platform_device s3c2440_device_dma = { 
};

#endif



#if defined(CONFIG_CPUS_3C2443) || defined(CONFIG_CPU_S3C2416)

#if defined(CONFIG_CPU_S3C2443) || defined(CONFIG_CPU_S3C2416)

static struct resource s3c2443_dma_resource[] = {

	[0] = DEFINE_RES_MEM(S3C24XX_PA_DMA, S3C24XX_SZ_DMA),

	[1] = DEFINE_RES_IRQ(IRQ_S3C2443_DMA0),

arch/arm/mach-s3c64xx/mach-crag6410-module.c

+1 −1
Original line number Diff line number Diff line
@@ -401,4 +401,4 @@ static int __init wlf_gf_module_register(void) 
{

	return i2c_add_driver(&wlf_gf_module_driver);

}

module_init(wlf_gf_module_register);
 
device_initcall(wlf_gf_module_register);