Re: PATCH: ARM: S5PV210: Add USB EHCI support for SMDKV210 board
On Sat, 2011-12-24 at 13:21 +1100, Angus Gratton wrote: > Signed-off-by: Angus Gratton > > --- > (This is my first kernel patch submission, so apologies in advance for > any mistakes.) > > Support is adapted from in EHCI in an older kernel & from the current > mach-exynos EHCI support. I've tried to duplicate the mach-exynos code > layout. > > I don't actually have an SMDKV210 board to test on, this is tested on a > SMDKV210-derived product called a Flexiview FV-1. I believe this should > work on SMDKV210, and probably other S5PV210 boards, though. Eck, sorry I might have sent this patch a bit early. Please disregard for now. On my hardware USB devices initially come up happily, but sustained reads or writes eventually cause unexpected device resets and errors. This doesn't happen with $vendorblobkernel so I must be doing something wrong. Will keep trying. Sorry again, Angus -- 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/3] s5p-g2d: add G2D to plat-s5p and mach-exynos4
Kamil Debski wrote:
>
> Signed-off-by: Kamil Debski
> Signed-off-by: Kyungmin Park
> ---
> arch/arm/mach-exynos/include/mach/map.h |3 +++
> arch/arm/plat-s5p/Kconfig |5 +
> arch/arm/plat-samsung/devs.c | 28
> arch/arm/plat-samsung/include/plat/devs.h |1 +
> 4 files changed, 37 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-exynos/include/mach/map.h b/arch/arm/mach-
> exynos/include/mach/map.h
> index 03e2c99..e3321aa 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_G2D 0x1280
> +
> #define EXYNOS4_PA_I2S0 0x0383
> #define EXYNOS4_PA_I2S1 0xE310
> #define EXYNOS4_PA_I2S2 0xE2A0
> @@ -156,6 +158,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_G2D EXYNOS4_PA_G2D
> #define S5P_PA_FIMD0 EXYNOS4_PA_FIMD0
> #define S5P_PA_HDMI EXYNOS4_PA_HDMI
> #define S5P_PA_IIC_HDMIPHY EXYNOS4_PA_IIC_HDMIPHY
> diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig
> index 9b9968f..5e6333c 100644
> --- a/arch/arm/plat-s5p/Kconfig
> +++ b/arch/arm/plat-s5p/Kconfig
> @@ -79,6 +79,11 @@ config S5P_DEV_FIMC3
> help
> Compile in platform device definitions for FIMC controller 3
>
> +config S5P_DEV_G2D
> + bool
> + help
> + Compile in platform device definitions for G2D device
> +
> config S5P_DEV_FIMD0
> bool
> help
> diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
> index 4ca8b57..ec4848d 100644
> --- a/arch/arm/plat-samsung/devs.c
> +++ b/arch/arm/plat-samsung/devs.c
> @@ -265,6 +265,34 @@ struct platform_device s5p_device_fimc3 = {
> };
> #endif /* CONFIG_S5P_DEV_FIMC3 */
>
> +/* G2D */
> +
> +#ifdef CONFIG_S5P_DEV_G2D
> +static struct resource s5p_g2d_resource[] = {
> +[0] = {
> +.start = S5P_PA_G2D,
> +.end= S5P_PA_G2D + SZ_4K - 1,
> +.flags = IORESOURCE_MEM,
> +},
> +[1] = {
> +.start = IRQ_2D,
> +.end= IRQ_2D,
> +.flags = IORESOURCE_IRQ,
> +},
> +};
> +
> +struct platform_device s5p_device_g2d = {
> +.name = "s5p-g2d",
> +.id = 0,
> +.num_resources = ARRAY_SIZE(s5p_g2d_resource),
> +.resource = s5p_g2d_resource,
> +.dev= {
> +.dma_mask = &samsung_device_dma_mask,
> +.coherent_dma_mask = DMA_BIT_MASK(32),
> +},
> +};
> +#endif /* CONFIG_S5P_DEV_G2D */
> +
> /* 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 ab633c9..d4e92e2 100644
> --- a/arch/arm/plat-samsung/include/plat/devs.h
> +++ b/arch/arm/plat-samsung/include/plat/devs.h
> @@ -78,6 +78,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_g2d;
> extern struct platform_device s5p_device_fimd0;
> extern struct platform_device s5p_device_hdmi;
> extern struct platform_device s5p_device_i2c_hdmiphy;
> --
> 1.7.0.4
Hi Kamil,
Please fix following with checkpatch.
ERROR: trailing whitespace
#47: FILE: arch/arm/plat-s5p/Kconfig:86:
+^I $
ERROR: code indent should use tabs where possible
#63: FILE: arch/arm/plat-samsung/devs.c:272:
+[0] = {$
WARNING: please, no spaces at the start of a line
#63: FILE: arch/arm/plat-samsung/devs.c:272:
+[0] = {$
ERROR: code indent should use tabs where possible
#64: FILE: arch/arm/plat-samsung/devs.c:273:
+.start = S5P_PA_G2D,$
WARNING: please, no spaces at the start of a line
#64: FILE: arch/arm/plat-samsung/devs.c:273:
+.start = S5P_PA_G2D,$
ERROR: code indent should use tabs where possible
#65: FILE: arch/arm/plat-samsung/devs.c:274:
+.end= S5P_PA_G2D + SZ_4K - 1,$
WARNING: please, no spaces at the start of a line
#65: FILE: arch/arm/plat-samsung/devs.c:274:
+.end= S5P_PA_G2D + SZ_4K - 1,$
ERROR: code indent should use tabs where possible
#66: FILE: arch/arm/plat-samsung/devs.c:275:
+.flags = IORESOURCE_MEM,$
WARNING: please, no spaces at the start of a line
#66: FILE: arch/arm/plat-samsung/devs.c:275:
+.flags = IORESOURCE_MEM,$
ERROR: code indent
RE: [PATCH 0/3] Samsung S5P platform modification required for G2D driver
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. > > The patches have been rebased to the newest kgene/for-next branch. The > driver > is currently staging for 3.3 in Mauro's repository, so please include > these > patches for the next release. > > 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(-) Hi Kamil, Looks ok to me with small discussion about including some stuff in common or board file on 2/3 patch. Anyway, will apply. And if any problem, let you know. Merry Christmas. Thanks. Best regards, Kgene. -- Kukjin Kim , 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 2/3] s5p-g2d: add G2D to mach-nuri
Kyungmin Park wrote: > > On 12/20/11, Mark Brown wrote: > > On Mon, Dec 12, 2011 at 11:32:28PM +0900, Kyungmin Park wrote: > >> On Mon, Dec 12, 2011 at 7:03 PM, Mark Brown > > > >> > I'm not sure I understand why we would not be ready to do things like > >> > this? I'd also expect that doing things in a board specific fashion > >> > might create issues with things being set up twice. > > > >> Please see the below, > >> https://lkml.org/lkml/2011/11/15/16 > > > >> Even though I can't agree with his opinions. There are other voice like > >> this. > > > >> I also want to common registration and select at each board. > > > > So, I looked at the discussion there and I'm not sure I'm buying what's > > being said; it seems to be as much a fear of change and a lack of > > awareness of modern infrastructure as anything else. It seems to me > > that this is a case where we should just be turning round and saying > > that the default position ought to be the other way around, if things > > need to be done per board there should be a strong reason for it. > > Please ask the Mr. Kim. Now he's working on common file so include > these functionality. > then other boards can follow up. > Hi, I'm not sure it can be included on common.c now, anyway let me check it soon. Merry Christmas. Thanks. Best regards, Kgene. -- Kukjin Kim , 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
PATCH: ARM: S5PV210: Add USB EHCI support for SMDKV210 board
Signed-off-by: Angus Gratton
---
(This is my first kernel patch submission, so apologies in advance for
any mistakes.)
Support is adapted from in EHCI in an older kernel & from the current
mach-exynos EHCI support. I've tried to duplicate the mach-exynos code
layout.
I don't actually have an SMDKV210 board to test on, this is tested on a
SMDKV210-derived product called a Flexiview FV-1. I believe this should
work on SMDKV210, and probably other S5PV210 boards, though.
arch/arm/mach-s5pv210/Kconfig |9 +++
arch/arm/mach-s5pv210/Makefile|1 +
arch/arm/mach-s5pv210/clock.c |2 +-
arch/arm/mach-s5pv210/include/mach/irqs.h |2 +-
arch/arm/mach-s5pv210/include/mach/map.h |5 ++
arch/arm/mach-s5pv210/mach-smdkv210.c |9 +++
arch/arm/mach-s5pv210/setup-usb-phy.c | 83 +
drivers/usb/host/ehci-s5p.c |1 -
8 files changed, 109 insertions(+), 3 deletions(-)
create mode 100644 arch/arm/mach-s5pv210/setup-usb-phy.c
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 646057a..bf7f70c 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -60,6 +60,13 @@ config S5PV210_SETUP_FIMC
help
Common setup code for the camera interfaces.
+config S5PV210_SETUP_USB_PHY
+ bool
+ help
+ Common setup code for USB PHY controller
+
+
+
menu "S5PC110 Machines"
config MACH_AQUILA
@@ -143,12 +150,14 @@ config MACH_SMDKV210
select SAMSUNG_DEV_KEYPAD
select SAMSUNG_DEV_PWM
select SAMSUNG_DEV_TS
+ select S5P_DEV_USB_EHCI
select S5PV210_SETUP_FB_24BPP
select S5PV210_SETUP_I2C1
select S5PV210_SETUP_I2C2
select S5PV210_SETUP_IDE
select S5PV210_SETUP_KEYPAD
select S5PV210_SETUP_SDHCI
+ select S5PV210_SETUP_USB_PHY
help
Machine support for Samsung SMDKV210
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 009fbe5..4d0af14 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -37,3 +37,4 @@ obj-$(CONFIG_S5PV210_SETUP_IDE) += setup-ide.o
obj-$(CONFIG_S5PV210_SETUP_KEYPAD) += setup-keypad.o
obj-$(CONFIG_S5PV210_SETUP_SDHCI) += setup-sdhci.o
obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
+obj-$(CONFIG_S5PV210_SETUP_USB_PHY) += setup-usb-phy.o
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index 4c5ac7a..2aaa259 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -384,7 +384,7 @@ static struct clk init_clocks_off[] = {
.enable = s5pv210_clk_ip1_ctrl,
.ctrlbit= (1<<16),
}, {
- .name = "usb-host",
+ .name = "usbhost",
.parent = &clk_hclk_psys.clk,
.enable = s5pv210_clk_ip1_ctrl,
.ctrlbit= (1<<17),
diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h
b/arch/arm/mach-s5pv210/include/mach/irqs.h
index 5e0de3a..b62b060 100644
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -59,7 +59,7 @@
#define IRQ_IIC_HDMIPHYS5P_IRQ_VIC1(20)
#define IRQ_HSIRX S5P_IRQ_VIC1(21)
#define IRQ_HSITX S5P_IRQ_VIC1(22)
-#define IRQ_UHOST S5P_IRQ_VIC1(23)
+#define IRQ_USB_HOST S5P_IRQ_VIC1(23)
#define IRQ_OTGS5P_IRQ_VIC1(24)
#define IRQ_MSMS5P_IRQ_VIC1(25)
#define IRQ_HSMMC0 S5P_IRQ_VIC1(26)
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h
b/arch/arm/mach-s5pv210/include/mach/map.h
index 7ff609f..9f9ffe7 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -66,6 +66,9 @@
#define S5PV210_PA_HSOTG 0xEC00
#define S5PV210_PA_HSPHY 0xEC10
+#define S5PV210_PA_USB_EHCI0xEC20
+#define S5PV210_PA_USB_OHCI0xEC30
+
#define S5PV210_PA_IIS00xEEE3
#define S5PV210_PA_IIS10xE210
#define S5PV210_PA_IIS20xE2A0
@@ -111,6 +114,8 @@
#define S3C_PA_WDT S5PV210_PA_WATCHDOG
#define S5P_PA_CHIPID S5PV210_PA_CHIPID
+#define S5P_PA_EHCIS5PV210_PA_USB_EHCI
+#define S5P_PA_OHCIS5PV210_PA_USB_OHCI
#define S5P_PA_FIMC0 S5PV210_PA_FIMC0
#define S5P_PA_FIMC1 S5PV210_PA_FIMC1
#define S5P_PA_FIMC2 S5PV210_PA_FIMC2
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c
b/arch/arm/mach-s5pv210/mach-smdkv210.c
index 8662ef6..72fd925 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -46,6 +4
RE: [CPUFREQ] EXYNOS: Make EXYNOS common cpufreq driver
Kukjin Kim wrote: > > Dave Jones wrote: > > > > On Wed, Dec 07, 2011 at 11:44:21AM +0900, Kukjin Kim wrote: > > > From: Jaecheol Lee > > > > > > To support various EXYNOS series SoCs commonly, > > > added exynos common structure. > > > exynos-cpufreq.c => EXYNOS series common cpufreq driver > > > exynos4210-cpufreq.c => EXYNOS4210 support cpufreq driver > > > > > > Signed-off-by: Jaecheol Lee > > > Signed-off-by: Kukjin Kim > > > > Please rediff this one and resend. It doesn't apply on top of the other > > patches.. > > > > Applying: [CPUFREQ] EXYNOS4210: Remove code about bus on cpufreq > > Applying: [CPUFREQ] EXYNOS4210: Update frequency table for cpu divider > > Applying: [CPUFREQ] EXYNOS4210: cpufreq code is changed for stable > working > > Applying: [CPUFREQ] EXYNOS: Make EXYNOS common cpufreq driver > > error: patch failed: drivers/cpufreq/Makefile:42 > > error: drivers/cpufreq/Makefile: patch does not apply > > Patch failed at 0005 [CPUFREQ] EXYNOS: Make EXYNOS common cpufreq driver > > When you have resolved this problem run "git am --resolved". > > If you would prefer to skip this patch, instead run "git am --skip". > > To restore the original branch and stop patching run "git am --abort". > > > > I'll push out what I have applied so far to cpufreq.next > > > Hi Dave > > You can find updated 4th patch at below. > I rebased it on your latest cpufreq/next branch. > And the 5th patch has no problem to apply. > Hi Dave, I couldn't find 4th and 5th patches in your cpufreq yet. If any problem, please let me know. Merry Christmas! Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. > If any problem, please let me know. > > As a note, since my git send-email has problem, re-submitted them on > Sunday. > Please kindly ignore that. > > Thanks. > > Best regards, > Kgene. > -- > Kukjin Kim , Senior Engineer, > SW Solution Development Team, Samsung Electronics Co., Ltd. (snip) -- 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: Pull Requeset: Exynos4 Register Address Update for Devfreq Drivers.
MyungJoo Ham wrote: > > Hello, > Hi, > Please pull the patches for Exynos4 SoCs that support devfreq device > drivers for Exynos4210/4212/4412. > > The patches are: > ARM: EXYNOS4: Add DMC1, allow PPMU access for DMC. > ARM: EXYNOS4: Add clock register addresses for Exynos4x12 bus devfreq > driver > ARM Exynos4210-Nuri: support Exynos4210-bus Devfreq driver. > > Gitweb: http://git.infradead.org/users/kmpark/linux- > samsung/shortlog/refs/heads/devfreq-for-samsung > Git Repository: git://git.infradead.org/users/kmpark/linux-samsung > Branch: devfreq-for-samsung > > The following changes since commit > 390f998509bf049019df0b078c0a6606e0d57fb4: > > Merge: e34d6b4 6f6c2aa > Author: Linus Torvalds > Date: Sun Dec 18 14:28:31 2011 -0800 > > Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes- > 2.6 > (2011-12-18 14:28:31 -0800) > > are available in the git repository at: > > git://git.infradead.org/users/kmpark/linux-samsung.git devfreq-for- > samsung > > MyungJoo Ham (3): > ARM: EXYNOS4: Add DMC1, allow PPMU access for DMC. > ARM: EXYNOS4: Add clock register addresses for Exynos4x12 bus > devfreq driver > ARM Exynos4210-Nuri: support Exynos4210-bus Devfreq driver. > > arch/arm/mach-exynos/cpu.c |7 +++- > arch/arm/mach-exynos/include/mach/map.h|1 + > arch/arm/mach-exynos/include/mach/regs-clock.h | 42 > > arch/arm/mach-exynos/mach-nuri.c | 11 -- > 4 files changed, 57 insertions(+), 4 deletions(-) > > As I commented, looks ok to me and will apply patches not pull and since I didn't get your answer to ask 'topic branch is required for this', I didn't yet. As a note, if there is no reason to create based on not -rc, just use -rc. Merry Christmas. Thanks. Best regards, Kgene. -- Kukjin Kim , 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: Add USB OHCI support to ORIGEN board
Jingoo Han wrote:
>
> Hi, Tushar.
>
> Tushar Behera wrote:
> > -Original Message-
> > Subject: [PATCH] ARM: EXYNOS: Add USB OHCI support to ORIGEN board
> >
> > Signed-off-by: Tushar Behera
> > Signed-off-by: Angus Ainslie
>
> Acked-by: Jingoo Han
>
OK, will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim , Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> Thanks.
>
> Best regards,
> Jingoo Han
> > ---
> >
> > This patch are based Kukjin's for-next branch and OHCI related
> > patches from Jingoo Han.
> > [PATCH v2 0/3] Support Samsung Exynos OHCI device and driver
> >
> > arch/arm/mach-exynos/Kconfig |1 +
> > arch/arm/mach-exynos/mach-origen.c | 13 +
> > 2 files changed, 14 insertions(+), 0 deletions(-)
> >
> > diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
> > index bd1bb9f1..0da2ced 100644
> > --- a/arch/arm/mach-exynos/Kconfig
> > +++ b/arch/arm/mach-exynos/Kconfig
> > @@ -304,6 +304,7 @@ config MACH_ORIGEN
> > select SAMSUNG_DEV_PWM
> > select EXYNOS4_DEV_DMA
> > select EXYNOS4_DEV_PD
> > + select EXYNOS4_DEV_USB_OHCI
> > select EXYNOS4_SETUP_FIMD0
> > select EXYNOS4_SETUP_SDHCI
> > select EXYNOS4_SETUP_USB_PHY
> > diff --git a/arch/arm/mach-exynos/mach-origen.c b/arch/arm/mach-
> exynos/mach-origen.c
> > index f56d027..a0116036 100644
> > --- a/arch/arm/mach-exynos/mach-origen.c
> > +++ b/arch/arm/mach-exynos/mach-origen.c
> > @@ -42,6 +42,7 @@
> > #include
> > #include
> >
> > +#include
> > #include
> >
> > /* Following are default values for UCON, ULCON and UFCON UART
> registers */
> > @@ -487,6 +488,16 @@ static void __init origen_ehci_init(void)
> > s5p_ehci_set_platdata(pdata);
> > }
> >
> > +/* USB OHCI */
> > +static struct exynos4_ohci_platdata origen_ohci_pdata;
> > +
> > +static void __init origen_ohci_init(void)
> > +{
> > + struct exynos4_ohci_platdata *pdata = &origen_ohci_pdata;
> > +
> > + exynos4_ohci_set_platdata(pdata);
> > +}
> > +
> > static struct gpio_keys_button origen_gpio_keys_table[] = {
> > {
> > .code = KEY_MENU,
> > @@ -627,6 +638,7 @@ static struct platform_device *origen_devices[]
> __initdata = {
> > &s5p_device_mfc_l,
> > &s5p_device_mfc_r,
> > &s5p_device_mixer,
> > + &exynos4_device_ohci,
> > &exynos4_device_pd[PD_LCD0],
> > &exynos4_device_pd[PD_TV],
> > &exynos4_device_pd[PD_G3D],
> > @@ -702,6 +714,7 @@ static void __init origen_machine_init(void)
> > s3c_sdhci0_set_platdata(&origen_hsmmc0_pdata);
> >
> > origen_ehci_init();
> > + origen_ohci_init();
> > clk_xusbxti.rate = 2400;
> >
> > s5p_tv_setup();
> > --
> > 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: Adds Samsung TRATS board support
HeungJun, Kim wrote:
>
> This patch adds Samsung Mobile TRATS board support.
>
> Signed-off-by: HeungJun, Kim
> Signed-off-by: Kyungmin Park
> ---
> arch/arm/mach-exynos/Kconfig | 11 ++
> arch/arm/mach-exynos/Makefile |1 +
> arch/arm/mach-exynos/board-trats.c | 340
>
> 3 files changed, 352 insertions(+), 0 deletions(-)
> create mode 100644 arch/arm/mach-exynos/board-trats.c
>
If this is for v3.3, unfortunately, it's a little late to add board file and
since many things have changed I don't want to cause the conflicts with
others now.
BTW, why is the name board-xxx not mach-xxx like others?
Thanks.
Best regards,
Kgene.
--
Kukjin Kim , Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
> index 0afcc3b..3bbbef8 100644
> --- a/arch/arm/mach-exynos/Kconfig
> +++ b/arch/arm/mach-exynos/Kconfig
> @@ -304,6 +304,17 @@ config MACH_ORIGEN
> help
> Machine support for ORIGEN based on Samsung EXYNOS4210
>
> +config MACH_TRATS
> + bool "Mobile TRATS Board"
> + select CPU_EXYNOS4210
> + select S3C_DEV_WDT
> + select S3C_DEV_HSMMC
> + select S3C_DEV_I2C5
> + select EXYNOS4_SETUP_I2C5
> + select EXYNOS4_SETUP_SDHCI
> + help
> + Machine support for Samsung Mobile TRATS Board.
> +
> comment "EXYNOS4212 Boards"
>
> config MACH_SMDK4212
> diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile
> index 57e5296..f3bdda9 100644
> --- a/arch/arm/mach-exynos/Makefile
> +++ b/arch/arm/mach-exynos/Makefile
> @@ -33,6 +33,7 @@ obj-$(CONFIG_MACH_ARMLEX4210) += mach-
> armlex4210.o
> obj-$(CONFIG_MACH_UNIVERSAL_C210)+= mach-universal_c210.o
> obj-$(CONFIG_MACH_NURI) += mach-nuri.o
> obj-$(CONFIG_MACH_ORIGEN)+= mach-origen.o
> +obj-$(CONFIG_MACH_TRATS) += board-trats.o
>
> obj-$(CONFIG_MACH_SMDK4212) += mach-smdk4x12.o
> obj-$(CONFIG_MACH_SMDK4412) += mach-smdk4x12.o
> diff --git a/arch/arm/mach-exynos/board-trats.c b/arch/arm/mach-
> exynos/board-trats.c
> new file mode 100644
> index 000..4c13dfc
> --- /dev/null
> +++ b/arch/arm/mach-exynos/board-trats.c
> @@ -0,0 +1,340 @@
> +/*
> + * linux/arch/arm/mach-exynos4/board-trats.c
> + *
> + * Copyright (c) 2011 Samsung Electronics Co., Ltd.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include
> +#include
> +
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +#include
> +
> +#include
> +
> +/* Following are default values for UCON, ULCON and UFCON UART registers
> */
> +#define TRATS_UCON_DEFAULT (S3C2410_UCON_TXILEVEL |\
> + S3C2410_UCON_RXILEVEL |\
> + S3C2410_UCON_TXIRQMODE | \
> + S3C2410_UCON_RXIRQMODE | \
> + S3C2410_UCON_RXFIFO_TOI | \
> + S3C2443_UCON_RXERR_IRQEN)
> +
> +#define TRATS_ULCON_DEFAULT S3C2410_LCON_CS8
> +
> +#define TRATS_UFCON_DEFAULT (S3C2410_UFCON_FIFOMODE | \
> + S5PV210_UFCON_TXTRIG256 | \
> + S5PV210_UFCON_RXTRIG256)
> +
> +enum fixed_regulator_id {
> + FIXED_REG_ID_MMC = 0,
> +};
> +
> +static struct s3c2410_uartcfg trats_uartcfgs[] __initdata = {
> + {
> + .hwport = 0,
> + .ucon = TRATS_UCON_DEFAULT,
> + .ulcon = TRATS_ULCON_DEFAULT,
> + .ufcon = TRATS_UFCON_DEFAULT,
> + },
> + {
> + .hwport = 1,
> + .ucon = TRATS_UCON_DEFAULT,
> + .ulcon = TRATS_ULCON_DEFAULT,
> + .ufcon = TRATS_UFCON_DEFAULT,
> + },
> + {
> + .hwport = 2,
> + .ucon = TRATS_UCON_DEFAULT,
> + .ulcon = TRATS_ULCON_DEFAULT,
> + .ufcon = TRATS_UFCON_DEFAULT,
> + },
> + {
> + .hwport = 3,
> + .ucon = TRATS_UCON_DEFAULT,
> + .ulcon = TRATS_ULCON_DEFAULT,
> + .ufcon = TRATS_UFCON_DEFAULT,
> + },
> +};
> +
> +/* eMMC */
> +static struct s3c_sdhci_platdata trats_hsmmc0_data __initdata = {
> + .max_width = 8,
> + .host_caps = (MMC_CAP_8_BIT_DATA | MMC_CAP_4_BIT_DATA |
> + MMC_CAP_MMC_HIGHSPEED | MMC_CAP_SD_HIGHSPEED
|
> + MMC_CAP_DISABLE |
RE: [PATCH 2/2] ARM: SAMSUNG: dma-ops.h needs mach/dma.h
Mark Brown wrote:
>
> dma-ops.h uses samsung_dma_is_dmadev so it needs to have mach/dma.h
> included.
>
> Signed-off-by: Mark Brown
> ---
> arch/arm/plat-samsung/include/plat/dma-ops.h |1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h b/arch/arm/plat-
> samsung/include/plat/dma-ops.h
> index 70b6325..71a6827 100644
> --- a/arch/arm/plat-samsung/include/plat/dma-ops.h
> +++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
> @@ -14,6 +14,7 @@
> #define __SAMSUNG_DMA_OPS_H_ __FILE__
>
> #include
> +#include
>
> struct samsung_dma_prep_info {
> enum dma_transaction_type cap;
> --
> 1.7.7.3
OK, will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim , 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/2] ARM: SAMSUNG: Guard against multiple inclusion of plat/dma.h
Mark Brown wrote:
>
> Otherwise it'll generate errors if included twice.
>
Yes, right. Will apply.
Merry Christmas :)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim , Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> Signed-off-by: Mark Brown
> ---
> arch/arm/plat-samsung/include/plat/dma.h |5 +
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-samsung/include/plat/dma.h b/arch/arm/plat-
> samsung/include/plat/dma.h
> index b906112..baa05ed 100644
> --- a/arch/arm/plat-samsung/include/plat/dma.h
> +++ b/arch/arm/plat-samsung/include/plat/dma.h
> @@ -10,6 +10,9 @@
> * published by the Free Software Foundation.
> */
>
> +#ifndef __PLAT_DMA_H
> +#define __PLAT_DMA_H
> +
> #include
>
> enum s3c2410_dma_buffresult {
> @@ -124,3 +127,5 @@ extern int s3c2410_dma_set_buffdone_fn(enum dma_ch,
> s3c2410_dma_cbfn_t rtn);
>
>
> #include
> +
> +#endif
> --
> 1.7.7.3
--
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 09/12] ARM: EXYNOS: introduce arch/arm/mach-exynos/common.[ch]
Russell King - ARM Linux wrote: > > On Tue, Dec 20, 2011 at 09:48:33PM +0900, Kukjin Kim wrote: > > This patch introduces common.[ch] which are used only in the > > arch/arm/mach-exynos/ directory. The common.c file merges > > the cpu.c, init.c, irq-combiner.c and irq-eint.c files which > > are used commonly on EXYNOS SoCs and the common.h file replaces > > with plat/exynos4.h file. > > > > Cc: Ben Dooks > > Cc: Russell King > > Signed-off-by: Kukjin Kim > Hi Russell, Sorry for my late following up the restart work :( > It looks like there's some changes made to exynos stuff between -rc1 Yes, some bug has been fixed after -rc1... > (which my immutable restart-cleanup branch is based upon) and the base > for this patch which makes it hard to apply: > Oops, I created this based on your devel-stable as per your suggestion and I couldn't look at 'restart-cleanup' and 'restart' branches in your git, 'http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm.git' . > Patching 7249/1... > git apply --whitespace=fix -p1 --index --check > /tmp/pdb.2292 2>&1 exited > with > non-zero status: 256 > error: patch failed: arch/arm/mach-exynos/cpu.c:1 > error: arch/arm/mach-exynos/cpu.c: patch does not apply > > Trying with GNU patch gives: > > Patching 7249/1... > patch -p1 -f -EF0 -N --dry-run > /tmp/pdb.2298 2>&1 exited with non-zero > status: 256 > patching file arch/arm/mach-exynos/Makefile > patching file arch/arm/mach-exynos/clock-exynos4210.c > patching file arch/arm/mach-exynos/clock-exynos4212.c > patching file arch/arm/mach-exynos/clock.c > patching file arch/arm/mach-exynos/common.c > patching file arch/arm/mach-exynos/common.h > patching file arch/arm/mach-exynos/cpu.c > Hunk #1 FAILED at 1. > File arch/arm/mach-exynos/cpu.c is not empty after patch, as expected > 1 out of 1 hunk FAILED -- saving rejects to file arch/arm/mach- > exynos/cpu.c.rej > patching file arch/arm/mach-exynos/include/mach/map.h > patching file arch/arm/mach-exynos/init.c > patching file arch/arm/mach-exynos/irq-combiner.c > patching file arch/arm/mach-exynos/irq-eint.c > patching file arch/arm/mach-exynos/mach-armlex4210.c > Hunk #1 succeeded at 20 (offset -1 lines). > Hunk #2 succeeded at 27 (offset -1 lines). > Hunk #3 succeeded at 188 (offset -1 lines). > patching file arch/arm/mach-exynos/mach-nuri.c > Hunk #1 succeeded at 37 (offset -1 lines). > Hunk #2 succeeded at 53 (offset -1 lines). > Hunk #3 succeeded at 1284 (offset -1 lines). > patching file arch/arm/mach-exynos/mach-origen.c > Hunk #1 succeeded at 28 (offset -1 lines). > Hunk #2 succeeded at 42 (offset -1 lines). > Hunk #3 succeeded at 639 (offset -1 lines). > patching file arch/arm/mach-exynos/mach-smdk4x12.c > Hunk #1 succeeded at 27 (offset -1 lines). > Hunk #2 succeeded at 35 (offset -1 lines). > Hunk #3 succeeded at 250 (offset -1 lines). > patching file arch/arm/mach-exynos/mach-smdkv310.c > Hunk #1 succeeded at 27 (offset -1 lines). > Hunk #2 succeeded at 42 (offset -1 lines). > Hunk #3 succeeded at 333 (offset -1 lines). > patching file arch/arm/mach-exynos/mach-universal_c210.c > Hunk #1 succeeded at 27 (offset -1 lines). > Hunk #2 succeeded at 46 (offset -1 lines). > Hunk #3 succeeded at 993 (offset -1 lines). > patching file arch/arm/plat-s5p/Makefile > patching file arch/arm/plat-s5p/cpu.c > patching file arch/arm/plat-samsung/include/plat/cpu.h > patching file arch/arm/plat-samsung/include/plat/exynos4.h > > So I can't apply this, and this in turn means I can't provide Nicolas with > a tree this evening for his arch_idle changes. > So, isn't there any required my effort for it? > Given the proximity to Christmas, and I'm _not_ planning to work from this > evening until after the new year, things will now have to just sit and > wait > until after the festive period. Hmm...yeah... Anyway, Russell, Merry Christmas to you and your family ;) > > I'll push out what I have been able to merge later this evening, but it > will not include the exynos patches. How should I do for including exynos-restart? Please kindly let me know. Thanks. Best regards, Kgene. -- Kukjin Kim , 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
[GIT PULL] Samsung cleanup-spi for v3.3
Hi Arnd and Olof, Please pull the samsung-cleanup-spi for v3.3. It depends on samsung-devel-spi3 branch... If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit a153e31abb01484d0088ac28425dc98204848ad4: ARM: SAMSUNG: Remove SPI bus clocks from platform data (2011-12-23 10:10:46 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next-samsung-cleanup-spi4 Padmavathi Venna (6): ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung ARM: S3C64XX: Modified files for SPI consolidation work ARM: S5PC100: Modified files for SPI consolidation work ARM: S5P64X0: Modified files for SPI consolidation work ARM: S5PV210: Modified files for SPI consolidation work ARM: S3C64XX: Modified according to SPI consolidation work arch/arm/mach-s3c64xx/Kconfig|8 +- arch/arm/mach-s3c64xx/Makefile |2 +- arch/arm/mach-s3c64xx/dev-spi.c | 173 - arch/arm/mach-s3c64xx/include/mach/map.h |2 + arch/arm/mach-s3c64xx/setup-spi.c| 45 + arch/arm/mach-s5p64x0/Kconfig|7 +- arch/arm/mach-s5p64x0/Makefile |2 +- arch/arm/mach-s5p64x0/dev-spi.c | 218 - arch/arm/mach-s5p64x0/include/mach/map.h |2 + arch/arm/mach-s5p64x0/setup-spi.c| 55 ++ arch/arm/mach-s5pc100/Kconfig|5 + arch/arm/mach-s5pc100/Makefile |2 +- arch/arm/mach-s5pc100/dev-spi.c | 220 -- arch/arm/mach-s5pc100/include/mach/map.h |3 + arch/arm/mach-s5pc100/setup-spi.c| 65 +++ arch/arm/mach-s5pv210/Kconfig|5 + arch/arm/mach-s5pv210/Makefile |2 +- arch/arm/mach-s5pv210/dev-spi.c | 169 - arch/arm/mach-s5pv210/include/mach/map.h |2 + arch/arm/mach-s5pv210/setup-spi.c| 51 + arch/arm/plat-samsung/Kconfig| 16 ++- arch/arm/plat-samsung/devs.c | 127 + arch/arm/plat-samsung/include/plat/devs.h|8 +- arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 22 ++- 24 files changed, 409 insertions(+), 802 deletions(-) delete mode 100644 arch/arm/mach-s3c64xx/dev-spi.c create mode 100644 arch/arm/mach-s3c64xx/setup-spi.c delete mode 100644 arch/arm/mach-s5p64x0/dev-spi.c create mode 100644 arch/arm/mach-s5p64x0/setup-spi.c delete mode 100644 arch/arm/mach-s5pc100/dev-spi.c create mode 100644 arch/arm/mach-s5pc100/setup-spi.c delete mode 100644 arch/arm/mach-s5pv210/dev-spi.c create mode 100644 arch/arm/mach-s5pv210/setup-spi.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] Samsung devel-spi for v3.3
Hi Arnd and Olof, Please pull the samsung-devel-spi for v3.3. Same as cleanup-mmc pull requesting, it depends on next-samsung-cleanup-mmc2 branch. As a note, the number at the end of branch name means the ordering :) If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 4346b6d9c6651121f35ae9e42f240f36a8e56ce6: mmc: sdhci-s3c: Use generic clock names for sdhci bus clock options (2011-12-23 10:09:22 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next-samsung-devel-spi3 Padmavathi Venna (6): spi/s3c64xx: Use bus clocks created using clkdev ARM: S3C64XX: Add SPI clkdev support ARM: S5PC100: Add SPI clkdev support ARM: S5P64X0: Add SPI clkdev support ARM: S5PV210: Add SPI clkdev support ARM: SAMSUNG: Remove SPI bus clocks from platform data arch/arm/mach-s3c64xx/clock.c| 80 +-- arch/arm/mach-s3c64xx/dev-spi.c |7 -- arch/arm/mach-s5p64x0/clock-s5p6440.c| 61 +-- arch/arm/mach-s5p64x0/clock-s5p6450.c| 49 + arch/arm/mach-s5p64x0/dev-spi.c |6 - arch/arm/mach-s5pc100/clock.c| 124 +- arch/arm/mach-s5pc100/dev-spi.c |7 -- arch/arm/mach-s5pv210/clock.c| 50 + arch/arm/mach-s5pv210/dev-spi.c |6 - arch/arm/plat-samsung/include/plat/s3c64xx-spi.h |2 - drivers/spi/spi-s3c64xx.c| 14 +-- 11 files changed, 215 insertions(+), 191 deletions(-) -- 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] Samsung cleanup-mmc for v3.3
Hi Arnd and Olof, Please pull the samsung-cleanup-mmc for v3.3 It depends on next-samsung-devel-dt1 branch which has been requested pull before this. If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 0561ceabd0f13871900d116278fe9268aeb714d1: ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN (2011-12-23 10:07:12 +0900) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next-samsung-cleanup-mmc2 Rajeshwari Shinde (3): ARM: SAMSUNG: Remove SDHCI bus clocks from platform data ARM: SAMSUNG: Add lookup of sdhci-s3c clocks using generic names mmc: sdhci-s3c: Use generic clock names for sdhci bus clock options arch/arm/mach-exynos/Makefile |1 - arch/arm/mach-exynos/clock.c | 88 +-- arch/arm/mach-exynos/setup-sdhci.c | 22 arch/arm/mach-s3c2416/Makefile |1 - arch/arm/mach-s3c2416/clock.c | 68 ++- arch/arm/mach-s3c2416/setup-sdhci.c| 24 arch/arm/mach-s3c64xx/Makefile |1 - arch/arm/mach-s3c64xx/clock.c | 126 + arch/arm/mach-s3c64xx/setup-sdhci.c| 24 arch/arm/mach-s5pc100/Makefile |1 - arch/arm/mach-s5pc100/clock.c | 130 +- arch/arm/mach-s5pc100/setup-sdhci.c| 23 arch/arm/mach-s5pv210/Makefile |1 - arch/arm/mach-s5pv210/clock.c | 167 +--- arch/arm/mach-s5pv210/setup-sdhci.c| 22 arch/arm/plat-s3c24xx/s3c2443-clock.c | 16 ++- arch/arm/plat-samsung/include/plat/sdhci.h | 31 - drivers/mmc/host/sdhci-s3c.c |7 +- 18 files changed, 361 insertions(+), 392 deletions(-) delete mode 100644 arch/arm/mach-exynos/setup-sdhci.c delete mode 100644 arch/arm/mach-s3c2416/setup-sdhci.c delete mode 100644 arch/arm/mach-s3c64xx/setup-sdhci.c delete mode 100644 arch/arm/mach-s5pc100/setup-sdhci.c delete mode 100644 arch/arm/mach-s5pv210/setup-sdhci.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] Samsung devel-dt for v3.3
Hi Arnd and Olof, Please pull the samsung-devel-dt for v3.3. It includes support DT for Samsung EXYNOS4. Thanks. Best regards, Kgene. -- Kukjin Kim , Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. The following changes since commit 384703b8e6cd4c8ef08512e596024e028c91c339: Linux 3.2-rc6 (2011-12-16 18:36:26 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next-samsung-devel-dt1 Mark Brown (1): serial: samsung: Fix build for non-Exynos4210 devices Thomas Abraham (26): ARM: SAMSUNG: Move timer irq numbers to end of linux irq space ARM: EXYNOS: Enable conversion of GIC dt irq specifier to linux virq gpio/samsung: Add device tree support for EXYNOS4 serial: samsung: Keep a copy of the location of platform data in driver's private data ARM: S3C2440: move handling of fclk/n clock to platform code serial: samsung: switch to clkdev based clock lookup ARM: SAMSUNG: remove struct 's3c24xx_uart_clksrc' and all uses of it serial: samsung: remove all uses of get_clksrc and set_clksrc ARM: SAMSUNG: register uart clocks to clock lookup list serial: samsung: merge all SoC specific port reset functions serial: samsung: merge probe() function from all SoC specific extensions serial: samsung: add device tree support DMA: PL330: move filter function into driver DMA: PL330: Infer transfer direction from transfer request instead of platform data ARM: EXYNOS: Modify platform data for pl330 driver DMA: PL330: Add device tree support ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build ARM: EXYNOS: Add a alias for pdma clocks ARM: S5P64x0: Modify platform data for pl330 driver ARM: S5PC100: Modify platform data for pl330 driver ARM: S5PV210: Modify platform data for pl330 driver input: samsung-keypad: Add device tree support rtc: rtc-s3c: Add device tree support ARM: EXYNOS: Add Exynos4 device tree enabled board file ARM: dts: Add intial dts file for EXYNOS4210 SoC, SMDKV310 and ORIGEN .../devicetree/bindings/arm/insignal-boards.txt|8 + .../devicetree/bindings/arm/samsung-boards.txt |8 + .../devicetree/bindings/dma/arm-pl330.txt | 30 + .../devicetree/bindings/gpio/gpio-samsung.txt | 40 ++ .../devicetree/bindings/input/samsung-keypad.txt | 88 +++ Documentation/devicetree/bindings/rtc/s3c-rtc.txt | 20 + .../devicetree/bindings/serial/samsung_uart.txt| 14 + arch/arm/boot/dts/exynos4210-origen.dts| 137 + arch/arm/boot/dts/exynos4210-smdkv310.dts | 182 ++ arch/arm/boot/dts/exynos4210.dtsi | 397 arch/arm/mach-exynos/Kconfig | 24 + arch/arm/mach-exynos/Makefile |5 +- arch/arm/mach-exynos/clock.c | 141 +++-- arch/arm/mach-exynos/cpu.c | 17 +- arch/arm/mach-exynos/dma.c | 229 ++- arch/arm/mach-exynos/include/mach/entry-macro.S|1 - arch/arm/mach-exynos/include/mach/irqs.h |8 +- arch/arm/mach-exynos/init.c| 21 +- arch/arm/mach-exynos/mach-exynos4-dt.c | 85 +++ arch/arm/mach-s3c2410/mach-bast.c | 22 - arch/arm/mach-s3c2410/mach-vr1000.c| 24 - arch/arm/mach-s3c2410/s3c2410.c|6 + arch/arm/mach-s3c2412/clock.c |7 + arch/arm/mach-s3c2440/clock.c | 44 ++ arch/arm/mach-s3c2440/mach-anubis.c| 22 +- arch/arm/mach-s3c2440/mach-at2440evb.c | 22 +- arch/arm/mach-s3c2440/mach-osiris.c| 24 +- arch/arm/mach-s3c2440/mach-rx1950.c| 18 +- arch/arm/mach-s3c2440/mach-rx3715.c| 19 +- arch/arm/mach-s3c64xx/clock.c | 37 +- arch/arm/mach-s5p64x0/clock-s5p6440.c | 32 +- arch/arm/mach-s5p64x0/clock-s5p6450.c | 32 +- arch/arm/mach-s5p64x0/dma.c| 227 ++- arch/arm/mach-s5p64x0/include/mach/irqs.h |2 + arch/arm/mach-s5p64x0/init.c | 31 - arch/arm/mach-s5pc100/clock.c | 33 +- arch/arm/mach-s5pc100/dma.c| 247 +++-- arch/arm/mach-s5pc100/include/mach/irqs.h |2 + arch/arm/mach-s5pv210/clock.c | 107 ++-- arch/arm/mach-s5pv210/dma.c| 241 +++-- arch/arm/mach-s5pv210/include/mach/irqs.h |2 + arch/arm/mach-s5pv210/init.c | 19 - arch/arm/plat-s3c24xx/s3c2443-clock.c | 23 +- arch/arm/plat-samsung/dma-ops.c
Re: [PATCH 09/12] ARM: EXYNOS: introduce arch/arm/mach-exynos/common.[ch]
On Tue, Dec 20, 2011 at 09:48:33PM +0900, Kukjin Kim wrote: > This patch introduces common.[ch] which are used only in the > arch/arm/mach-exynos/ directory. The common.c file merges > the cpu.c, init.c, irq-combiner.c and irq-eint.c files which > are used commonly on EXYNOS SoCs and the common.h file replaces > with plat/exynos4.h file. > > Cc: Ben Dooks > Cc: Russell King > Signed-off-by: Kukjin Kim It looks like there's some changes made to exynos stuff between -rc1 (which my immutable restart-cleanup branch is based upon) and the base for this patch which makes it hard to apply: Patching 7249/1... git apply --whitespace=fix -p1 --index --check > /tmp/pdb.2292 2>&1 exited with non-zero status: 256 error: patch failed: arch/arm/mach-exynos/cpu.c:1 error: arch/arm/mach-exynos/cpu.c: patch does not apply Trying with GNU patch gives: Patching 7249/1... patch -p1 -f -EF0 -N --dry-run > /tmp/pdb.2298 2>&1 exited with non-zero status: 256 patching file arch/arm/mach-exynos/Makefile patching file arch/arm/mach-exynos/clock-exynos4210.c patching file arch/arm/mach-exynos/clock-exynos4212.c patching file arch/arm/mach-exynos/clock.c patching file arch/arm/mach-exynos/common.c patching file arch/arm/mach-exynos/common.h patching file arch/arm/mach-exynos/cpu.c Hunk #1 FAILED at 1. File arch/arm/mach-exynos/cpu.c is not empty after patch, as expected 1 out of 1 hunk FAILED -- saving rejects to file arch/arm/mach-exynos/cpu.c.rej patching file arch/arm/mach-exynos/include/mach/map.h patching file arch/arm/mach-exynos/init.c patching file arch/arm/mach-exynos/irq-combiner.c patching file arch/arm/mach-exynos/irq-eint.c patching file arch/arm/mach-exynos/mach-armlex4210.c Hunk #1 succeeded at 20 (offset -1 lines). Hunk #2 succeeded at 27 (offset -1 lines). Hunk #3 succeeded at 188 (offset -1 lines). patching file arch/arm/mach-exynos/mach-nuri.c Hunk #1 succeeded at 37 (offset -1 lines). Hunk #2 succeeded at 53 (offset -1 lines). Hunk #3 succeeded at 1284 (offset -1 lines). patching file arch/arm/mach-exynos/mach-origen.c Hunk #1 succeeded at 28 (offset -1 lines). Hunk #2 succeeded at 42 (offset -1 lines). Hunk #3 succeeded at 639 (offset -1 lines). patching file arch/arm/mach-exynos/mach-smdk4x12.c Hunk #1 succeeded at 27 (offset -1 lines). Hunk #2 succeeded at 35 (offset -1 lines). Hunk #3 succeeded at 250 (offset -1 lines). patching file arch/arm/mach-exynos/mach-smdkv310.c Hunk #1 succeeded at 27 (offset -1 lines). Hunk #2 succeeded at 42 (offset -1 lines). Hunk #3 succeeded at 333 (offset -1 lines). patching file arch/arm/mach-exynos/mach-universal_c210.c Hunk #1 succeeded at 27 (offset -1 lines). Hunk #2 succeeded at 46 (offset -1 lines). Hunk #3 succeeded at 993 (offset -1 lines). patching file arch/arm/plat-s5p/Makefile patching file arch/arm/plat-s5p/cpu.c patching file arch/arm/plat-samsung/include/plat/cpu.h patching file arch/arm/plat-samsung/include/plat/exynos4.h So I can't apply this, and this in turn means I can't provide Nicolas with a tree this evening for his arch_idle changes. Given the proximity to Christmas, and I'm _not_ planning to work from this evening until after the new year, things will now have to just sit and wait until after the festive period. I'll push out what I have been able to merge later this evening, but it will not include the exynos patches. -- 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 07/12] ARM: S5PV210: introduce arch/arm/mach-s5pv210/common.[ch]
On Tue, Dec 20, 2011 at 09:48:31PM +0900, Kukjin Kim wrote: > This patch introduces common.[ch] which are used only in the > arch/arm/mach-s5pv210/ directory. The common.c file merges > the cpu.c and init.c which are used commonly on S5PCV210/S5PC100 > SoC and the common.h local header file replaces with plat/s5pv210.h > file. Note that the patch system does _not_ deal in any way with replacing patch comments. Comments added against a patch already submitted to the patch system containing an attributation get _added_ to the initial comment. So, it ends up looking like this: ARM: 7248/1: S5PV210: introduce arch/arm/mach-s5pv210/common.[ch This patch introduces common.[ch] which are used only in the arch/arm/mach-s5pv210/ directory. The common.c file merges the cpu.c and init.c which are used commonly on S5PCV210/S5PC100 SoC and the common.h local header file replaces with plat/s5pv210.h file. Comments from Kukjin Kim: Subject: [PATCH 04/12] ARM: S5PV210: introduce arch/arm/mach-s5pv210/common.[ch] This patch introduces common.[ch] which are used only in the arch/arm/mach-s5pv210/ directory. The common.c file merges the cpu.c and init.c which are used commonly on S5PCV210/S5PC100 SoC and the common.h local header file replaces with plat/s5pv210.h file. --- Changes: fixed missing ']' at the end of the subject Cc: Ben Dooks Signed-off-by: Kukjin Kim Signed-off-by: Russell King which I think you can agree is not good. If you want to _change_ the initial comments, please resubmit the patch entirely. -- 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: SAMSUNG: dma-ops.h needs mach/dma.h
dma-ops.h uses samsung_dma_is_dmadev so it needs to have mach/dma.h
included.
Signed-off-by: Mark Brown
---
arch/arm/plat-samsung/include/plat/dma-ops.h |1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-samsung/include/plat/dma-ops.h
b/arch/arm/plat-samsung/include/plat/dma-ops.h
index 70b6325..71a6827 100644
--- a/arch/arm/plat-samsung/include/plat/dma-ops.h
+++ b/arch/arm/plat-samsung/include/plat/dma-ops.h
@@ -14,6 +14,7 @@
#define __SAMSUNG_DMA_OPS_H_ __FILE__
#include
+#include
struct samsung_dma_prep_info {
enum dma_transaction_type cap;
--
1.7.7.3
--
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: SAMSUNG: Guard against multiple inclusion of plat/dma.h
Otherwise it'll generate errors if included twice.
Signed-off-by: Mark Brown
---
arch/arm/plat-samsung/include/plat/dma.h |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-samsung/include/plat/dma.h
b/arch/arm/plat-samsung/include/plat/dma.h
index b906112..baa05ed 100644
--- a/arch/arm/plat-samsung/include/plat/dma.h
+++ b/arch/arm/plat-samsung/include/plat/dma.h
@@ -10,6 +10,9 @@
* published by the Free Software Foundation.
*/
+#ifndef __PLAT_DMA_H
+#define __PLAT_DMA_H
+
#include
enum s3c2410_dma_buffresult {
@@ -124,3 +127,5 @@ extern int s3c2410_dma_set_buffdone_fn(enum dma_ch,
s3c2410_dma_cbfn_t rtn);
#include
+
+#endif
--
1.7.7.3
--
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: DMA: PL330: Merge PL330 drivers
On Thu, 2011-12-08 at 10:10 +0900, Boojin Kim wrote: > In-Reply-To: > > PL330 driver is divided into 2 parts. > First is the PL330 API driver that located on driver/dma/. > Second is the low-level PL330 driver that is located on arch/arm/common/. > But, It's not needed anymore to divided PL330 driver into 2 parts > Low-level PL330 driver is only used for PL330 API driver on driver/dma > because samsung specific S3C-PL330 driver was gone. > So, This patch merges 'arch/arm/common/pl330' into 'driver/dma/pl330.c'. > > [PATCH 1/2] DMA: PL330: Merge PL330 drivers > [PATCH 2/2] DMA: PL330: Remove an unused function You should try git --cover-letter for this :) -- ~Vinod -- 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: [rtc-linux] Re: [PATCH v2 0/4] Implement RTC support for S3C2443/S3C2416/S3C2450
On Wed, Dec 21, 2011 at 09:22:11AM +0100, Heiko St?bner wrote: > Am Mittwoch, 21. Dezember 2011, 08:25:53 schrieb Kukjin Kim: > > There were small comments on 1st patch and others looks ok to me. > > If you're ok on my comments, please re-send it so that I can request to > > pull this series to Alessandro or Andrew with my ack. > Who is Andrew and should I include him in the recipients? I only found > Alessandro Zummo in the MAINTAINERS file for rtc stuff and am lacking any > comment from the rtc-side until now. Andrew Morton. Alessandro hasn't been terribly active for a while now. -- 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 V8 1/2] mmc: core: HS200 mode support for eMMC 4.5
Looks good to me.
Acked-by: Subhash Jadavani
Regards,
Subhash
On 12/23/2011 12:42 PM, Girish K S wrote:
This patch adds the support of the HS200 bus speed for eMMC 4.5 devices.
The eMMC 4.5 devices have support for 200MHz bus speed. The function
prototype of the tuning function is modified to handle the tuning command
number which is different in sd and mmc case.
cc: Chris Ball
Signed-off-by: Girish K S
Signed-off-by: Philip Rakity
---
drivers/mmc/core/bus.c |3 +-
drivers/mmc/core/debugfs.c |3 +
drivers/mmc/core/mmc.c | 163 +---
drivers/mmc/core/sd.c |3 +-
drivers/mmc/core/sdio.c|4 +-
include/linux/mmc/card.h |3 +
include/linux/mmc/host.h | 11 +++-
include/linux/mmc/mmc.h| 66 +-
8 files changed, 242 insertions(+), 14 deletions(-)
diff --git a/drivers/mmc/core/bus.c b/drivers/mmc/core/bus.c
index f8a228a..5d011a3 100644
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
@@ -303,10 +303,11 @@ int mmc_add_card(struct mmc_card *card)
mmc_card_ddr_mode(card) ? "DDR " : "",
type);
} else {
- printk(KERN_INFO "%s: new %s%s%s card at address %04x\n",
+ pr_info("%s: new %s%s%s%s card at address %04x\n",
mmc_hostname(card->host),
mmc_card_uhs(card) ? "ultra high speed " :
(mmc_card_highspeed(card) ? "high speed " : ""),
+ (mmc_card_hs200(card) ? "HS200 " : ""),
mmc_card_ddr_mode(card) ? "DDR " : "",
type, card->rca);
}
diff --git a/drivers/mmc/core/debugfs.c b/drivers/mmc/core/debugfs.c
index 027615d..9ab5b17 100644
--- a/drivers/mmc/core/debugfs.c
+++ b/drivers/mmc/core/debugfs.c
@@ -135,6 +135,9 @@ static int mmc_ios_show(struct seq_file *s, void *data)
case MMC_TIMING_UHS_DDR50:
str = "sd uhs DDR50";
break;
+ case MMC_TIMING_MMC_HS200:
+ str = "mmc high-speed SDR200";
+ break;
default:
str = "invalid";
break;
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index f0a9f1f..583cb42 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -286,6 +286,27 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8
*ext_csd)
}
card->ext_csd.raw_card_type = ext_csd[EXT_CSD_CARD_TYPE];
switch (ext_csd[EXT_CSD_CARD_TYPE]& EXT_CSD_CARD_TYPE_MASK) {
+ case EXT_CSD_CARD_TYPE_SDR_ALL:
+ case EXT_CSD_CARD_TYPE_SDR_ALL_DDR_1_8V:
+ case EXT_CSD_CARD_TYPE_SDR_ALL_DDR_1_2V:
+ case EXT_CSD_CARD_TYPE_SDR_ALL_DDR_52:
+ card->ext_csd.hs_max_dtr = 2;
+ card->ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_200;
+ break;
+ case EXT_CSD_CARD_TYPE_SDR_1_2V_ALL:
+ case EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_1_8V:
+ case EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_1_2V:
+ case EXT_CSD_CARD_TYPE_SDR_1_2V_DDR_52:
+ card->ext_csd.hs_max_dtr = 2;
+ card->ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_1_2V;
+ break;
+ case EXT_CSD_CARD_TYPE_SDR_1_8V_ALL:
+ case EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_1_8V:
+ case EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_1_2V:
+ case EXT_CSD_CARD_TYPE_SDR_1_8V_DDR_52:
+ card->ext_csd.hs_max_dtr = 2;
+ card->ext_csd.card_type = EXT_CSD_CARD_TYPE_SDR_1_8V;
+ break;
case EXT_CSD_CARD_TYPE_DDR_52 | EXT_CSD_CARD_TYPE_52 |
EXT_CSD_CARD_TYPE_26:
card->ext_csd.hs_max_dtr = 5200;
@@ -700,6 +721,79 @@ static int mmc_select_powerclass(struct mmc_card *card,
}
/*
+ * Selects the desired buswidth and switch to the HS200 mode
+ * if bus width set without error
+ */
+static int mmc_select_hs200(struct mmc_card *card)
+{
+ int idx, err = 0;
+ struct mmc_host *host;
+ static unsigned ext_csd_bits[] = {
+ EXT_CSD_BUS_WIDTH_4,
+ EXT_CSD_BUS_WIDTH_8,
+ };
+ static unsigned bus_widths[] = {
+ MMC_BUS_WIDTH_4,
+ MMC_BUS_WIDTH_8,
+ };
+
+ BUG_ON(!card);
+
+ host = card->host;
+
+ if ((card->ext_csd.card_type& EXT_CSD_CARD_TYPE_SDR_1_2V)
+ && (host->caps2& MMC_CAP2_HS200_1_2V_SDR))
+ if (mmc_set_signal_voltage(host, MMC_SIGNAL_VOLTAGE_120, 0))
+ err = mmc_set_signal_voltage(host,
+MMC_SIGNAL_VOLTAGE_180, 0);
+
+ /* If fails try again during next card power cycle */
+ if (err)
+ goto err;
+
+ idx = (host->caps& MMC_CAP_8_BIT_DATA) ? 1 : 0;
+
+ /*
+* Unlike SD, MMC cards dont have a configuration register to notify
+* supported bus width.
