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

Commit 23c7301d authored by Kukjin Kim's avatar Kukjin Kim
Browse files

Merge branch 'next/board-samsung-2' into next/board-samsung-3

parents 84a1caf1 6bba0caf

arch/arm/mach-exynos/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -207,6 +207,7 @@ config MACH_SMDKV310 
	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select S3C_DEV_HSMMC3

	select S3C_DEV_USB_HSOTG

	select SAMSUNG_DEV_BACKLIGHT

	select EXYNOS_DEV_DRM

	select EXYNOS_DEV_SYSMMU
@@ -326,6 +327,7 @@ config MACH_ORIGEN 
	select S3C_DEV_WDT

	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC2

	select S3C_DEV_USB_HSOTG

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2
@@ -360,22 +362,26 @@ config MACH_SMDK4212 
	select S3C_DEV_I2C3

	select S3C_DEV_I2C7

	select S3C_DEV_RTC

	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select S5P_DEV_FIMC0

	select S5P_DEV_FIMC1

	select S5P_DEV_FIMC2

	select S5P_DEV_FIMC3

	select S5P_DEV_FIMD0

	select S5P_DEV_MFC

	select SAMSUNG_DEV_BACKLIGHT

	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_PWM

	select EXYNOS_DEV_SYSMMU

	select EXYNOS_DEV_DMA

	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_I2C1

	select EXYNOS4_SETUP_I2C3

	select EXYNOS4_SETUP_I2C7

	select EXYNOS4_SETUP_KEYPAD

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	help

	  Machine support for Samsung SMDK4212

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

+6 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/mfd/max8997.h>

#include <linux/lcd.h>

#include <linux/rfkill-gpio.h>

#include <linux/platform_data/s3c-hsotg.h>



#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>
@@ -499,6 +500,9 @@ static void __init origen_ohci_init(void) 
	exynos4_ohci_set_platdata(pdata);

}



/* USB OTG */

static struct s3c_hsotg_plat origen_hsotg_pdata;



static struct gpio_keys_button origen_gpio_keys_table[] = {

	{

