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

Commit bda7997e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/fixes-samsung' of... 

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

From Kukjin Kim:
Here is Samsung fixes for v3.9 and it is not a critical fixes.

* 'next/fixes-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: dts: Correct pin configuration of SD 4 for exynos4x12-pinctrl
  ARM: SAMSUNG: Silence empty switch warning in fimc-core.h
  ARM: SAMSUNG: Silence empty switch warning in sdhci.h
  ARM: S5PV210: Fix early uart output in fifo mode
  ARM: S3C24XX: Fix compile breakage for SMDK2410
  ARM: S3C24XX: add missing platform_device.h include for osiris
  ARM: S3C24XX: let S3C2412_PM select S3C2412_PM_SLEEP
  ARM: SAMSUNG: Gracefully exit on suspend failure
  ARM: SAMSUNG: using vsnprintf instead of vsprintf for the limit buffer length 256
  ARM: S3C24XX: Make 'clk_msysclk' static
parents 69eb383a ebf47628

arch/arm/boot/dts/exynos4x12-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ 


		sd4_bus8: sd4-bus-width8 {

			samsung,pins = "gpk1-3", "gpk1-4", "gpk1-5", "gpk1-6";

			samsung,pin-function = <3>;

			samsung,pin-function = <4>;

			samsung,pin-pud = <4>;

			samsung,pin-drv = <3>;

		};

arch/arm/mach-exynos/pm.c

+4 −2
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static int exynos_cpu_suspend(unsigned long arg) 
	/* issue the standby signal into the pm unit. */

	cpu_do_idle();



	/* we should never get past here */

	panic("sleep resumed to originator?");

	pr_info("Failed to suspend the system\n");

	return 1; /* Aborting suspend */

}



static void exynos_pm_prepare(void)
@@ -282,6 +282,8 @@ static void exynos_pm_resume(void) 
	if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) {

		tmp |= S5P_CENTRAL_LOWPWR_CFG;

		__raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);

		/* clear the wakeup state register */

		__raw_writel(0x0, S5P_WAKEUP_STAT);

		/* No need to perform below restore code */

		goto early_wakeup;

	}

arch/arm/mach-s3c24xx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -226,6 +226,7 @@ config MACH_QT2410 
config ARCH_SMDK2410

	bool "SMDK2410/A9M2410"

	select S3C24XX_SMDK

	select S3C_DEV_USB_HOST

	help

	  Say Y here if you are using the SMDK2410 or the derived module A9M2410

	  <http://www.fsforth.de>
@@ -273,6 +274,7 @@ config S3C2412_DMA 


config S3C2412_PM

	bool

	select S3C2412_PM_SLEEP

	help

	  Internal config node to apply S3C2412 power management

arch/arm/mach-s3c24xx/common-s3c2443.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ static struct clk *clk_msysclk_sources[] = { 
	[3] = &clk_mpllref,

};



struct clksrc_clk clk_msysclk = {

static struct clksrc_clk clk_msysclk = {

	.clk	= {

		.name		= "msysclk",

		.parent		= &clk_xtal,

arch/arm/mach-s3c24xx/mach-osiris.c

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include <linux/clk.h>

#include <linux/i2c.h>

#include <linux/io.h>

#include <linux/platform_device.h>



#include <linux/i2c/tps65010.h>