[PATCH] ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
From: Changhwan Youn chaos.y...@samsung.com
EXYNOS SOC series use MCT for kernel timer and MCT has two types of
clock event timers, which are mct-comp and mct-tick.
Because the clock rate of each event timer is diffent from the other,
this patch fixes cycles_per_jiffy for each timer's periodic mode.
Signed-off-by: Changhwan Youn chaos.y...@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos/mct.c | 21 +
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-exynos/mct.c b/arch/arm/mach-exynos/mct.c
index 85b5527..3e894ba 100644
--- a/arch/arm/mach-exynos/mct.c
+++ b/arch/arm/mach-exynos/mct.c
@@ -29,12 +29,13 @@
#include mach/regs-mct.h
#include asm/mach/time.h
+#define TICK_BASE_CNT 1
+
enum {
MCT_INT_SPI,
MCT_INT_PPI
};
-static unsigned long clk_cnt_per_tick;
static unsigned long clk_rate;
static unsigned int mct_int_type;
@@ -205,11 +206,14 @@ static int exynos4_comp_set_next_event(unsigned long
cycles,
static void exynos4_comp_set_mode(enum clock_event_mode mode,
struct clock_event_device *evt)
{
+ unsigned long cycles_per_jiffy;
exynos4_mct_comp0_stop();
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC:
- exynos4_mct_comp0_start(mode, clk_cnt_per_tick);
+ cycles_per_jiffy =
+ (((unsigned long long) NSEC_PER_SEC / HZ * evt-mult)
evt-shift);
+ exynos4_mct_comp0_start(mode, cycles_per_jiffy);
break;
case CLOCK_EVT_MODE_ONESHOT:
@@ -248,9 +252,7 @@ static struct irqaction mct_comp_event_irq = {
static void exynos4_clockevent_init(void)
{
- clk_cnt_per_tick = clk_rate / 2 / HZ;
-
- clockevents_calc_mult_shift(mct_comp_device, clk_rate / 2, 5);
+ clockevents_calc_mult_shift(mct_comp_device, clk_rate, 5);
mct_comp_device.max_delta_ns =
clockevent_delta2ns(0x, mct_comp_device);
mct_comp_device.min_delta_ns =
@@ -314,12 +316,15 @@ static inline void exynos4_tick_set_mode(enum
clock_event_mode mode,
struct clock_event_device *evt)
{
struct mct_clock_event_device *mevt = this_cpu_ptr(percpu_mct_tick);
+ unsigned long cycles_per_jiffy;
exynos4_mct_tick_stop(mevt);
switch (mode) {
case CLOCK_EVT_MODE_PERIODIC:
- exynos4_mct_tick_start(clk_cnt_per_tick, mevt);
+ cycles_per_jiffy =
+ (((unsigned long long) NSEC_PER_SEC / HZ * evt-mult)
evt-shift);
+ exynos4_mct_tick_start(cycles_per_jiffy, mevt);
break;
case CLOCK_EVT_MODE_ONESHOT:
@@ -393,7 +398,7 @@ static void exynos4_mct_tick_init(struct clock_event_device
*evt)
evt-features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
evt-rating = 450;
- clockevents_calc_mult_shift(evt, clk_rate / 2, 5);
+ clockevents_calc_mult_shift(evt, clk_rate / (TICK_BASE_CNT + 1), 5);
evt-max_delta_ns =
clockevent_delta2ns(0x7fff, evt);
evt-min_delta_ns =
@@ -401,7 +406,7 @@ static void exynos4_mct_tick_init(struct clock_event_device
*evt)
clockevents_register_device(evt);
- exynos4_mct_write(0x1, mevt-base + MCT_L_TCNTB_OFFSET);
+ exynos4_mct_write(TICK_BASE_CNT, mevt-base + MCT_L_TCNTB_OFFSET);
if (mct_int_type == MCT_INT_SPI) {
if (cpu == 0) {
--
1.7.4.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
[PATCH 0/5] ARM: EXYNOS: update clock part for new EXYNOS SoC
This patches are splited out as per Olof's suggestion. And this series is including following: - move mach-exynos/clock.c to mach-exynos/clock-exynos4.c - according to moving clock-exynos4.c, move mach/exynos4-clock.h to clock-exynos4.h - the prefix of clk register replace S5P_ with EXYNOS4_ - add prefix exynos4_ on clk declaration - add clock registers for exynos4x12-cpufreq [PATCH 1/5] ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs [PATCH 2/5] ARM: EXYNOS: use static declaration on regarding clock [PATCH 3/5] ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for [PATCH 4/5] PM / devfreq: update the name of EXYNOS clock register [PATCH 5/5] ARM: EXYNOS: add clock registers for exynos4x12-cpufreq -- 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/5] ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
This patch changes the name of clock.c to clock-exynos4.c for other
EXYNOS series such as EXYNOS5. And since the header file of clock
is used only in arch/arm/mach-exynos, moves it in the local directory.
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos/Makefile |3 +-
arch/arm/mach-exynos/{clock.c = clock-exynos4.c} | 173 ++--
.../mach/exynos4-clock.h = clock-exynos4.h} |1 -
arch/arm/mach-exynos/clock-exynos4210.c|2 +-
arch/arm/mach-exynos/clock-exynos4212.c|2 +-
5 files changed, 90 insertions(+), 91 deletions(-)
rename arch/arm/mach-exynos/{clock.c = clock-exynos4.c} (92%)
rename arch/arm/mach-exynos/{include/mach/exynos4-clock.h = clock-exynos4.h}
(95%)
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
index 5fc202c..995e7cc 100644
--- a/arch/arm/mach-exynos/Makefile
+++ b/arch/arm/mach-exynos/Makefile
@@ -12,7 +12,8 @@ obj- :=
# Core
-obj-$(CONFIG_ARCH_EXYNOS4) += common.o clock.o
+obj-$(CONFIG_ARCH_EXYNOS) += common.o
+obj-$(CONFIG_ARCH_EXYNOS4) += clock-exynos4.o
obj-$(CONFIG_CPU_EXYNOS4210) += clock-exynos4210.o
obj-$(CONFIG_SOC_EXYNOS4212) += clock-exynos4212.o
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock-exynos4.c
similarity index 92%
rename from arch/arm/mach-exynos/clock.c
rename to arch/arm/mach-exynos/clock-exynos4.c
index 187287a..1d6d64f 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock-exynos4.c
@@ -1,5 +1,4 @@
-/* linux/arch/arm/mach-exynos4/clock.c
- *
+/*
* Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
@@ -26,9 +25,9 @@
#include mach/map.h
#include mach/regs-clock.h
#include mach/sysmmu.h
-#include mach/exynos4-clock.h
#include common.h
+#include clock-exynos4.h
#ifdef CONFIG_PM_SLEEP
static struct sleep_save exynos4_clock_save[] = {
@@ -215,8 +214,8 @@ static struct clksrc_clk clk_mout_apll = {
.clk= {
.name = mout_apll,
},
- .sources= clk_src_apll,
- .reg_src= { .reg = S5P_CLKSRC_CPU, .shift = 0, .size = 1 },
+ .sources = clk_src_apll,
+ .reg_src = { .reg = S5P_CLKSRC_CPU, .shift = 0, .size = 1 },
};
struct clksrc_clk clk_sclk_apll = {
@@ -224,22 +223,22 @@ struct clksrc_clk clk_sclk_apll = {
.name = sclk_apll,
.parent = clk_mout_apll.clk,
},
- .reg_div= { .reg = S5P_CLKDIV_CPU, .shift = 24, .size = 3 },
+ .reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 24, .size = 3 },
};
struct clksrc_clk clk_mout_epll = {
.clk= {
.name = mout_epll,
},
- .sources= clk_src_epll,
- .reg_src= { .reg = S5P_CLKSRC_TOP0, .shift = 4, .size = 1 },
+ .sources = clk_src_epll,
+ .reg_src = { .reg = S5P_CLKSRC_TOP0, .shift = 4, .size = 1 },
};
struct clksrc_clk clk_mout_mpll = {
- .clk = {
+ .clk= {
.name = mout_mpll,
},
- .sources= clk_src_mpll,
+ .sources = clk_src_mpll,
/* reg_src will be added in each SoCs' clock */
};
@@ -258,8 +257,8 @@ static struct clksrc_clk clk_moutcore = {
.clk= {
.name = moutcore,
},
- .sources= clkset_moutcore,
- .reg_src= { .reg = S5P_CLKSRC_CPU, .shift = 16, .size = 1 },
+ .sources = clkset_moutcore,
+ .reg_src = { .reg = S5P_CLKSRC_CPU, .shift = 16, .size = 1 },
};
static struct clksrc_clk clk_coreclk = {
@@ -267,7 +266,7 @@ static struct clksrc_clk clk_coreclk = {
.name = core_clk,
.parent = clk_moutcore.clk,
},
- .reg_div= { .reg = S5P_CLKDIV_CPU, .shift = 0, .size = 3 },
+ .reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 0, .size = 3 },
};
static struct clksrc_clk clk_armclk = {
@@ -282,7 +281,7 @@ static struct clksrc_clk clk_aclk_corem0 = {
.name = aclk_corem0,
.parent = clk_coreclk.clk,
},
- .reg_div= { .reg = S5P_CLKDIV_CPU, .shift = 4, .size = 3 },
+ .reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 4, .size = 3 },
};
static struct clksrc_clk clk_aclk_cores = {
@@ -290,7 +289,7 @@ static struct clksrc_clk clk_aclk_cores = {
.name = aclk_cores,
.parent = clk_coreclk.clk,
},
- .reg_div= { .reg = S5P_CLKDIV_CPU, .shift = 4, .size = 3 },
+ .reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 4, .size = 3 },
};
static struct clksrc_clk clk_aclk_corem1 = {
@@ -298,7 +297,7 @@ static struct clksrc_clk clk_aclk_corem1 = {
.name = aclk_corem1,
.parent = clk_coreclk.clk,
},
[PATCH 2/5] ARM: EXYNOS: use static declaration on regarding clock
This patch uses static declaration struct which is not
used in other file and re-arrange with group in header
file.
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos/clock-exynos4.c | 18 +-
arch/arm/mach-exynos/clock-exynos4.h | 13 +
2 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-exynos/clock-exynos4.c
b/arch/arm/mach-exynos/clock-exynos4.c
index 1d6d64f..7dde81b 100644
--- a/arch/arm/mach-exynos/clock-exynos4.c
+++ b/arch/arm/mach-exynos/clock-exynos4.c
@@ -95,21 +95,21 @@ static struct sleep_save exynos4_clock_save[] = {
};
#endif
-struct clk clk_sclk_hdmi27m = {
+static struct clk clk_sclk_hdmi27m = {
.name = sclk_hdmi27m,
.rate = 2700,
};
-struct clk clk_sclk_hdmiphy = {
+static struct clk clk_sclk_hdmiphy = {
.name = sclk_hdmiphy,
};
-struct clk clk_sclk_usbphy0 = {
+static struct clk clk_sclk_usbphy0 = {
.name = sclk_usbphy0,
.rate = 2700,
};
-struct clk clk_sclk_usbphy1 = {
+static struct clk clk_sclk_usbphy1 = {
.name = sclk_usbphy1,
};
@@ -218,7 +218,7 @@ static struct clksrc_clk clk_mout_apll = {
.reg_src = { .reg = S5P_CLKSRC_CPU, .shift = 0, .size = 1 },
};
-struct clksrc_clk clk_sclk_apll = {
+static struct clksrc_clk clk_sclk_apll = {
.clk= {
.name = sclk_apll,
.parent = clk_mout_apll.clk,
@@ -226,7 +226,7 @@ struct clksrc_clk clk_sclk_apll = {
.reg_div = { .reg = S5P_CLKDIV_CPU, .shift = 24, .size = 3 },
};
-struct clksrc_clk clk_mout_epll = {
+static struct clksrc_clk clk_mout_epll = {
.clk= {
.name = mout_epll,
},
@@ -310,7 +310,7 @@ static struct clksrc_clk clk_periphclk = {
/* Core list of CMU_CORE side */
-struct clk *clkset_corebus_list[] = {
+static struct clk *clkset_corebus_list[] = {
[0] = clk_mout_mpll.clk,
[1] = clk_sclk_apll.clk,
};
@@ -375,7 +375,7 @@ struct clk *clkset_aclk_top_list[] = {
[1] = clk_sclk_apll.clk,
};
-struct clksrc_sources clkset_aclk = {
+static struct clksrc_sources clkset_aclk = {
.sources= clkset_aclk_top_list,
.nr_sources = ARRAY_SIZE(clkset_aclk_top_list),
};
@@ -446,7 +446,7 @@ static struct clksrc_sources clkset_sclk_vpll = {
.nr_sources = ARRAY_SIZE(clkset_sclk_vpll_list),
};
-struct clksrc_clk clk_sclk_vpll = {
+static struct clksrc_clk clk_sclk_vpll = {
.clk= {
.name = sclk_vpll,
},
diff --git a/arch/arm/mach-exynos/clock-exynos4.h
b/arch/arm/mach-exynos/clock-exynos4.h
index f64e9f7..d2ef305 100644
--- a/arch/arm/mach-exynos/clock-exynos4.h
+++ b/arch/arm/mach-exynos/clock-exynos4.h
@@ -15,25 +15,14 @@
#include linux/clk.h
-extern struct clk clk_sclk_hdmi27m;
-extern struct clk clk_sclk_usbphy0;
-extern struct clk clk_sclk_usbphy1;
-extern struct clk clk_sclk_hdmiphy;
-
-extern struct clksrc_clk clk_sclk_apll;
extern struct clksrc_clk clk_mout_mpll;
extern struct clksrc_clk clk_aclk_133;
-extern struct clksrc_clk clk_mout_epll;
-extern struct clksrc_clk clk_sclk_vpll;
-extern struct clk *clkset_corebus_list[];
extern struct clksrc_sources clkset_mout_corebus;
+extern struct clksrc_sources clkset_group;
extern struct clk *clkset_aclk_top_list[];
-extern struct clksrc_sources clkset_aclk;
-
extern struct clk *clkset_group_list[];
-extern struct clksrc_sources clkset_group;
extern int exynos4_clksrc_mask_fsys_ctrl(struct clk *clk, int enable);
extern int exynos4_clk_ip_fsys_ctrl(struct clk *clk, int enable);
--
1.7.4.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
[PATCH 4/5] PM / devfreq: update the name of EXYNOS clock register
According to replacing the name of EXYNOS clock registers,
this patch updates exynos4_bus.c file where it is used.
Acked-by: MyungJoo Ham myungjoo@samsung.com
Cc: Kyungmin Park kyungmin.p...@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
drivers/devfreq/exynos4_bus.c | 224
1 files changed, 112 insertions(+), 112 deletions(-)
diff --git a/drivers/devfreq/exynos4_bus.c b/drivers/devfreq/exynos4_bus.c
index 6460577..565aa98 100644
--- a/drivers/devfreq/exynos4_bus.c
+++ b/drivers/devfreq/exynos4_bus.c
@@ -311,51 +311,51 @@ static int exynos4210_set_busclk(struct busfreq_data
*data, struct opp *opp)
/* Change Divider - DMC0 */
tmp = data-dmc_divtable[index];
- __raw_writel(tmp, S5P_CLKDIV_DMC0);
+ __raw_writel(tmp, EXYNOS4_CLKDIV_DMC0);
do {
- tmp = __raw_readl(S5P_CLKDIV_STAT_DMC0);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_DMC0);
} while (tmp 0x);
/* Change Divider - TOP */
tmp = data-top_divtable[index];
- __raw_writel(tmp, S5P_CLKDIV_TOP);
+ __raw_writel(tmp, EXYNOS4_CLKDIV_TOP);
do {
- tmp = __raw_readl(S5P_CLKDIV_STAT_TOP);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_TOP);
} while (tmp 0x1);
/* Change Divider - LEFTBUS */
- tmp = __raw_readl(S5P_CLKDIV_LEFTBUS);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_LEFTBUS);
- tmp = ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);
+ tmp = ~(EXYNOS4_CLKDIV_BUS_GDLR_MASK | EXYNOS4_CLKDIV_BUS_GPLR_MASK);
tmp |= ((exynos4210_clkdiv_lr_bus[index][0]
- S5P_CLKDIV_BUS_GDLR_SHIFT) |
+ EXYNOS4_CLKDIV_BUS_GDLR_SHIFT) |
(exynos4210_clkdiv_lr_bus[index][1]
- S5P_CLKDIV_BUS_GPLR_SHIFT));
+ EXYNOS4_CLKDIV_BUS_GPLR_SHIFT));
- __raw_writel(tmp, S5P_CLKDIV_LEFTBUS);
+ __raw_writel(tmp, EXYNOS4_CLKDIV_LEFTBUS);
do {
- tmp = __raw_readl(S5P_CLKDIV_STAT_LEFTBUS);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_LEFTBUS);
} while (tmp 0x11);
/* Change Divider - RIGHTBUS */
- tmp = __raw_readl(S5P_CLKDIV_RIGHTBUS);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_RIGHTBUS);
- tmp = ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);
+ tmp = ~(EXYNOS4_CLKDIV_BUS_GDLR_MASK | EXYNOS4_CLKDIV_BUS_GPLR_MASK);
tmp |= ((exynos4210_clkdiv_lr_bus[index][0]
- S5P_CLKDIV_BUS_GDLR_SHIFT) |
+ EXYNOS4_CLKDIV_BUS_GDLR_SHIFT) |
(exynos4210_clkdiv_lr_bus[index][1]
- S5P_CLKDIV_BUS_GPLR_SHIFT));
+ EXYNOS4_CLKDIV_BUS_GPLR_SHIFT));
- __raw_writel(tmp, S5P_CLKDIV_RIGHTBUS);
+ __raw_writel(tmp, EXYNOS4_CLKDIV_RIGHTBUS);
do {
- tmp = __raw_readl(S5P_CLKDIV_STAT_RIGHTBUS);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_RIGHTBUS);
} while (tmp 0x11);
return 0;
@@ -376,137 +376,137 @@ static int exynos4x12_set_busclk(struct busfreq_data
*data, struct opp *opp)
/* Change Divider - DMC0 */
tmp = data-dmc_divtable[index];
- __raw_writel(tmp, S5P_CLKDIV_DMC0);
+ __raw_writel(tmp, EXYNOS4_CLKDIV_DMC0);
do {
- tmp = __raw_readl(S5P_CLKDIV_STAT_DMC0);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_DMC0);
} while (tmp 0x);
/* Change Divider - DMC1 */
- tmp = __raw_readl(S5P_CLKDIV_DMC1);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_DMC1);
- tmp = ~(S5P_CLKDIV_DMC1_G2D_ACP_MASK |
- S5P_CLKDIV_DMC1_C2C_MASK |
- S5P_CLKDIV_DMC1_C2CACLK_MASK);
+ tmp = ~(EXYNOS4_CLKDIV_DMC1_G2D_ACP_MASK |
+ EXYNOS4_CLKDIV_DMC1_C2C_MASK |
+ EXYNOS4_CLKDIV_DMC1_C2CACLK_MASK);
tmp |= ((exynos4x12_clkdiv_dmc1[index][0]
- S5P_CLKDIV_DMC1_G2D_ACP_SHIFT) |
+ EXYNOS4_CLKDIV_DMC1_G2D_ACP_SHIFT) |
(exynos4x12_clkdiv_dmc1[index][1]
- S5P_CLKDIV_DMC1_C2C_SHIFT) |
+ EXYNOS4_CLKDIV_DMC1_C2C_SHIFT) |
(exynos4x12_clkdiv_dmc1[index][2]
- S5P_CLKDIV_DMC1_C2CACLK_SHIFT));
+ EXYNOS4_CLKDIV_DMC1_C2CACLK_SHIFT));
- __raw_writel(tmp, S5P_CLKDIV_DMC1);
+ __raw_writel(tmp, EXYNOS4_CLKDIV_DMC1);
do {
- tmp = __raw_readl(S5P_CLKDIV_STAT_DMC1);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_STAT_DMC1);
} while (tmp 0x11);
/* Change Divider - TOP */
- tmp = __raw_readl(S5P_CLKDIV_TOP);
+ tmp = __raw_readl(EXYNOS4_CLKDIV_TOP);
[PATCH 5/5] ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
From: Jaecheol Lee jc@samsung.com Signed-off-by: Jaecheol Lee jc@samsung.com Signed-off-by: Kukjin Kim kgene@samsung.com --- arch/arm/mach-exynos/include/mach/regs-clock.h |9 + 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/include/mach/regs-clock.h b/arch/arm/mach-exynos/include/mach/regs-clock.h index 790f525..b1a2aeb 100644 --- a/arch/arm/mach-exynos/include/mach/regs-clock.h +++ b/arch/arm/mach-exynos/include/mach/regs-clock.h @@ -160,6 +160,15 @@ #define EXYNOS4_CLKDIV_CPU0_PCLKDBG_MASK (0x7 EXYNOS4_CLKDIV_CPU0_PCLKDBG_SHIFT) #define EXYNOS4_CLKDIV_CPU0_APLL_SHIFT (24) #define EXYNOS4_CLKDIV_CPU0_APLL_MASK (0x7 EXYNOS4_CLKDIV_CPU0_APLL_SHIFT) +#define EXYNOS4_CLKDIV_CPU0_CORE2_SHIFT28 +#define EXYNOS4_CLKDIV_CPU0_CORE2_MASK (0x7 EXYNOS4_CLKDIV_CPU0_CORE2_SHIFT) + +#define EXYNOS4_CLKDIV_CPU1_COPY_SHIFT 0 +#define EXYNOS4_CLKDIV_CPU1_COPY_MASK (0x7 EXYNOS4_CLKDIV_CPU1_COPY_SHIFT) +#define EXYNOS4_CLKDIV_CPU1_HPM_SHIFT 4 +#define EXYNOS4_CLKDIV_CPU1_HPM_MASK (0x7 EXYNOS4_CLKDIV_CPU1_HPM_SHIFT) +#define EXYNOS4_CLKDIV_CPU1_CORES_SHIFT8 +#define EXYNOS4_CLKDIV_CPU1_CORES_MASK (0x7 EXYNOS4_CLKDIV_CPU1_CORES_SHIFT) #define EXYNOS4_CLKDIV_DMC0_ACP_SHIFT (0) #define EXYNOS4_CLKDIV_DMC0_ACP_MASK (0x7 EXYNOS4_CLKDIV_DMC0_ACP_SHIFT) -- 1.7.4.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
Re: [GIT PULL] Samsung Cleanup EXYNOS clock for v3.4
On 03/09/12 07:33, Kukjin Kim wrote: On 03/08/12 23:06, MyungJoo Ham wrote: 2012/3/9 함명주myungjoo@samsung.com: [...] Hello, Kgene I've rebased the branch that was pull-requested to Kgene based on this branch. OK, thanks. Let me apply this series on top of new cleanup-exynos-clock. Applied, thanks. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- 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: [PATCHv3 1/3] ARM: Exynos: JPEG board definition
On 02/01/12 03:19, Andrzej Pietrasiewicz wrote:
ARM: Exynos: JPEG board definition
Please adding comments in detail next time.
Signed-off-by: Andrzej Pietrasiewiczandrze...@samsung.com
Signed-off-by: Kyungmin Parkkyungmin.p...@samsung.com
---
arch/arm/mach-exynos/clock.c |5 +
arch/arm/mach-exynos/include/mach/map.h |3 +++
arch/arm/plat-s5p/Kconfig |5 +
arch/arm/plat-samsung/devs.c | 18 ++
arch/arm/plat-samsung/include/plat/devs.h |1 +
5 files changed, 32 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/clock.c b/arch/arm/mach-exynos/clock.c
index 5a8c42e..e5d446a 100644
--- a/arch/arm/mach-exynos/clock.c
+++ b/arch/arm/mach-exynos/clock.c
@@ -470,6 +470,11 @@ static struct clk init_clocks_off[] = {
.enable = exynos4_clk_ip_cam_ctrl,
.ctrlbit= (1 5),
}, {
+ .name = jpeg,
+ .id = 0,
+ .enable = exynos4_clk_ip_cam_ctrl,
+ .ctrlbit= (1 6),
Please use tab...
+ }, {
.name = fimc,
.devname= exynos4-fimc.0,
.enable = exynos4_clk_ip_cam_ctrl,
diff --git a/arch/arm/mach-exynos/include/mach/map.h
b/arch/arm/mach-exynos/include/mach/map.h
index 7df9e74..5a9e656 100644
--- a/arch/arm/mach-exynos/include/mach/map.h
+++ b/arch/arm/mach-exynos/include/mach/map.h
@@ -31,6 +31,8 @@
#define EXYNOS4_PA_FIMC2 0x1182
#define EXYNOS4_PA_FIMC3 0x1183
+#define EXYNOS4_PA_JPEG0x1184
+
#define EXYNOS4_PA_G2D0x1280
#define EXYNOS4_PA_I2S0 0x0383
@@ -164,6 +166,7 @@
#define S5P_PA_FIMC1 EXYNOS4_PA_FIMC1
#define S5P_PA_FIMC2 EXYNOS4_PA_FIMC2
#define S5P_PA_FIMC3 EXYNOS4_PA_FIMC3
+#define S5P_PA_JPEGEXYNOS4_PA_JPEG
#define S5P_PA_G2DEXYNOS4_PA_G2D
#define S5P_PA_FIMD0 EXYNOS4_PA_FIMD0
#define S5P_PA_HDMI EXYNOS4_PA_HDMI
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
index e7fec78..7a30869 100644
--- a/arch/arm/plat-s5p/Kconfig
+++ b/arch/arm/plat-s5p/Kconfig
@@ -80,6 +80,11 @@ config S5P_DEV_FIMC3
help
Compile in platform device definitions for FIMC controller 3
+config S5P_DEV_JPEG
+ bool
+ help
+ Compile in platform device definitions for JPEG codec
+
config S5P_DEV_G2D
bool
help
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 145580a..1121372 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -295,6 +295,24 @@ struct platform_device s5p_device_g2d = {
};
#endif /* CONFIG_S5P_DEV_G2D */
+#ifdef CONFIG_S5P_DEV_JPEG
+static struct resource s5p_jpeg_resource[] = {
+ [0] = DEFINE_RES_MEM(S5P_PA_JPEG, SZ_4K),
+ [1] = DEFINE_RES_IRQ(IRQ_JPEG),
+};
+
+struct platform_device s5p_device_jpeg = {
+ .name = s5p-jpeg,
+ .id = 0,
+ .num_resources = ARRAY_SIZE(s5p_jpeg_resource),
+ .resource = s5p_jpeg_resource,
+ .dev= {
+ .dma_mask =samsung_device_dma_mask,
+ .coherent_dma_mask = DMA_BIT_MASK(32),
+ },
+};
+#endif /* CONFIG_S5P_DEV_JPEG */
+
/* FIMD0 */
#ifdef CONFIG_S5P_DEV_FIMD0
diff --git a/arch/arm/plat-samsung/include/plat/devs.h
b/arch/arm/plat-samsung/include/plat/devs.h
index bb45848..5e7972d 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -79,6 +79,7 @@ extern struct platform_device s5p_device_fimc1;
extern struct platform_device s5p_device_fimc2;
extern struct platform_device s5p_device_fimc3;
extern struct platform_device s5p_device_fimc_md;
+extern struct platform_device s5p_device_jpeg;
extern struct platform_device s5p_device_g2d;
extern struct platform_device s5p_device_fimd0;
extern struct platform_device s5p_device_hdmi;
Applied and I fixed when I apply this.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
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: Hook up JPEG PD to generic PD infrastructure
On 02/19/12 21:45, Sachin Kamat wrote: Add JPEG power domain (PD) to generic power domain infrastructure. Signed-off-by: Sachin Kamatsachin.ka...@linaro.org --- Hi Kukjin, Please apply this over the JPEG platform suport patches for Exynos. OK, applied. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. --- 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); -- -- 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 RE-SEND] [CPUFREQ] EXYNOS4X12: Add support cpufreq for EXYNOS4X12
From: Jaecheol Lee jc@samsung.com
This patch adds support cpufreq for EXYNOS4X12 SoCs. Basically,
the exynos-cpufreq.c is used commonly and exynos4x12-cpufreq.c
is used for EXYNOS4212(two Cortex-A9 cores) and EXYNOS4412(four
Cortex-A9 cores) SoCs.
Signed-off-by: Jaecheol Lee jc@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
Changes since v1:
Address comments from Sylwester
arch/arm/mach-exynos/include/mach/cpufreq.h |1 +
drivers/cpufreq/Kconfig.arm |7 +
drivers/cpufreq/Makefile|1 +
drivers/cpufreq/exynos-cpufreq.c|2 +
drivers/cpufreq/exynos4x12-cpufreq.c| 536 +++
5 files changed, 547 insertions(+), 0 deletions(-)
create mode 100644 drivers/cpufreq/exynos4x12-cpufreq.c
diff --git a/arch/arm/mach-exynos/include/mach/cpufreq.h
b/arch/arm/mach-exynos/include/mach/cpufreq.h
index 3df27f2..96ac0cb 100644
--- a/arch/arm/mach-exynos/include/mach/cpufreq.h
+++ b/arch/arm/mach-exynos/include/mach/cpufreq.h
@@ -32,3 +32,4 @@ struct exynos_dvfs_info {
};
extern int exynos4210_cpufreq_init(struct exynos_dvfs_info *);
+extern int exynos4x12_cpufreq_init(struct exynos_dvfs_info *);
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index dc59abf..9b99a96 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -47,6 +47,7 @@ config ARM_EXYNOS_CPUFREQ
bool SAMSUNG EXYNOS SoCs
depends on ARCH_EXYNOS
select ARM_EXYNOS4210_CPUFREQ if CPU_EXYNOS4210
+ select ARM_EXYNOS4X12_CPUFREQ if (SOC_EXYNOS4212 || SOC_EXYNOS4412)
default y
help
This adds the CPUFreq driver common part for Samsung
@@ -60,3 +61,9 @@ config ARM_EXYNOS4210_CPUFREQ
help
This adds the CPUFreq driver for Samsung EXYNOS4210
SoC (S5PV310 or S5PC210).
+
+config ARM_EXYNOS4X12_CPUFREQ
+ bool Samsung EXYNOS4X12
+ help
+ This adds the CPUFreq driver for Samsung EXYNOS4X12
+ SoC (EXYNOS4212 or EXYNOS4412).
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index 042fbae..f37bbcc 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -45,6 +45,7 @@ obj-$(CONFIG_ARM_S3C64XX_CPUFREQ) += s3c64xx-cpufreq.o
obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o
+obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o
obj-$(CONFIG_ARCH_OMAP2PLUS)+= omap-cpufreq.o
##
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 7cfb516..2c63b68 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -254,6 +254,8 @@ static int __init exynos_cpufreq_init(void)
if (soc_is_exynos4210())
ret = exynos4210_cpufreq_init(exynos_info);
+ else if (soc_is_exynos4212() || soc_is_exynos4412())
+ ret = exynos4x12_cpufreq_init(exynos_info);
else
pr_err(%s: CPU type not found\n, __func__);
diff --git a/drivers/cpufreq/exynos4x12-cpufreq.c
b/drivers/cpufreq/exynos4x12-cpufreq.c
new file mode 100644
index 000..8c5a7af
--- /dev/null
+++ b/drivers/cpufreq/exynos4x12-cpufreq.c
@@ -0,0 +1,536 @@
+/*
+ * Copyright (c) 2010-2012 Samsung Electronics Co., Ltd.
+ * http://www.samsung.com
+ *
+ * EXYNOS4X12 - CPU frequency scaling support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include linux/module.h
+#include linux/kernel.h
+#include linux/err.h
+#include linux/clk.h
+#include linux/io.h
+#include linux/slab.h
+#include linux/cpufreq.h
+
+#include mach/regs-clock.h
+#include mach/cpufreq.h
+
+#define CPUFREQ_LEVEL_END (L13 + 1)
+
+static int max_support_idx;
+static int min_support_idx = (CPUFREQ_LEVEL_END - 1);
+
+static struct clk *cpu_clk;
+static struct clk *moutcore;
+static struct clk *mout_mpll;
+static struct clk *mout_apll;
+
+struct cpufreq_clkdiv {
+ unsigned intindex;
+ unsigned intclkdiv;
+ unsigned intclkdiv1;
+};
+
+static unsigned int exynos4x12_volt_table[CPUFREQ_LEVEL_END];
+
+static struct cpufreq_frequency_table exynos4x12_freq_table[] = {
+ {L0, 1500 * 1000},
+ {L1, 1400 * 1000},
+ {L2, 1300 * 1000},
+ {L3, 1200 * 1000},
+ {L4, 1100 * 1000},
+ {L5, 1000 * 1000},
+ {L6, 900 * 1000},
+ {L7, 800 * 1000},
+ {L8, 700 * 1000},
+ {L9, 600 * 1000},
+ {L10, 500 * 1000},
+ {L11, 400 * 1000},
+ {L12, 300 * 1000},
+ {L13, 200 * 1000},
+ {0, CPUFREQ_TABLE_END},
+};
+
+static struct cpufreq_clkdiv
[PATCH v2 RE-SEND] [CPUFREQ] EXYNOS5250: Add support cpufreq for EXYNOS5250
From: Jaecheol Lee jc@samsung.com
This patch adds support cpufreq for EXYNOS5250 SoC. Basically,
the exynos-cpufreq.c is used commonly and exynos5250-cpufreq.c
is used for EXYNOS5250(two Cortex-A15 cores) SoC.
Signed-off-by: Jaecheol Lee jc@samsung.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
arch/arm/mach-exynos/include/mach/cpufreq.h |1 +
drivers/cpufreq/Kconfig.arm |7 +
drivers/cpufreq/Makefile|1 +
drivers/cpufreq/exynos-cpufreq.c|2 +
drivers/cpufreq/exynos5250-cpufreq.c| 347 +++
5 files changed, 358 insertions(+), 0 deletions(-)
create mode 100644 drivers/cpufreq/exynos5250-cpufreq.c
diff --git a/arch/arm/mach-exynos/include/mach/cpufreq.h
b/arch/arm/mach-exynos/include/mach/cpufreq.h
index 96ac0cb..7517c3f 100644
--- a/arch/arm/mach-exynos/include/mach/cpufreq.h
+++ b/arch/arm/mach-exynos/include/mach/cpufreq.h
@@ -33,3 +33,4 @@ struct exynos_dvfs_info {
extern int exynos4210_cpufreq_init(struct exynos_dvfs_info *);
extern int exynos4x12_cpufreq_init(struct exynos_dvfs_info *);
+extern int exynos5250_cpufreq_init(struct exynos_dvfs_info *);
diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm
index 9b99a96..2e33515 100644
--- a/drivers/cpufreq/Kconfig.arm
+++ b/drivers/cpufreq/Kconfig.arm
@@ -48,6 +48,7 @@ config ARM_EXYNOS_CPUFREQ
depends on ARCH_EXYNOS
select ARM_EXYNOS4210_CPUFREQ if CPU_EXYNOS4210
select ARM_EXYNOS4X12_CPUFREQ if (SOC_EXYNOS4212 || SOC_EXYNOS4412)
+ select ARM_EXYNOS5250_CPUFREQ if SOC_EXYNOS5250
default y
help
This adds the CPUFreq driver common part for Samsung
@@ -67,3 +68,9 @@ config ARM_EXYNOS4X12_CPUFREQ
help
This adds the CPUFreq driver for Samsung EXYNOS4X12
SoC (EXYNOS4212 or EXYNOS4412).
+
+config ARM_EXYNOS5250_CPUFREQ
+ bool Samsung EXYNOS5250
+ help
+ This adds the CPUFreq driver for Samsung EXYNOS5250
+ SoC.
diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile
index f37bbcc..3cbbcd0 100644
--- a/drivers/cpufreq/Makefile
+++ b/drivers/cpufreq/Makefile
@@ -46,6 +46,7 @@ obj-$(CONFIG_ARM_S5PV210_CPUFREQ) += s5pv210-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS_CPUFREQ) += exynos-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS4210_CPUFREQ) += exynos4210-cpufreq.o
obj-$(CONFIG_ARM_EXYNOS4X12_CPUFREQ) += exynos4x12-cpufreq.o
+obj-$(CONFIG_ARM_EXYNOS5250_CPUFREQ) += exynos5250-cpufreq.o
obj-$(CONFIG_ARCH_OMAP2PLUS)+= omap-cpufreq.o
##
diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 2c63b68..b243a7e 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -256,6 +256,8 @@ static int __init exynos_cpufreq_init(void)
ret = exynos4210_cpufreq_init(exynos_info);
else if (soc_is_exynos4212() || soc_is_exynos4412())
ret = exynos4x12_cpufreq_init(exynos_info);
+ else if (soc_is_exynos5250())
+ ret = exynos5250_cpufreq_init(exynos_info);
else
pr_err(%s: CPU type not found\n, __func__);
diff --git a/drivers/cpufreq/exynos5250-cpufreq.c
b/drivers/cpufreq/exynos5250-cpufreq.c
new file mode 100644
index 000..a883316
--- /dev/null
+++ b/drivers/cpufreq/exynos5250-cpufreq.c
@@ -0,0 +1,347 @@
+/*
+ * Copyright (c) 2010-20122Samsung Electronics Co., Ltd.
+ * http://www.samsung.com
+ *
+ * EXYNOS5250 - CPU frequency scaling support
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+#include linux/module.h
+#include linux/kernel.h
+#include linux/err.h
+#include linux/clk.h
+#include linux/io.h
+#include linux/slab.h
+#include linux/cpufreq.h
+
+#include mach/map.h
+#include mach/regs-clock.h
+#include mach/cpufreq.h
+
+#define CPUFREQ_LEVEL_END (L15 + 1)
+
+static int max_support_idx;
+static int min_support_idx = (CPUFREQ_LEVEL_END - 1);
+static struct clk *cpu_clk;
+static struct clk *moutcore;
+static struct clk *mout_mpll;
+static struct clk *mout_apll;
+
+struct cpufreq_clkdiv {
+ unsigned intindex;
+ unsigned intclkdiv;
+ unsigned intclkdiv1;
+};
+
+static unsigned int exynos5250_volt_table[CPUFREQ_LEVEL_END];
+
+static struct cpufreq_frequency_table exynos5250_freq_table[] = {
+ {L0, 1700 * 1000},
+ {L1, 1600 * 1000},
+ {L2, 1500 * 1000},
+ {L3, 1400 * 1000},
+ {L4, 1300 * 1000},
+ {L5, 1200 * 1000},
+ {L6, 1100 * 1000},
+ {L7, 1000 * 1000},
+ {L8, 900 * 1000},
+ {L9, 800 * 1000},
+ {L10, 700 * 1000},
+ {L11, 600 * 1000},
+ {L12, 500 * 1000},
+ {L13, 400 * 1000},
+ {L14, 300 * 1000},
+
[GIT PULL] Samsung board stuff for v3.4
Hi Arnd, Olof, Please pull regarding Samsung board patches for v3.4. Most are enabling some features(IPs) on each board and one is adding new board file, Samsung Mobile's TRATS board. If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linux 3.3-rc6 (2012-03-03 17:08:09 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/board-samsung Andrzej Pietrasiewicz (2): ARM: EXYNOS: Register JPEG on universal_c210 ARM: EXYNOS: Register JPEG on nuri HeungJun, Kim (1): ARM: EXYNOS: Adds Samsung TRATS board support Kamil Debski (2): ARM: EXYNOS: add G2D to mach-nuri ARM: EXYNOS: add G2D to mach-universal Mark Brown (8): ARM: S3C64XX: Support GPIO LEDs on Cragganmore ARM: S3C64XX: Fix build of Cragganmore after SPI changes ARM: S3C64XX: Enable power management for disk on Cragganmore ARM: S3C64XX: Enable power management for WiFi on Cragganmore ARM: S3C64XX: Add hookup for Tomatin module on Cragganmore ARM: S3C64XX: Add a SPKVDD supply for CODECs on Cragganmore ARM: S3C64XX: Add some more Cragganmore module IDs to the table ARM: S3C64XX: Supply platform data for SPI on Cragganmore MyungJoo Ham (1): ARM: EXYNOS: support Exynos4210-bus Devfreq driver on Nuri board Sachin Kamat (13): ARM: EXYNOS: Enable G2D on ORIGEN 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 ARM: EXYNOS: Enable G2D on SMDKV310 ARM: S5PV210: Enable MFC on SMDKV210 ARM: S5PV210: Enable MFC on SMDKC110 ARM: S5PV210: Enable FIMC on SMDKV210 ARM: S5PV210: Enable FIMC on SMDKC110 ARM: EXYNOS: Enable JPEG on SMDKV310 ARM: EXYNOS: Enable JPEG on Origen ARM: S5PV210: Add JPEG board definition ARM: S5PV210: Enable JPEG on SMDKV210 Sangwook Lee (1): ARM: EXYNOS: Enable Bluetooth on ORIGEN Sylwester Nawrocki (3): ARM: EXYNOS: Increase virtual framebuffer size on Universal C210 board ARM: EXYNOS: Add support for S5K6AAFX image sensor on Universal C210 board ARM: SAMSUNG: Add support for S5K6AAFX camera on Nuri board Tushar Behera (2): ARM: EXYNOS: Add __init attribute to nuri_camera_init() ARM: EXYNOS: Add __init attribute to universal_camera_init() arch/arm/mach-exynos/Kconfig | 21 ++ arch/arm/mach-exynos/Makefile|1 + arch/arm/mach-exynos/mach-nuri.c | 80 ++- arch/arm/mach-exynos/mach-origen.c | 37 +++ arch/arm/mach-exynos/mach-smdkv310.c |3 + arch/arm/mach-exynos/mach-trats.c| 344 ++ arch/arm/mach-exynos/mach-universal_c210.c | 80 ++- arch/arm/mach-s3c64xx/Kconfig|1 + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 31 +++- arch/arm/mach-s3c64xx/mach-crag6410.c| 67 +- arch/arm/mach-s5pv210/Kconfig|9 + arch/arm/mach-s5pv210/clock.c|5 + arch/arm/mach-s5pv210/include/mach/map.h |4 + arch/arm/mach-s5pv210/mach-aquila.c |1 + arch/arm/mach-s5pv210/mach-smdkc110.c| 14 + arch/arm/mach-s5pv210/mach-smdkv210.c| 15 ++ 16 files changed, 702 insertions(+), 11 deletions(-) create mode 100644 arch/arm/mach-exynos/mach-trats.c -- 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: [GIT PULL] Samsung Cleanup EXYNOS clock for v3.4
On 03/09/12 07:33, Kukjin Kim wrote: On 03/08/12 07:16, Olof Johansson wrote: Hi, On Thu, Mar 8, 2012 at 3:13 AM, Kukjin Kimkgene@samsung.com wrote: Kukjin Kim (2): ARM: EXYNOS: cleanup clock part for new EXYNOS SoCs This is one large commit that does many things in one change. As the patch message says: ARM: EXYNOS: cleanup clock part for new EXYNOS SoCs - the prefix of clk register replace S5P_ with EXYNOS4_ - move mach-exynos/clock.c to mach-exynos/clock-exynos4.c - according to moving clock-exynos4.c, movemach/exynos4-clock.h to clock-exynos4.h - add prefix exynos4_ on clk declaration It makes it hard to review, especially when you combine a move with other changes. It's better to do the move in a separate commit that doesn't change code (or only changes very very little) and then do the other changes in separate commits later. Hmm...OK, let me do as per your suggestion and will re-send this soon. Hi Olof, I addressed comments from you and I think it should be ok to you. Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-exynos-clock If any problems, please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linux 3.3-rc6 (2012-03-03 17:08:09 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-exynos-clock Jaecheol Lee (1): ARM: EXYNOS: add clock registers for exynos4x12-cpufreq Kukjin Kim (4): ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs ARM: EXYNOS: use static declaration on regarding clock ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock PM / devfreq: update the name of EXYNOS clock register MyungJoo Ham (2): PM / devfreq: update the name of EXYNOS clock registers that were omitted ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver arch/arm/mach-exynos/Makefile |3 +- arch/arm/mach-exynos/clock-exynos4.c | 1563 arch/arm/mach-exynos/clock-exynos4.h | 30 + arch/arm/mach-exynos/clock-exynos4210.c | 46 +- arch/arm/mach-exynos/clock-exynos4212.c | 30 +- arch/arm/mach-exynos/clock.c | 1564 - arch/arm/mach-exynos/common.h |9 + arch/arm/mach-exynos/include/mach/exynos4-clock.h | 43 - arch/arm/mach-exynos/include/mach/regs-clock.h| 416 +++--- arch/arm/mach-exynos/pm.c | 40 +- drivers/devfreq/exynos4_bus.c | 230 ++-- 11 files changed, 2009 insertions(+), 1965 deletions(-) create mode 100644 arch/arm/mach-exynos/clock-exynos4.c create mode 100644 arch/arm/mach-exynos/clock-exynos4.h delete mode 100644 arch/arm/mach-exynos/clock.c delete mode 100644 arch/arm/mach-exynos/include/mach/exynos4-clock.h -- 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
[GIT PULL 1/4] Samsung devel for v3.4
Hi Arnd, Olof,
This is various develop regarding Samsung stuff for v3.4.
Please pull following:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/devel-samsung
I think, you can pull this cleanly without any conflicts.
If any problems, please kindly let me know.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d:
Linux 3.3-rc6 (2012-03-03 17:08:09 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/devel-samsung
Amit Daniel Kachhap (5):
ARM: EXYNOS: Add support AFTR mode on EXYNOS4210
ARM: S5P: add L2 early resume code
ARM: EXYNOS: save L2 settings during bootup
ARM: EXYNOS: remove useless code to save/restore L2
ARM: EXYNOS: Enable l2 configuration through device tree
Andrzej Pietrasiewicz (1):
ARM: EXYNOS: add support JPEG
Changhwan Youn (1):
ARM: EXYNOS: fix cycle count for periodic mode of clock event timers
Jingoo Han (1):
ARM: SAMSUNG: Add a callback 'notify_after' for PWM backlight control
Joonyoung Shim (2):
ARM: S3C64XX: Add usb otg phy control
ARM: S5PV210: Add usb otg phy control
Kamil Debski (1):
ARM: SAMSUNG: add G2D to plat-s5p and mach-exynos
Mark Brown (4):
ARM: S3C64XX: Add basic cpuidle driver
ARM: S3C64XX: Gate some more clocks by default
ARM: S3C64XX: Reduce residency requirement for cpuidle WFI mode
ARM: S3C64XX: Define some additional always off clocks
Minho Ban (1):
ARM: SAMSUNG: use spin_lock_irqsave() in clk_{enable,disable}
MyungJoo Ham (1):
ARM: EXYNOS: Add DMC1, allow PPMU access for DMC
Sylwester Nawrocki (1):
ARM: SAMSUNG: Correct MIPI-CSIS io memory resource definition
Tushar Behera (2):
ARM: SAMSUNG: Add __init attribute to samsung_bl_set()
ARM: SAMSUNG: fix __init attribute on regarding s3c_set_platdata()
arch/arm/mach-exynos/clock.c |5 +
arch/arm/mach-exynos/common.c | 60 ++--
arch/arm/mach-exynos/cpuidle.c | 151
+++-
arch/arm/mach-exynos/include/mach/map.h|7 +
arch/arm/mach-exynos/include/mach/pmu.h|2 +
arch/arm/mach-exynos/mct.c | 21 ++-
arch/arm/mach-exynos/pm.c | 15 --
arch/arm/mach-s3c64xx/Kconfig |8 +
arch/arm/mach-s3c64xx/Makefile |2 +
arch/arm/mach-s3c64xx/clock.c | 121 ++--
arch/arm/mach-s3c64xx/cpuidle.c| 91
arch/arm/mach-s3c64xx/mach-crag6410.c |4 +
arch/arm/mach-s3c64xx/mach-smartq.c|3 +
arch/arm/mach-s3c64xx/mach-smdk6410.c |4 +
arch/arm/mach-s3c64xx/setup-usb-phy.c | 90
arch/arm/mach-s5pv210/Kconfig |6 +
arch/arm/mach-s5pv210/Makefile |1 +
arch/arm/mach-s5pv210/include/mach/regs-sys.h |4 -
arch/arm/mach-s5pv210/setup-usb-phy.c | 90
arch/arm/plat-s5p/Kconfig | 10 ++
arch/arm/plat-s5p/sleep.S | 44 +-
arch/arm/plat-samsung/clock.c | 12 +-
arch/arm/plat-samsung/dev-backlight.c |4 +-
arch/arm/plat-samsung/devs.c | 68 -
arch/arm/plat-samsung/include/plat/devs.h |2 +
.../plat-samsung/include/plat/regs-usb-hsotg-phy.h |7 +-
arch/arm/plat-samsung/include/plat/udc-hs.h|5 +
27 files changed, 765 insertions(+), 72 deletions(-)
create mode 100644 arch/arm/mach-s3c64xx/cpuidle.c
create mode 100644 arch/arm/mach-s3c64xx/setup-usb-phy.c
create mode 100644 arch/arm/mach-s5pv210/setup-usb-phy.c
--
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
[GIT PULL 2/4] Samsung devel-pd for v3.4
Hi Arnd, Olof, This is Generic Power Domain patches for EXYNOS. Basically, Thomas' patches, adding support Generic Power Domain patches are in Rafael's tree, linux-pm/linux-next and see below merge commit. http://git.kernel.org/?p=linux/kernel/git/rafael/linux-pm.git;a=commit;h=dcaad77a8074b6de58e745546bc543d5538404f2 And this adds hooking up G2D and JPEG to Generic PD. Please pull and here is my preferred resolution when merge this after next/board-samsung. diff --cc arch/arm/mach-exynos/mach-universal_c210.c index 3663aee,0262417..0b944eb --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@@ -1053,10 -981,6 +1052,7 @@@ static struct platform_device *universa s5p_device_mfc, s5p_device_mfc_l, s5p_device_mfc_r, - exynos4_device_pd[PD_MFC], - exynos4_device_pd[PD_LCD0], - exynos4_device_pd[PD_CAM], + cam_vt_dio_fixed_reg_dev, cam_i_core_fixed_reg_dev, cam_s_if_fixed_reg_dev, s5p_device_fimc_md, If any problems, please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linux 3.3-rc6 (2012-03-03 17:08:09 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung-pd Sachin Kamat (2): ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure Thomas Abraham (2): PM / Domains: Add OF support ARM: EXYNOS: Hook up power domains to generic power domain infrastructure .../bindings/arm/exynos/power_domain.txt | 21 ++ arch/arm/mach-exynos/Kconfig | 10 +- arch/arm/mach-exynos/Makefile |2 +- arch/arm/mach-exynos/dev-pd.c | 139 -- arch/arm/mach-exynos/mach-nuri.c | 11 - arch/arm/mach-exynos/mach-origen.c | 14 -- arch/arm/mach-exynos/mach-smdkv310.c | 12 -- arch/arm/mach-exynos/mach-universal_c210.c | 17 -- arch/arm/mach-exynos/pm_domains.c | 201 drivers/base/power/domain.c| 32 +++ include/linux/pm_domain.h | 12 ++ 11 files changed, 268 insertions(+), 203 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/exynos/power_domain.txt delete mode 100644 arch/arm/mach-exynos/dev-pd.c create mode 100644 arch/arm/mach-exynos/pm_domains.c -- 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
[GIT PULL 3/4] Samsung devel-mmc for v3.4
Hi Arnd, Olof This is regarding Samsung mmc for v3.4. As a note, v3.4-for-cjb branch is merged into mmc/mmc-next like following: http://git.kernel.org/?p=linux/kernel/git/cjb/mmc.git;a=commit;h=fcd9bdae386753531a9cb6b2577359a83f4e121c And others are accordingly changes on regarding mmc. Please pull and if any problems, please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linux 3.3-rc6 (2012-03-03 17:08:09 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung-mmc Jaehoon Chung (3): ARM: SAMSUNG: support the second capability for samsung-soc mmc: sdhci-s3c: add platform data for the second capability ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci Kukjin Kim (1): Merge branch 'v3.4-for-cjb' into next/devel-samsung-mmc Thomas Abraham (6): mmc: sdhci-s3c: Remove usage of clk_type member in platform data ARM: EXYNOS: use 'exynos4-sdhci' as device name for sdhci controllers ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data mmc: sdhci-s3c: derive transfer width host capability from max_width in platform data mmc: sdhci-s3c: Keep a copy of platform data and use it mmc: sdhci-s3c: Add device tree support .../devicetree/bindings/mmc/samsung-sdhci.txt | 70 ++ arch/arm/mach-exynos/clock.c | 24 +- arch/arm/mach-exynos/common.c |5 + arch/arm/mach-exynos/mach-armlex4210.c |3 - arch/arm/mach-exynos/mach-nuri.c |7 +- arch/arm/mach-exynos/mach-origen.c |2 - arch/arm/mach-exynos/mach-smdk4x12.c |2 - arch/arm/mach-exynos/mach-smdkv310.c |4 - arch/arm/mach-exynos/mach-universal_c210.c |4 +- arch/arm/plat-samsung/devs.c |4 - arch/arm/plat-samsung/include/plat/sdhci.h | 37 +++- arch/arm/plat-samsung/platformdata.c |4 +- drivers/mmc/host/sdhci-s3c.c | 238 +++- 13 files changed, 351 insertions(+), 53 deletions(-) create mode 100644 Documentation/devicetree/bindings/mmc/samsung-sdhci.txt -- 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
[GIT PULL 4/4] Samsung devel-dma for v3.4
Hi Arnd, Olof,
This is for Samsung dma stuff for v3.4 and depends on following:
next/cleanup-use-static
next/cleanup-exynos-clock
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/devel-samsung-dma
And conflicts will be happened in clock part. Here is my preferred
resolution. The mach-exynos/clock.c can be removed with following:
arch/arm/mach-exynos/exynos-clock4.c
[...]
+ .ctrlbit= (1 0),
+ }, {
+ .name = hsmmc,
- .devname= s3c-sdhci.0,
++ .devname= exynos4-sdhci.0,
+ .parent = exynos4_clk_aclk_133.clk,
+ .enable = exynos4_clk_ip_fsys_ctrl,
+ .ctrlbit= (1 5),
+ }, {
+ .name = hsmmc,
- .devname= s3c-sdhci.1,
++ .devname= exynos4-sdhci.1,
+ .parent = exynos4_clk_aclk_133.clk,
+ .enable = exynos4_clk_ip_fsys_ctrl,
+ .ctrlbit= (1 6),
+ }, {
+ .name = hsmmc,
- .devname= s3c-sdhci.2,
++ .devname= exynos4-sdhci.2,
+ .parent = exynos4_clk_aclk_133.clk,
+ .enable = exynos4_clk_ip_fsys_ctrl,
+ .ctrlbit= (1 7),
+ }, {
+ .name = hsmmc,
- .devname= s3c-sdhci.3,
++ .devname= exynos4-sdhci.3,
+ .parent = exynos4_clk_aclk_133.clk,
+ .enable = exynos4_clk_ip_fsys_ctrl,
+ .ctrlbit= (1 8),
[...]
+ static struct clksrc_clk exynos5_clk_sclk_mmc0 = {
+ .clk= {
+ .name = sclk_mmc,
- .devname= s3c-sdhci.0,
++ .devname= exynos4-sdhci.0,
+ .parent = exynos4_clk_dout_mmc0.clk,
+ .enable = exynos4_clksrc_mask_fsys_ctrl,
+ .ctrlbit= (1 0),
[...]
+ static struct clksrc_clk exynos4_clk_sclk_mmc1 = {
+ .clk= {
+ .name = sclk_mmc,
- .devname= s3c-sdhci.1,
++ .devname= exynos4-sdhci.1,
+ .parent = exynos4_clk_dout_mmc1.clk,
+ .enable = exynos4_clksrc_mask_fsys_ctrl,
+ .ctrlbit= (1 4),
[...]
+ static struct clksrc_clk exynos4_clk_sclk_mmc2 = {
+ .clk= {
+ .name = sclk_mmc,
- .devname= s3c-sdhci.2,
++ .devname= exynos4-sdhci.2,
+ .parent = exynos4_clk_dout_mmc2.clk,
+ .enable = exynos4_clksrc_mask_fsys_ctrl,
+ .ctrlbit= (1 8),
[...]
+ static struct clksrc_clk exynos4_clk_sclk_mmc3 = {
+ .clk= {
+ .name = sclk_mmc,
- .devname= s3c-sdhci.3,
++ .devname= exynos4-sdhci.3,
+ .parent = exynos4_clk_dout_mmc3.clk,
+ .enable = exynos4_clksrc_mask_fsys_ctrl,
+ .ctrlbit= (1 12),
[...]
+ static struct clk_lookup exynos4_clk_lookup[] = {
+ CLKDEV_INIT(exynos4210-uart.0, clk_uart_baud0,
exynos4_clk_sclk_uart0.clk),
+ CLKDEV_INIT(exynos4210-uart.1, clk_uart_baud0,
exynos4_clk_sclk_uart1.clk),
+ CLKDEV_INIT(exynos4210-uart.2, clk_uart_baud0,
exynos4_clk_sclk_uart2.clk),
+ CLKDEV_INIT(exynos4210-uart.3, clk_uart_baud0,
exynos4_clk_sclk_uart3.clk),
- CLKDEV_INIT(s3c-sdhci.0, mmc_busclk.2, exynos4_clk_sclk_mmc0.clk),
- CLKDEV_INIT(s3c-sdhci.1, mmc_busclk.2, exynos4_clk_sclk_mmc1.clk),
- CLKDEV_INIT(s3c-sdhci.2, mmc_busclk.2, exynos4_clk_sclk_mmc2.clk),
- CLKDEV_INIT(s3c-sdhci.3, mmc_busclk.2, exynos4_clk_sclk_mmc3.clk),
++ CLKDEV_INIT(exynos4-sdhci.0, mmc_busclk.2,
exynos4_clk_sclk_mmc0.clk),
++ CLKDEV_INIT(exynos4-sdhci.1, mmc_busclk.2,
exynos4_clk_sclk_mmc1.clk),
++ CLKDEV_INIT(exynos4-sdhci.2, mmc_busclk.2,
exynos4_clk_sclk_mmc2.clk),
++ CLKDEV_INIT(exynos4-sdhci.3, mmc_busclk.2,
exynos4_clk_sclk_mmc3.clk),
+ CLKDEV_INIT(dma-pl330.0, apb_pclk, exynos4_clk_pdma0),
+ CLKDEV_INIT(dma-pl330.1, apb_pclk, exynos4_clk_pdma1),
+ CLKDEV_INIT(dma-pl330.2, apb_pclk, exynos4_clk_mdma1),
If any problems, please kindly let me know.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
The following changes since commit e914c89254a8f943d8d06a0bda67769fd27bf9c6:
Merge branch 'next/cleanup-exynos-clock' into next/devel-samsung-dma
(2012-03-10 03:32:19 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/devel-samsung-dma
Boojin Kim (2):
Re: [GIT PULL] Samsung Cleanup S3C24XX for v3.4
On 03/08/12 08:56, Olof Johansson wrote: On Thu, Mar 8, 2012 at 3:08 AM, Kukjin Kimkgene@samsung.com wrote: Hi Arnd, Olof, Please pull cleanup s3c24xx from following: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-s3c24xx As I said before, this is including merge of mach-s3c24.. directories into just one mach-s3c24xx directory. If any problems, please kindly let me know. Thanks, pulled. Nice first step on making all of this common! Thanks and as a note, will happen conflicts when this is on top of latest mainline. Just FYI. arch/arm/mach-s3c2440/common.h can be deleted with following diff --cc arch/arm/mach-s3c24xx/common.h index f65dc80,62a2e19..a7cd62f --- a/arch/arm/mach-s3c24xx/common.h +++ b/arch/arm/mach-s3c24xx/common.h @@@ -12,6 -12,12 +12,12 @@@ #ifndef __ARCH_ARM_MACH_S3C2410_COMMON_H #define __ARCH_ARM_MACH_S3C2410_COMMON_H + #ifdef CONFIG_CPU_S3C2410 void s3c2410_restart(char mode, const char *cmd); + #endif + -#ifdef CONFIG_CPU_S3C2440 -void s3c2440_restart(char mode, const char *cmd); ++#ifdef CONFIG_CPU_S3C244X ++void s3c244x_restart(char mode, const char *cmd); + #endif #endif /* __ARCH_ARM_MACH_S3C2410_COMMON_H */ Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- 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/5] ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
On Sat, Mar 10, 2012 at 02:19:05AM -0800, Kukjin Kim wrote: This patch changes the name of clock.c to clock-exynos4.c for other EXYNOS series such as EXYNOS5. And since the header file of clock is used only in arch/arm/mach-exynos, moves it in the local directory. Signed-off-by: Kukjin Kim kgene@samsung.com Thanks, much easier to review this way! Ideally the whitespace cleanup could also be split up to a separate patch that has _no_ contents changes besides whitespace, but this is OK too since it's easy to see what's a change and not anyway. -Olof -- 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: [GIT PULL] Samsung Cleanup EXYNOS clock for v3.4
On Sat, Mar 10, 2012 at 07:35:29AM -0800, Kukjin Kim wrote: On 03/09/12 07:33, Kukjin Kim wrote: On 03/08/12 07:16, Olof Johansson wrote: Hi, On Thu, Mar 8, 2012 at 3:13 AM, Kukjin Kimkgene@samsung.com wrote: Kukjin Kim (2): ARM: EXYNOS: cleanup clock part for new EXYNOS SoCs This is one large commit that does many things in one change. As the patch message says: ARM: EXYNOS: cleanup clock part for new EXYNOS SoCs - the prefix of clk register replace S5P_ with EXYNOS4_ - move mach-exynos/clock.c to mach-exynos/clock-exynos4.c - according to moving clock-exynos4.c, movemach/exynos4-clock.h to clock-exynos4.h - add prefix exynos4_ on clk declaration It makes it hard to review, especially when you combine a move with other changes. It's better to do the move in a separate commit that doesn't change code (or only changes very very little) and then do the other changes in separate commits later. Hmm...OK, let me do as per your suggestion and will re-send this soon. Hi Olof, I addressed comments from you and I think it should be ok to you. Yes, much easier to review. Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-exynos-clock If any problems, please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linux 3.3-rc6 (2012-03-03 17:08:09 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-exynos-clock The contents of the branch itself looks good, but now you have introduced a modified/delete conflict with yourself. You modify arch/arm/mach-exynos/clock.c in your cleanup-use-static branch, and then you move it here. That means that when I merge in this branch, git throws a conflict and I have to do manual edits to make the contents match. It's better if you base this branch on your cleanup-use-static branch, so that the move includes those edits. That way there is no conflict resolution to do at our end either. Can you please do that rebase and send a fresh pull request? I'll continue looking at your other requests meanwhile. Thanks! -Olof -- 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: [GIT PULL] Samsung board stuff for v3.4
Hi, On Sat, Mar 10, 2012 at 7:34 AM, Kukjin Kim kgene@samsung.com wrote: Hi Arnd, Olof, Please pull regarding Samsung board patches for v3.4. Most are enabling some features(IPs) on each board and one is adding new board file, Samsung Mobile's TRATS board. Given that exynos has started conversion to device tree, there should not be any additions of non-devicetree-probed board files being added. At the very least, you should move over to using DT_MACHINE instead of MACHINE for the new board, and probe using device tree. Even better would be if you added support for this board through mach-exynos4-dt.c instead of adding a brand new board file. I also see a large number of the same additions of devices, done to a number of board files. I don't think you need to rework those patches now, but please consider how you can make it less churny to add a device on the SoC in the future without touching all board files. If you rebase without the board file addition I can take the rest of the branch while that part is being reworked. Please send a new pull request with the rebased tree. Thanks, -Olof -- 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: [GIT PULL 2/4] Samsung devel-pd for v3.4
Hi Rafael, The below series contains two patches that have been sent to you, and that are sitting in the pm-domains branch. Two questions before I pull this into arm-soc: 1) Are you 100% sure this will be submitted to 3.4? And if so, will you send it early during the merge window? 2) Are you 100% sure you will not rebase the branch into which you pulled the v3.4-for-rafael branch? I am asking because if we pull this in, and you rebase between now and when it's sent in, we're risking merge conflicts that will be painful to resolve. We've been bitten by that from other dependencies in the past so we're being careful. Thanks, -Olof On Sat, Mar 10, 2012 at 8:08 AM, Kukjin Kim kgene@samsung.com wrote: Hi Arnd, Olof, This is Generic Power Domain patches for EXYNOS. Basically, Thomas' patches, adding support Generic Power Domain patches are in Rafael's tree, linux-pm/linux-next and see below merge commit. http://git.kernel.org/?p=linux/kernel/git/rafael/linux-pm.git;a=commit;h=dcaad77a8074b6de58e745546bc543d5538404f2 And this adds hooking up G2D and JPEG to Generic PD. Please pull and here is my preferred resolution when merge this after next/board-samsung. diff --cc arch/arm/mach-exynos/mach-universal_c210.c index 3663aee,0262417..0b944eb --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@@ -1053,10 -981,6 +1052,7 @@@ static struct platform_device *universa s5p_device_mfc, s5p_device_mfc_l, s5p_device_mfc_r, - exynos4_device_pd[PD_MFC], - exynos4_device_pd[PD_LCD0], - exynos4_device_pd[PD_CAM], + cam_vt_dio_fixed_reg_dev, cam_i_core_fixed_reg_dev, cam_s_if_fixed_reg_dev, s5p_device_fimc_md, If any problems, please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linux 3.3-rc6 (2012-03-03 17:08:09 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung-pd Sachin Kamat (2): ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure Thomas Abraham (2): PM / Domains: Add OF support ARM: EXYNOS: Hook up power domains to generic power domain infrastructure .../bindings/arm/exynos/power_domain.txt | 21 ++ arch/arm/mach-exynos/Kconfig | 10 +- arch/arm/mach-exynos/Makefile | 2 +- arch/arm/mach-exynos/dev-pd.c | 139 -- arch/arm/mach-exynos/mach-nuri.c | 11 - arch/arm/mach-exynos/mach-origen.c | 14 -- arch/arm/mach-exynos/mach-smdkv310.c | 12 -- arch/arm/mach-exynos/mach-universal_c210.c | 17 -- arch/arm/mach-exynos/pm_domains.c | 201 drivers/base/power/domain.c | 32 +++ include/linux/pm_domain.h | 12 ++ 11 files changed, 268 insertions(+), 203 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/exynos/power_domain.txt delete mode 100644 arch/arm/mach-exynos/dev-pd.c create mode 100644 arch/arm/mach-exynos/pm_domains.c -- 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: [GIT PULL 3/4] Samsung devel-mmc for v3.4
Hi, On Sat, Mar 10, 2012 at 8:08 AM, Kukjin Kim kgene@samsung.com wrote: Hi Arnd, Olof This is regarding Samsung mmc for v3.4. As a note, v3.4-for-cjb branch is merged into mmc/mmc-next like following: http://git.kernel.org/?p=linux/kernel/git/cjb/mmc.git;a=commit;h=fcd9bdae386753531a9cb6b2577359a83f4e121c Looking at this series, there's really only one patch that is not in the mmc tree: ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci And all it does is change the platform device string contents. Since there are no build-time dependencies between this and the MMC change, I suggest you send only this patch so that we avoid having merge dependencies where not strictly needed. Would that be OK with you? If so, please send a fresh pull request with only the above change in it. Thanks, -Olof -- 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: [GIT PULL 3/4] Samsung devel-mmc for v3.4
On Sat, Mar 10, 2012 at 10:08 AM, Olof Johansson o...@lixom.net wrote: Hi, On Sat, Mar 10, 2012 at 8:08 AM, Kukjin Kim kgene@samsung.com wrote: Hi Arnd, Olof This is regarding Samsung mmc for v3.4. As a note, v3.4-for-cjb branch is merged into mmc/mmc-next like following: http://git.kernel.org/?p=linux/kernel/git/cjb/mmc.git;a=commit;h=fcd9bdae386753531a9cb6b2577359a83f4e121c Looking at this series, there's really only one patch that is not in the mmc tree: ARM: SAMSUNG: change the name from s3c-sdhci to exynos4-sdhci And all it does is change the platform device string contents. Since there are no build-time dependencies between this and the MMC change, I suggest you send only this patch so that we avoid having merge dependencies where not strictly needed. Would that be OK with you? If so, please send a fresh pull request with only the above change in it. Sorry, I misread the series when browsing it. Looks like there are two more patches in it: mmc: sdhci-s3c: add platform data for the second capability ARM: SAMSUNG: support the second capability for samsung-soc But the original suggestion remains, since those two seem to be unrelated to the branch sent to Chris. So please resend with just those patches, please? Thanks, -Olof -- 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: [GIT PULL 1/4] Samsung devel for v3.4
On Sat, Mar 10, 2012 at 8:08 AM, Kukjin Kim kgene@samsung.com wrote: Hi Arnd, Olof, This is various develop regarding Samsung stuff for v3.4. Please pull following: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung I think, you can pull this cleanly without any conflicts. If any problems, please kindly let me know. Thanks, pulled into next/soc. -Olof -- 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: [GIT PULL 4/4] Samsung devel-dma for v3.4
On Sat, Mar 10, 2012 at 08:09:11AM -0800, Kukjin Kim wrote: Hi Arnd, Olof, This is for Samsung dma stuff for v3.4 and depends on following: next/cleanup-use-static next/cleanup-exynos-clock Please pull from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung-dma And conflicts will be happened in clock part. Here is my preferred resolution. The mach-exynos/clock.c can be removed with following: arch/arm/mach-exynos/exynos-clock4.c Hi, given my feedback on the cleanup-exynos-clock pull request, I'm holding off on this one waiting on you to do the resolution of the conflicts. :-) Thanks, -Olof -- 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: [GIT PULL 2/4] Samsung devel-pd for v3.4
Hi, On Saturday, March 10, 2012, Olof Johansson wrote: Hi Rafael, The below series contains two patches that have been sent to you, and that are sitting in the pm-domains branch. Two questions before I pull this into arm-soc: 1) Are you 100% sure this will be submitted to 3.4? And if so, will you send it early during the merge window? Yes and yes. 2) Are you 100% sure you will not rebase the branch into which you pulled the v3.4-for-rafael branch? Yes, I am. I am asking because if we pull this in, and you rebase between now and when it's sent in, we're risking merge conflicts that will be painful to resolve. We've been bitten by that from other dependencies in the past so we're being careful. Sure, I understand that. As a general rule, topic braches in my tree whose names start with pm- are never rebased (exactly for this reason). Thanks, Rafael On Sat, Mar 10, 2012 at 8:08 AM, Kukjin Kim kgene@samsung.com wrote: Hi Arnd, Olof, This is Generic Power Domain patches for EXYNOS. Basically, Thomas' patches, adding support Generic Power Domain patches are in Rafael's tree, linux-pm/linux-next and see below merge commit. http://git.kernel.org/?p=linux/kernel/git/rafael/linux-pm.git;a=commit;h=dcaad77a8074b6de58e745546bc543d5538404f2 And this adds hooking up G2D and JPEG to Generic PD. Please pull and here is my preferred resolution when merge this after next/board-samsung. diff --cc arch/arm/mach-exynos/mach-universal_c210.c index 3663aee,0262417..0b944eb --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@@ -1053,10 -981,6 +1052,7 @@@ static struct platform_device *universa s5p_device_mfc, s5p_device_mfc_l, s5p_device_mfc_r, - exynos4_device_pd[PD_MFC], - exynos4_device_pd[PD_LCD0], - exynos4_device_pd[PD_CAM], + cam_vt_dio_fixed_reg_dev, cam_i_core_fixed_reg_dev, cam_s_if_fixed_reg_dev, s5p_device_fimc_md, If any problems, please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 192cfd58774b4d17b2fe8bdc77d89c2ef4e0591d: Linux 3.3-rc6 (2012-03-03 17:08:09 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung-pd Sachin Kamat (2): ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure ARM: EXYNOS: Hook up JPEG PD to generic PD infrastructure Thomas Abraham (2): PM / Domains: Add OF support ARM: EXYNOS: Hook up power domains to generic power domain infrastructure .../bindings/arm/exynos/power_domain.txt | 21 ++ arch/arm/mach-exynos/Kconfig | 10 +- arch/arm/mach-exynos/Makefile |2 +- arch/arm/mach-exynos/dev-pd.c | 139 -- arch/arm/mach-exynos/mach-nuri.c | 11 - arch/arm/mach-exynos/mach-origen.c | 14 -- arch/arm/mach-exynos/mach-smdkv310.c | 12 -- arch/arm/mach-exynos/mach-universal_c210.c | 17 -- arch/arm/mach-exynos/pm_domains.c | 201 drivers/base/power/domain.c| 32 +++ include/linux/pm_domain.h | 12 ++ 11 files changed, 268 insertions(+), 203 deletions(-) create mode 100644 Documentation/devicetree/bindings/arm/exynos/power_domain.txt delete mode 100644 arch/arm/mach-exynos/dev-pd.c create mode 100644 arch/arm/mach-exynos/pm_domains.c -- 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
