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

Commit 190a44e6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Cleanups for the Samsung platforms

Various cleanup changes that the device driver changes are built upon.
Since the samsung cleanups depend on the device tree series, which
depends on the first set of cleanups for tegra.

* tag 'cleanup2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: EXYNOS: Use gpio_request_one
  ARM: S5PV210: Use gpio_request_one
  ARM: S3C64XX: Modified according to SPI consolidation work
  ARM: S5PV210: Modified files for SPI consolidation work
  ARM: S5P64X0: Modified files for SPI consolidation work
  ARM: S5PC100: Modified files for SPI consolidation work
  ARM: S3C64XX: Modified files for SPI consolidation work
  ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung
  ARM: SAMSUNG: Remove SPI bus clocks from platform data
  ARM: S5PV210: Add SPI clkdev support
  ARM: S5P64X0: Add SPI clkdev support
  ARM: S5PC100: Add SPI clkdev support
  ARM: S3C64XX: Add SPI clkdev support
  spi/s3c64xx: Use bus clocks created using clkdev
  mmc: sdhci-s3c: Use generic clock names for sdhci bus clock options
  ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names
  ARM: SAMSUNG: Remove SDHCI bus clocks from platform data
  ARM: SAMSUNG: Use kmemdup rather than duplicating its implementation
  ARM: EXYNOS: remove exynos4_scu_enable()
parents dfc1ebe7 b48741cc

arch/arm/mach-exynos/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -61,6 +61,5 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C5) += setup-i2c5.o 
obj-$(CONFIG_EXYNOS4_SETUP_I2C6)	+= setup-i2c6.o

obj-$(CONFIG_EXYNOS4_SETUP_I2C7)	+= setup-i2c7.o

obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD)	+= setup-keypad.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI)	+= setup-sdhci.o

obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o

obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY)	+= setup-usb-phy.o

arch/arm/mach-exynos/clock.c

+52 −36
Original line number Diff line number Diff line
@@ -1155,42 +1155,6 @@ static struct clksrc_clk clksrcs[] = { 
		.sources = &clkset_mout_mfc,

		.reg_src = { .reg = S5P_CLKSRC_MFC, .shift = 8, .size = 1 },

		.reg_div = { .reg = S5P_CLKDIV_MFC, .shift = 0, .size = 4 },

	}, {

		.clk		= {

			.name		= "sclk_mmc",

			.devname	= "s3c-sdhci.0",

			.parent		= &clk_dout_mmc0.clk,

			.enable		= exynos4_clksrc_mask_fsys_ctrl,

			.ctrlbit	= (1 << 0),

		},

		.reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 8, .size = 8 },

	}, {

		.clk		= {

			.name		= "sclk_mmc",

			.devname	= "s3c-sdhci.1",

			.parent         = &clk_dout_mmc1.clk,

			.enable		= exynos4_clksrc_mask_fsys_ctrl,

			.ctrlbit	= (1 << 4),

		},

		.reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 24, .size = 8 },

	}, {

		.clk		= {

			.name		= "sclk_mmc",

			.devname	= "s3c-sdhci.2",

			.parent         = &clk_dout_mmc2.clk,

			.enable		= exynos4_clksrc_mask_fsys_ctrl,

			.ctrlbit	= (1 << 8),

		},

		.reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 8, .size = 8 },

	}, {

		.clk		= {

			.name		= "sclk_mmc",

			.devname	= "s3c-sdhci.3",

			.parent         = &clk_dout_mmc3.clk,

			.enable		= exynos4_clksrc_mask_fsys_ctrl,

			.ctrlbit	= (1 << 12),

		},

		.reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 24, .size = 8 },

	}, {

		.clk		= {

			.name		= "sclk_dwmmc",
@@ -1250,6 +1214,50 @@ static struct clksrc_clk clk_sclk_uart3 = { 
	.reg_div = { .reg = S5P_CLKDIV_PERIL0, .shift = 12, .size = 4 },

};



static struct clksrc_clk clk_sclk_mmc0 = {

	.clk		= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.0",

		.parent		= &clk_dout_mmc0.clk,

		.enable		= exynos4_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 0),

	},

	.reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 8, .size = 8 },

};



static struct clksrc_clk clk_sclk_mmc1 = {

	.clk		= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.1",

		.parent         = &clk_dout_mmc1.clk,

		.enable		= exynos4_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 4),

	},

	.reg_div = { .reg = S5P_CLKDIV_FSYS1, .shift = 24, .size = 8 },

};



static struct clksrc_clk clk_sclk_mmc2 = {

	.clk		= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.2",

		.parent         = &clk_dout_mmc2.clk,

		.enable		= exynos4_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 8),

	},

	.reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 8, .size = 8 },

};



static struct clksrc_clk clk_sclk_mmc3 = {

	.clk		= {

		.name		= "sclk_mmc",

		.devname	= "s3c-sdhci.3",

		.parent         = &clk_dout_mmc3.clk,

		.enable		= exynos4_clksrc_mask_fsys_ctrl,

		.ctrlbit	= (1 << 12),

	},

