[PATCH] ARM: EXYNOS4: ADD USB EHCI device to SMDKV310
Signed-off-by: Bhuvana Kakunoori
Signed-off-by: Pankaj Dubey
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/Kconfig |2 ++
arch/arm/mach-exynos4/mach-smdkv310.c | 16
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index bb29d51..cc97d23 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -136,6 +136,7 @@ config MACH_SMDKV310
bool "SMDKV310"
select CPU_EXYNOS4210
select S5P_DEV_FIMD0
+ select S5P_DEV_USB_EHCI
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_I2C1
@@ -151,6 +152,7 @@ config MACH_SMDKV310
select SAMSUNG_DEV_PWM
select EXYNOS4_DEV_SYSMMU
select EXYNOS4_SETUP_FIMD0
+ select EXYNOS4_SETUP_USB_PHY
select EXYNOS4_SETUP_I2C1
select EXYNOS4_SETUP_KEYPAD
select EXYNOS4_SETUP_SDHCI
diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c
b/arch/arm/mach-exynos4/mach-smdkv310.c
index 5f62b2b..b6c28ea 100644
--- a/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@ -33,6 +33,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -167,6 +169,16 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
{I2C_BOARD_INFO("wm8994", 0x1a),},
};
+/* USB EHCI */
+static struct s5p_ehci_platdata smdkv310_ehci_pdata;
+
+static void __init smdkv310_ehci_init(void)
+{
+ struct s5p_ehci_platdata *pdata = &smdkv310_ehci_pdata;
+
+ s5p_ehci_set_platdata(pdata);
+}
+
static struct platform_device *smdkv310_devices[] __initdata = {
&s3c_device_hsmmc0,
&s3c_device_hsmmc1,
@@ -175,6 +187,7 @@ static struct platform_device *smdkv310_devices[]
__initdata = {
&s3c_device_i2c1,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_ehci,
&exynos4_device_ac97,
&exynos4_device_i2s0,
&samsung_device_keypad,
@@ -258,6 +271,9 @@ static void __init smdkv310_machine_init(void)
samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);
+ smdkv310_ehci_init();
+ clk_xusbxti.rate = 2400;
+
platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Add USB EHCI device to Origen
Signed-off-by: Pankaj Dubey
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/Kconfig |2 ++
arch/arm/mach-exynos4/mach-origen.c | 17 +
2 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 3ab0f18..fba97a4 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -189,8 +189,10 @@ config MACH_NURI
config MACH_ORIGEN
bool "ORIGEN"
select CPU_EXYNOS4210
+ select S5P_DEV_USB_EHCI
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select EXYNOS4_SETUP_USB_PHY
select S3C_DEV_HSMMC2
select EXYNOS4_SETUP_SDHCI
help
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index ed59f86..d101756 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -24,6 +24,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -79,10 +81,21 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata
__initdata = {
.clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
};
+/* USB EHCI */
+static struct s5p_ehci_platdata origen_ehci_pdata;
+
+static void __init origen_ehci_init(void)
+{
+ struct s5p_ehci_platdata *pdata = &origen_ehci_pdata;
+
+ s5p_ehci_set_platdata(pdata);
+}
+
static struct platform_device *origen_devices[] __initdata = {
&s3c_device_hsmmc2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_ehci,
};
static void __init origen_map_io(void)
@@ -95,6 +108,10 @@ static void __init origen_map_io(void)
static void __init origen_machine_init(void)
{
s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata);
+
+ origen_ehci_init();
+ clk_xusbxti.rate = 2400;
+
platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Enable system MMU support on Origen
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/Kconfig |1 +
arch/arm/mach-exynos4/mach-origen.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 3ab0f18..bdb76e2 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -192,6 +192,7 @@ config MACH_ORIGEN
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_HSMMC2
+ select EXYNOS4_DEV_SYSMMU
select EXYNOS4_SETUP_SDHCI
help
Machine support for ORIGEN based on Samsung EXYNOS4210
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index ed59f86..d04f7ee 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -83,6 +83,7 @@ static struct platform_device *origen_devices[] __initdata = {
&s3c_device_hsmmc2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &exynos4_device_sysmmu,
};
static void __init origen_map_io(void)
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Add FIMC device on SMDKV310 board
This patch adds definitions to enable support for s5p-fimc driver on
SMDKV310 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/Kconfig |4
arch/arm/mach-exynos4/mach-smdkv310.c |4
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index e6925de..95f778e 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -135,6 +135,10 @@ config MACH_SMDKC210
config MACH_SMDKV310
bool "SMDKV310"
select CPU_EXYNOS4210
+ select S5P_DEV_FIMC0
+ select S5P_DEV_FIMC1
+ select S5P_DEV_FIMC2
+ select S5P_DEV_FIMC3
select S5P_DEV_FIMD0
select S3C_DEV_RTC
select S3C_DEV_WDT
diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c
b/arch/arm/mach-exynos4/mach-smdkv310.c
index 5f62b2b..4380b02 100644
--- a/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@ -168,6 +168,10 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
};
static struct platform_device *smdkv310_devices[] __initdata = {
+ &s5p_device_fimc0,
+ &s5p_device_fimc1,
+ &s5p_device_fimc2,
+ &s5p_device_fimc3,
&s3c_device_hsmmc0,
&s3c_device_hsmmc1,
&s3c_device_hsmmc2,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Add FIMC device on Origen board
This patch adds definitions to enable support for s5p-fimc driver on
Origen board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/Kconfig |4
arch/arm/mach-exynos4/mach-origen.c |4
2 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index e6925de..a3d92a8 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -227,6 +227,10 @@ config MACH_NURI
config MACH_ORIGEN
bool "ORIGEN"
select CPU_EXYNOS4210
+ select S5P_DEV_FIMC0
+ select S5P_DEV_FIMC1
+ select S5P_DEV_FIMC2
+ select S5P_DEV_FIMC3
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_HSMMC2
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index ed59f86..4a2ac49 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -80,6 +80,10 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata
__initdata = {
};
static struct platform_device *origen_devices[] __initdata = {
+ &s5p_device_fimc0,
+ &s5p_device_fimc1,
+ &s5p_device_fimc2,
+ &s5p_device_fimc3,
&s3c_device_hsmmc2,
&s3c_device_rtc,
&s3c_device_wdt,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] ARM: EXYNOS4: Add PWM backlight support on Origen
From: Giridhar Maruthy
This patch adds support for LCD backlight using PWM timer on
Origen board.
Signed-off-by: Giridhar Maruthy
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/Kconfig |2 ++
arch/arm/mach-exynos4/mach-origen.c | 16
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index e6925de..3e9138e 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -230,6 +230,8 @@ config MACH_ORIGEN
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_HSMMC2
+ select SAMSUNG_DEV_BACKLIGHT
+ select SAMSUNG_DEV_PWM
select EXYNOS4_SETUP_SDHCI
help
Machine support for ORIGEN based on Samsung EXYNOS4210
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index ed59f86..b871815 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
@@ -24,6 +25,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -85,6 +88,17 @@ static struct platform_device *origen_devices[] __initdata =
{
&s3c_device_wdt,
};
+/* LCD Backlight data */
+static struct samsung_bl_gpio_info origen_bl_gpio_info = {
+ .no = EXYNOS4_GPD0(0),
+ .func = S3C_GPIO_SFN(2),
+};
+
+static struct platform_pwm_backlight_data origen_bl_data = {
+ .pwm_id = 0,
+ .pwm_period_ns = 1000,
+};
+
static void __init origen_map_io(void)
{
s5p_init_io(NULL, 0, S5P_VA_CHIPID);
@@ -96,6 +110,8 @@ static void __init origen_machine_init(void)
{
s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata);
platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
+
+ samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data);
}
MACHINE_START(ORIGEN, "ORIGEN")
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/2] ARM: EXYNOS4: USB: Code cleanup and PHY initialization
This patch set is based on Kukjin Kim's for-next branch. Tested on SMDKV310 and Origen boards. The patch set cleans up intermediate functions and combines USB host and device initialisation into a single function. Pankaj Dubey (2): ARM: EXYNOS4: Code cleanup and remove extra functions. ARM: EXYNOS4: Add USB phy initialization for device arch/arm/mach-exynos4/include/mach/regs-pmu.h |2 +- arch/arm/mach-exynos4/setup-usb-phy.c | 123 + 2 files changed, 84 insertions(+), 41 deletions(-) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] ARM: EXYNOS4: Code cleanup and remove extra functions.
From: Pankaj Dubey
This patch removes the intermediate exynos4_usb_phy1_init and
exynos4_usb_phy1_exit function calls.
Signed-off-by: Pankaj Dubey
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/setup-usb-phy.c | 166 +++-
1 files changed, 78 insertions(+), 88 deletions(-)
diff --git a/arch/arm/mach-exynos4/setup-usb-phy.c
b/arch/arm/mach-exynos4/setup-usb-phy.c
index 39aca04..f4c944a 100644
--- a/arch/arm/mach-exynos4/setup-usb-phy.c
+++ b/arch/arm/mach-exynos4/setup-usb-phy.c
@@ -19,118 +19,108 @@
#include
#include
-static int exynos4_usb_phy1_init(struct platform_device *pdev)
+int s5p_usb_phy_init(struct platform_device *pdev, int type)
{
- struct clk *otg_clk;
- struct clk *xusbxti_clk;
- u32 phyclk;
- u32 rstcon;
- int err;
-
- otg_clk = clk_get(&pdev->dev, "otg");
- if (IS_ERR(otg_clk)) {
- dev_err(&pdev->dev, "Failed to get otg clock\n");
- return PTR_ERR(otg_clk);
- }
+ if (type == S5P_USB_PHY_HOST) {
+ struct clk *otg_clk;
+ struct clk *xusbxti_clk;
+ u32 phyclk;
+ u32 rstcon;
+ int err;
+
+ otg_clk = clk_get(&pdev->dev, "otg");
+ if (IS_ERR(otg_clk)) {
+ dev_err(&pdev->dev, "Failed to get otg clock\n");
+ return PTR_ERR(otg_clk);
+ }
- err = clk_enable(otg_clk);
- if (err) {
- clk_put(otg_clk);
- return err;
- }
+ err = clk_enable(otg_clk);
+ if (err) {
+ clk_put(otg_clk);
+ return err;
+ }
- writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE,
+ writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE,
S5P_USBHOST_PHY_CONTROL);
- /* set clock frequency for PLL */
- phyclk = readl(EXYNOS4_PHYCLK) & ~CLKSEL_MASK;
-
- xusbxti_clk = clk_get(&pdev->dev, "xusbxti");
- if (xusbxti_clk && !IS_ERR(xusbxti_clk)) {
- switch (clk_get_rate(xusbxti_clk)) {
- case 12 * MHZ:
- phyclk |= CLKSEL_12M;
- break;
- case 24 * MHZ:
- phyclk |= CLKSEL_24M;
- break;
- default:
- case 48 * MHZ:
- /* default reference clock */
- break;
- }
+ /* set clock frequency for PLL */
+ phyclk = readl(EXYNOS4_PHYCLK) & ~CLKSEL_MASK;
+
+ xusbxti_clk = clk_get(&pdev->dev, "xusbxti");
+ if (xusbxti_clk && !IS_ERR(xusbxti_clk)) {
+ switch (clk_get_rate(xusbxti_clk)) {
+ case 12 * MHZ:
+ phyclk |= CLKSEL_12M;
+ break;
+ case 24 * MHZ:
+ phyclk |= CLKSEL_24M;
+ break;
+ default:
+ case 48 * MHZ:
+ /* default reference clock */
+ break;
+ }
clk_put(xusbxti_clk);
- }
+ }
- writel(phyclk, EXYNOS4_PHYCLK);
+ writel(phyclk, EXYNOS4_PHYCLK);
- /* floating prevention logic: disable */
- writel((readl(EXYNOS4_PHY1CON) | FPENABLEN), EXYNOS4_PHY1CON);
+ /* floating prevention logic: disable */
+ writel((readl(EXYNOS4_PHY1CON) | FPENABLEN), EXYNOS4_PHY1CON);
- /* set to normal HSIC 0 and 1 of PHY1 */
- writel((readl(EXYNOS4_PHYPWR) & ~PHY1_HSIC_NORMAL_MASK),
+ /* set to normal HSIC 0 and 1 of PHY1 */
+ writel((readl(EXYNOS4_PHYPWR) & ~PHY1_HSIC_NORMAL_MASK),
EXYNOS4_PHYPWR);
- /* set to normal standard USB of PHY1 */
- writel((readl(EXYNOS4_PHYPWR) & ~PHY1_STD_NORMAL_MASK), EXYNOS4_PHYPWR);
+ /* set to normal standard USB of PHY1 */
+ writel((readl(EXYNOS4_PHYPWR) & ~PHY1_STD_NORMAL_MASK),
+ EXYNOS4_PHYPWR);
- /* reset all ports of both PHY and Link */
- rstcon = readl(EXYNOS4_RSTCON) | HOST_LINK_PORT_SWRST_MASK |
- PHY1_SWRST_MASK;
- writel(rstcon, EXYNOS4_RSTCON);
- udelay(10);
+ /* reset all ports of both PHY and Link */
+ rstcon = readl(EXYNOS4_RSTCON) | HOST_LINK_PORT_SWRST_MASK |
+ PHY1_SWRST_MASK;
+ writel(rstcon, EXYNOS4_RSTCON);
+ udelay(10);
- rstcon &= ~(HOST_LINK_POR
[PATCH 2/2] ARM: EXYNOS4: Add USB PHY initialization for device
From: Pankaj Dubey
This patch modifies USB PHY initialization code so that USB host
and device can be initialized with the same function.
Signed-off-by: Pankaj Dubey
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/include/mach/regs-pmu.h |2 +-
arch/arm/mach-exynos4/setup-usb-phy.c | 159
2 files changed, 107 insertions(+), 54 deletions(-)
diff --git a/arch/arm/mach-exynos4/include/mach/regs-pmu.h
b/arch/arm/mach-exynos4/include/mach/regs-pmu.h
index cdf9b47..c4709f2 100644
--- a/arch/arm/mach-exynos4/include/mach/regs-pmu.h
+++ b/arch/arm/mach-exynos4/include/mach/regs-pmu.h
@@ -34,7 +34,7 @@
#define S5P_WAKEUP_STATS5P_PMUREG(0x0600)
#define S5P_EINT_WAKEUP_MASK S5P_PMUREG(0x0604)
#define S5P_WAKEUP_MASKS5P_PMUREG(0x0608)
-
+#define S5P_USBDEVICE_PHY_CONTROL S5P_PMUREG(0x0704)
#define S5P_USBHOST_PHY_CONTROLS5P_PMUREG(0x0708)
#define S5P_USBHOST_PHY_ENABLE (1 << 0)
diff --git a/arch/arm/mach-exynos4/setup-usb-phy.c
b/arch/arm/mach-exynos4/setup-usb-phy.c
index f4c944a..69878a1 100644
--- a/arch/arm/mach-exynos4/setup-usb-phy.c
+++ b/arch/arm/mach-exynos4/setup-usb-phy.c
@@ -21,51 +21,65 @@
int s5p_usb_phy_init(struct platform_device *pdev, int type)
{
+ struct clk *otg_clk, *usbhost_clk;
+ struct clk *xusbxti_clk;
+ u32 phyclk;
+ u32 rstcon;
+ int err;
+ if ((type != S5P_USB_PHY_HOST) && (type != S5P_USB_PHY_DEVICE))
+ return -EINVAL;
+
+ otg_clk = clk_get(&pdev->dev, "otg");
+ if (IS_ERR(otg_clk)) {
+ dev_err(&pdev->dev, "Failed to get otg clock\n");
+ return PTR_ERR(otg_clk);
+ }
+
+ err = clk_enable(otg_clk);
+ if (err) {
+ clk_put(otg_clk);
+ return err;
+ }
+
+ /* set clock frequency for PLL */
+ phyclk = readl(EXYNOS4_PHYCLK) & ~CLKSEL_MASK;
+
+ xusbxti_clk = clk_get(&pdev->dev, "xusbxti");
+ if (xusbxti_clk && !IS_ERR(xusbxti_clk)) {
+ switch (clk_get_rate(xusbxti_clk)) {
+ case 12 * MHZ:
+ phyclk |= CLKSEL_12M;
+ break;
+ case 24 * MHZ:
+ phyclk |= CLKSEL_24M;
+ break;
+ default:
+ case 48 * MHZ:
+ /* default reference clock */
+ break;
+ }
+ clk_put(xusbxti_clk);
+ }
+
+ writel(phyclk, EXYNOS4_PHYCLK);
+
if (type == S5P_USB_PHY_HOST) {
- struct clk *otg_clk;
- struct clk *xusbxti_clk;
- u32 phyclk;
- u32 rstcon;
- int err;
-
- otg_clk = clk_get(&pdev->dev, "otg");
- if (IS_ERR(otg_clk)) {
- dev_err(&pdev->dev, "Failed to get otg clock\n");
- return PTR_ERR(otg_clk);
+ usbhost_clk = clk_get(&pdev->dev, "usbhost");
+
+ if (IS_ERR(usbhost_clk)) {
+ dev_err(&pdev->dev, "Failed to get usbhost clock\n");
+ return PTR_ERR(usbhost_clk);
}
- err = clk_enable(otg_clk);
+ err = clk_enable(usbhost_clk);
if (err) {
- clk_put(otg_clk);
+ clk_put(usbhost_clk);
return err;
}
writel(readl(S5P_USBHOST_PHY_CONTROL) | S5P_USBHOST_PHY_ENABLE,
S5P_USBHOST_PHY_CONTROL);
- /* set clock frequency for PLL */
- phyclk = readl(EXYNOS4_PHYCLK) & ~CLKSEL_MASK;
-
- xusbxti_clk = clk_get(&pdev->dev, "xusbxti");
- if (xusbxti_clk && !IS_ERR(xusbxti_clk)) {
- switch (clk_get_rate(xusbxti_clk)) {
- case 12 * MHZ:
- phyclk |= CLKSEL_12M;
- break;
- case 24 * MHZ:
- phyclk |= CLKSEL_24M;
- break;
- default:
- case 48 * MHZ:
- /* default reference clock */
- break;
- }
- clk_put(xusbxti_clk);
- }
-
- writel(phyclk, EXYNOS4_PHYCLK);
-
- /* floating prevention logic: disable */
writel((readl(EXYNOS4_PHY1CON) | FPENABLEN), EXYNOS4_PHY1CON);
/* set to normal HSIC 0 and 1 of PHY1 */
@@ -84,30 +98,61 @@ int s5p_
[PATCH] ARM: EXYNOS4: Add HDMI support for Origen
This patch adds HDMI (TVout) support for Origen board.
This patch is based on for-next branch of Kukjin Kim's tree:
http://git.kernel.org/?p=linux/kernel/git/kgene/linux-samsung.git;a=summary
This patch is tested using Hatim's patch:
http://www.spinics.net/lists/linux-samsung-soc/msg06367.html
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/Kconfig |2 ++
arch/arm/mach-exynos4/mach-origen.c |4
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 181fb04..4f908f7 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -225,6 +225,8 @@ config MACH_ORIGEN
select S3C_DEV_WDT
select S3C_DEV_HSMMC2
select EXYNOS4_SETUP_SDHCI
+ select S5P_DEV_I2C_HDMIPHY
+ select S5P_DEV_TV
help
Machine support for ORIGEN based on Samsung EXYNOS4210
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index ed59f86..6ec68ee 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -81,8 +81,11 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata
__initdata = {
static struct platform_device *origen_devices[] __initdata = {
&s3c_device_hsmmc2,
+ &s5p_device_i2c_hdmiphy,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_hdmi,
+ &s5p_device_mixer,
};
static void __init origen_map_io(void)
@@ -95,6 +98,7 @@ static void __init origen_map_io(void)
static void __init origen_machine_init(void)
{
s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata);
+ s5p_i2c_hdmiphy_set_platdata(NULL);
platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2] ARM: EXYNOS4: Add HDMI support for Origen
This patch adds HDMI (TVout) support for Origen board.
Signed-off-by: Sachin Kamat
---
Re-submitting the patch with minor changes since v1:
* Re-ordered the entries in Kconfig and init data
This patch is based on for-next branch of Kukjin Kim's tree:
http://git.kernel.org/?p=linux/kernel/git/kgene/linux-samsung.git;a=summary
This patch is tested using Hatim's patch:
http://www.spinics.net/lists/linux-samsung-soc/msg06367.html
---
arch/arm/mach-exynos4/Kconfig |2 ++
arch/arm/mach-exynos4/mach-origen.c |4
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 181fb04..e0c217f 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -224,6 +224,8 @@ config MACH_ORIGEN
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_HSMMC2
+ select S5P_DEV_I2C_HDMIPHY
+ select S5P_DEV_TV
select EXYNOS4_SETUP_SDHCI
help
Machine support for ORIGEN based on Samsung EXYNOS4210
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index ed59f86..5525329 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -83,6 +83,9 @@ static struct platform_device *origen_devices[] __initdata = {
&s3c_device_hsmmc2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_i2c_hdmiphy,
+ &s5p_device_hdmi,
+ &s5p_device_mixer,
};
static void __init origen_map_io(void)
@@ -95,6 +98,7 @@ static void __init origen_map_io(void)
static void __init origen_machine_init(void)
{
s3c_sdhci2_set_platdata(&origen_hsmmc2_pdata);
+ s5p_i2c_hdmiphy_set_platdata(NULL);
platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Add keypad support for Origen
This patch adds keypad support for Origen board as GPIO keys.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/mach-origen.c | 58 +++
1 files changed, 58 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index ed59f86..61da36b 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -14,6 +14,7 @@
#include
#include
#include
+#include
#include
#include
@@ -79,10 +80,67 @@ static struct s3c_sdhci_platdata origen_hsmmc2_pdata
__initdata = {
.clk_type = S3C_SDHCI_CLK_DIV_EXTERNAL,
};
+static struct gpio_keys_button origen_gpio_keys_table[] = {
+ {
+ .code = KEY_MENU,
+ .gpio = EXYNOS4_GPX1(5),
+ .desc = "gpio-keys: KEY_MENU",
+ .type = EV_KEY,
+ .active_low = 1,
+ .wakeup = 1,
+ .debounce_interval = 1,
+ }, {
+ .code = KEY_HOME,
+ .gpio = EXYNOS4_GPX1(6),
+ .desc = "gpio-keys: KEY_HOME",
+ .type = EV_KEY,
+ .active_low = 1,
+ .wakeup = 1,
+ .debounce_interval = 1,
+ }, {
+ .code = KEY_BACK,
+ .gpio = EXYNOS4_GPX1(7),
+ .desc = "gpio-keys: KEY_BACK",
+ .type = EV_KEY,
+ .active_low = 1,
+ .wakeup = 1,
+ .debounce_interval = 1,
+ }, {
+ .code = KEY_UP,
+ .gpio = EXYNOS4_GPX2(0),
+ .desc = "gpio-keys: KEY_UP",
+ .type = EV_KEY,
+ .active_low = 1,
+ .wakeup = 1,
+ .debounce_interval = 1,
+ }, {
+ .code = KEY_DOWN,
+ .gpio = EXYNOS4_GPX2(1),
+ .desc = "gpio-keys: KEY_DOWN",
+ .type = EV_KEY,
+ .active_low = 1,
+ .wakeup = 1,
+ .debounce_interval = 1,
+ },
+};
+
+static struct gpio_keys_platform_data origen_gpio_keys_data = {
+ .buttons = origen_gpio_keys_table,
+ .nbuttons = ARRAY_SIZE(origen_gpio_keys_table),
+};
+
+static struct platform_device origen_device_gpiokeys = {
+ .name = "gpio-keys",
+ .dev = {
+ .platform_data = &origen_gpio_keys_data,
+ },
+};
+
static struct platform_device *origen_devices[] __initdata = {
&s3c_device_hsmmc2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &origen_device_gpiokeys,
};
static void __init origen_map_io(void)
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Add header file protection macros
This patch adds header file protection macros to prevent duplication.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/include/mach/pm-core.h |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/include/mach/pm-core.h
b/arch/arm/mach-exynos4/include/mach/pm-core.h
index 1df3b81..4c3406b 100644
--- a/arch/arm/mach-exynos4/include/mach/pm-core.h
+++ b/arch/arm/mach-exynos4/include/mach/pm-core.h
@@ -14,6 +14,10 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+
+#ifndef __ASM_ARCH_PM_CORE_H
+#define __ASM_ARCH_PM_CORE_H __FILE__
+
#include
static inline void s3c_pm_debug_init_uart(void)
@@ -57,3 +61,5 @@ static inline void s3c_pm_saved_gpios(void)
{
/* nothing here yet */
}
+
+#endif /* __ASM_ARCH_PM_CORE_H */
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Add HPD and PD support for HDMI on Origen
This patch adds hot plug detection (HPD) and power domain (PD) support for HDMI
on Origen board.
Signed-off-by: Sachin Kamat
---
I have added the KConfig entry and header file required for enabling PD
since the patch [1] is not yet applied on Kgene's tree [2].
[1] http://permalink.gmane.org/gmane.linux.kernel.samsung-soc/6763
[2] https://github.com/kgene/linux-samsung/tree/for-next
---
arch/arm/mach-exynos4/Kconfig |1 +
arch/arm/mach-exynos4/mach-origen.c | 14 ++
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index d0491c2..a02c94f 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -243,6 +243,7 @@ config MACH_ORIGEN
select S5P_DEV_I2C_HDMIPHY
select S5P_DEV_TV
select S5P_DEV_USB_EHCI
+ select EXYNOS4_DEV_PD
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_PWM
select EXYNOS4_SETUP_SDHCI
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index 421294b..36709ea 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -30,6 +30,7 @@
#include
#include
#include
+#include
#include
@@ -168,6 +169,7 @@ static struct platform_device *origen_devices[] __initdata
= {
&s5p_device_i2c_hdmiphy,
&s5p_device_mixer,
&origen_device_gpiokeys,
+ &exynos4_device_pd[PD_TV],
};
/* LCD Backlight data */
@@ -181,6 +183,14 @@ static struct platform_pwm_backlight_data origen_bl_data =
{
.pwm_period_ns = 1000,
};
+static void s5p_tv_setup(void)
+{
+ /* Direct HPD to HDMI chip */
+ 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);
+}
+
static void __init origen_map_io(void)
{
s5p_init_io(NULL, 0, S5P_VA_CHIPID);
@@ -200,10 +210,14 @@ static void __init origen_machine_init(void)
origen_ehci_init();
clk_xusbxti.rate = 2400;
+ s5p_tv_setup();
s5p_i2c_hdmiphy_set_platdata(NULL);
platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
+ s5p_device_hdmi.dev.parent = &exynos4_device_pd[PD_TV].dev;
+ s5p_device_mixer.dev.parent = &exynos4_device_pd[PD_TV].dev;
+
samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data);
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Enable MFC on Origen
This patch enables multi-format codec (MFC) support on Origen board.
Signed-off-by: Sachin Kamat
---
PD related code in KConfig and header are added only because for-next branch of
Kgene's tree does not have it enabled yet.
---
arch/arm/mach-exynos4/Kconfig |2 ++
arch/arm/mach-exynos4/mach-origen.c | 13 +
2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index d0491c2..93f9a62 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -243,6 +243,8 @@ config MACH_ORIGEN
select S5P_DEV_I2C_HDMIPHY
select S5P_DEV_TV
select S5P_DEV_USB_EHCI
+ select S5P_DEV_MFC
+ select EXYNOS4_DEV_PD
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_PWM
select EXYNOS4_SETUP_SDHCI
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index 421294b..4e53d10 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -30,6 +30,8 @@
#include
#include
#include
+#include
+#include
#include
@@ -167,6 +169,10 @@ static struct platform_device *origen_devices[] __initdata
= {
&s5p_device_hdmi,
&s5p_device_i2c_hdmiphy,
&s5p_device_mixer,
+ &s5p_device_mfc,
+ &s5p_device_mfc_l,
+ &s5p_device_mfc_r,
+ &exynos4_device_pd[PD_MFC],
&origen_device_gpiokeys,
};
@@ -188,6 +194,11 @@ static void __init origen_map_io(void)
s3c24xx_init_uarts(origen_uartcfgs, ARRAY_SIZE(origen_uartcfgs));
}
+static void __init origen_reserve(void)
+{
+ s5p_mfc_reserve_mem(0x4300, 8 << 20, 0x5100, 8 << 20);
+}
+
static void __init origen_machine_init(void)
{
/*
@@ -203,6 +214,7 @@ static void __init origen_machine_init(void)
s5p_i2c_hdmiphy_set_platdata(NULL);
platform_add_devices(origen_devices, ARRAY_SIZE(origen_devices));
+ s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
samsung_bl_set(&origen_bl_gpio_info, &origen_bl_data);
}
@@ -214,4 +226,5 @@ MACHINE_START(ORIGEN, "ORIGEN")
.map_io = origen_map_io,
.init_machine = origen_machine_init,
.timer = &exynos4_timer,
+ .reserve= &origen_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Register power domains on Origen.
This patch registers all the available power domains on Origen.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/mach-origen.c |4
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index 18909cf..35b12d7 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -601,6 +601,10 @@ static struct platform_device *origen_devices[] __initdata
= {
&s5p_device_mixer,
&exynos4_device_pd[PD_LCD0],
&exynos4_device_pd[PD_TV],
+ &exynos4_device_pd[PD_G3D],
+ &exynos4_device_pd[PD_LCD1],
+ &exynos4_device_pd[PD_CAM],
+ &exynos4_device_pd[PD_GPS],
&origen_device_gpiokeys,
&origen_lcd_hv070wsa,
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Enable regulator support for HDMI on Origen
This patch enables the regulators for HDMI on Origen board.
Since the DC5V line is connected directly to the HDMI connector,
"hdmi-en" regulator would become a dummy regulator on origen board
(by defining REGULATOR_DUMMY in the kernel config file).
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos4/mach-origen.c |3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/mach-origen.c
b/arch/arm/mach-exynos4/mach-origen.c
index 18909cf..39d8d4e 100644
--- a/arch/arm/mach-exynos4/mach-origen.c
+++ b/arch/arm/mach-exynos4/mach-origen.c
@@ -89,6 +89,8 @@ static struct s3c2410_uartcfg origen_uartcfgs[] __initdata = {
static struct regulator_consumer_supply __initdata ldo3_consumer[] = {
REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */
+ REGULATOR_SUPPLY("vdd", "exynos4-hdmi"), /* HDMI */
+ REGULATOR_SUPPLY("vdd_pll", "exynos4-hdmi"), /* HDMI */
};
static struct regulator_consumer_supply __initdata ldo6_consumer[] = {
REGULATOR_SUPPLY("vdd18", "s5p-mipi-csis.0"), /* MIPI */
@@ -98,6 +100,7 @@ static struct regulator_consumer_supply __initdata
ldo7_consumer[] = {
};
static struct regulator_consumer_supply __initdata ldo8_consumer[] = {
REGULATOR_SUPPLY("vdd", "s5p-adc"), /* ADC */
+ REGULATOR_SUPPLY("vdd_osc", "exynos4-hdmi"), /* HDMI */
};
static struct regulator_consumer_supply __initdata ldo9_consumer[] = {
REGULATOR_SUPPLY("dvdd", "swb-a31"), /* AR6003 WLAN & CSR 8810 BT */
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/3] s5p-g2d: add G2D to mach-nuri
Hi Kamil,
On 9 December 2011 21:34, Kamil Debski wrote:
> Signed-off-by: Kamil Debski
> Signed-off-by: Kyungmin Park
> ---
> arch/arm/mach-exynos/Kconfig | 1 +
> arch/arm/mach-exynos/mach-nuri.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
> index 0afcc3b..176092c 100644
> --- a/arch/arm/mach-exynos/Kconfig
> +++ b/arch/arm/mach-exynos/Kconfig
> @@ -171,6 +171,7 @@ config MACH_SMDKV310
> select S5P_DEV_FIMC1
> select S5P_DEV_FIMC2
> select S5P_DEV_FIMC3
> + select S5P_DEV_G2D
Shouldn't this entry be under "config MACH_NURI" instead of MACH_SMDKV310 ?
> select S5P_DEV_I2C_HDMIPHY
> select S5P_DEV_MFC
> select S5P_DEV_TV
> diff --git a/arch/arm/mach-exynos/mach-nuri.c
> b/arch/arm/mach-exynos/mach-nuri.c
> index 236bbe1..5251e91 100644
> --- a/arch/arm/mach-exynos/mach-nuri.c
> +++ b/arch/arm/mach-exynos/mach-nuri.c
> @@ -1262,6 +1262,7 @@ static struct platform_device *nuri_devices[]
> __initdata = {
> &s3c_device_i2c3,
> &i2c9_gpio,
> &s3c_device_adc,
> + &s5p_device_g2d,
> &s3c_device_rtc,
> &s5p_device_mfc,
> &s5p_device_mfc_l,
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/4] ARM: S5PV210: Enable FIMC and MFC on SMDK C110 and V210 boards
This patch series adds support for MFC and FIMC on SMDK C110 and V210 boards. It is based on Kukjin Kim's latest for-next branch. Sachin Kamat (4): ARM: S5PV210: Enable MFC on SMDKV210 ARM: S5PV210: Enable MFC on SMDKC110 ARM: S5PV210: Enable FIMC on SMDKV210 ARM: S5PV210: Enable FIMC on SMDKC110 arch/arm/mach-s5pv210/Kconfig |8 arch/arm/mach-s5pv210/mach-smdkc110.c | 14 ++ arch/arm/mach-s5pv210/mach-smdkv210.c | 13 + 3 files changed, 35 insertions(+), 0 deletions(-) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/4] ARM: S5PV210: Enable MFC on SMDKV210
This patch adds MFC support on SMDKV210 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |1 +
arch/arm/mach-s5pv210/mach-smdkv210.c | 10 ++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 646057a..251491d 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -137,6 +137,7 @@ config MACH_SMDKV210
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_MFC
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_IDE
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c
b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 8662ef6..d50cacd 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
/* Following are default values for UCON, ULCON and UFCON UART registers */
#define SMDKV210_UCON_DEFAULT (S3C2410_UCON_TXILEVEL |\
@@ -225,6 +226,9 @@ static struct platform_device *smdkv210_devices[]
__initdata = {
&s3c_device_rtc,
&s3c_device_ts,
&s3c_device_wdt,
+ &s5p_device_mfc,
+ &s5p_device_mfc_l,
+ &s5p_device_mfc_r,
&s5pv210_device_ac97,
&s5pv210_device_iis0,
&s5pv210_device_spdif,
@@ -284,6 +288,11 @@ static void __init smdkv210_map_io(void)
s5p_set_timer_source(S5P_PWM2, S5P_PWM4);
}
+static void __init smdkv210_reserve(void)
+{
+ s5p_mfc_reserve_mem(0x4300, 8 << 20, 0x5100, 8 << 20);
+}
+
static void __init smdkv210_machine_init(void)
{
s3c_pm_init();
@@ -319,4 +328,5 @@ MACHINE_START(SMDKV210, "SMDKV210")
.map_io = smdkv210_map_io,
.init_machine = smdkv210_machine_init,
.timer = &s5p_timer,
+ .reserve= &smdkv210_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/4] ARM: S5PV210: Enable MFC on SMDKC110
This patch adds MFC support on SMDKC110 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |1 +
arch/arm/mach-s5pv210/mach-smdkc110.c | 11 +++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 251491d..32893c7 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -113,6 +113,7 @@ config MACH_SMDKC110
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_MFC
select SAMSUNG_DEV_IDE
select S5PV210_SETUP_I2C1
select S5PV210_SETUP_I2C2
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c
b/arch/arm/mach-s5pv210/mach-smdkc110.c
index f7266bb..0087c7b 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
/* Following are default values for UCON, ULCON and UFCON UART registers */
#define SMDKC110_UCON_DEFAULT (S3C2410_UCON_TXILEVEL |\
@@ -92,6 +93,9 @@ static struct platform_device *smdkc110_devices[] __initdata
= {
&s3c_device_i2c2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_mfc,
+ &s5p_device_mfc_l,
+ &s5p_device_mfc_r,
};
static struct i2c_board_info smdkc110_i2c_devs0[] __initdata = {
@@ -115,6 +119,12 @@ static void __init smdkc110_map_io(void)
s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
}
+static void __init smdkc110_reserve(void)
+{
+ s5p_mfc_reserve_mem(0x4300, 8 << 20, 0x5100, 8 << 20);
+}
+
+
static void __init smdkc110_machine_init(void)
{
s3c_pm_init();
@@ -141,4 +151,5 @@ MACHINE_START(SMDKC110, "SMDKC110")
.map_io = smdkc110_map_io,
.init_machine = smdkc110_machine_init,
.timer = &s5p_timer,
+ .reserve= &smdkc110_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] ARM: S5PV210: Enable FIMC on SMDKV210
This patch adds support for FIMC 0, 1 and 2 on SMDKV210 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |3 +++
arch/arm/mach-s5pv210/mach-smdkv210.c |3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 32893c7..66e1b3d 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -138,6 +138,9 @@ config MACH_SMDKV210
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_FIMC0
+ select S5P_DEV_FIMC1
+ select S5P_DEV_FIMC2
select S5P_DEV_MFC
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c
b/arch/arm/mach-s5pv210/mach-smdkv210.c
index d50cacd..038fc5f 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -226,6 +226,9 @@ static struct platform_device *smdkv210_devices[]
__initdata = {
&s3c_device_rtc,
&s3c_device_ts,
&s3c_device_wdt,
+ &s5p_device_fimc0,
+ &s5p_device_fimc1,
+ &s5p_device_fimc2,
&s5p_device_mfc,
&s5p_device_mfc_l,
&s5p_device_mfc_r,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/4] ARM: S5PV210: Enable FIMC on SMDKC110
This patch adds support for FIMC 0, 1 & 2 on SMDKC110 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |3 +++
arch/arm/mach-s5pv210/mach-smdkc110.c |3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 66e1b3d..eb31498 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -113,6 +113,9 @@ config MACH_SMDKC110
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_FIMC0
+ select S5P_DEV_FIMC1
+ select S5P_DEV_FIMC2
select S5P_DEV_MFC
select SAMSUNG_DEV_IDE
select S5PV210_SETUP_I2C1
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c
b/arch/arm/mach-s5pv210/mach-smdkc110.c
index 0087c7b..59757b6 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -93,6 +93,9 @@ static struct platform_device *smdkc110_devices[] __initdata
= {
&s3c_device_i2c2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_fimc0,
+ &s5p_device_fimc1,
+ &s5p_device_fimc2,
&s5p_device_mfc,
&s5p_device_mfc_l,
&s5p_device_mfc_r,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] ARM: S5PV210: Enable FIMC on SMDKV210
Hi Mark, Thank you for your review comments. On 26 December 2011 17:24, Mark Brown wrote: > On Mon, Dec 26, 2011 at 03:30:12PM +0530, Sachin Kamat wrote: >> This patch adds support for FIMC 0, 1 and 2 on SMDKV210 board. > > Why does this not also apply to the Aquilla, Gony and Torbreck machines? FIMC is already enabled in Aquila and Goni machines. I was not sure if it is required in Torbreck. > >> &s3c_device_wdt, >> + &s5p_device_fimc0, >> + &s5p_device_fimc1, >> + &s5p_device_fimc2, >> &s5p_device_mfc, > > The support consists solely of adding them to the lists of devices, > there's no visible per board hookup here. Yes. > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" > in > the body of a message to majord...@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/4] ARM: S5PV210: Enable FIMC on SMDKV210
Hi Sylwester,
Thank you for your comments.
I did check Goni code and found that there was s5p_device_fimc_md device added.
But I could n't find much description about it and also initial
version did not have it enabled, hence I did not include it.
I will re-submit the patch after adding s5p_device_fimc_md in the device list.
Thanks and regards
Sachin
On 26 December 2011 21:57, Sylwester Nawrocki wrote:
> Hi Sachin,
>
> thanks for the patch.
>
> On 12/26/2011 11:00 AM, Sachin Kamat wrote:
>> This patch adds support for FIMC 0, 1 and 2 on SMDKV210 board.
>>
>> Signed-off-by: Sachin Kamat
>> ---
>> arch/arm/mach-s5pv210/Kconfig | 3 +++
>> arch/arm/mach-s5pv210/mach-smdkv210.c | 3 +++
>> 2 files changed, 6 insertions(+), 0 deletions(-)
>>
>> diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
>> index 32893c7..66e1b3d 100644
>> --- a/arch/arm/mach-s5pv210/Kconfig
>> +++ b/arch/arm/mach-s5pv210/Kconfig
>> @@ -138,6 +138,9 @@ config MACH_SMDKV210
>> select S3C_DEV_I2C2
>> select S3C_DEV_RTC
>> select S3C_DEV_WDT
>> + select S5P_DEV_FIMC0
>> + select S5P_DEV_FIMC1
>> + select S5P_DEV_FIMC2
>> select S5P_DEV_MFC
>> select SAMSUNG_DEV_ADC
>> select SAMSUNG_DEV_BACKLIGHT
>> diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c
>> b/arch/arm/mach-s5pv210/mach-smdkv210.c
>> index d50cacd..038fc5f 100644
>> --- a/arch/arm/mach-s5pv210/mach-smdkv210.c
>> +++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
>> @@ -226,6 +226,9 @@ static struct platform_device *smdkv210_devices[]
>> __initdata = {
>> &s3c_device_rtc,
>> &s3c_device_ts,
>> &s3c_device_wdt,
>> + &s5p_device_fimc0,
>> + &s5p_device_fimc1,
>> + &s5p_device_fimc2,
>
> Sorry, this won't work, unless you add &s5p_device_fimc_md after all
> s5p_fimc_device? entries. s5p_device_fimc_md is a platform device for
> FIMC media device driver (/dev/media?), which registers all required
> video nodes (mem-to-mem and video capture).
> Complete board code for FIMC can be found in Goni (or Nuri) board files.
>
> Does the above really work for you with 3.2-rc7 kernel ?
>
> I've had prepared a patch adding s5p_device_fimc_md for the SMDK boards
> that already register FIMC devices, but got distracted by other tasks
> and finally I didn't send it for 3.2 :(
>
> BTW, is there anyone interested in s3c64xx (s3c24xx) CAMIF v4l2 driver
> in the mainline kernel ? I've started some works on it and could carry on
> with that if there is some interest, so we can have something which
> is in line with the mainline APIs.
>
> --
>
> Thanks,
> Sylwester
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/4] ARM: S5PV210: Enable FIMC and MFC on SMDK C110 and V210 boards
Hi Kukjin, Please pick up the MFC patches (patches 1 & 2) from this series. I will post a separate patch series for FIMC related changes. Regards Sachin On 26 December 2011 15:30, Sachin Kamat wrote: > This patch series adds support for MFC and FIMC on SMDK C110 and V210 boards. > It is based on Kukjin Kim's latest for-next branch. > > Sachin Kamat (4): > ARM: S5PV210: Enable MFC on SMDKV210 > ARM: S5PV210: Enable MFC on SMDKC110 > ARM: S5PV210: Enable FIMC on SMDKV210 > ARM: S5PV210: Enable FIMC on SMDKC110 > > arch/arm/mach-s5pv210/Kconfig | 8 > arch/arm/mach-s5pv210/mach-smdkc110.c | 14 ++ > arch/arm/mach-s5pv210/mach-smdkv210.c | 13 + > 3 files changed, 35 insertions(+), 0 deletions(-) > > -- > 1.7.4.1 > -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/3] Samsung S5P platform modification required for G2D driver
Hi Kamil, Your previous patch set has already been merged into [1]. Thus this has the G2D selected under SMDKV310 instead of NURI in the KConfig file. [1] http://git.kernel.org/?p=linux/kernel/git/kgene/linux-samsung.git;a=shortlog;h=refs/heads/for-next Regards Sachin On 27/12/2011, Kamil Debski wrote: > Hi, > > This series of patches contains necessary platform modification required by > the > G2D driver. G2D is a 2D-graphics acceleration engine present in the S5PC110 > and > Exynos4 Samsung SoCs. > > I have fixed the errors pointed out by Kukjin Kim an Sachin Kamat. (Thanks!) > Also the patches have been rebased to the newest kgene/for-next branch. > > Best wishes, > Kamil Debski > > Kamil Debski (3): > s5p-g2d: add G2D to plat-s5p and mach-exynos4 > s5p-g2d: add G2D to mach-nuri > s5p-g2d: add G2D to mach-universal > > arch/arm/mach-exynos/Kconfig |2 ++ > arch/arm/mach-exynos/include/mach/map.h|3 +++ > arch/arm/mach-exynos/mach-nuri.c |1 + > arch/arm/mach-exynos/mach-universal_c210.c |1 + > arch/arm/plat-s5p/Kconfig |5 + > arch/arm/plat-samsung/devs.c | 28 > > arch/arm/plat-samsung/include/plat/devs.h |1 + > 7 files changed, 41 insertions(+), 0 deletions(-) > > -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS: Enable G2D on Origen
This patch enables G2D support on Origen board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/Kconfig |1 +
arch/arm/mach-exynos/mach-origen.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index e931924..febfd53 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -303,6 +303,7 @@ config MACH_ORIGEN
select S5P_DEV_FIMC2
select S5P_DEV_FIMC3
select S5P_DEV_FIMD0
+ select S5P_DEV_G2D
select S5P_DEV_I2C_HDMIPHY
select S5P_DEV_MFC
select S5P_DEV_TV
diff --git a/arch/arm/mach-exynos/mach-origen.c
b/arch/arm/mach-exynos/mach-origen.c
index a0116036..0ec2a63 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -632,6 +632,7 @@ static struct platform_device *origen_devices[] __initdata
= {
&s5p_device_fimc2,
&s5p_device_fimc3,
&s5p_device_fimd0,
+ &s5p_device_g2d,
&s5p_device_hdmi,
&s5p_device_i2c_hdmiphy,
&s5p_device_mfc,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: S5PV210: Enable FIMC on SMDKV210
This patch enables FIMC 0,1,2 and media device(md) on SMDKV210 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |3 +++
arch/arm/mach-s5pv210/mach-smdkv210.c |4
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 2cdc42e..faa94e6 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -142,6 +142,9 @@ config MACH_SMDKV210
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_FIMC0
+ select S5P_DEV_FIMC1
+ select S5P_DEV_FIMC2
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_IDE
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c
b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 513db92..511f807 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -221,6 +221,10 @@ static struct platform_device *smdkv210_devices[]
__initdata = {
&s3c_device_rtc,
&s3c_device_ts,
&s3c_device_wdt,
+ &s5p_device_fimc0,
+ &s5p_device_fimc1,
+ &s5p_device_fimc2,
+ &s5p_device_fimc_md,
&s5pv210_device_ac97,
&s5pv210_device_iis0,
&s5pv210_device_spdif,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: S5PV210: Enable FIMC on SMDKC110
This patch enables FIMC 0,1,2 and media device (md) on SMDKC110 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |3 +++
arch/arm/mach-s5pv210/mach-smdkc110.c |4
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 2cdc42e..afceaa9 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -118,6 +118,9 @@ config MACH_SMDKC110
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_FIMC0
+ select S5P_DEV_FIMC1
+ select S5P_DEV_FIMC2
select SAMSUNG_DEV_IDE
select S5PV210_SETUP_I2C1
select S5PV210_SETUP_I2C2
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c
b/arch/arm/mach-s5pv210/mach-smdkc110.c
index f7266bb..cd823e5 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -92,6 +92,10 @@ static struct platform_device *smdkc110_devices[] __initdata
= {
&s3c_device_i2c2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_fimc0,
+ &s5p_device_fimc1,
+ &s5p_device_fimc2,
+ &s5p_device_fimc_md,
};
static struct i2c_board_info smdkc110_i2c_devs0[] __initdata = {
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 0/3] ARM: EXYNOS/S5PV210: Add missing FIMC media device
FIMC media device (md) registers all required video nodes. This is required for functioning of FIMC devices. Thanks to Sylwester Nawrocki for pointing this out. This patchset is based on the latest for-next branch of Kukjin Kim's tree. Sachin Kamat (3): ARM: S5PV210: Add missing FIMC media device to Aquila ARM: EXYNOS: Add missing FIMC media device to SMDKV310 ARM: EXYNOS: Add missing FIMC media device to Origen arch/arm/mach-exynos/mach-origen.c |1 + arch/arm/mach-exynos/mach-smdkv310.c |1 + arch/arm/mach-s5pv210/mach-aquila.c |1 + 3 files changed, 3 insertions(+), 0 deletions(-) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/3] ARM: S5PV210: Add missing FIMC media device to Aquila
FIMC media device (md) registers all required video nodes.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/mach-aquila.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/mach-aquila.c
b/arch/arm/mach-s5pv210/mach-aquila.c
index 404ac7a..ca7cfdb 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -614,6 +614,7 @@ static struct platform_device *aquila_devices[] __initdata
= {
&s5p_device_fimc0,
&s5p_device_fimc1,
&s5p_device_fimc2,
+ &s5p_device_fimc_md,
&s5pv210_device_iis0,
&wm8994_fixed_voltage0,
&wm8994_fixed_voltage1,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/3] ARM: EXYNOS: Add missing FIMC media device to SMDKV310
FIMC media device (md) registers all required video nodes.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/mach-smdkv310.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c
b/arch/arm/mach-exynos/mach-smdkv310.c
index bf2094e..09d0525 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -268,6 +268,7 @@ static struct platform_device *smdkv310_devices[]
__initdata = {
&s5p_device_fimc1,
&s5p_device_fimc2,
&s5p_device_fimc3,
+ &s5p_device_fimc_md,
&exynos4_device_ac97,
&exynos4_device_i2s0,
&exynos4_device_ohci,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] ARM: EXYNOS: Add missing FIMC media device to Origen
FIMC media device (md) registers all required video nodes.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/mach-origen.c |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-origen.c
b/arch/arm/mach-exynos/mach-origen.c
index a0116036..d691146 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -631,6 +631,7 @@ static struct platform_device *origen_devices[] __initdata
= {
&s5p_device_fimc1,
&s5p_device_fimc2,
&s5p_device_fimc3,
+ &s5p_device_fimc_md,
&s5p_device_fimd0,
&s5p_device_hdmi,
&s5p_device_i2c_hdmiphy,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS: Enable G2D on SMDKV310
This patch enables G2D support on SMDKV310 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/Kconfig |1 +
arch/arm/mach-exynos/mach-smdkv310.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index bd4600e..a673d0d 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -183,6 +183,7 @@ config MACH_SMDKV310
select S5P_DEV_FIMC1
select S5P_DEV_FIMC2
select S5P_DEV_FIMC3
+ select S5P_DEV_G2D
select S5P_DEV_I2C_HDMIPHY
select S5P_DEV_MFC
select S5P_DEV_TV
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c
b/arch/arm/mach-exynos/mach-smdkv310.c
index b2c5557..8a5c23b 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -270,6 +270,7 @@ static struct platform_device *smdkv310_devices[]
__initdata = {
&s5p_device_fimc1,
&s5p_device_fimc2,
&s5p_device_fimc3,
+ &s5p_device_g2d,
&exynos4_device_ac97,
&exynos4_device_i2s0,
&exynos4_device_ohci,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: S5PV210: Add G2D to mach-s5pv210
Signed-off-by: Sachin Kamat --- arch/arm/mach-s5pv210/include/mach/map.h |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h index 89c34b8..721df50 100644 --- a/arch/arm/mach-s5pv210/include/mach/map.h +++ b/arch/arm/mach-s5pv210/include/mach/map.h @@ -80,6 +80,8 @@ #define S5PV210_PA_FB 0xF800 +#define S5PV210_PA_G2D 0xFA00 + #define S5PV210_PA_MDMA0xFA20 #define S5PV210_PA_PDMA0 0xE090 #define S5PV210_PA_PDMA1 0xE0A0 @@ -119,6 +121,7 @@ #define S5P_PA_MIPI_CSIS0 S5PV210_PA_MIPI_CSIS #define S5P_PA_MFC S5PV210_PA_MFC #define S5P_PA_IIC_HDMIPHY S5PV210_PA_IIC_HDMIPHY +#define S5P_PA_G2D S5PV210_PA_G2D #define S5P_PA_SDO S5PV210_PA_SDO #define S5P_PA_VP S5PV210_PA_VP -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/4] ARM: S5PV210: Enable FIMC and MFC on SMDK C110 and V210 boards
Hi Kukjin, Ping. On 10 January 2012 04:48, Jeongtae Park wrote: > Hi Sachin, > > thanks for the patch. > There is no issue for MFC. > > Best regards, > /jtpark > >> -Original Message- >> From: Kukjin Kim [mailto:kgene@samsung.com] >> Sent: Thursday, December 29, 2011 12:35 PM >> To: 'Sachin Kamat'; linux-samsung-soc@vger.kernel.org >> Cc: jtp.p...@samsung.com >> Subject: RE: [PATCH 0/4] ARM: S5PV210: Enable FIMC and MFC on SMDK C110 and >> V210 boards >> >> Sachin Kamat wrote: >> > >> > Hi Kukjin, >> > >> > Please pick up the MFC patches (patches 1 & 2) from this series. I >> > will post a separate patch series for FIMC related changes. >> > >> (Cc'ed Jeongtae Park) >> >> Jeongtae, let me know your opinion on this MFC enabling patches. >> >> Thanks. >> >> Best regards, >> Kgene. >> -- >> Kukjin Kim , Senior Engineer, >> SW Solution Development Team, Samsung Electronics Co., Ltd. >> >> > Regards >> > Sachin >> > >> > On 26 December 2011 15:30, Sachin Kamat wrote: >> > > This patch series adds support for MFC and FIMC on SMDK C110 and V210 >> > boards. >> > > It is based on Kukjin Kim's latest for-next branch. >> > > >> > > Sachin Kamat (4): >> > > ARM: S5PV210: Enable MFC on SMDKV210 >> > > ARM: S5PV210: Enable MFC on SMDKC110 >> > > ARM: S5PV210: Enable FIMC on SMDKV210 >> > > ARM: S5PV210: Enable FIMC on SMDKC110 >> > > >> > > arch/arm/mach-s5pv210/Kconfig | 8 >> > > arch/arm/mach-s5pv210/mach-smdkc110.c | 14 ++ >> > > arch/arm/mach-s5pv210/mach-smdkv210.c | 13 + >> > > 3 files changed, 35 insertions(+), 0 deletions(-) >> > > >> > > -- >> > > 1.7.4.1 >> > > >> > >> > >> > >> > -- >> > With warm regards, >> > Sachin > -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/3] ARM: EXYNOS/S5PV210: Add missing FIMC media device
Hi Kukjin, Please let me know your comments about this series as well as other FIMC and G2D enablement patches submitted by me. Regards Sachin On 29 December 2011 11:59, Sachin Kamat wrote: > FIMC media device (md) registers all required video nodes. > This is required for functioning of FIMC devices. > > Thanks to Sylwester Nawrocki for pointing this out. > > This patchset is based on the latest for-next branch of Kukjin Kim's tree. > > Sachin Kamat (3): > ARM: S5PV210: Add missing FIMC media device to Aquila > ARM: EXYNOS: Add missing FIMC media device to SMDKV310 > ARM: EXYNOS: Add missing FIMC media device to Origen > > arch/arm/mach-exynos/mach-origen.c | 1 + > arch/arm/mach-exynos/mach-smdkv310.c | 1 + > arch/arm/mach-s5pv210/mach-aquila.c | 1 + > 3 files changed, 3 insertions(+), 0 deletions(-) > > -- > 1.7.4.1 > -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/4] ARM: S5PV210: Enable FIMC and MFC on SMDK C110 and V210 boards
Hi Kukjin, On 31 January 2012 09:47, Kukjin Kim wrote: > On 01/30/12 14:15, Sachin Kamat wrote: >> >> Hi Kukjin, >> >> Ping. >> > Hi Sachin, > > I looked at your reply on Sylwester's comments, PATCH 3/4. > I'd like to apply all of this series after your re-submitting. I have already re-submitted patches 3 and 4 incorporating Sylwester's comments. Please let me know if you want me to send them once again. Regards Sachin > > > Thanks. > > Best regards, > Kgene. > -- > Kukjin Kim , Senior Engineer, > SW Solution Development Team, Samsung Electronics Co., Ltd. > >> >> On 10 January 2012 04:48, Jeongtae Park wrote: >>> >>> Hi Sachin, >>> >>> thanks for the patch. >>> There is no issue for MFC. >>> >>> Best regards, >>> /jtpark >>> >>>> -Original Message- >>>> From: Kukjin Kim [mailto:kgene@samsung.com] >>>> Sent: Thursday, December 29, 2011 12:35 PM >>>> To: 'Sachin Kamat'; linux-samsung-soc@vger.kernel.org >>>> Cc: jtp.p...@samsung.com >>>> Subject: RE: [PATCH 0/4] ARM: S5PV210: Enable FIMC and MFC on SMDK C110 >>>> and V210 boards >>>> >>>> Sachin Kamat wrote: >>>>> >>>>> >>>>> Hi Kukjin, >>>>> >>>>> Please pick up the MFC patches (patches 1& 2) from this series. I >>>>> >>>>> will post a separate patch series for FIMC related changes. >>>>> >>>> (Cc'ed Jeongtae Park) >>>> >>>> Jeongtae, let me know your opinion on this MFC enabling patches. >>>> >>>> Thanks. >>>> >>>> Best regards, >>>> Kgene. >>>> -- >>>> Kukjin Kim, Senior Engineer, >>>> SW Solution Development Team, Samsung Electronics Co., Ltd. >>>> >>>>> Regards >>>>> Sachin >>>>> >>>>> On 26 December 2011 15:30, Sachin Kamat >>>>> wrote: >>>>>> >>>>>> This patch series adds support for MFC and FIMC on SMDK C110 and V210 >>>>> >>>>> boards. >>>>>> >>>>>> It is based on Kukjin Kim's latest for-next branch. >>>>>> >>>>>> Sachin Kamat (4): >>>>>> ARM: S5PV210: Enable MFC on SMDKV210 >>>>>> ARM: S5PV210: Enable MFC on SMDKC110 >>>>>> ARM: S5PV210: Enable FIMC on SMDKV210 >>>>>> ARM: S5PV210: Enable FIMC on SMDKC110 >>>>>> >>>>>> arch/arm/mach-s5pv210/Kconfig | 8 >>>>>> arch/arm/mach-s5pv210/mach-smdkc110.c | 14 ++ >>>>>> arch/arm/mach-s5pv210/mach-smdkv210.c | 13 + >>>>>> 3 files changed, 35 insertions(+), 0 deletions(-) >>>>>> >>>>>> -- >>>>>> 1.7.4.1 -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: S5PV210: Add G2D to mach-s5pv210
Ping Kukjin... On 2 January 2012 15:01, Sachin Kamat wrote: > Signed-off-by: Sachin Kamat > --- > arch/arm/mach-s5pv210/include/mach/map.h | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/mach-s5pv210/include/mach/map.h > b/arch/arm/mach-s5pv210/include/mach/map.h > index 89c34b8..721df50 100644 > --- a/arch/arm/mach-s5pv210/include/mach/map.h > +++ b/arch/arm/mach-s5pv210/include/mach/map.h > @@ -80,6 +80,8 @@ > > #define S5PV210_PA_FB 0xF800 > > +#define S5PV210_PA_G2D 0xFA00 > + > #define S5PV210_PA_MDMA 0xFA20 > #define S5PV210_PA_PDMA0 0xE090 > #define S5PV210_PA_PDMA1 0xE0A0 > @@ -119,6 +121,7 @@ > #define S5P_PA_MIPI_CSIS0 S5PV210_PA_MIPI_CSIS > #define S5P_PA_MFC S5PV210_PA_MFC > #define S5P_PA_IIC_HDMIPHY S5PV210_PA_IIC_HDMIPHY > +#define S5P_PA_G2D S5PV210_PA_G2D > > #define S5P_PA_SDO S5PV210_PA_SDO > #define S5P_PA_VP S5PV210_PA_VP > -- > 1.7.4.1 > -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: EXYNOS: Enable G2D on SMDKV310
ping
On 2 January 2012 13:55, Sachin Kamat wrote:
> This patch enables G2D support on SMDKV310 board.
>
> Signed-off-by: Sachin Kamat
> ---
> arch/arm/mach-exynos/Kconfig | 1 +
> arch/arm/mach-exynos/mach-smdkv310.c | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
> index bd4600e..a673d0d 100644
> --- a/arch/arm/mach-exynos/Kconfig
> +++ b/arch/arm/mach-exynos/Kconfig
> @@ -183,6 +183,7 @@ config MACH_SMDKV310
> select S5P_DEV_FIMC1
> select S5P_DEV_FIMC2
> select S5P_DEV_FIMC3
> + select S5P_DEV_G2D
> select S5P_DEV_I2C_HDMIPHY
> select S5P_DEV_MFC
> select S5P_DEV_TV
> diff --git a/arch/arm/mach-exynos/mach-smdkv310.c
> b/arch/arm/mach-exynos/mach-smdkv310.c
> index b2c5557..8a5c23b 100644
> --- a/arch/arm/mach-exynos/mach-smdkv310.c
> +++ b/arch/arm/mach-exynos/mach-smdkv310.c
> @@ -270,6 +270,7 @@ static struct platform_device *smdkv310_devices[]
> __initdata = {
> &s5p_device_fimc1,
> &s5p_device_fimc2,
> &s5p_device_fimc3,
> + &s5p_device_g2d,
> &exynos4_device_ac97,
> &exynos4_device_i2s0,
> &exynos4_device_ohci,
> --
> 1.7.4.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH-RESEND 0/4] ARM: S5PV210: Enable FIMC & MFC on SMDKC110 & V210 boards
Re-sending the patch series rebased onto next/board-samsung branch of Kukjin Kim's tree: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git Sachin Kamat (4): ARM: S5PV210: Enable MFC on SMDKV210 ARM: S5PV210: Enable MFC on SMDKC110 ARM: S5PV210: Enable FIMC on SMDKV210 ARM: S5PV210: Enable FIMC on SMDKC110 arch/arm/mach-s5pv210/Kconfig |8 arch/arm/mach-s5pv210/mach-smdkc110.c | 14 ++ arch/arm/mach-s5pv210/mach-smdkv210.c | 14 ++ 3 files changed, 36 insertions(+), 0 deletions(-) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH-RESEND 1/4] ARM: S5PV210: Enable MFC on SMDKV210
Add MFC support on SMDKV210 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |1 +
arch/arm/mach-s5pv210/mach-smdkv210.c | 10 ++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 2cdc42e..1e0131b 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -142,6 +142,7 @@ config MACH_SMDKV210
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_MFC
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT
select SAMSUNG_DEV_IDE
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c
b/arch/arm/mach-s5pv210/mach-smdkv210.c
index dff9ea7..0b0d65d 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -46,6 +46,7 @@
#include
#include
#include
+#include
#include "common.h"
@@ -223,6 +224,9 @@ static struct platform_device *smdkv210_devices[]
__initdata = {
&s3c_device_rtc,
&s3c_device_ts,
&s3c_device_wdt,
+ &s5p_device_mfc,
+ &s5p_device_mfc_l,
+ &s5p_device_mfc_r,
&s5pv210_device_ac97,
&s5pv210_device_iis0,
&s5pv210_device_spdif,
@@ -282,6 +286,11 @@ static void __init smdkv210_map_io(void)
s5p_set_timer_source(S5P_PWM2, S5P_PWM4);
}
+static void __init smdkv210_reserve(void)
+{
+ s5p_mfc_reserve_mem(0x4300, 8 << 20, 0x5100, 8 << 20);
+}
+
static void __init smdkv210_machine_init(void)
{
s3c_pm_init();
@@ -319,4 +328,5 @@ MACHINE_START(SMDKV210, "SMDKV210")
.init_machine = smdkv210_machine_init,
.timer = &s5p_timer,
.restart= s5pv210_restart,
+ .reserve= &smdkv210_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH-RESEND 2/4] ARM: S5PV210: Enable MFC on SMDKC110
Add MFC support on SMDKC110 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |1 +
arch/arm/mach-s5pv210/mach-smdkc110.c | 10 ++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 1e0131b..dd9bdab 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -118,6 +118,7 @@ config MACH_SMDKC110
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_MFC
select SAMSUNG_DEV_IDE
select S5PV210_SETUP_I2C1
select S5PV210_SETUP_I2C2
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c
b/arch/arm/mach-s5pv210/mach-smdkc110.c
index b323983..7100f7e 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -31,6 +31,7 @@
#include
#include
#include
+#include
#include "common.h"
@@ -94,6 +95,9 @@ static struct platform_device *smdkc110_devices[] __initdata
= {
&s3c_device_i2c2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_mfc,
+ &s5p_device_mfc_l,
+ &s5p_device_mfc_r,
};
static struct i2c_board_info smdkc110_i2c_devs0[] __initdata = {
@@ -117,6 +121,11 @@ static void __init smdkc110_map_io(void)
s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
}
+static void __init smdkc110_reserve(void)
+{
+ s5p_mfc_reserve_mem(0x4300, 8 << 20, 0x5100, 8 << 20);
+}
+
static void __init smdkc110_machine_init(void)
{
s3c_pm_init();
@@ -145,4 +154,5 @@ MACHINE_START(SMDKC110, "SMDKC110")
.init_machine = smdkc110_machine_init,
.timer = &s5p_timer,
.restart= s5pv210_restart,
+ .reserve= &smdkc110_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH-RESEND 3/4] ARM: S5PV210: Enable FIMC on SMDKV210
Enable FIMC 0,1,2 and media device(md) on SMDKV210 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |3 +++
arch/arm/mach-s5pv210/mach-smdkv210.c |4
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index dd9bdab..cf3be3b 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -143,6 +143,9 @@ config MACH_SMDKV210
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_FIMC0
+ select S5P_DEV_FIMC1
+ select S5P_DEV_FIMC2
select S5P_DEV_MFC
select SAMSUNG_DEV_ADC
select SAMSUNG_DEV_BACKLIGHT
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c
b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 0b0d65d..7b9d0ce 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -224,6 +224,10 @@ static struct platform_device *smdkv210_devices[]
__initdata = {
&s3c_device_rtc,
&s3c_device_ts,
&s3c_device_wdt,
+ &s5p_device_fimc0,
+ &s5p_device_fimc1,
+ &s5p_device_fimc2,
+ &s5p_device_fimc_md,
&s5p_device_mfc,
&s5p_device_mfc_l,
&s5p_device_mfc_r,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH-RESEND 4/4] ARM: S5PV210: Enable FIMC on SMDKC110
Enable FIMC 0,1,2 and media device (md) on SMDKC110 board.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s5pv210/Kconfig |3 +++
arch/arm/mach-s5pv210/mach-smdkc110.c |4
2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index cf3be3b..c338b86 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -118,6 +118,9 @@ config MACH_SMDKC110
select S3C_DEV_I2C2
select S3C_DEV_RTC
select S3C_DEV_WDT
+ select S5P_DEV_FIMC0
+ select S5P_DEV_FIMC1
+ select S5P_DEV_FIMC2
select S5P_DEV_MFC
select SAMSUNG_DEV_IDE
select S5PV210_SETUP_I2C1
diff --git a/arch/arm/mach-s5pv210/mach-smdkc110.c
b/arch/arm/mach-s5pv210/mach-smdkc110.c
index 7100f7e..dfc2923 100644
--- a/arch/arm/mach-s5pv210/mach-smdkc110.c
+++ b/arch/arm/mach-s5pv210/mach-smdkc110.c
@@ -95,6 +95,10 @@ static struct platform_device *smdkc110_devices[] __initdata
= {
&s3c_device_i2c2,
&s3c_device_rtc,
&s3c_device_wdt,
+ &s5p_device_fimc0,
+ &s5p_device_fimc1,
+ &s5p_device_fimc2,
+ &s5p_device_fimc_md,
&s5p_device_mfc,
&s5p_device_mfc_l,
&s5p_device_mfc_r,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/4] ARM: S5PV210: Enable FIMC and MFC on SMDK C110 and V210 boards
Hi Kukjin, On 9 February 2012 18:57, Kukjin Kim wrote: > Sachin Kamat wrote: >> >> Hi Kukjin, >> > Hi, >> >> On 31 January 2012 09:47, Kukjin Kim wrote: >> > On 01/30/12 14:15, Sachin Kamat wrote: >> >> >> >> Hi Kukjin, >> >> >> >> Ping. >> >> >> > Hi Sachin, >> > >> > I looked at your reply on Sylwester's comments, PATCH 3/4. >> > I'd like to apply all of this series after your re-submitting. >> >> >> I have already re-submitted patches 3 and 4 incorporating Sylwester's >> comments. >> > Would be helpful to me if you could add the mark of version in the re-submit > patch. > >> Please let me know if you want me to send them once again. >> > Yes, please. Re-sent the patch series "[PATCH-RESEND 0/4] ARM: S5PV210: Enable FIMC & MFC on SMDKC110 & V210 boards" rebased on your next/board-samsung branch. > > Thanks. > > Best regards, > Kgene. > -- > Kukjin Kim , Senior Engineer, > SW Solution Development Team, Samsung Electronics Co., Ltd. > -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure
Add G2D power domain (PD) to generic power domain infrastructure. Signed-off-by: Sachin Kamat --- arch/arm/mach-exynos/pm_domains.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 0b04af2..a84df72 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -183,6 +183,9 @@ static __init int exynos4_pm_init_power_domain(void) #ifdef CONFIG_S5P_DEV_CSIS1 exynos_pm_add_dev_to_genpd(&s5p_device_mipi_csis1, &exynos4_pd_cam); #endif +#ifdef CONFIG_S5P_DEV_G2D + exynos_pm_add_dev_to_genpd(&s5p_device_g2d, &exynos4_pd_lcd0); +#endif return 0; } arch_initcall(exynos4_pm_init_power_domain); -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure
Add JPEG power domain (PD) to generic power domain infrastructure. Signed-off-by: Sachin Kamat --- Hi Kukjin, Please apply this over the JPEG platform suport patches for Exynos. --- arch/arm/mach-exynos/pm_domains.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 0b04af2..4e8340f 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -183,6 +183,9 @@ static __init int exynos4_pm_init_power_domain(void) #ifdef CONFIG_S5P_DEV_CSIS1 exynos_pm_add_dev_to_genpd(&s5p_device_mipi_csis1, &exynos4_pd_cam); #endif +#ifdef CONFIG_S5P_DEV_JPEG + exynos_pm_add_dev_to_genpd(&s5p_device_jpeg, &exynos4_pd_cam); +#endif return 0; } arch_initcall(exynos4_pm_init_power_domain); -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] ARM: EXYNOS4: Enable MFC on Samsung SMDKV310
Signed-off-by: Sachin Kamat
---
This patch is based on Kukjin's for-arm-soc branch.
arch/arm/mach-exynos4/Kconfig |1 +
arch/arm/mach-exynos4/mach-smdkv310.c | 11 +++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig
index 9d62e13..8da2960 100644
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@ -139,6 +139,7 @@ config MACH_SMDKV310
select S3C_DEV_RTC
select S3C_DEV_WDT
select S3C_DEV_I2C1
+ select S5P_DEV_MFC
select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2
diff --git a/arch/arm/mach-exynos4/mach-smdkv310.c
b/arch/arm/mach-exynos4/mach-smdkv310.c
index ea41495..2a128f4 100644
--- a/arch/arm/mach-exynos4/mach-smdkv310.c
+++ b/arch/arm/mach-exynos4/mach-smdkv310.c
@@ -32,6 +32,7 @@
#include
#include
#include
+#include
#include
@@ -177,6 +178,9 @@ static struct platform_device *smdkv310_devices[]
__initdata = {
&exynos4_device_ac97,
&exynos4_device_i2s0,
&samsung_device_keypad,
+ &s5p_device_mfc,
+ &s5p_device_mfc_l,
+ &s5p_device_mfc_r,
&exynos4_device_pd[PD_MFC],
&exynos4_device_pd[PD_G3D],
&exynos4_device_pd[PD_LCD0],
@@ -233,6 +237,11 @@ static void __init smdkv310_map_io(void)
s3c24xx_init_uarts(smdkv310_uartcfgs, ARRAY_SIZE(smdkv310_uartcfgs));
}
+static void __init smdkv310_reserve(void)
+{
+ s5p_mfc_reserve_mem(0x4300, 8 << 20, 0x5100, 8 << 20);
+}
+
static void __init smdkv310_machine_init(void)
{
s3c_i2c1_set_platdata(NULL);
@@ -250,6 +259,7 @@ static void __init smdkv310_machine_init(void)
samsung_bl_set(&smdkv310_bl_gpio_info, &smdkv310_bl_data);
platform_add_devices(smdkv310_devices, ARRAY_SIZE(smdkv310_devices));
+ s5p_device_mfc.dev.parent = &exynos4_device_pd[PD_MFC].dev;
}
MACHINE_START(SMDKV310, "SMDKV310")
@@ -260,4 +270,5 @@ MACHINE_START(SMDKV310, "SMDKV310")
.map_io = smdkv310_map_io,
.init_machine = smdkv310_machine_init,
.timer = &exynos4_timer,
+ .reserve= &smdkv310_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] ARM: EXYNOS: Make combiner_of_init function static
Silences the following warning:
arch/arm/mach-exynos/common.c:576:12: warning:
symbol 'combiner_of_init' was not declared. Should it be static?
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/common.c |3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-exynos/common.c b/arch/arm/mach-exynos/common.c
index 4e577f6..5b35d71 100644
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@ -573,7 +573,8 @@ static void __init combiner_init(void __iomem
*combiner_base,
}
#ifdef CONFIG_OF
-int __init combiner_of_init(struct device_node *np, struct device_node *parent)
+static int __init combiner_of_init(struct device_node *np,
+ struct device_node *parent)
{
void __iomem *combiner_base;
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] ARM: EXYNOS: Add missing static storage class specifiers in clock-exynos5.c
Fixes the following warnings:
arch/arm/mach-exynos/clock-exynos5.c:300:19: warning:
symbol 'exynos5_clk_mout_mpll' was not declared. Should it be static?
arch/arm/mach-exynos/clock-exynos5.c:475:12: warning:
symbol 'exynos5_clkset_aclk_top_list' was not declared. Should it be static?
arch/arm/mach-exynos/clock-exynos5.c:480:23: warning:
symbol 'exynos5_clkset_aclk' was not declared. Should it be static?
arch/arm/mach-exynos/clock-exynos5.c:494:12: warning:
symbol 'exynos5_clkset_aclk_333_166_list' was not declared. Should it be static?
arch/arm/mach-exynos/clock-exynos5.c:499:23: warning:
symbol 'exynos5_clkset_aclk_333_166' was not declared. Should it be static?
arch/arm/mach-exynos/clock-exynos5.c:989:12: warning:
symbol 'exynos5_clkset_group_list' was not declared. Should it be static?
arch/arm/mach-exynos/clock-exynos5.c:1002:23: warning:
symbol 'exynos5_clkset_group' was not declared. Should it be static?
arch/arm/mach-exynos/clock-exynos5.c:1218:19: warning:
symbol 'exynos5_clk_sclk_fimd1' was not declared. Should it be static?
arch/arm/mach-exynos/clock-exynos5.c:1499:20: warning:
symbol 'exynos5_clock_syscore_ops' was not declared. Should it be static?
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/clock-exynos5.c | 18 +-
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-exynos/clock-exynos5.c
b/arch/arm/mach-exynos/clock-exynos5.c
index a88e0d9..e48d7c2 100644
--- a/arch/arm/mach-exynos/clock-exynos5.c
+++ b/arch/arm/mach-exynos/clock-exynos5.c
@@ -297,7 +297,7 @@ static struct clksrc_sources exynos5_clk_src_mpll = {
.nr_sources = ARRAY_SIZE(exynos5_clk_src_mpll_list),
};
-struct clksrc_clk exynos5_clk_mout_mpll = {
+static struct clksrc_clk exynos5_clk_mout_mpll = {
.clk = {
.name = "mout_mpll",
},
@@ -472,12 +472,12 @@ static struct clksrc_clk exynos5_clk_pclk_acp = {
/* Core list of CMU_TOP side */
-struct clk *exynos5_clkset_aclk_top_list[] = {
+static struct clk *exynos5_clkset_aclk_top_list[] = {
[0] = &exynos5_clk_mout_mpll_user.clk,
[1] = &exynos5_clk_mout_bpll_user.clk,
};
-struct clksrc_sources exynos5_clkset_aclk = {
+static struct clksrc_sources exynos5_clkset_aclk = {
.sources= exynos5_clkset_aclk_top_list,
.nr_sources = ARRAY_SIZE(exynos5_clkset_aclk_top_list),
};
@@ -491,12 +491,12 @@ static struct clksrc_clk exynos5_clk_aclk_400 = {
.reg_div = { .reg = EXYNOS5_CLKDIV_TOP0, .shift = 24, .size = 3 },
};
-struct clk *exynos5_clkset_aclk_333_166_list[] = {
+static struct clk *exynos5_clkset_aclk_333_166_list[] = {
[0] = &exynos5_clk_mout_cpll.clk,
[1] = &exynos5_clk_mout_mpll_user.clk,
};
-struct clksrc_sources exynos5_clkset_aclk_333_166 = {
+static struct clksrc_sources exynos5_clkset_aclk_333_166 = {
.sources= exynos5_clkset_aclk_333_166_list,
.nr_sources = ARRAY_SIZE(exynos5_clkset_aclk_333_166_list),
};
@@ -986,7 +986,7 @@ static struct clk exynos5_clk_fimd1 = {
.ctrlbit= (1 << 0),
};
-struct clk *exynos5_clkset_group_list[] = {
+static struct clk *exynos5_clkset_group_list[] = {
[0] = &clk_ext_xtal_mux,
[1] = NULL,
[2] = &exynos5_clk_sclk_hdmi24m,
@@ -999,7 +999,7 @@ struct clk *exynos5_clkset_group_list[] = {
[9] = &exynos5_clk_mout_cpll.clk,
};
-struct clksrc_sources exynos5_clkset_group = {
+static struct clksrc_sources exynos5_clkset_group = {
.sources= exynos5_clkset_group_list,
.nr_sources = ARRAY_SIZE(exynos5_clkset_group_list),
};
@@ -1215,7 +1215,7 @@ static struct clksrc_clk exynos5_clk_sclk_spi2 = {
.reg_div = { .reg = EXYNOS5_CLKDIV_PERIC2, .shift = 8, .size = 8 },
};
-struct clksrc_clk exynos5_clk_sclk_fimd1 = {
+static struct clksrc_clk exynos5_clk_sclk_fimd1 = {
.clk= {
.name = "sclk_fimd",
.devname= "exynos5-fb.1",
@@ -1496,7 +1496,7 @@ static void exynos5_clock_resume(void)
#define exynos5_clock_resume NULL
#endif
-struct syscore_ops exynos5_clock_syscore_ops = {
+static struct syscore_ops exynos5_clock_syscore_ops = {
.suspend= exynos5_clock_suspend,
.resume = exynos5_clock_resume,
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] ARM: S3C24XX: Fix potential NULL pointer dereference error
chan->end is tested for being NULL. However in the event that it is NULL, the
subsequent assignment statement would lead to NULL pointer dereference.
Thus dereferencing it only when it is not NULL.
Signed-off-by: Sachin Kamat
---
Based on Kukjin Kim's for-next branch. Compile tested.
---
arch/arm/plat-s3c24xx/dma.c |9 +
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
index db98e70..0abd1c4 100644
--- a/arch/arm/plat-s3c24xx/dma.c
+++ b/arch/arm/plat-s3c24xx/dma.c
@@ -473,12 +473,13 @@ int s3c2410_dma_enqueue(enum dma_ch channel, void *id,
pr_debug("dma%d: %s: buffer %p queued onto non-empty channel\n",
chan->number, __func__, buf);
- if (chan->end == NULL)
+ if (chan->end == NULL) {
pr_debug("dma%d: %s: %p not empty, and
chan->end==NULL?\n",
chan->number, __func__, chan);
-
- chan->end->next = buf;
- chan->end = buf;
+ } else {
+ chan->end->next = buf;
+ chan->end = buf;
+ }
}
/* if necessary, update the next buffer field */
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1] ARM: S3C24XX: Fix potential NULL pointer dereference error
ping Kukjin.
On 8 November 2012 14:31, Sachin Kamat wrote:
> chan->end is tested for being NULL. However in the event that it is NULL, the
> subsequent assignment statement would lead to NULL pointer dereference.
> Thus dereferencing it only when it is not NULL.
>
> Signed-off-by: Sachin Kamat
> ---
> Based on Kukjin Kim's for-next branch. Compile tested.
> ---
> arch/arm/plat-s3c24xx/dma.c |9 +
> 1 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
> index db98e70..0abd1c4 100644
> --- a/arch/arm/plat-s3c24xx/dma.c
> +++ b/arch/arm/plat-s3c24xx/dma.c
> @@ -473,12 +473,13 @@ int s3c2410_dma_enqueue(enum dma_ch channel, void *id,
> pr_debug("dma%d: %s: buffer %p queued onto non-empty
> channel\n",
> chan->number, __func__, buf);
>
> - if (chan->end == NULL)
> + if (chan->end == NULL) {
> pr_debug("dma%d: %s: %p not empty, and
> chan->end==NULL?\n",
> chan->number, __func__, chan);
> -
> - chan->end->next = buf;
> - chan->end = buf;
> + } else {
> + chan->end->next = buf;
> + chan->end = buf;
> + }
> }
>
> /* if necessary, update the next buffer field */
> --
> 1.7.4.1
>
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/1] ARM: S3C24XX: Fix potential NULL pointer dereference error
Hi Kukjin,
You seem to have ignored this patch before sending out your pull request.
Can you please check this?
Regards
Sachin
On 20 November 2012 10:28, Sachin Kamat wrote:
> ping Kukjin.
>
> On 8 November 2012 14:31, Sachin Kamat wrote:
>> chan->end is tested for being NULL. However in the event that it is NULL, the
>> subsequent assignment statement would lead to NULL pointer dereference.
>> Thus dereferencing it only when it is not NULL.
>>
>> Signed-off-by: Sachin Kamat
>> ---
>> Based on Kukjin Kim's for-next branch. Compile tested.
>> ---
>> arch/arm/plat-s3c24xx/dma.c |9 +
>> 1 files changed, 5 insertions(+), 4 deletions(-)
>>
>> diff --git a/arch/arm/plat-s3c24xx/dma.c b/arch/arm/plat-s3c24xx/dma.c
>> index db98e70..0abd1c4 100644
>> --- a/arch/arm/plat-s3c24xx/dma.c
>> +++ b/arch/arm/plat-s3c24xx/dma.c
>> @@ -473,12 +473,13 @@ int s3c2410_dma_enqueue(enum dma_ch channel, void *id,
>> pr_debug("dma%d: %s: buffer %p queued onto non-empty
>> channel\n",
>> chan->number, __func__, buf);
>>
>> - if (chan->end == NULL)
>> + if (chan->end == NULL) {
>> pr_debug("dma%d: %s: %p not empty, and
>> chan->end==NULL?\n",
>> chan->number, __func__, chan);
>> -
>> - chan->end->next = buf;
>> - chan->end = buf;
>> + } else {
>> + chan->end->next = buf;
>> + chan->end = buf;
>> + }
>> }
>>
>> /* if necessary, update the next buffer field */
>> --
>> 1.7.4.1
>>
>
>
>
> --
> With warm regards,
> Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 4/7] i2c: s3c2410: Convert to use devm_ioremap()
Hi Tushar,
On 23 November 2012 11:29, Tushar Behera wrote:
> Signed-off-by: Tushar Behera
> ---
> drivers/i2c/busses/i2c-s3c2410.c | 13 -
> 1 files changed, 4 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-s3c2410.c
> b/drivers/i2c/busses/i2c-s3c2410.c
> index a274ef7..3446af2 100644
> --- a/drivers/i2c/busses/i2c-s3c2410.c
> +++ b/drivers/i2c/busses/i2c-s3c2410.c
> @@ -996,7 +996,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
> goto err_clk;
> }
>
> - i2c->regs = ioremap(res->start, resource_size(res));
> + i2c->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res));
>
request_mem_region and ioremap and be replaced using a single
devm_request_and_ioremap() call.
Also you may squash patches 2-5 into single convert to devm_* functions patch.
> if (i2c->regs == NULL) {
> dev_err(&pdev->dev, "cannot map IO\n");
> @@ -1016,7 +1016,7 @@ static int s3c24xx_i2c_probe(struct platform_device
> *pdev)
>
> ret = s3c24xx_i2c_init(i2c);
> if (ret != 0)
> - goto err_iomap;
> + goto err_clk;
>
> /* find the IRQ for this unit (note, this relies on the init call to
> * ensure no current IRQs pending
> @@ -1025,7 +1025,7 @@ static int s3c24xx_i2c_probe(struct platform_device
> *pdev)
> i2c->irq = ret = platform_get_irq(pdev, 0);
> if (ret <= 0) {
> dev_err(&pdev->dev, "cannot find IRQ\n");
> - goto err_iomap;
> + goto err_clk;
> }
>
> ret = request_irq(i2c->irq, s3c24xx_i2c_irq, 0,
> @@ -1033,7 +1033,7 @@ static int s3c24xx_i2c_probe(struct platform_device
> *pdev)
>
> if (ret != 0) {
> dev_err(&pdev->dev, "cannot claim IRQ %d\n", i2c->irq);
> - goto err_iomap;
> + goto err_clk;
> }
>
> ret = s3c24xx_i2c_register_cpufreq(i2c);
> @@ -1073,9 +1073,6 @@ static int s3c24xx_i2c_probe(struct platform_device
> *pdev)
> err_irq:
> free_irq(i2c->irq, i2c);
>
> - err_iomap:
> - iounmap(i2c->regs);
> -
> err_clk:
> clk_disable_unprepare(i2c->clk);
> return ret;
> @@ -1100,8 +1097,6 @@ static int s3c24xx_i2c_remove(struct platform_device
> *pdev)
>
> clk_disable_unprepare(i2c->clk);
>
> - iounmap(i2c->regs);
> -
> s3c24xx_i2c_dt_gpio_free(i2c);
>
> return 0;
> --
> 1.7.4.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] ARM: dts: Fix gpio pin names of keypad columns in exynos4x12-pinctrl
Keypad columns are connected to gpx1 pins on 4x12.
Cc: Tomasz Figa
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 16
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 8e6115a..0b293fb 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -779,56 +779,56 @@
};
keypad_col0: keypad-col0 {
- samsung,pins = "gpl2-0";
+ samsung,pins = "gpx1-0";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
keypad_col1: keypad-col1 {
- samsung,pins = "gpl2-1";
+ samsung,pins = "gpx1-1";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
keypad_col2: keypad-col2 {
- samsung,pins = "gpl2-2";
+ samsung,pins = "gpx1-2";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
keypad_col3: keypad-col3 {
- samsung,pins = "gpl2-3";
+ samsung,pins = "gpx1-3";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
keypad_col4: keypad-col4 {
- samsung,pins = "gpl2-4";
+ samsung,pins = "gpx1-4";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
keypad_col5: keypad-col5 {
- samsung,pins = "gpl2-5";
+ samsung,pins = "gpx1-5";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
keypad_col6: keypad-col6 {
- samsung,pins = "gpl2-6";
+ samsung,pins = "gpx1-6";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
keypad_col7: keypad-col7 {
- samsung,pins = "gpl2-7";
+ samsung,pins = "gpx1-7";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] ARM: dts: Add keypad row entries for exynos4x12
This patch adds keypad row support for Exynos4x12.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 56 +
1 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 0b293fb..bdfdf51 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -778,6 +778,62 @@
samsung,pin-drv = <3>;
};
+ keypad_row0: keypad-row0 {
+ samsung,pins = "gpx2-0";
+ samsung,pin-function = <3>;
+ samsung,pin-pud = <3>;
+ samsung,pin-drv = <0>;
+ };
+
+ keypad_row1: keypad-row1 {
+ samsung,pins = "gpx2-1";
+ samsung,pin-function = <3>;
+ samsung,pin-pud = <3>;
+ samsung,pin-drv = <0>;
+ };
+
+ keypad_row2: keypad-row2 {
+ samsung,pins = "gpx2-2";
+ samsung,pin-function = <3>;
+ samsung,pin-pud = <3>;
+ samsung,pin-drv = <0>;
+ };
+
+ keypad_row3: keypad-row3 {
+ samsung,pins = "gpx2-3";
+ samsung,pin-function = <3>;
+ samsung,pin-pud = <3>;
+ samsung,pin-drv = <0>;
+ };
+
+ keypad_row4: keypad-row4 {
+ samsung,pins = "gpx2-4";
+ samsung,pin-function = <3>;
+ samsung,pin-pud = <3>;
+ samsung,pin-drv = <0>;
+ };
+
+ keypad_row5: keypad-row5 {
+ samsung,pins = "gpx2-5";
+ samsung,pin-function = <3>;
+ samsung,pin-pud = <3>;
+ samsung,pin-drv = <0>;
+ };
+
+ keypad_row6: keypad-row6 {
+ samsung,pins = "gpx2-6";
+ samsung,pin-function = <3>;
+ samsung,pin-pud = <3>;
+ samsung,pin-drv = <0>;
+ };
+
+ keypad_row7: keypad-row7 {
+ samsung,pins = "gpx2-7";
+ samsung,pin-function = <3>;
+ samsung,pin-pud = <3>;
+ samsung,pin-drv = <0>;
+ };
+
keypad_col0: keypad-col0 {
samsung,pins = "gpx1-0";
samsung,pin-function = <3>;
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/3] ARM: EXYNOS: Fix NULL pointer dereference bug in Origen
When DRM support for Samsung SoC and Samsung S3C framebuffer support
are selected, the kernel crashes as it does not get the required
platform data. Change the compile macro to CONFIG_DRM_EXYNOS_FIMD
to fix this.
Without this patch the following crash occurs during bootup:
Unable to handle kernel NULL pointer dereference at virtual address
PC is at 0x0
LR is at s3c_fb_probe+0x198/0x788
[] (s3c_fb_probe+0x198/0x788) from []
(platform_drv_probe+0x18/0x1c)
[] (platform_drv_probe+0x18/0x1c) from []
(driver_probe_device+0x70/0x1f0)
[] (driver_probe_device+0x70/0x1f0) from []
(__driver_attach+0x8c/0x90)
[] (__driver_attach+0x8c/0x90) from []
(bus_for_each_dev+0x50/0x7c)
[] (bus_for_each_dev+0x50/0x7c) from []
(bus_add_driver+0x170/0x23c)
[] (bus_add_driver+0x170/0x23c) from []
(driver_register+0x78/0x144)
[] (driver_register+0x78/0x144) from []
(do_one_initcall+0x34/0x174)
[] (do_one_initcall+0x34/0x174) from []
(kernel_init+0x100/0x2a0)
[] (kernel_init+0x100/0x2a0) from []
(ret_from_fork+0x14/0x3c)
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/mach-origen.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-origen.c
b/arch/arm/mach-exynos/mach-origen.c
index e6f4191..5e34b9c 100644
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@ -621,7 +621,7 @@ static struct pwm_lookup origen_pwm_lookup[] = {
PWM_LOOKUP("s3c24xx-pwm.0", 0, "pwm-backlight.0", NULL),
};
-#ifdef CONFIG_DRM_EXYNOS
+#ifdef CONFIG_DRM_EXYNOS_FIMD
static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
.panel = {
.timing = {
@@ -793,7 +793,7 @@ static void __init origen_machine_init(void)
s5p_i2c_hdmiphy_set_platdata(NULL);
s5p_hdmi_set_platdata(&hdmiphy_info, NULL, 0);
-#ifdef CONFIG_DRM_EXYNOS
+#ifdef CONFIG_DRM_EXYNOS_FIMD
s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;
exynos4_fimd0_gpio_setup_24bpp();
#else
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/3] ARM: EXYNOS: Fix NULL pointer dereference bug in SMDK4X12
When DRM support for Samsung SoC and Samsung S3C framebuffer support
are selected, the kernel crashes as it does not get the required
platform data. Change the compile macro to CONFIG_DRM_EXYNOS_FIMD
to fix this.
Fixes the following boot time crash:
Unable to handle kernel NULL pointer dereference at virtual address
PC is at 0x0
LR is at s3c_fb_probe+0x198/0x788
[] (s3c_fb_probe+0x198/0x788) from []
(platform_drv_probe+0x18/0x1c)
[] (platform_drv_probe+0x18/0x1c) from []
(driver_probe_device+0x70/0x1f0)
[] (driver_probe_device+0x70/0x1f0) from []
(__driver_attach+0x8c/0x90)
[] (__driver_attach+0x8c/0x90) from []
(bus_for_each_dev+0x50/0x7c)
[] (bus_for_each_dev+0x50/0x7c) from []
(bus_add_driver+0x170/0x23c)
[] (bus_add_driver+0x170/0x23c) from []
(driver_register+0x78/0x144)
[] (driver_register+0x78/0x144) from []
(do_one_initcall+0x34/0x174)
[] (do_one_initcall+0x34/0x174) from []
(kernel_init+0x100/0x2a0)
[] (kernel_init+0x100/0x2a0) from []
(ret_from_fork+0x14/0x3c)
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/mach-smdk4x12.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c
b/arch/arm/mach-exynos/mach-smdk4x12.c
index a1555a7..ae6da40 100644
--- a/arch/arm/mach-exynos/mach-smdk4x12.c
+++ b/arch/arm/mach-exynos/mach-smdk4x12.c
@@ -246,7 +246,7 @@ static struct samsung_keypad_platdata smdk4x12_keypad_data
__initdata = {
.cols = 8,
};
-#ifdef CONFIG_DRM_EXYNOS
+#ifdef CONFIG_DRM_EXYNOS_FIMD
static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
.panel = {
.timing = {
@@ -360,7 +360,7 @@ static void __init smdk4x12_machine_init(void)
s3c_hsotg_set_platdata(&smdk4x12_hsotg_pdata);
-#ifdef CONFIG_DRM_EXYNOS
+#ifdef CONFIG_DRM_EXYNOS_FIMD
s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;
exynos4_fimd0_gpio_setup_24bpp();
#else
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/3] ARM: EXYNOS: Fix NULL pointer dereference bug in SMDKV310
When DRM support for Samsung SoC and Samsung S3C framebuffer support
are selected, the kernel crashes as it does not get the required
platform data. Change the compile macro to CONFIG_DRM_EXYNOS_FIMD
to fix this.
Signed-off-by: Sachin Kamat
---
arch/arm/mach-exynos/mach-smdkv310.c |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c
b/arch/arm/mach-exynos/mach-smdkv310.c
index b738424..35548e3 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -159,7 +159,7 @@ static struct platform_device smdkv310_lcd_lte480wv = {
.dev.platform_data = &smdkv310_lcd_lte480wv_data,
};
-#ifdef CONFIG_DRM_EXYNOS
+#ifdef CONFIG_DRM_EXYNOS_FIMD
static struct exynos_drm_fimd_pdata drm_fimd_pdata = {
.panel = {
.timing = {
@@ -402,7 +402,7 @@ static void __init smdkv310_machine_init(void)
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
+#ifdef CONFIG_DRM_EXYNOS_FIMD
s5p_device_fimd0.dev.platform_data = &drm_fimd_pdata;
exynos4_fimd0_gpio_setup_24bpp();
#else
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/4] ARM: EXYNOS: Add MFC codec support for Exynos4 DT machines
This patch adds MFC codec support for Exynos4 DT machines.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4.dtsi |6 ++
arch/arm/mach-exynos/mach-exynos4-dt.c | 17 +
2 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e1347fc..b6b431a 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -289,4 +289,10 @@
interrupts = <0 34 0>;
};
};
+
+ mfc: codec@1340 {
+ compatible = "samsung,mfc-v5";
+ reg = <0x1340 0x1>;
+ interrupts = <0 94 0>;
+ };
};
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c
b/arch/arm/mach-exynos/mach-exynos4-dt.c
index ab1dacc..8ae8da1 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -12,7 +12,9 @@
*/
#include
+#include
#include
+#include
#include
#include
@@ -20,6 +22,7 @@
#include
#include
+#include
#include "common.h"
@@ -80,6 +83,7 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[]
__initconst = {
OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
"exynos-tmu", NULL),
+ OF_DEV_AUXDATA("samsung,mfc-v5", 0x1340, "s5p-mfc", NULL),
{},
};
@@ -102,6 +106,18 @@ static char const *exynos4_dt_compat[] __initdata = {
NULL
};
+static void __init exynos4_reserve(void)
+{
+#ifdef CONFIG_S5P_DEV_MFC
+ struct s5p_mfc_dt_meminfo mfc_mem;
+
+ /* Reserve memory for MFC only if it's available */
+ mfc_mem.compatible = "samsung,mfc-v5";
+ if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem))
+ s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff,
+ mfc_mem.lsize);
+#endif
+}
DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
/* Maintainer: Thomas Abraham */
.smp= smp_ops(exynos_smp_ops),
@@ -114,4 +130,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened
Device Tree)")
.timer = &exynos4_timer,
.dt_compat = exynos4_dt_compat,
.restart= exynos4_restart,
+ .reserve= exynos4_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/4] ARM: EXYNOS: Add MFC codec support to SMDKV310 DT
Added MFC codec support to SMDKV310 DT file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4210-smdkv310.dts |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts
b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index f634907..8481f8f 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -189,4 +189,9 @@
};
};
};
+
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ };
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/4] ARM: EXYNOS: Add MFC codec support to Origen DT
This patch adds MFC codec support to Origen DT file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4210-origen.dts |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts
b/arch/arm/boot/dts/exynos4210-origen.dts
index f271001..cd0d1e2 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -121,4 +121,9 @@
linux,default-trigger = "heartbeat";
};
};
+
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ };
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/4] ARM: EXYNOS: Update MFC DT binding documentation
Added an example for bindings for illustration and clarity.
Cc: devicetree-disc...@lists.ozlabs.org
Cc: Arun Kumar K
Signed-off-by: Sachin Kamat
---
.../devicetree/bindings/media/s5p-mfc.txt | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt
b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index 67ec3d4..261c9dc 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -21,3 +21,16 @@ Required properties:
- samsung,mfc-l : Base address of the second memory bank used by MFC
for DMA contiguous memory allocation and its size.
+
+Example:
+
+mfc: codec@1340 {
+ compatible = "samsung,mfc-v5";
+ reg = <0x1340 0x1>;
+ interrupts = <0 94 0>;
+};
+
+codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: EXYNOS: fix uncompress.h and debug-macro.S for EXYNOS5440
Hi Kukjin, On 27 December 2012 23:57, Kukjin Kim wrote: > This patch fixes uart base address for uncompress and debug-macro > on EXYNOS5440. > > Signed-off-by: Kukjin Kim > --- > arch/arm/mach-exynos/include/mach/debug-macro.S | 25 > +-- > arch/arm/mach-exynos/include/mach/map.h |1 + > arch/arm/mach-exynos/include/mach/uncompress.h | 20 +++--- > 3 files changed, 33 insertions(+), 13 deletions(-) With this patch I found that Origen board does not boot. It stops at "Uncompressing Linux...". Tested using your latest for-next branch. --- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] ARM: S3C24XX: Make 'clk_msysclk' static
Fixes the following warning:
arch/arm/mach-s3c24xx/common-s3c2443.c:135:19: warning:
symbol 'clk_msysclk' was not declared. Should it be static?
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s3c24xx/common-s3c2443.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/common-s3c2443.c
b/arch/arm/mach-s3c24xx/common-s3c2443.c
index aeb4a24..f6b9f2e 100644
--- a/arch/arm/mach-s3c24xx/common-s3c2443.c
+++ b/arch/arm/mach-s3c24xx/common-s3c2443.c
@@ -132,7 +132,7 @@ static struct clk *clk_msysclk_sources[] = {
[3] = &clk_mpllref,
};
-struct clksrc_clk clk_msysclk = {
+static struct clksrc_clk clk_msysclk = {
.clk= {
.name = "msysclk",
.parent = &clk_xtal,
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] ARM: S3C24XX: Fix warnings in irq-s3c2416.c
Fixes the following warnings:
arch/arm/mach-s3c24xx/irq-s3c2416.c:226:17: warning:
symbol 's3c2416_irq_second' was not declared. Should it be static?
arch/arm/mach-s3c24xx/irq-s3c2416.c:332:5: warning:
symbol 's3c2416_irq_suspend' was not declared. Should it be static?
arch/arm/mach-s3c24xx/irq-s3c2416.c:339:6: warning:
symbol 's3c2416_irq_resume' was not declared. Should it be static?
Signed-off-by: Sachin Kamat
---
arch/arm/mach-s3c24xx/irq-s3c2416.c |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-s3c24xx/irq-s3c2416.c
b/arch/arm/mach-s3c24xx/irq-s3c2416.c
index ff141b0..f282670 100644
--- a/arch/arm/mach-s3c24xx/irq-s3c2416.c
+++ b/arch/arm/mach-s3c24xx/irq-s3c2416.c
@@ -223,7 +223,7 @@ static void s3c2416_irq_unmask_second(struct irq_data *data)
__raw_writel(mask, S3C2416_INTMSK2);
}
-struct irq_chip s3c2416_irq_second = {
+static struct irq_chip s3c2416_irq_second = {
.irq_ack= s3c2416_irq_ack_second,
.irq_mask = s3c2416_irq_mask_second,
.irq_unmask = s3c2416_irq_unmask_second,
@@ -329,14 +329,14 @@ static struct sleep_save irq_save[] = {
SAVE_ITEM(S3C2416_INTMSK2),
};
-int s3c2416_irq_suspend(void)
+static int s3c2416_irq_suspend(void)
{
s3c_pm_do_save(irq_save, ARRAY_SIZE(irq_save));
return 0;
}
-void s3c2416_irq_resume(void)
+static void s3c2416_irq_resume(void)
{
s3c_pm_do_restore(irq_save, ARRAY_SIZE(irq_save));
}
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] ARM: dts: Add vmmc regulator node in exynos4412-origen.dts
Added vmmc regulator node in exynos4412-origen.dts file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4412-origen.dts |9 +
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts
b/arch/arm/boot/dts/exynos4412-origen.dts
index df880c4..fe70bc6 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -27,6 +27,15 @@
bootargs ="console=ttySAC2,115200";
};
+ mmc_reg: voltage-regulator {
+ compatible = "regulator-fixed";
+ regulator-name = "VMEM_VDD_2.8V";
+ regulator-min-microvolt = <280>;
+ regulator-max-microvolt = <280>;
+ gpio = <&gpx1 1 0>;
+ enable-active-high;
+ };
+
serial@1380 {
status = "okay";
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] ARM: dts: Add sdhci node for exynos4412-origen
Added sdhci node for exynos4412-origen.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4412-origen.dts |8
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts
b/arch/arm/boot/dts/exynos4412-origen.dts
index fe70bc6..4eba374 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -36,6 +36,14 @@
enable-active-high;
};
+ sdhci@1253 {
+ bus-width = <4>;
+ pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
+ pinctrl-names = "default";
+ vmmc-supply = <&mmc_reg>;
+ status = "okay";
+ };
+
serial@1380 {
status = "okay";
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/2] ARM: dts: Add vmmc regulator node in exynos4412-origen.dts
Hi Tomasz On 17 January 2013 14:56, Tomasz Figa wrote: > Hi Sachin, > > On Thursday 17 of January 2013 11:18:12 Sachin Kamat wrote: >> Added vmmc regulator node in exynos4412-origen.dts file. >> >> Signed-off-by: Sachin Kamat >> --- > > > Reviewed-by: Tomasz Figa > Thank you for reviewing the patches. -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: dts: fix tick and alarm inq numbers for exynos5440
typo in patch title s/inq/irq
On 19 January 2013 10:27, Kukjin Kim wrote:
> From: Giridhar Maruthy
>
> The interrupts for RTC tick and alarm interrupt were swapped.
> Has been fixed here.
>
> Signed-off-by: Giridhar Maruthy
> Signed-off-by: Kukjin Kim
> ---
> arch/arm/boot/dts/exynos5440.dtsi |2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/exynos5440.dtsi
> b/arch/arm/boot/dts/exynos5440.dtsi
> index 25f0fa6..5f3562a 100644
> --- a/arch/arm/boot/dts/exynos5440.dtsi
> +++ b/arch/arm/boot/dts/exynos5440.dtsi
> @@ -154,6 +154,6 @@
> rtc {
> compatible = "samsung,s3c6410-rtc";
> reg = <0x13 0x1000>;
> - interrupts = <0 16 0>, <0 17 0>;
> + interrupts = <0 17 0>, <0 16 0>;
> };
> };
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc"
> in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/2] cpufreq: exynos: Fix unsigned variable being checked for negative value
exynos_cpufreq_scale function returns signed value which was assigned to an unsigned variable and checked for negative value which is always false. Hence make it signed. Fixes the following smatch warnings: drivers/cpufreq/exynos-cpufreq.c:83 exynos_cpufreq_scale() warn: unsigned 'old_index' is never less than zero. drivers/cpufreq/exynos-cpufreq.c:89 exynos_cpufreq_scale() warn: unsigned 'index' is never less than zero. Signed-off-by: Sachin Kamat --- Rafael J. Wysocki suggested these 2 patches be taken through the Samsung tree. --- drivers/cpufreq/exynos-cpufreq.c |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c index 218b3ce..88401ba 100644 --- a/drivers/cpufreq/exynos-cpufreq.c +++ b/drivers/cpufreq/exynos-cpufreq.c @@ -65,7 +65,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq) struct cpufreq_policy *policy = cpufreq_cpu_get(0); unsigned int arm_volt, safe_arm_volt = 0; unsigned int mpll_freq_khz = exynos_info->mpll_freq_khz; - unsigned int index, old_index; + int index, old_index; int ret = 0; freqs.old = policy->cur; -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/2] cpufreq: exynos: Initialise return variable
'ret' is undefined when the function returns from the first
'if' condition. Without this patch we get the following warning:
drivers/cpufreq/exynos-cpufreq.c: In function ‘exynos_target’:
drivers/cpufreq/exynos-cpufreq.c:182:2: warning:
‘ret’ may be used uninitialized in this function [-Wuninitialized]
Suggested-by: Jonghwan Choi
Signed-off-by: Sachin Kamat
---
drivers/cpufreq/exynos-cpufreq.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 88401ba..4268e46 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -159,7 +159,7 @@ static int exynos_target(struct cpufreq_policy *policy,
{
struct cpufreq_frequency_table *freq_table = exynos_info->freq_table;
unsigned int index;
- int ret;
+ int ret = 0;
mutex_lock(&cpufreq_lock);
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: DTS: exynos5250-arndale: Add initial board support file
Hi Tushar,
Just a couple of minor comments.
On 24 January 2013 11:46, Tushar Behera wrote:
> From: Girish K S
>
> Arndale is a low cost board based on the Samsung Exynos5250 SoC. This
> patch adds initial device tree support for this board.
>
> Signed-off-by: Girish K S
> Signed-off-by: Tushar Behera
> ---
> arch/arm/boot/dts/Makefile |1 +
> arch/arm/boot/dts/exynos5250-arndale.dts | 124
> ++
> 2 files changed, 125 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/boot/dts/exynos5250-arndale.dts
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 5ebb44f..60a9e52 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -44,6 +44,7 @@ dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
> exynos4210-trats.dtb \
> exynos4412-smdk4412.dtb \
> exynos5250-smdk5250.dtb \
> + exynos5250-arndale.dtb \
I think this entry could be moved one step up for maintaining
alphabetical order.
> exynos5250-snow.dtb \
> exynos5440-ssdk5440.dtb
> dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
> diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts
> b/arch/arm/boot/dts/exynos5250-arndale.dts
> new file mode 100644
> index 000..7504cf3
> --- /dev/null
> +++ b/arch/arm/boot/dts/exynos5250-arndale.dts
> @@ -0,0 +1,124 @@
> +/*
> + * Samsung's Exynos5250 based Arndale board device tree source
> + *
> + * Copyright (c) 2012 Samsung Electronics Co., Ltd.
2013?
> + * http://www.samsung.com
> + *
> + * 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.
> +*/
> +
> +/dts-v1/;
> +/include/ "exynos5250.dtsi"
> +
> +/ {
> + model = "Insignal Arndale evaluation board based on EXYNOS5250";
> + compatible = "insignal,arndale", "samsung,exynos5250";
> +
> + memory {
> + reg = <0x4000 0x8000>;
> + };
> +
> + chosen {
> + bootargs = "root=/dev/ram0 rw ramdisk=8192
> initrd=0x4100,8M console=ttySAC2,115200 init=/linuxrc";
This could be resticted only to console
bootargs = "console=ttySAC2,115200";
> + };
> +
> + i2c@12C6 {
> + status = "disabled";
> + };
> +
> + i2c@12C7 {
> + status = "disabled";
> + };
> +
> + i2c@12C8 {
> + status = "disabled";
> + };
> +
> + i2c@12C9 {
> + status = "disabled";
> + };
> +
> + i2c@12CA {
> + status = "disabled";
> + };
> +
> + i2c@12CB {
> + status = "disabled";
> + };
> +
> + i2c@12CC {
> + status = "disabled";
> + };
> +
> + i2c@12CD {
> + status = "disabled";
> + };
> +
> + i2c@121D {
> + status = "disabled";
> + };
> +
> + dwmmc_0: dwmmc0@1220 {
> + num-slots = <1>;
> + supports-highspeed;
> + broken-cd;
> + fifo-depth = <0x80>;
> + card-detect-delay = <200>;
> + samsung,dw-mshc-ciu-div = <3>;
> + samsung,dw-mshc-sdr-timing = <2 3>;
> + samsung,dw-mshc-ddr-timing = <1 2>;
> +
> + slot@0 {
> + reg = <0>;
> + bus-width = <8>;
> + gpios = <&gpc0 0 2 0 3>, <&gpc0 1 2 0 3>,
> + <&gpc1 0 2 3 3>, <&gpc1 1 2 3 3>,
> + <&gpc1 2 2 3 3>, <&gpc1 3 2 3 3>,
> + <&gpc0 3 2 3 3>, <&gpc0 4 2 3 3>,
> + <&gpc0 5 2 3 3>, <&gpc0 6 2 3 3>;
> + };
> + };
> +
> + dwmmc_1: dwmmc1@1221 {
> + status = "disabled";
> + };
> +
> + dwmmc_2: dwmmc2@1222 {
> + num-slots = <1>;
> + supports-highspeed;
> + fifo-depth = <0x80>;
> + card-detect-delay = <200>;
> + samsung,dw-mshc-ciu-div = <3>;
> + samsung,dw-mshc-sdr-timing = <2 3>;
> + samsung,dw-mshc-ddr-timing = <1 2>;
> +
> + slot@0 {
> + reg = <0>;
> + bus-width = <4>;
> + samsung,cd-pinmux-gpio = <&gpc3 2 2 3 3>;
> + gpios = <&gpc3 0 2 0 3>, <&gpc3 1 2 0 3>,
> + <&gpc3 3 2 3 3>, <&gpc3 4 2 3 3>,
> + <&gpc3 5 2 3 3>, <&gpc3 6 2 3 3>,
> + <&gpc4 3 3 3 3>, <&gpc4 3 3 3 3>,
> + <&gpc4 5 3 3 3>, <&gpc4 6 3 3 3>;
> + };
> + };
> +
> + dwmmc_3: dwmmc3@1223 {
> + status = "disabled";
[PATCH 1/1] ARM: dts: Add sdhci node for exynos4412-smdk4412
Added sdhci node for exynos4412-smdk4412.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4412-smdk4412.dts |7 +++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts
b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index f05bf57..e885971 100644
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -27,6 +27,13 @@
bootargs ="root=/dev/ram0 rw ramdisk=8192 initrd=0x4100,8M
console=ttySAC1,115200 init=/linuxrc";
};
+ sdhci@1253 {
+ bus-width = <4>;
+ pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>;
+ pinctrl-names = "default";
+ status = "okay";
+ };
+
serial@1380 {
status = "okay";
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 0/5] Add DRM FIMD DT support for Exynos4 DT Machines
Hi Vikas, You need to CC devicetree-disc...@lists.ozlabs.org for patches adding new bindings and add documentation related to it. On 28 January 2013 11:14, Vikas Sajjan wrote: > This patch series adds support for DRM FIMD DT for Exynos4 DT Machines, > specifically for Exynos4412 SoC. > > Is based on branch "for-next" > http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git > > Vikas Sajjan (5): > ARM: dts: Add FIMD node to exynos4 > ARM: dts: Adds lcd pinctrl node entries for SAMSUNG EXYNOS4412 SoC > ARM: dts: Add FIMD node and display timing node to > exynos4412-origen.dts > ARM: dts: adds FIMD AUXDATA node entry for exynos4 DT > ARM: EXYNOS: Enable backlight and PWM support for Exynos4 DT machines > > arch/arm/boot/dts/exynos4.dtsi|7 +++ > arch/arm/boot/dts/exynos4412-origen.dts | 21 + > arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 26 ++ > arch/arm/mach-exynos/Kconfig |2 ++ > arch/arm/mach-exynos/mach-exynos4-dt.c|4 > 5 files changed, 60 insertions(+) > > -- > 1.7.9.5 > -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH Resend 0/6] ARM: dts: Add MFC support for Exynos4
Resending this series after adding support for some Exynos4412 boards (patches 5 and 6) and renaming the patch titles to "ARM: dts: ". This series is based on for-next branch of Kukjin Kim's tree. git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git Sachin Kamat (6): ARM: dts: Update MFC DT binding documentation ARM: dts: Add MFC codec support for Exynos4 DT machines ARM: dts: Add MFC codec support to SMDKV310 DT ARM: dts: Add MFC codec support to Origen DT ARM: dts: Add MFC codec entry to exynos4412-origen DT file ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file .../devicetree/bindings/media/s5p-mfc.txt | 13 + arch/arm/boot/dts/exynos4.dtsi |7 +++ arch/arm/boot/dts/exynos4210-origen.dts|5 + arch/arm/boot/dts/exynos4210-smdkv310.dts |5 + arch/arm/boot/dts/exynos4412-origen.dts|5 + arch/arm/boot/dts/exynos4412-smdk4412.dts |5 + arch/arm/mach-exynos/mach-exynos4-dt.c | 17 + 7 files changed, 57 insertions(+), 0 deletions(-) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/6] ARM: dts: Update MFC DT binding documentation
Added an example for bindings for illustration and clarity.
Cc: devicetree-disc...@lists.ozlabs.org
Cc: Arun Kumar K
Signed-off-by: Sachin Kamat
---
.../devicetree/bindings/media/s5p-mfc.txt | 13 +
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt
b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index 67ec3d4..261c9dc 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -21,3 +21,16 @@ Required properties:
- samsung,mfc-l : Base address of the second memory bank used by MFC
for DMA contiguous memory allocation and its size.
+
+Example:
+
+mfc: codec@1340 {
+ compatible = "samsung,mfc-v5";
+ reg = <0x1340 0x1>;
+ interrupts = <0 94 0>;
+};
+
+codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/6] ARM: dts: Add MFC codec support for Exynos4 DT machines
This patch adds MFC codec support for Exynos4 DT machines.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4.dtsi |7 +++
arch/arm/mach-exynos/mach-exynos4-dt.c | 17 +
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e1347fc..1122fb1 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -289,4 +289,11 @@
interrupts = <0 34 0>;
};
};
+
+ mfc: codec@1340 {
+ compatible = "samsung,mfc-v5";
+ reg = <0x1340 0x1>;
+ interrupts = <0 94 0>;
+ samsung,power-domain = <&pd_mfc>;
+ };
};
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c
b/arch/arm/mach-exynos/mach-exynos4-dt.c
index ab1dacc..8ae8da1 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -12,7 +12,9 @@
*/
#include
+#include
#include
+#include
#include
#include
@@ -20,6 +22,7 @@
#include
#include
+#include
#include "common.h"
@@ -80,6 +83,7 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[]
__initconst = {
OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
"exynos-tmu", NULL),
+ OF_DEV_AUXDATA("samsung,mfc-v5", 0x1340, "s5p-mfc", NULL),
{},
};
@@ -102,6 +106,18 @@ static char const *exynos4_dt_compat[] __initdata = {
NULL
};
+static void __init exynos4_reserve(void)
+{
+#ifdef CONFIG_S5P_DEV_MFC
+ struct s5p_mfc_dt_meminfo mfc_mem;
+
+ /* Reserve memory for MFC only if it's available */
+ mfc_mem.compatible = "samsung,mfc-v5";
+ if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem))
+ s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff,
+ mfc_mem.lsize);
+#endif
+}
DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
/* Maintainer: Thomas Abraham */
.smp= smp_ops(exynos_smp_ops),
@@ -114,4 +130,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened
Device Tree)")
.timer = &exynos4_timer,
.dt_compat = exynos4_dt_compat,
.restart= exynos4_restart,
+ .reserve= exynos4_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/6] ARM: dts: Add MFC codec support to SMDKV310 DT
Added MFC codec support to SMDKV310 DT file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4210-smdkv310.dts |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts
b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index f634907..8481f8f 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -189,4 +189,9 @@
};
};
};
+
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ };
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/6] ARM: dts: Add MFC codec support to Origen DT
This patch adds MFC codec support to Origen DT file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4210-origen.dts |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts
b/arch/arm/boot/dts/exynos4210-origen.dts
index f271001..cd0d1e2 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -121,4 +121,9 @@
linux,default-trigger = "heartbeat";
};
};
+
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ };
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 5/6] ARM: dts: Add MFC codec entry to exynos4412-origen DT file
Added MFC codec entry to exynos4412-origen.dts.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4412-origen.dts |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts
b/arch/arm/boot/dts/exynos4412-origen.dts
index 4eba374..d9766da 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -59,4 +59,9 @@
serial@1383 {
status = "okay";
};
+
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ };
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/6] ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file
Added MFC DT entry to exynos4412-smdk4412.dts file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4412-smdk4412.dts |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts
b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index e885971..dcd1f33 100644
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -49,4 +49,9 @@
serial@1383 {
status = "okay";
};
+
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ };
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Failure due to missing (Exynos related) pinctrl patch
Hi Linus, Kukjin, Patch titled "pinctrl: exynos: change PINCTRL_EXYNOS option" (linux-next commit Id: 7452b64d) which is present in linux-next is missing in the mainline kernel. This patch is required along with the patch "gpio: samsung: fix pinctrl condition for exynos and exynos5440" (mainline commit Id: e4a5da51) which has already made it into mainline. Without the missing patch we get the following boot up warnings and subsequent failures with dt boot on 4412 based board: WARNING: at drivers/gpio/gpio-samsung.c:3102 samsung_gpiolib_init+0x29c/0x2e8() Unknown SoC in gpio-samsung, no GPIOs added Modules linked in: [] (unwind_backtrace+0x0/0xf8) from [] (warn_slowpath_common+0x4c/0x64) [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_fmt+0x30/0x40) [] (warn_slowpath_fmt+0x30/0x40) from [] (samsung_gpiolib_init+0x29c/0x2e8) [] (samsung_gpiolib_init+0x29c/0x2e8) from [] (do_one_initcall+0x34/0x174) [] (do_one_initcall+0x34/0x174) from [] (kernel_init_freeable+0xfc/0x1c8) [] (kernel_init_freeable+0xfc/0x1c8) from [] (kernel_init+0x8/0xe4) [] (kernel_init+0x8/0xe4) from [] (ret_from_fork+0x14/0x3c) -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Failure due to missing (Exynos related) pinctrl patch
>> This patch is required along with the >> patch "gpio: samsung: fix pinctrl condition for exynos and exynos5440" >> (mainline commit Id: e4a5da51) which has already made it into >> mainline. Without the missing patch we get the following boot up >> warnings and subsequent failures with dt boot on 4412 based board: > > Hm I didn't realize there was a dependency between these > patches, oh well, better get the pull for the pinctrl tree finished > off then... Ideally those 2 patches should have been squashed together. -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Failure due to missing (Exynos related) pinctrl patch
On 30 January 2013 09:38, Kukjin Kim wrote: > Sachin Kamat wrote: >> >> >> This patch is required along with the >> >> patch "gpio: samsung: fix pinctrl condition for exynos and exynos5440" >> >> (mainline commit Id: e4a5da51) which has already made it into >> >> mainline. Without the missing patch we get the following boot up >> >> warnings and subsequent failures with dt boot on 4412 based board: >> > >> > Hm I didn't realize there was a dependency between these >> > patches, oh well, better get the pull for the pinctrl tree finished >> > off then... >> >> Ideally those 2 patches should have been squashed together. >> > Err, Sachin, what are you talking about? As you said, one patch has been > merged into the mainline, so how does it can be squashed? In this case, just > applying the other patch into pinctrl-fixes is enough. Yes you are right. It cannot be squashed now. I was referring to the time of generation of these patches. > > Thanks. > > - Kukjin > -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] ARM: dts: Update MFC DT binding documentation
Hi Sylwester,
>> +Example:
>
> Maybe adding a comment that this is a SoC...
>
>> +mfc: codec@1340 {
>> + compatible = "samsung,mfc-v5";
>> + reg = <0x1340 0x1>;
>> + interrupts = <0 94 0>;
>> +};
>
> and the board specific part would make it more clear ?
Absolutely :)
>
>> +codec@1340 {
>> + samsung,mfc-r = <0x4300 0x80>;
>> + samsung,mfc-l = <0x5100 0x80>;
>> +};
>
> Also please note that in the first node above you need
> status = "disabled"; line, so the MFC is disabled by default.
> Then in dts files for boards that use the codec it can be
> overridden to enable the device as needed.
Right.
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 2/6] ARM: dts: Add MFC codec support for Exynos4 DT machines
Hi Sylwester,
>> + mfc: codec@1340 {
>> + compatible = "samsung,mfc-v5";
>> + reg = <0x1340 0x1>;
>> + interrupts = <0 94 0>;
>> + samsung,power-domain = <&pd_mfc>;
>
> Please add:
> status = "disabled";
OK
>
>> + };
>> };
>> +static void __init exynos4_reserve(void)
>> +{
>> +#ifdef CONFIG_S5P_DEV_MFC
>
> Where is this symbol supposed to be enabled ?
>
> Don't you need a change like this as a part of this patch ?
Yes. Good catch. Since this symbol was defined under other machines
which were getting enabled, I did not notice this.
>
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 3/6] ARM: dts: Add MFC codec support to SMDKV310 DT
Hi Sylwester,
>> + codec@1340 {
>> + samsung,mfc-r = <0x4300 0x80>;
>> + samsung,mfc-l = <0x5100 0x80>;
>
> With the change as I proposed in patch 2/6 you need to add:
>
> status = "okay";
>
> in this node and for all other boards in the further patches
> in this series.
Right. Will update the series with your comments and re-send it.
Thank you for reviewing.
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 0/6] ARM: dts: Add MFC support for Exynos4
Changes since v1: Addressed comments from Sylwester - Updated documentation - Added 'status' to the nodes - Updated Kconfig entry This series is based on for-next branch of Kukjin Kim's tree. git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git Sachin Kamat (6): ARM: dts: Update MFC DT binding documentation ARM: dts: Add MFC codec support for Exynos4 DT machines ARM: dts: Add MFC codec support to SMDKV310 DT ARM: dts: Add MFC codec support to Origen DT ARM: dts: Add MFC codec entry to exynos4412-origen DT file ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file .../devicetree/bindings/media/s5p-mfc.txt | 21 arch/arm/boot/dts/exynos4.dtsi |8 +++ arch/arm/boot/dts/exynos4210-origen.dts|6 + arch/arm/boot/dts/exynos4210-smdkv310.dts |6 + arch/arm/boot/dts/exynos4412-origen.dts|6 + arch/arm/boot/dts/exynos4412-smdk4412.dts |6 + arch/arm/mach-exynos/Kconfig |1 + arch/arm/mach-exynos/mach-exynos4-dt.c | 17 8 files changed, 71 insertions(+), 0 deletions(-) -- 1.7.4.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/6] ARM: dts: Update MFC DT binding documentation
Added an example for bindings for illustration and clarity.
Cc: devicetree-disc...@lists.ozlabs.org
Cc: Arun Kumar K
Signed-off-by: Sachin Kamat
---
.../devicetree/bindings/media/s5p-mfc.txt | 21
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/Documentation/devicetree/bindings/media/s5p-mfc.txt
b/Documentation/devicetree/bindings/media/s5p-mfc.txt
index 67ec3d4..bf0182d 100644
--- a/Documentation/devicetree/bindings/media/s5p-mfc.txt
+++ b/Documentation/devicetree/bindings/media/s5p-mfc.txt
@@ -21,3 +21,24 @@ Required properties:
- samsung,mfc-l : Base address of the second memory bank used by MFC
for DMA contiguous memory allocation and its size.
+
+Optional properties:
+ - samsung,power-domain : power-domain property defined with a phandle
+ to respective power domain.
+
+Example:
+SoC specific DT entry:
+
+mfc: codec@1340 {
+ compatible = "samsung,mfc-v5";
+ reg = <0x1340 0x1>;
+ interrupts = <0 94 0>;
+ samsung,power-domain = <&pd_mfc>;
+};
+
+Board specific DT entry:
+
+codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 2/6] ARM: dts: Add MFC codec support for Exynos4 DT machines
This patch adds MFC codec support for Exynos4 DT machines.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4.dtsi |8
arch/arm/mach-exynos/Kconfig |1 +
arch/arm/mach-exynos/mach-exynos4-dt.c | 17 +
3 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index e1347fc..6581bb2 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -131,6 +131,14 @@
status = "disabled";
};
+ mfc: codec@1340 {
+ compatible = "samsung,mfc-v5";
+ reg = <0x1340 0x1>;
+ interrupts = <0 94 0>;
+ samsung,power-domain = <&pd_mfc>;
+ status = "disabled";
+ };
+
serial@1380 {
compatible = "samsung,exynos4210-uart";
reg = <0x1380 0x100>;
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index e103c29..f0d8f09 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -415,6 +415,7 @@ config MACH_EXYNOS4_DT
select HAVE_SAMSUNG_KEYPAD if INPUT_KEYBOARD
select PINCTRL
select PINCTRL_EXYNOS4
+ select S5P_DEV_MFC
select USE_OF
help
Machine support for Samsung Exynos4 machine with device tree enabled.
diff --git a/arch/arm/mach-exynos/mach-exynos4-dt.c
b/arch/arm/mach-exynos/mach-exynos4-dt.c
index ab1dacc..8ae8da1 100644
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@ -12,7 +12,9 @@
*/
#include
+#include
#include
+#include
#include
#include
@@ -20,6 +22,7 @@
#include
#include
+#include
#include "common.h"
@@ -80,6 +83,7 @@ static const struct of_dev_auxdata exynos4_auxdata_lookup[]
__initconst = {
OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
"exynos-tmu", NULL),
+ OF_DEV_AUXDATA("samsung,mfc-v5", 0x1340, "s5p-mfc", NULL),
{},
};
@@ -102,6 +106,18 @@ static char const *exynos4_dt_compat[] __initdata = {
NULL
};
+static void __init exynos4_reserve(void)
+{
+#ifdef CONFIG_S5P_DEV_MFC
+ struct s5p_mfc_dt_meminfo mfc_mem;
+
+ /* Reserve memory for MFC only if it's available */
+ mfc_mem.compatible = "samsung,mfc-v5";
+ if (of_scan_flat_dt(s5p_fdt_find_mfc_mem, &mfc_mem))
+ s5p_mfc_reserve_mem(mfc_mem.roff, mfc_mem.rsize, mfc_mem.loff,
+ mfc_mem.lsize);
+#endif
+}
DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
/* Maintainer: Thomas Abraham */
.smp= smp_ops(exynos_smp_ops),
@@ -114,4 +130,5 @@ DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened
Device Tree)")
.timer = &exynos4_timer,
.dt_compat = exynos4_dt_compat,
.restart= exynos4_restart,
+ .reserve= exynos4_reserve,
MACHINE_END
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 4/6] ARM: dts: Add MFC codec support to Origen DT
This patch adds MFC codec support to Origen DT file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4210-origen.dts |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-origen.dts
b/arch/arm/boot/dts/exynos4210-origen.dts
index f271001..052606b 100644
--- a/arch/arm/boot/dts/exynos4210-origen.dts
+++ b/arch/arm/boot/dts/exynos4210-origen.dts
@@ -57,6 +57,12 @@
status = "okay";
};
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ status = "okay";
+ };
+
serial@1380 {
status = "okay";
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 5/6] ARM: dts: Add MFC codec entry to exynos4412-origen DT file
Added MFC codec entry to exynos4412-origen.dts.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4412-origen.dts |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts
b/arch/arm/boot/dts/exynos4412-origen.dts
index 4eba374..e066fc6 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -44,6 +44,12 @@
status = "okay";
};
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ status = "okay";
+ };
+
serial@1380 {
status = "okay";
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 6/6] ARM: dts: Add MFC codec entry to exynos4412-smdk4412 DT file
Added MFC DT entry to exynos4412-smdk4412.dts file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4412-smdk4412.dts |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts
b/arch/arm/boot/dts/exynos4412-smdk4412.dts
index e885971..6ae4276 100644
--- a/arch/arm/boot/dts/exynos4412-smdk4412.dts
+++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts
@@ -34,6 +34,12 @@
status = "okay";
};
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ status = "okay";
+ };
+
serial@1380 {
status = "okay";
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 3/6] ARM: dts: Add MFC codec support to SMDKV310 DT
Added MFC codec support to SMDKV310 DT file.
Signed-off-by: Sachin Kamat
---
arch/arm/boot/dts/exynos4210-smdkv310.dts |6 ++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts
b/arch/arm/boot/dts/exynos4210-smdkv310.dts
index f634907..2b1e03a 100644
--- a/arch/arm/boot/dts/exynos4210-smdkv310.dts
+++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts
@@ -43,6 +43,12 @@
status = "okay";
};
+ codec@1340 {
+ samsung,mfc-r = <0x4300 0x80>;
+ samsung,mfc-l = <0x5100 0x80>;
+ status = "okay";
+ };
+
serial@1380 {
status = "okay";
};
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Failure due to missing (Exynos related) pinctrl patch
Hi Linus, On 30 January 2013 15:18, Linus Walleij wrote: > On Wed, Jan 30, 2013 at 5:08 AM, Kukjin Kim wrote: >> Sachin Kamat wrote: >>> >>> >> This patch is required along with the >>> >> patch "gpio: samsung: fix pinctrl condition for exynos and exynos5440" >>> >> (mainline commit Id: e4a5da51) which has already made it into >>> >> mainline. Without the missing patch we get the following boot up >>> >> warnings and subsequent failures with dt boot on 4412 based board: >>> > >>> > Hm I didn't realize there was a dependency between these >>> > patches, oh well, better get the pull for the pinctrl tree finished >>> > off then... > > Torvalds has already pulled it in -> problem solved. :-) > I tested this on Linus T.'s latest tip (2e51b231) and the problem still persists :( You sent the following patch in your pull request to Linus T.: Kukjin Kim (1): pinctrl: samsung: removing duplicated condition for PINCTRL_SAMSUNG However, the missing dependent patch is: "pinctrl: exynos: change PINCTRL_EXYNOS option" -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 0/6] ARM: dts: Add MFC support for Exynos4
> > Thanks Sachin. For the whole series: > > Reviewed-by: Sylwester Nawrocki > > I have also tested patch 2/6 on an Exynos4412 based board, > just added the mfc clock entries in the codec node. Thanks Sylwester for your review and testing. -- With warm regards, Sachin -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH 1/1] ARM: dts: Add s5m8767 PMIC node to exynos4412-origen.dts
Added s5m8767 PMIC node to exynos4412-origen DT file.
Signed-off-by: Sachin Kamat
---
This patch is created against for-next branch of Kukjin Kim's tree.
This patch is added on top of the following patch:
http://www.spinics.net/lists/linux-samsung-soc/msg15423.html
and based on the below patch:
http://comments.gmane.org/gmane.linux.kernel/1434801
---
arch/arm/boot/dts/exynos4412-origen.dts | 330 +++
1 files changed, 330 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts
b/arch/arm/boot/dts/exynos4412-origen.dts
index e066fc6..daa3884 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -65,4 +65,334 @@
serial@1383 {
status = "okay";
};
+
+ i2c@1386 {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ samsung,i2c-sda-delay = <100>;
+ samsung,i2c-max-bus-freq = <2>;
+ pinctrl-0 = <&i2c0_bus>;
+ pinctrl-names = "default";
+ status = "okay";
+
+ s5m8767_pmic@66 {
+ compatible = "samsung,s5m8767-pmic";
+ reg = <0x66>;
+
+ s5m8767,pmic-buck-default-dvs-idx = <3>;
+
+ s5m8767,pmic-buck-dvs-gpios = <&gpx2 3 0>,
+<&gpx2 4 0>,
+<&gpx2 5 0>;
+
+ s5m8767,pmic-buck-ds-gpios = <&gpm3 5 0>,
+ <&gpm3 6 0>,
+ <&gpm3 7 0>;
+
+ s5m8767,pmic-buck2-dvs-voltage = <125>, <120>,
+<120>, <120>,
+<120>, <120>,
+<120>, <120>;
+
+ s5m8767,pmic-buck3-dvs-voltage = <110>, <110>,
+<110>, <110>,
+<110>, <110>,
+<110>, <110>;
+
+ s5m8767,pmic-buck4-dvs-voltage = <120>, <120>,
+<120>, <120>,
+<120>, <120>,
+<120>, <120>;
+
+ regulators {
+ ldo1_reg: LDO1 {
+ regulator-name = "VDD_ALIVE";
+ regulator-min-microvolt = <110>;
+ regulator-max-microvolt = <110>;
+ regulator-always-on;
+ regulator-boot-on;
+ op_mode = <1>; /* Normal Mode */
+ };
+
+ ldo2_reg: LDO2 {
+ regulator-name = "VDDQ_M12";
+ regulator-min-microvolt = <120>;
+ regulator-max-microvolt = <120>;
+ regulator-always-on;
+ op_mode = <1>; /* Normal Mode */
+ };
+
+ ldo3_reg: LDO3 {
+ regulator-name = "VDDIOAP_18";
+ regulator-min-microvolt = <180>;
+ regulator-max-microvolt = <180>;
+ regulator-always-on;
+ op_mode = <1>; /* Normal Mode */
+ };
+
+ ldo4_reg: LDO4 {
+ regulator-name = "VDDQ_PRE";
+ regulator-min-microvolt = <180>;
+ regulator-max-microvolt = <180>;
+ regulator-always-on;
+ op_mode = <1>; /* Normal Mode */
+