		.code			= KEY_MENU,
@@ -655,6 +659,7 @@ static struct platform_device *origen_devices[] __initdata = { 
	&s3c_device_hsmmc0,

	&s3c_device_i2c0,

	&s3c_device_rtc,

	&s3c_device_usb_hsotg,

	&s3c_device_wdt,

	&s5p_device_ehci,

	&s5p_device_fimc0,
@@ -744,6 +749,7 @@ static void __init origen_machine_init(void) 


	origen_ehci_init();

	origen_ohci_init();

	s3c_hsotg_set_platdata(&origen_hsotg_pdata);

	clk_xusbxti.rate = 24000000;



	s5p_tv_setup();

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

+47 −4
Original line number Diff line number Diff line
@@ -13,12 +13,14 @@ 
#include <linux/i2c.h>

#include <linux/input.h>

#include <linux/io.h>

#include <linux/lcd.h>

#include <linux/mfd/max8997.h>

#include <linux/mmc/host.h>

#include <linux/platform_device.h>

#include <linux/pwm_backlight.h>

#include <linux/regulator/machine.h>

#include <linux/serial_core.h>

#include <linux/platform_data/s3c-hsotg.h>



#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>
@@ -28,10 +30,12 @@ 
#include <plat/clock.h>

#include <plat/cpu.h>

#include <plat/devs.h>

#include <plat/fb.h>

#include <plat/gpio-cfg.h>

#include <plat/iic.h>

#include <plat/keypad.h>

#include <plat/mfc.h>

#include <plat/regs-fb.h>

#include <plat/regs-serial.h>

#include <plat/sdhci.h>
@@ -219,8 +223,10 @@ static struct platform_pwm_backlight_data smdk4x12_bl_data = { 


static uint32_t smdk4x12_keymap[] __initdata = {

	/* KEY(row, col, keycode) */

	KEY(1, 0, KEY_D), KEY(1, 1, KEY_A), KEY(1, 2, KEY_B),

	KEY(1, 3, KEY_E), KEY(1, 4, KEY_C)

	KEY(1, 3, KEY_1), KEY(1, 4, KEY_2), KEY(1, 5, KEY_3),

	KEY(1, 6, KEY_4), KEY(1, 7, KEY_5),

	KEY(2, 5, KEY_D), KEY(2, 6, KEY_A), KEY(2, 7, KEY_B),

	KEY(0, 7, KEY_E), KEY(0, 5, KEY_C)

};



static struct matrix_keymap_data smdk4x12_keymap_data __initdata = {
@@ -230,10 +236,41 @@ static struct matrix_keymap_data smdk4x12_keymap_data __initdata = { 


static struct samsung_keypad_platdata smdk4x12_keypad_data __initdata = {

	.keymap_data	= &smdk4x12_keymap_data,

	.rows		= 2,

	.cols		= 5,

	.rows		= 3,

	.cols		= 8,

};



static struct s3c_fb_pd_win smdk4x12_fb_win0 = {

	.xres		= 480,

	.yres		= 800,

	.virtual_x	= 480,

	.virtual_y	= 800 * 2,

	.max_bpp	= 32,

	.default_bpp	= 24,

};



static struct fb_videomode smdk4x12_lcd_timing = {

	.left_margin	= 8,

	.right_margin	= 8,

	.upper_margin	= 6,

	.lower_margin	= 6,

	.hsync_len	= 6,

	.vsync_len	= 4,

	.xres		= 480,

	.yres		= 800,

};



static struct s3c_fb_platdata smdk4x12_lcd_pdata __initdata = {

	.win[0]		= &smdk4x12_fb_win0,

	.vtiming	= &smdk4x12_lcd_timing,

	.vidcon0	= VIDCON0_VIDOUT_RGB | VIDCON0_PNRMODE_RGB,

	.vidcon1	= VIDCON1_INV_HSYNC | VIDCON1_INV_VSYNC,

	.setup_gpio	= exynos4_fimd0_gpio_setup_24bpp,

};



/* USB OTG */

static struct s3c_hsotg_plat smdk4x12_hsotg_pdata;



static struct platform_device *smdk4x12_devices[] __initdata = {

	&s3c_device_hsmmc2,

	&s3c_device_hsmmc3,
@@ -242,12 +279,14 @@ static struct platform_device *smdk4x12_devices[] __initdata = { 
	&s3c_device_i2c3,

	&s3c_device_i2c7,

	&s3c_device_rtc,

	&s3c_device_usb_hsotg,

	&s3c_device_wdt,

	&s5p_device_fimc0,

	&s5p_device_fimc1,

	&s5p_device_fimc2,

	&s5p_device_fimc3,

	&s5p_device_fimc_md,

	&s5p_device_fimd0,

	&s5p_device_mfc,

	&s5p_device_mfc_l,

	&s5p_device_mfc_r,
@@ -293,6 +332,10 @@ static void __init smdk4x12_machine_init(void) 
	s3c_sdhci2_set_platdata(&smdk4x12_hsmmc2_pdata);

	s3c_sdhci3_set_platdata(&smdk4x12_hsmmc3_pdata);



	s3c_hsotg_set_platdata(&smdk4x12_hsotg_pdata);



	s5p_fimd0_set_platdata(&smdk4x12_lcd_pdata);



	platform_add_devices(smdk4x12_devices, ARRAY_SIZE(smdk4x12_devices));

}

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

+13 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/i2c.h>

#include <linux/input.h>

#include <linux/pwm_backlight.h>

#include <linux/platform_data/s3c-hsotg.h>



#include <asm/mach/arch.h>

#include <asm/hardware/gic.h>
@@ -271,6 +272,15 @@ static void __init smdkv310_ohci_init(void) 
	exynos4_ohci_set_platdata(pdata);

}



/* USB OTG */

static struct s3c_hsotg_plat smdkv310_hsotg_pdata;



/* Audio device */

static struct platform_device smdkv310_device_audio = {

	.name = "smdk-audio",

	.id = -1,

};



static struct platform_device *smdkv310_devices[] __initdata = {

	&s3c_device_hsmmc0,

	&s3c_device_hsmmc1,
@@ -279,6 +289,7 @@ static struct platform_device *smdkv310_devices[] __initdata = { 
	&s3c_device_i2c1,

	&s5p_device_i2c_hdmiphy,

	&s3c_device_rtc,

	&s3c_device_usb_hsotg,

	&s3c_device_wdt,

	&s5p_device_ehci,

	&s5p_device_fimc0,
@@ -302,6 +313,7 @@ static struct platform_device *smdkv310_devices[] __initdata = { 
	&samsung_asoc_dma,

	&samsung_asoc_idma,

	&s5p_device_fimd0,

	&smdkv310_device_audio,

	&smdkv310_lcd_lte480wv,

	&smdkv310_smsc911x,

	&exynos4_device_ahci,
@@ -390,6 +402,7 @@ static void __init smdkv310_machine_init(void) 


	smdkv310_ehci_init();

	smdkv310_ohci_init();

	s3c_hsotg_set_platdata(&smdkv310_hsotg_pdata);

	clk_xusbxti.rate = 24000000;



	platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));

arch/arm/mach-s3c64xx/include/mach/crag6410.h

+1 −3
Original line number Diff line number Diff line
@@ -13,9 +13,7 @@ 


#include <linux/gpio.h>



#define BANFF_PMIC_IRQ_BASE		IRQ_BOARD_START

#define GLENFARCLAS_PMIC_IRQ_BASE	(IRQ_BOARD_START + 64)

#define CODEC_IRQ_BASE			(IRQ_BOARD_START + 128)

#define GLENFARCLAS_PMIC_IRQ_BASE	IRQ_BOARD_START



#define PCA935X_GPIO_BASE		GPIO_BOARD_START

#define CODEC_GPIO_BASE			(GPIO_BOARD_START + 8)