	.reg_div = { .reg = S5P_CLKDIV_FSYS2, .shift = 24, .size = 8 },

};



/* Clock initialization code */

static struct clksrc_clk *sysclks[] = {

	&clk_mout_apll,
@@ -1294,6 +1302,10 @@ static struct clksrc_clk *clksrc_cdev[] = { 
	&clk_sclk_uart1,

	&clk_sclk_uart2,

	&clk_sclk_uart3,

	&clk_sclk_mmc0,

	&clk_sclk_mmc1,

	&clk_sclk_mmc2,

	&clk_sclk_mmc3,

};



static struct clk_lookup exynos4_clk_lookup[] = {
@@ -1301,6 +1313,10 @@ static struct clk_lookup exynos4_clk_lookup[] = { 
	CLKDEV_INIT("exynos4210-uart.1", "clk_uart_baud0", &clk_sclk_uart1.clk),

	CLKDEV_INIT("exynos4210-uart.2", "clk_uart_baud0", &clk_sclk_uart2.clk),

	CLKDEV_INIT("exynos4210-uart.3", "clk_uart_baud0", &clk_sclk_uart3.clk),

	CLKDEV_INIT("s3c-sdhci.0", "mmc_busclk.2", &clk_sclk_mmc0.clk),

	CLKDEV_INIT("s3c-sdhci.1", "mmc_busclk.2", &clk_sclk_mmc1.clk),

	CLKDEV_INIT("s3c-sdhci.2", "mmc_busclk.2", &clk_sclk_mmc2.clk),

	CLKDEV_INIT("s3c-sdhci.3", "mmc_busclk.2", &clk_sclk_mmc3.clk),

	CLKDEV_INIT("dma-pl330.0", "apb_pclk", &clk_pdma0),

	CLKDEV_INIT("dma-pl330.1", "apb_pclk", &clk_pdma1),

};

arch/arm/mach-exynos/mach-nuri.c

+2 −7
Original line number Diff line number Diff line
@@ -249,13 +249,8 @@ static void nuri_lcd_power_on(struct plat_lcd_data *pd, unsigned int power) 


static int nuri_bl_init(struct device *dev)

{

	int ret, gpio = EXYNOS4_GPE2(3);



	ret = gpio_request(gpio, "LCD_LDO_EN");

	if (!ret)

		gpio_direction_output(gpio, 0);



	return ret;

	return gpio_request_one(EXYNOS4_GPE2(3), GPIOF_OUT_INIT_LOW,

				"LCD_LD0_EN");

}



static int nuri_bl_notify(struct device *dev, int brightness)

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

+1 −3
Original line number Diff line number Diff line
@@ -131,9 +131,7 @@ static void lcd_lte480wv_set_power(struct plat_lcd_data *pd, 
		gpio_free(EXYNOS4_GPD0(1));

#endif

		/* fire nRESET on power up */

		gpio_request(EXYNOS4_GPX0(6), "GPX0");



		gpio_direction_output(EXYNOS4_GPX0(6), 1);

		gpio_request_one(EXYNOS4_GPX0(6), GPIOF_OUT_INIT_HIGH, "GPX0");

		mdelay(100);



		gpio_set_value(EXYNOS4_GPX0(6), 0);

arch/arm/mach-exynos/mach-universal_c210.c

+3 −7
Original line number Diff line number Diff line
@@ -610,8 +610,7 @@ static void __init universal_tsp_init(void) 


	/* TSP_LDO_ON: XMDMADDR_11 */

	gpio = EXYNOS4_GPE2(3);

	gpio_request(gpio, "TSP_LDO_ON");

	gpio_direction_output(gpio, 1);

	gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "TSP_LDO_ON");

	gpio_export(gpio, 0);



	/* TSP_INT: XMDMADDR_7 */
@@ -671,8 +670,7 @@ static void __init universal_touchkey_init(void) 
	i2c_gpio12_devs[0].irq = gpio_to_irq(gpio);



	gpio = EXYNOS4_GPE3(3);			/* XMDMDATA_3 */

	gpio_request(gpio, "3_TOUCH_EN");

	gpio_direction_output(gpio, 1);

	gpio_request_one(gpio, GPIOF_OUT_INIT_HIGH, "3_TOUCH_EN");

}



static struct s3c2410_platform_i2c universal_i2c0_platdata __initdata = {
@@ -1002,9 +1000,7 @@ static void __init universal_map_io(void) 
void s5p_tv_setup(void)

{

	/* direct HPD to HDMI chip */

	gpio_request(EXYNOS4_GPX3(7), "hpd-plug");



	gpio_direction_input(EXYNOS4_GPX3(7));

	gpio_request_one(EXYNOS4_GPX3(7), GPIOF_IN, "hpd-plug");

	s3c_gpio_cfgpin(EXYNOS4_GPX3(7), S3C_GPIO_SFN(0x3));

	s3c_gpio_setpull(EXYNOS4_GPX3(7), S3C_GPIO_PULL_NONE);