* [PATCH] ARM: EXYNOS4: Adds Samsung NURI board support
@ 2011-02-25 8:43 Minkyu Kang
2011-02-28 7:42 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Minkyu Kang @ 2011-02-25 8:43 UTC (permalink / raw)
To: linux-arm-kernel
This patch adds Samsung NURI board support.
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
This patch is base on next-exynos4 branch at kgene tree.
arch/arm/configs/exynos4_defconfig | 1 +
arch/arm/mach-exynos4/Kconfig | 15 +++
arch/arm/mach-exynos4/Makefile | 1 +
arch/arm/mach-exynos4/mach-nuri.c | 233 ++++++++++++++++++++++++++++++++++++
4 files changed, 250 insertions(+), 0 deletions(-)
create mode 100644 arch/arm/mach-exynos4/mach-nuri.c
diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig
index 2ffba24..fd92324 100644
--- a/arch/arm/configs/exynos4_defconfig
+++ b/arch/arm/configs/exynos4_defconfig
@@ -9,6 +9,7 @@ CONFIG_S3C_LOWLEVEL_UART_PORT=1
CONFIG_MACH_SMDKC210=y
CONFIG_MACH_SMDKV310=y
CONFIG_MACH_UNIVERSAL_C210=y
+CONFIG_MACH_NURI=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index ad03840..5bf00b9 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -123,6 +123,21 @@ config MACH_UNIVERSAL_C210
Machine support for Samsung Mobile Universal S5PC210 Reference
Board.
+config MACH_NURI
+ bool "Mobile NURI Board"
+ select CPU_EXYNOS4210
+ select S3C_DEV_WDT
+ select S3C_DEV_HSMMC
+ select S3C_DEV_HSMMC2
+ select S3C_DEV_HSMMC3
+ select S3C_DEV_I2C1
+ select S3C_DEV_I2C5
+ select EXYNOS4_SETUP_I2C1
+ select EXYNOS4_SETUP_I2C5
+ select EXYNOS4_SETUP_SDHCI
+ help
+ Machine support for Samsung Mobile NURI Board.
+
endmenu
comment "Configuration for HSMMC bus width"
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile
index 0558235..fa9e814 100644
--- a/arch/arm/mach-exynos4/Makefile
+++ b/arch/arm/mach-exynos4/Makefile
@@ -25,6 +25,7 @@ obj-$(CONFIG_HOTPLUG_CPU) += hotplug.o
obj-$(CONFIG_MACH_SMDKC210) += mach-smdkc210.o
obj-$(CONFIG_MACH_SMDKV310) += mach-smdkv310.o
obj-$(CONFIG_MACH_UNIVERSAL_C210) += mach-universal_c210.o
+obj-$(CONFIG_MACH_NURI) += mach-nuri.o
# device support
diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c
new file mode 100644
index 0000000..28010bd
--- /dev/null
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@ -0,0 +1,233 @@
+/*
+ * linux/arch/arm/mach-exynos4/mach-nuri.c
+ *
+ * Copyright (c) 2011 Samsung Electronics Co., Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/platform_device.h>
+#include <linux/serial_core.h>
+#include <linux/input.h>
+#include <linux/i2c.h>
+#include <linux/gpio_keys.h>
+#include <linux/gpio.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/fixed.h>
+#include <linux/mmc/host.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach-types.h>
+
+#include <plat/regs-serial.h>
+#include <plat/exynos4.h>
+#include <plat/cpu.h>
+#include <plat/devs.h>
+#include <plat/sdhci.h>
+
+#include <mach/map.h>
+
+/* Following are default values for UCON, ULCON and UFCON UART registers */
+#define NURI_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
+ S3C2410_UCON_RXILEVEL | \
+ S3C2410_UCON_TXIRQMODE | \
+ S3C2410_UCON_RXIRQMODE | \
+ S3C2410_UCON_RXFIFO_TOI | \
+ S3C2443_UCON_RXERR_IRQEN)
+
+#define NURI_ULCON_DEFAULT S3C2410_LCON_CS8
+
+#define NURI_UFCON_DEFAULT (S3C2410_UFCON_FIFOMODE | \
+ S5PV210_UFCON_TXTRIG256 | \
+ S5PV210_UFCON_RXTRIG256)
+
+enum fixed_regulator_id {
+ FIXED_REG_ID_MMC = 0,
+};
+
+static struct s3c2410_uartcfg nuri_uartcfgs[] __initdata = {
+ {
+ .hwport = 0,
+ .ucon = NURI_UCON_DEFAULT,
+ .ulcon = NURI_ULCON_DEFAULT,
+ .ufcon = NURI_UFCON_DEFAULT,
+ },
+ {
+ .hwport = 1,
+ .ucon = NURI_UCON_DEFAULT,
+ .ulcon = NURI_ULCON_DEFAULT,
+ .ufcon = NURI_UFCON_DEFAULT,
+ },
+ {
+ .hwport = 2,
+ .ucon = NURI_UCON_DEFAULT,
+ .ulcon = NURI_ULCON_DEFAULT,
+ .ufcon = NURI_UFCON_DEFAULT,
+ },
+ {
+ .hwport = 3,
+ .ucon = NURI_UCON_DEFAULT,
+ .ulcon = NURI_ULCON_DEFAULT,
+ .ufcon = NURI_UFCON_DEFAULT,
+ },
+};
+
+/* eMMC */
+static struct s3c_sdhci_platdata nuri_hsmmc0_data __initdata = {
+ .max_width = 8,
+ .host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
+ MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
+ MMC_CAP_DISABLE | MMC_CAP_ERASE),
+ .cd_type = S3C_SDHCI_CD_PERMANENT,
+ .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
+};
+
+static struct regulator_consumer_supply emmc_supplies[] = {
+ REGULATOR_SUPPLY("vmmc", "s3c-sdhci.0"),
+ REGULATOR_SUPPLY("vmmc", "dw_mmc"),
+};
+
+static struct regulator_init_data emmc_fixed_voltage_init_data = {
+ .constraints = {
+ .name = "VMEM_VDD_2.8V",
+ .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+ },
+ .num_consumer_supplies = ARRAY_SIZE(emmc_supplies),
+ .consumer_supplies = emmc_supplies,
+};
+
+static struct fixed_voltage_config emmc_fixed_voltage_config = {
+ .supply_name = "MASSMEMORY_EN (inverted)",
+ .microvolts = 2800000,
+ .gpio = EXYNOS4_GPL1(1),
+ .enable_high = false,
+ .init_data = &emmc_fixed_voltage_init_data,
+};
+
+static struct platform_device emmc_fixed_voltage = {
+ .name = "reg-fixed-voltage",
+ .id = FIXED_REG_ID_MMC,
+ .dev = {
+ .platform_data = &emmc_fixed_voltage_config,
+ },
+};
+
+/* SD */
+static struct s3c_sdhci_platdata nuri_hsmmc2_data __initdata = {
+ .max_width = 4,
+ .host_caps = MMC_CAP_4_BIT_DATA |
+ MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED |
+ MMC_CAP_DISABLE,
+ .ext_cd_gpio = EXYNOS4_GPX3(3), /* XEINT_27 */
+ .ext_cd_gpio_invert = 1,
+ .cd_type = S3C_SDHCI_CD_GPIO,
+ .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
+};
+
+/* WLAN */
+static struct s3c_sdhci_platdata nuri_hsmmc3_data __initdata = {
+ .max_width = 4,
+ .host_caps = MMC_CAP_4_BIT_DATA |
+ MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED,
+ .cd_type = S3C_SDHCI_CD_EXTERNAL,
+ .clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
+};
+
+static void __init nuri_sdhci_init(void)
+{
+ s3c_sdhci0_set_platdata(&nuri_hsmmc0_data);
+ s3c_sdhci2_set_platdata(&nuri_hsmmc2_data);
+ s3c_sdhci3_set_platdata(&nuri_hsmmc3_data);
+}
+
+/* GPIO KEYS */
+static struct gpio_keys_button nuri_gpio_keys_tables[] = {
+ {
+ .code = KEY_VOLUMEUP,
+ .gpio = EXYNOS4_GPX2(0), /* XEINT16 */
+ .desc = "gpio-keys: KEY_VOLUMEUP",
+ .type = EV_KEY,
+ .active_low = 1,
+ .debounce_interval = 1,
+ }, {
+ .code = KEY_VOLUMEDOWN,
+ .gpio = EXYNOS4_GPX2(1), /* XEINT17 */
+ .desc = "gpio-keys: KEY_VOLUMEDOWN",
+ .type = EV_KEY,
+ .active_low = 1,
+ .debounce_interval = 1,
+ }, {
+ .code = KEY_POWER,
+ .gpio = EXYNOS4_GPX2(7), /* XEINT23 */
+ .desc = "gpio-keys: KEY_POWER",
+ .type = EV_KEY,
+ .active_low = 1,
+ .wakeup = 1,
+ .debounce_interval = 1,
+ },
+};
+
+static struct gpio_keys_platform_data nuri_gpio_keys_data = {
+ .buttons = nuri_gpio_keys_tables,
+ .nbuttons = ARRAY_SIZE(nuri_gpio_keys_tables),
+};
+
+static struct platform_device nuri_gpio_keys = {
+ .name = "gpio-keys",
+ .dev = {
+ .platform_data = &nuri_gpio_keys_data,
+ },
+};
+
+/* I2C1 */
+static struct i2c_board_info i2c1_devs[] __initdata = {
+ /* Gyro, To be updated */
+};
+
+/* GPIO I2C 5 (PMIC) */
+static struct i2c_board_info i2c5_devs[] __initdata = {
+ /* max8997, To be updated */
+};
+
+static struct platform_device *nuri_devices[] __initdata = {
+ /* Samsung Platform Devices */
+ &emmc_fixed_voltage,
+ &s3c_device_hsmmc0,
+ &s3c_device_hsmmc2,
+ &s3c_device_hsmmc3,
+#ifdef CONFIG_S3C2410_WATCHDOG
+ &s3c_device_wdt,
+#endif
+
+ /* NURI Devices */
+ &nuri_gpio_keys,
+};
+
+static void __init nuri_map_io(void)
+{
+ s5p_init_io(NULL, 0, S5P_VA_CHIPID);
+ s3c24xx_init_clocks(24000000);
+ s3c24xx_init_uarts(nuri_uartcfgs, ARRAY_SIZE(nuri_uartcfgs));
+}
+
+static void __init nuri_machine_init(void)
+{
+ nuri_sdhci_init();
+
+ i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
+ i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));
+
+ /* Last */
+ platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
+}
+
+MACHINE_START(NURI, "NURI")
+ /* Maintainer: Kyungmin Park <kyungmin.park@samsung.com> */
+ .boot_params = S5P_PA_SDRAM + 0x100,
+ .init_irq = exynos4_init_irq,
+ .map_io = nuri_map_io,
+ .init_machine = nuri_machine_init,
+ .timer = &exynos4_timer,
+MACHINE_END
--
1.7.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] ARM: EXYNOS4: Adds Samsung NURI board support
2011-02-25 8:43 [PATCH] ARM: EXYNOS4: Adds Samsung NURI board support Minkyu Kang
@ 2011-02-28 7:42 ` Kukjin Kim
2011-02-28 8:14 ` Minkyu Kang
0 siblings, 1 reply; 6+ messages in thread
From: Kukjin Kim @ 2011-02-28 7:42 UTC (permalink / raw)
To: linux-arm-kernel
Minkyu Kang wrote:
>
> This patch adds Samsung NURI board support.
>
> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> ---
> This patch is base on next-exynos4 branch at kgene tree.
>
> arch/arm/configs/exynos4_defconfig | 1 +
> arch/arm/mach-exynos4/Kconfig | 15 +++
> arch/arm/mach-exynos4/Makefile | 1 +
> arch/arm/mach-exynos4/mach-nuri.c | 233
> ++++++++++++++++++++++++++++++++++++
> 4 files changed, 250 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-exynos4/mach-nuri.c
>
(snip)
> +config MACH_NURI
> + bool "Mobile NURI Board"
> + select CPU_EXYNOS4210
> + select S3C_DEV_WDT
> + select S3C_DEV_HSMMC
> + select S3C_DEV_HSMMC2
> + select S3C_DEV_HSMMC3
> + select S3C_DEV_I2C1
> + select S3C_DEV_I2C5
> + select EXYNOS4_SETUP_I2C1
> + select EXYNOS4_SETUP_I2C5
> + select EXYNOS4_SETUP_SDHCI
> + help
> + Machine support for Samsung Mobile NURI Board.
> +
(snip)
> +enum fixed_regulator_id {
> + FIXED_REG_ID_MMC = 0,
FIXED_REG_ID_MMC,
(snip)
> +static struct platform_device emmc_fixed_voltage = {
> + .name = "reg-fixed-voltage",
> + .id = FIXED_REG_ID_MMC,
Is there any reason to use FIXED_REG_ID_MMC instead directly id 0?
(snip)
> +static struct platform_device *nuri_devices[] __initdata = {
> + /* Samsung Platform Devices */
> + &emmc_fixed_voltage,
> + &s3c_device_hsmmc0,
> + &s3c_device_hsmmc2,
> + &s3c_device_hsmmc3,
> +#ifdef CONFIG_S3C2410_WATCHDOG
> + &s3c_device_wdt,
> +#endif
Basically no need to add #ifdef here.
Because "s3c_device_wdt" depends on CONFIG_S3C_DEV_WDT and you already
selected it in Kconfig.
Of course, CONFIG_S3C2410_WATCHDOG is another selection for watchdog driver.
I'm sorting it out like the relation of platform device and regarding device
driver.
(snip)
Others, looks ok to me.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: EXYNOS4: Adds Samsung NURI board support
2011-02-28 7:42 ` Kukjin Kim
@ 2011-02-28 8:14 ` Minkyu Kang
2011-02-28 8:26 ` Kukjin Kim
0 siblings, 1 reply; 6+ messages in thread
From: Minkyu Kang @ 2011-02-28 8:14 UTC (permalink / raw)
To: linux-arm-kernel
Dear Kukjin Kim,
2011-02-28 ?? 4:42, Kukjin Kim ? ?:
> Minkyu Kang wrote:
>>
>> This patch adds Samsung NURI board support.
>>
>> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
>> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
>> ---
>> This patch is base on next-exynos4 branch at kgene tree.
>>
>> arch/arm/configs/exynos4_defconfig | 1 +
>> arch/arm/mach-exynos4/Kconfig | 15 +++
>> arch/arm/mach-exynos4/Makefile | 1 +
>> arch/arm/mach-exynos4/mach-nuri.c | 233
>> ++++++++++++++++++++++++++++++++++++
>> 4 files changed, 250 insertions(+), 0 deletions(-)
>> create mode 100644 arch/arm/mach-exynos4/mach-nuri.c
>>
>
>> +enum fixed_regulator_id {
>> + FIXED_REG_ID_MMC = 0,
>
> FIXED_REG_ID_MMC,
>
> (snip)
>
>> +static struct platform_device emmc_fixed_voltage = {
>> + .name = "reg-fixed-voltage",
>> + .id = FIXED_REG_ID_MMC,
>
> Is there any reason to use FIXED_REG_ID_MMC instead directly id 0?
>
I'm going to add more IDs of fixed regulator that are LCD and Backlight, and so on.
So use enum values for avoid the hard coding.
Thanks.
Minkyu Kang.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: EXYNOS4: Adds Samsung NURI board support
2011-02-28 8:14 ` Minkyu Kang
@ 2011-02-28 8:26 ` Kukjin Kim
2011-02-28 11:20 ` Kukjin Kim
2011-03-04 7:28 ` Kukjin Kim
0 siblings, 2 replies; 6+ messages in thread
From: Kukjin Kim @ 2011-02-28 8:26 UTC (permalink / raw)
To: linux-arm-kernel
Minkyu Kang wrote:
>
> Dear Kukjin Kim,
>
> 2011-02-28 ?? 4:42, Kukjin Kim ? ?:
> > Minkyu Kang wrote:
> >>
> >> This patch adds Samsung NURI board support.
> >>
> >> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
> >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> >> ---
> >> This patch is base on next-exynos4 branch at kgene tree.
> >>
> >> arch/arm/configs/exynos4_defconfig | 1 +
> >> arch/arm/mach-exynos4/Kconfig | 15 +++
> >> arch/arm/mach-exynos4/Makefile | 1 +
> >> arch/arm/mach-exynos4/mach-nuri.c | 233
> >> ++++++++++++++++++++++++++++++++++++
> >> 4 files changed, 250 insertions(+), 0 deletions(-)
> >> create mode 100644 arch/arm/mach-exynos4/mach-nuri.c
> >>
> >
> >> +enum fixed_regulator_id {
> >> + FIXED_REG_ID_MMC = 0,
> >
> > FIXED_REG_ID_MMC,
> >
> > (snip)
> >
> >> +static struct platform_device emmc_fixed_voltage = {
> >> + .name = "reg-fixed-voltage",
> >> + .id = FIXED_REG_ID_MMC,
> >
> > Is there any reason to use FIXED_REG_ID_MMC instead directly id 0?
> >
>
> I'm going to add more IDs of fixed regulator that are LCD and Backlight, and
> so on.
> So use enum values for avoid the hard coding.
>
Ok, applied this after removing "ifdef WATCHDOG".
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: EXYNOS4: Adds Samsung NURI board support
2011-02-28 8:26 ` Kukjin Kim
@ 2011-02-28 11:20 ` Kukjin Kim
2011-03-04 7:28 ` Kukjin Kim
1 sibling, 0 replies; 6+ messages in thread
From: Kukjin Kim @ 2011-02-28 11:20 UTC (permalink / raw)
To: linux-arm-kernel
Kukjin Kim wrote:
>
> Minkyu Kang wrote:
> >
> > Dear Kukjin Kim,
> >
> > 2011-02-28 ?? 4:42, Kukjin Kim ? ?:
> > > Minkyu Kang wrote:
> > >>
> > >> This patch adds Samsung NURI board support.
> > >>
> > >> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
> > >> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
> > >> ---
> > >> This patch is base on next-exynos4 branch at kgene tree.
> > >>
> > >> arch/arm/configs/exynos4_defconfig | 1 +
> > >> arch/arm/mach-exynos4/Kconfig | 15 +++
> > >> arch/arm/mach-exynos4/Makefile | 1 +
> > >> arch/arm/mach-exynos4/mach-nuri.c | 233
> > >> ++++++++++++++++++++++++++++++++++++
> > >> 4 files changed, 250 insertions(+), 0 deletions(-)
> > >> create mode 100644 arch/arm/mach-exynos4/mach-nuri.c
> > >>
> > >
> > >> +enum fixed_regulator_id {
> > >> + FIXED_REG_ID_MMC = 0,
> > >
> > > FIXED_REG_ID_MMC,
> > >
> > > (snip)
> > >
> > >> +static struct platform_device emmc_fixed_voltage = {
> > >> + .name = "reg-fixed-voltage",
> > >> + .id = FIXED_REG_ID_MMC,
> > >
> > > Is there any reason to use FIXED_REG_ID_MMC instead directly id 0?
> > >
> >
> > I'm going to add more IDs of fixed regulator that are LCD and Backlight,
> and
> > so on.
> > So use enum values for avoid the hard coding.
> >
>
> Ok, applied this after removing "ifdef WATCHDOG".
Oops, NURI board is not registered yet :(
So can't merge this before updating it now.
Or should drop update defconfig from this...
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ARM: EXYNOS4: Adds Samsung NURI board support
2011-02-28 8:26 ` Kukjin Kim
2011-02-28 11:20 ` Kukjin Kim
@ 2011-03-04 7:28 ` Kukjin Kim
1 sibling, 0 replies; 6+ messages in thread
From: Kukjin Kim @ 2011-03-04 7:28 UTC (permalink / raw)
To: linux-arm-kernel
Kukjin Kim wrote:
>
> Oops, NURI board is not registered yet :(
> So can't merge this before updating it now.
> Or should drop update defconfig from this...
>
So applied without defconfig changes.
As you know, if required, can do it later :)
If any problems, please let me know.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-04 7:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-25 8:43 [PATCH] ARM: EXYNOS4: Adds Samsung NURI board support Minkyu Kang
2011-02-28 7:42 ` Kukjin Kim
2011-02-28 8:14 ` Minkyu Kang
2011-02-28 8:26 ` Kukjin Kim
2011-02-28 11:20 ` Kukjin Kim
2011-03-04 7:28 ` Kukjin Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).