Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update mach-hkdk4412.c #38

Merged
merged 1 commit into from
Feb 27, 2014
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions arch/arm/mach-exynos/mach-hkdk4412.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@
#include "common.h"
#include "pmic-77686.h"

#include <linux/w1-gpio.h>

extern void exynos4_setup_dwmci_cfg_gpio(struct platform_device *dev, int width);

/* Following are default values for UCON, ULCON and UFCON UART registers */
Expand Down Expand Up @@ -212,6 +214,23 @@ static struct platform_device gpio_device_i2c4 = {
.dev.platform_data = &i2c4_gpio_platdata,
};

#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
/* Enables W1 on Pin 6 of the I/-Header of U3 */
/* Breaks support for I/O shield board */
#define GPIO_W1 EXYNOS4_GPX1(5) /* GPIO-PIN 204 */

static struct w1_gpio_platform_data w1_gpio_pdata = {
.pin = GPIO_W1,
.is_open_drain = 0,
};

static struct platform_device odroidu3_w1_device = {
.name = "w1-gpio",
.id = -1,
.dev.platform_data = &w1_gpio_pdata,
};
#endif

#if defined(CONFIG_GPIO_PCA953X)
static struct pca953x_platform_data odroid_gpio_expander_pdata = {
.gpio_base = EXYNOS4_GPIO_END,
Expand Down Expand Up @@ -489,6 +508,9 @@ static struct platform_device *hkdk4412_devices[] __initdata = {
&s3c_device_i2c3,
#if defined(CONFIG_ODROID_U2)
&gpio_device_i2c4,
#if defined(CONFIG_W1_MASTER_GPIO) || defined(CONFIG_W1_MASTER_GPIO_MODULE)
&odroidu3_w1_device,
#endif
#endif
&s3c_device_i2c7,
&s3c_device_rtc,
Expand Down