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

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

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

Merge branch 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/boards

From Kukjin Kim:

This is for updating non-DT Samsung board files for v3.7, there are adding
generic PWM lookup support and some updates.

* 'next/board-samsung' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung

:
  ARM: EXYNOS: Add generic PWM lookup support for SMDKV310
  ARM: EXYNOS: Add generic PWM lookup support for SMDK4X12
  ARM: EXYNOS: Use generic pwm driver in Origen board
  ARM: dts: Add heartbeat gpio-leds support to Origen
  ARM: dts: Use active low flag for gpio-keys on Origen
  ARM: S3C64XX: Register audio platform devices for Bells on Cragganmore
  ARM: S3C64XX: Update configuration for WM5102 module on Cragganmore

Fixed trivial merge conflict in arch/arm/mach-exynos/mach-smdkv310.c.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 0e7d35c1 fae9659a

arch/arm/boot/dts/exynos4210-origen.dts

+13 −5
Original line number Diff line number Diff line
@@ -62,35 +62,43 @@ 


		up {

			label = "Up";

			gpios = <&gpx2 0 0 0 2>;

			gpios = <&gpx2 0 0 0x10000 2>;

			linux,code = <103>;

		};



		down {

			label = "Down";

			gpios = <&gpx2 1 0 0 2>;

			gpios = <&gpx2 1 0 0x10000 2>;

			linux,code = <108>;

		};



		back {

			label = "Back";

			gpios = <&gpx1 7 0 0 2>;

			gpios = <&gpx1 7 0 0x10000 2>;

			linux,code = <158>;

		};



		home {

			label = "Home";

			gpios = <&gpx1 6 0 0 2>;

			gpios = <&gpx1 6 0 0x10000 2>;

			linux,code = <102>;

		};



		menu {

			label = "Menu";

			gpios = <&gpx1 5 0 0 2>;

			gpios = <&gpx1 5 0 0x10000 2>;

			linux,code = <139>;

		};

	};



	leds {

		compatible = "gpio-leds";

		status {

			gpios = <&gpx1 3 0 0x10000 2>;

			linux,default-trigger = "heartbeat";

		};

	};



	keypad@100A0000 {

		status = "disabled";

	};

arch/arm/mach-exynos/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ config MACH_SMDKV310 
	select EXYNOS4_SETUP_KEYPAD

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select S3C24XX_PWM

	help

	  Machine support for Samsung SMDKV310
@@ -348,6 +349,7 @@ config MACH_ORIGEN 
	select EXYNOS4_SETUP_FIMD0

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select S3C24XX_PWM

	help

	  Machine support for ORIGEN based on Samsung EXYNOS4210
@@ -383,6 +385,7 @@ config MACH_SMDK4212 
	select EXYNOS4_SETUP_KEYPAD

	select EXYNOS4_SETUP_SDHCI

	select EXYNOS4_SETUP_USB_PHY

	select S3C24XX_PWM

	help

	  Machine support for Samsung SMDK4212

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

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

#include <linux/io.h>

#include <linux/input.h>

#include <linux/pwm.h>

#include <linux/pwm_backlight.h>

#include <linux/gpio_keys.h>

#include <linux/i2c.h>
@@ -614,6 +615,10 @@ static struct platform_device origen_lcd_hv070wsa = { 
	.dev.platform_data	= &origen_lcd_hv070wsa_data,

};



static struct pwm_lookup origen_pwm_lookup[] = {

	PWM_LOOKUP("s3c24xx-pwm.0", 0, "pwm-backlight.0", NULL),

};



#ifdef CONFIG_DRM_EXYNOS

static struct exynos_drm_fimd_pdata drm_fimd_pdata = {

	.panel	= {
@@ -798,6 +803,7 @@ static void __init origen_machine_init(void) 


	platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));



	pwm_add_table(origen_pwm_lookup, ARRAY_SIZE(origen_pwm_lookup));

	samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data);



	origen_bt_setup();

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

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

#include <linux/mmc/host.h>

#include <linux/platform_device.h>

#include <linux/pwm.h>

#include <linux/pwm_backlight.h>

#include <linux/regulator/machine.h>

#include <linux/serial_core.h>
@@ -222,6 +223,10 @@ static struct platform_pwm_backlight_data smdk4x12_bl_data = { 
	.pwm_period_ns  = 1000,

};



static struct pwm_lookup smdk4x12_pwm_lookup[] = {

	PWM_LOOKUP("s3c24xx-pwm.1", 0, "pwm-backlight.0", NULL),

};



static uint32_t smdk4x12_keymap[] __initdata = {

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

	KEY(1, 3, KEY_1), KEY(1, 4, KEY_2), KEY(1, 5, KEY_3),
@@ -349,6 +354,7 @@ static void __init smdk4x12_machine_init(void) 
				ARRAY_SIZE(smdk4x12_i2c_devs7));



	samsung_bl_set(&smdk4x12_bl_gpio_info, &smdk4x12_bl_data);

	pwm_add_table(smdk4x12_pwm_lookup, ARRAY_SIZE(smdk4x12_pwm_lookup));



	samsung_keypad_set_platdata(&smdk4x12_keypad_data);

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

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

#include <linux/i2c.h>

#include <linux/input.h>

#include <linux/pwm.h>

#include <linux/pwm_backlight.h>

#include <linux/platform_data/s3c-hsotg.h>
@@ -360,6 +361,10 @@ static struct i2c_board_info hdmiphy_info = { 
	I2C_BOARD_INFO("hdmiphy-exynos4210", 0x38),

};



static struct pwm_lookup smdkv310_pwm_lookup[] = {

	PWM_LOOKUP("s3c24xx-pwm.1", 0, "pwm-backlight.0", NULL),

};



static void s5p_tv_setup(void)

{

	/* direct HPD to HDMI chip */
@@ -399,6 +404,8 @@ static void __init smdkv310_machine_init(void) 
	samsung_keypad_set_platdata(&smdkv310_keypad_data);



	samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);

	pwm_add_table(smdkv310_pwm_lookup, ARRAY_SIZE(smdkv310_pwm_lookup));



#ifdef CONFIG_DRM_EXYNOS

	s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;

	exynos4_fimd0_gpio_setup_24bpp();