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

Commit f1a04dbd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 's5p-fixes-for-linus' of... 

Merge branch 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

* 's5p-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C2440: fix section mismatch on mini2440
  ARM: S3C24XX: drop return codes in void function of dma.c
  ARM: S3C24XX: don't use uninitialized variable in dma.c
  ARM: EXYNOS4: Set appropriate I2C device variant
  ARM: S5PC100: Fix for compilation error
  spi/s3c64xx: Bug fix for SPI with different FIFO level
  ARM: SAMSUNG: Add tx_st_done variable
  ARM: EXYNOS4: Address a section mismatch w/ suspend issue.
  ARM: S5P: Fix bug on init of PWMTimers for HRTimer
  ARM: SAMSUNG: header file revised to prevent declaring duplicated
  ARM: EXYNOS4: fix improper gpio configuration
  ARM: EXYNOS4: Fix card detection for sdhci 0 and 2
parents b56045d4 d34c1fcd

arch/arm/mach-exynos4/cpu.c

+6 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <plat/sdhci.h>

#include <plat/devs.h>

#include <plat/fimc-core.h>

#include <plat/iic-core.h>



#include <mach/regs-irq.h>
@@ -132,6 +133,11 @@ void __init exynos4_map_io(void) 
	s3c_fimc_setname(1, "exynos4-fimc");

	s3c_fimc_setname(2, "exynos4-fimc");

	s3c_fimc_setname(3, "exynos4-fimc");



	/* The I2C bus controllers are directly compatible with s3c2440 */

	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

	s3c_i2c2_setname("s3c2440-i2c");

}



void __init exynos4_init_clocks(int xtal)

arch/arm/mach-exynos4/dev-audio.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ struct platform_device exynos4_device_ac97 = { 


static int exynos4_spdif_cfg_gpio(struct platform_device *pdev)

{

	s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 2, S3C_GPIO_SFN(3));

	s3c_gpio_cfgpin_range(EXYNOS4_GPC1(0), 2, S3C_GPIO_SFN(4));



	return 0;

}

arch/arm/mach-exynos4/headsmp.S

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <linux/linkage.h>

#include <linux/init.h>



	__INIT

	__CPUINIT



/*

 * exynos4 specific entry point for secondary CPUs.  This provides

arch/arm/mach-exynos4/mach-smdkv310.c

+2 −6
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ static struct s3c2410_uartcfg smdkv310_uartcfgs[] __initdata = { 
};



static struct s3c_sdhci_platdata smdkv310_hsmmc0_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_GPIO,

	.ext_cd_gpio		= EXYNOS4_GPK0(2),

	.ext_cd_gpio_invert	= 1,

	.cd_type		= S3C_SDHCI_CD_INTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

#ifdef CONFIG_EXYNOS4_SDHCI_CH0_8BIT

	.max_width		= 8,
@@ -96,9 +94,7 @@ static struct s3c_sdhci_platdata smdkv310_hsmmc1_pdata __initdata = { 
};



static struct s3c_sdhci_platdata smdkv310_hsmmc2_pdata __initdata = {

	.cd_type		= S3C_SDHCI_CD_GPIO,

	.ext_cd_gpio		= EXYNOS4_GPK2(2),

	.ext_cd_gpio_invert	= 1,

	.cd_type		= S3C_SDHCI_CD_INTERNAL,

	.clk_type		= S3C_SDHCI_CLK_DIV_EXTERNAL,

#ifdef CONFIG_EXYNOS4_SDHCI_CH2_8BIT

	.max_width		= 8,

arch/arm/mach-s3c2440/mach-mini2440.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ struct mini2440_features_t { 
	struct platform_device *optional[8];

};



static void mini2440_parse_features(

static void __init mini2440_parse_features(

		struct mini2440_features_t * features,

		const char * features_str )

{