[PATCH] ARM: S3C2440: Fixed build error for s3c244x
Fixed following: arch/arm/mach-s3c2440/s3c244x.c: In function 's3c244x_restart': arch/arm/mach-s3c2440/s3c244x.c:209: error: expected declaration or statement at end of input make[1]: *** [arch/arm/mach-s3c24xx/s3c244x.o] Error 1 make: *** [arch/arm/mach-s3c24xx] Error 2 Signed-off-by: Kukjin Kim kgene@samsung.com --- Hi Arnd, Olof, This happened when I applied Heiko's 'Fix restart on S3C2442'. It was my fault :( and this should be sent before release v3.3. Please pick this up. Thanks. Kgene. arch/arm/mach-s3c2440/s3c244x.c |1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-s3c2440/s3c244x.c b/arch/arm/mach-s3c2440/s3c244x.c index 744930a..d15852f 100644 --- a/arch/arm/mach-s3c2440/s3c244x.c +++ b/arch/arm/mach-s3c2440/s3c244x.c @@ -207,3 +207,4 @@ void s3c244x_restart(char mode, const char *cmd) /* we'll take a jump through zero as a poor second */ soft_restart(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
Re: [PATCH 1/6] ARM: S3C64XX: Add usb otg phy control
On 03/07/12 04:28, Kukjin Kim wrote: On 02/10/12 10:26, Mark Brown wrote: On Fri, Feb 10, 2012 at 11:35:41AM +0100, Lukasz Majewski wrote: From: Joonyoung Shimjy0922.s...@samsung.com This patch supports to control usb otg phy of S3C64XX. Currently, the driver for usb otg controls usb otg phy but it can be removed by this patch. Acked-by: Mark Brownbroo...@opensource.wolfsonmicro.com Applied, thanks. Oops, following error happened with s5pv210_defconfig after applying this. arch/arm/plat-samsung/built-in.o: In function `s3c_hsotg_set_platdata': arch/arm/plat-samsung/devs.c:1449: undefined reference to `s5p_usb_phy_init' arch/arm/plat-samsung/devs.c:1449: undefined reference to `s5p_usb_phy_init' arch/arm/plat-samsung/devs.c:1451: undefined reference to `s5p_usb_phy_exit' arch/arm/plat-samsung/devs.c:1451: undefined reference to `s5p_usb_phy_exit' make: *** [.tmp_vmlinux1] Error 1 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 V6 1/5] ARM: exynos: Add support AFTR mode on EXYNOS4210
On 03/07/12 15:12, Rob Lee wrote: Hello Kukjim and Amit, Can you tell me the status of this patch? I based my core cpuidle consolidation patchset on these changes. My patchset seems to be acceptable now and I would like to do a git pull-request for linux-next, but I see these Exynos cpuidle changes have not yet made it to linux-next. Hi Rob, Probably, I missed merging its topic branch and I will do right now. I think you can see it in a couple of hours. Then, if any problems, please let me know. Thanks for your reminder. 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 v3 0/4] mmc: sdhci-s3c: use the sdhci-pltfm.c and move the header file
On Thu, Mar 08, 2012 at 02:35:53PM +0900, Jaehoon Chung wrote: So i think no problem that removed #include plat/regs-sdhci.h. is it wrong? Just touching the setup-gpio- files is problem? It should be fine, like I say I didn't really read the patches in enough detail as the diffstat set off alarm bells. signature.asc Description: Digital signature
[GIT PULL] Samsung Cleanup S3C24XX for v3.4
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.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
The following changes since commit a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13:
Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc (2012-02-07 15:05:20
-0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-s3c24xx
Heiko Stuebner (17):
ARM: S3C24XX: remove unused spi gpio setup functions
ARM: S3C24XX: move spi-s3c24xx platdata out of mach
ARM: S3C24XX: Remove extern declaration of clk_msysclk
ARM: S3C24XX: move common S3C2443 clock definitions to clock.h
ARM: S3C2410: move s3c2410_baseclk_add to clock.h
ARM: S3C24XX: Move s3c2443-clock.c to mach-s3c24xx
ARM: S3C24XX: Move common-smdk code to mach directory
ARM: S3C24XX: move simtec-specific code to mach directory
ARM: S3C24XX: Consolidate Simtec extensions
ARM: S3C24XX: Move device setup files to mach directory
ARM: S3C24XX: Fix indentation of dma-s3c2443
ARM: S3C24XX: Reuse S3C2443 dma for S3C2416
ARM: S3C24XX: remove obsolete S3C2416_DMA option
ARM: S3C24XX: remove XXX_setup_clocks method from S3C2443
ARM: S3C24XX: add get_rate for clk_h on S3C2416/2443
ARM: S3C24XX: add get_rate for clk_p on S3C2416/2443
ARM: S3C24XX: remove call to s3c24xx_setup_clocks
Kukjin Kim (8):
ARM: S3C24XX: change the ARCH_S3C2410 to ARCH_S3C24XX
ARM: S3C2410: move mach-s3c2410/* into mach-s3c24xx/
ARM: S3C2412: move mach-s3c2412/* into mach-s3c24xx/
ARM: S3C2416: move mach-s3c2416/* into mach-s3c24xx/
ARM: S3C2440: move mach-s3c2440/* into mach-s3c24xx/
ARM: S3C2443: move mach-s3c2443/* into mach-s3c24xx/
ARM: s3c2410_defconfig: update s3c2410_defconfig
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
arch/arm/Kconfig | 27 +-
arch/arm/Makefile |2 +-
arch/arm/boot/compressed/head.S|2 +-
arch/arm/configs/mini2440_defconfig|2 +-
arch/arm/configs/s3c2410_defconfig | 57 +--
arch/arm/configs/tct_hammer_defconfig |2 +-
arch/arm/mach-s3c2410/Kconfig | 154 --
arch/arm/mach-s3c2410/Makefile | 26 -
arch/arm/mach-s3c2410/usb-simtec.h | 16 -
arch/arm/mach-s3c2412/Kconfig | 85 ---
arch/arm/mach-s3c2412/Makefile | 12 -
arch/arm/mach-s3c2416/Kconfig | 60 ---
arch/arm/mach-s3c2416/Makefile | 22 -
arch/arm/mach-s3c2440/Kconfig | 165 --
arch/arm/mach-s3c2440/Makefile | 26 +-
arch/arm/mach-s3c2440/common.h | 17 -
arch/arm/mach-s3c2443/Kconfig | 32 --
arch/arm/mach-s3c2443/Makefile | 20 -
arch/arm/mach-s3c24xx/Kconfig | 538
arch/arm/mach-s3c24xx/Makefile | 95
.../{mach-s3c2410 = mach-s3c24xx}/Makefile.boot |0
arch/arm/{mach-s3c2410 = mach-s3c24xx}/bast-ide.c |0
arch/arm/{mach-s3c2410 = mach-s3c24xx}/bast-irq.c |0
.../clock.c = mach-s3c24xx/clock-s3c2412.c} |0
.../clock.c = mach-s3c24xx/clock-s3c2416.c} |1 -
.../clock.c = mach-s3c24xx/clock-s3c2440.c} |0
.../clock.c = mach-s3c24xx/clock-s3c2443.c} |7 -
.../clock-s3c244x.c} |0
.../common-s3c2443.c} | 88 +++-
.../{plat-s3c24xx = mach-s3c24xx}/common-smdk.c |0
arch/arm/{mach-s3c2410 = mach-s3c24xx}/common.h |6 +
.../dma.c = mach-s3c24xx/dma-s3c2410.c} |0
.../dma.c = mach-s3c24xx/dma-s3c2412.c} |0
.../dma.c = mach-s3c24xx/dma-s3c2440.c} |0
.../dma.c = mach-s3c24xx/dma-s3c2443.c} | 30 +-
.../h1940-bluetooth.c |0
.../include/mach/anubis-cpld.h |0
.../include/mach/anubis-irq.h |0
.../include/mach/anubis-map.h |0
.../include/mach/bast-cpld.h |0
.../include/mach/bast-irq.h|0
.../include/mach/bast-map.h|0
.../include/mach/bast-pmu.h|0
.../include/mach/debug-macro.S |0
.../include/mach/dma.h |
[GIT PULL] Samsung Cleanup EXYNOS clock for v3.4
Hi Arnd, Olof, Here is cleanup clock part for EXYNOS SoCs from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-exynos-clock 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 b01543dfe67bb1d191998e90d20534dc354de059: Linux 3.3-rc4 (2012-02-18 15:53:33 -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 Kukjin Kim (2): ARM: EXYNOS: cleanup clock part for new EXYNOS SoCs PM / devfreq: update the name of EXYNOS clock register arch/arm/mach-exynos/Makefile |3 +- arch/arm/mach-exynos/clock-exynos4.c | 1564 + arch/arm/mach-exynos/clock-exynos4.h | 32 + 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| 364 +++--- arch/arm/mach-exynos/pm.c | 40 +- drivers/devfreq/exynos4_bus.c | 224 ++-- 11 files changed, 1959 insertions(+), 1960 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
Re: [PATCH 1/6] ARM: S3C64XX: Add usb otg phy control
On 03/08/2012 06:52 PM, Kukjin Kim wrote:
On 03/07/12 04:28, Kukjin Kim wrote:
On 02/10/12 10:26, Mark Brown wrote:
On Fri, Feb 10, 2012 at 11:35:41AM +0100, Lukasz Majewski wrote:
From: Joonyoung Shimjy0922.s...@samsung.com
This patch supports to control usb otg phy of S3C64XX. Currently, the
driver for usb otg controls usb otg phy but it can be removed by this
patch.
Acked-by: Mark Brownbroo...@opensource.wolfsonmicro.com
Applied, thanks.
Oops, following error happened with s5pv210_defconfig after applying
this.
arch/arm/plat-samsung/built-in.o: In function `s3c_hsotg_set_platdata':
arch/arm/plat-samsung/devs.c:1449: undefined reference to
`s5p_usb_phy_init'
arch/arm/plat-samsung/devs.c:1449: undefined reference to
`s5p_usb_phy_init'
arch/arm/plat-samsung/devs.c:1451: undefined reference to
`s5p_usb_phy_exit'
arch/arm/plat-samsung/devs.c:1451: undefined reference to
`s5p_usb_phy_exit'
make: *** [.tmp_vmlinux1] Error 1
Also the s5pv210 needs setup-usb-phy.c file. I think the attached patch
will solve this errors. This patch was tested only compile.
Thanks.
From 9ae6ac166743391a6037d7e7a4d178f68a96f047 Mon Sep 17 00:00:00 2001
From: Joonyoung Shim jy0922.s...@samsung.com
Date: Thu, 8 Mar 2012 19:52:25 +0900
Subject: [PATCH] ARM: S5PV210: Add usb otg phy control
This patch supports to control usb otg phy of S5PV210. Based on
setup-usb-phy.c of S3C64XX.
Signed-off-by: Joonyoung Shim jy0922.s...@samsung.com
Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com
---
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 +
4 files changed, 97 insertions(+), 4 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 2cdc42e..82525e3 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -65,6 +65,11 @@ config S5PV210_SETUP_SPI
help
Common setup code for SPI GPIO configurations.
+config S5PV210_SETUP_USB_PHY
+ bool
+ help
+ Common setup code for USB PHY controller
+
menu S5PC110 Machines
config MACH_AQUILA
@@ -107,6 +112,7 @@ config MACH_GONI
select S5PV210_SETUP_KEYPAD
select S5PV210_SETUP_SDHCI
select S5PV210_SETUP_FIMC
+ select S5PV210_SETUP_USB_PHY
help
Machine support for Samsung GONI board
S5PC110(MCP) is one of package option of S5PV210
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 76a121d..1c4e419 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -39,3 +39,4 @@ obj-$(CONFIG_S5PV210_SETUP_IDE) += setup-ide.o
obj-$(CONFIG_S5PV210_SETUP_KEYPAD) += setup-keypad.o
obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
obj-$(CONFIG_S5PV210_SETUP_SPI) += setup-spi.o
+obj-$(CONFIG_S5PV210_SETUP_USB_PHY) += setup-usb-phy.o
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-sys.h b/arch/arm/mach-s5pv210/include/mach/regs-sys.h
index 26691d3..cccb1ed 100644
--- a/arch/arm/mach-s5pv210/include/mach/regs-sys.h
+++ b/arch/arm/mach-s5pv210/include/mach/regs-sys.h
@@ -13,7 +13,3 @@
#define S5PV210_USB_PHY_CON (S3C_VA_SYS + 0xE80C)
#define S5PV210_USB_PHY0_EN (1 0)
#define S5PV210_USB_PHY1_EN (1 1)
-
-/* compatibility defines for s3c-hsotg driver */
-#define S3C64XX_OTHERS S5PV210_USB_PHY_CON
-#define S3C64XX_OTHERS_USBMASK S5PV210_USB_PHY0_EN
diff --git a/arch/arm/mach-s5pv210/setup-usb-phy.c b/arch/arm/mach-s5pv210/setup-usb-phy.c
new file mode 100644
index 000..be39cf4
--- /dev/null
+++ b/arch/arm/mach-s5pv210/setup-usb-phy.c
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2012 Samsung Electronics Co.Ltd
+ * Author: Joonyoung Shim jy0922.s...@samsung.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundationr
+ */
+
+#include linux/clk.h
+#include linux/delay.h
+#include linux/err.h
+#include linux/io.h
+#include linux/platform_device.h
+#include mach/map.h
+#include mach/regs-sys.h
+#include plat/cpu.h
+#include plat/regs-usb-hsotg-phy.h
+#include plat/usb-phy.h
+
+static int s5pv210_usb_otgphy_init(struct platform_device *pdev)
+{
+ struct clk *xusbxti;
+ u32 phyclk;
+
+ writel(readl(S5PV210_USB_PHY_CON) | S5PV210_USB_PHY0_EN,
+ S5PV210_USB_PHY_CON);
+
+ /* set clock frequency for PLL */
+ phyclk = readl(S3C_PHYCLK) ~S3C_PHYCLK_CLKSEL_MASK;
+
+ xusbxti = clk_get(pdev-dev, xusbxti);
+ if (xusbxti !IS_ERR(xusbxti)) {
+ switch (clk_get_rate(xusbxti)) {
+ case 12 * MHZ:
+ phyclk |= S3C_PHYCLK_CLKSEL_12M;
+ break;
+ case 24 * MHZ:
+ phyclk |= S3C_PHYCLK_CLKSEL_24M;
+ break;
+ default:
+ case 48 * MHZ:
+ /* default reference clock */
+ break;
+ }
+ clk_put(xusbxti);
+ }
+
+ /* TODO: select external clock/oscillator
Re: [PATCH-RESEND 0/4] ARM: S5PV210: Enable FIMC MFC on SMDKC110 V210 boards
Hi Kukjin, Could not find this series applied on any of your branches. Please check the same. Regards Sachin On 16/02/2012, Kukjin Kim kgene@samsung.com wrote: On 02/13/12 14:18, Sachin Kamat wrote: Re-sending the patch series rebased onto next/board-samsung branch of Kukjin Kim's tree: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git Sachin Kamat (4): ARM: S5PV210: Enable MFC on SMDKV210 ARM: S5PV210: Enable MFC on SMDKC110 ARM: S5PV210: Enable FIMC on SMDKV210 ARM: S5PV210: Enable FIMC on SMDKC110 arch/arm/mach-s5pv210/Kconfig |8 arch/arm/mach-s5pv210/mach-smdkc110.c | 14 ++ arch/arm/mach-s5pv210/mach-smdkv210.c | 14 ++ 3 files changed, 36 insertions(+), 0 deletions(-) Hi Sachin, Looks good to me, will apply this whole series. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- With warm regards, Sachin -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: EXYNOS: Hook up G2D PD to generic PD infrastructure
Hi Kukjin, This patch is also missed in your tree. Other G2D patches in arch/arm are already there. Please check. Regards Sachin On 16/02/2012, Kukjin Kim kgene@samsung.com wrote: On 02/15/12 13:01, Sachin Kamat wrote: Add G2D power domain (PD) to generic power domain infrastructure. Signed-off-by: Sachin Kamatsachin.ka...@linaro.org --- arch/arm/mach-exynos/pm_domains.c |3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-exynos/pm_domains.c b/arch/arm/mach-exynos/pm_domains.c index 0b04af2..a84df72 100644 --- a/arch/arm/mach-exynos/pm_domains.c +++ b/arch/arm/mach-exynos/pm_domains.c @@ -183,6 +183,9 @@ static __init int exynos4_pm_init_power_domain(void) #ifdef CONFIG_S5P_DEV_CSIS1 exynos_pm_add_dev_to_genpd(s5p_device_mipi_csis1,exynos4_pd_cam); #endif +#ifdef CONFIG_S5P_DEV_G2D +exynos_pm_add_dev_to_genpd(s5p_device_g2d,exynos4_pd_lcd0); +#endif return 0; } arch_initcall(exynos4_pm_init_power_domain); Hi Sachin, OK, will apply after pick up other regarding G2D patches for arch/arm/ Samsung stuff. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- With warm regards, Sachin -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] ARM: EXYNOS: Enable G2D on SMDKV310
Hi Kukjin,
This patch is missing in your tree.
Please check.
Regards
Sachin
On 16/02/2012, Kukjin Kim kgene@samsung.com wrote:
On 01/02/12 17:25, Sachin Kamat wrote:
This patch enables G2D support on SMDKV310 board.
Signed-off-by: Sachin Kamatsachin.ka...@linaro.org
---
arch/arm/mach-exynos/Kconfig |1 +
arch/arm/mach-exynos/mach-smdkv310.c |1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index bd4600e..a673d0d 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -183,6 +183,7 @@ config MACH_SMDKV310
select S5P_DEV_FIMC1
select S5P_DEV_FIMC2
select S5P_DEV_FIMC3
+select S5P_DEV_G2D
select S5P_DEV_I2C_HDMIPHY
select S5P_DEV_MFC
select S5P_DEV_TV
diff --git a/arch/arm/mach-exynos/mach-smdkv310.c
b/arch/arm/mach-exynos/mach-smdkv310.c
index b2c5557..8a5c23b 100644
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@ -270,6 +270,7 @@ static struct platform_device *smdkv310_devices[]
__initdata = {
s5p_device_fimc1,
s5p_device_fimc2,
s5p_device_fimc3,
+s5p_device_g2d,
exynos4_device_ac97,
exynos4_device_i2s0,
exynos4_device_ohci,
Looks ok, will apply.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
With warm regards,
Sachin
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH 1/6] ARM: S3C64XX: Add usb otg phy control
Hi Joonyoung,
On Thu, 8 Mar 2012 12:27:30 +0100
Joonyoung Shim jy0922.s...@samsung.com wrote:
On 03/08/2012 06:52 PM, Kukjin Kim wrote:
On 03/07/12 04:28, Kukjin Kim wrote:
On 02/10/12 10:26, Mark Brown wrote:
On Fri, Feb 10, 2012 at 11:35:41AM +0100, Lukasz Majewski wrote:
From: Joonyoung Shimjy0922.s...@samsung.com
This patch supports to control usb otg phy of S3C64XX.
Currently, the driver for usb otg controls usb otg phy but it
can be removed by this patch.
Acked-by: Mark Brownbroo...@opensource.wolfsonmicro.com
Applied, thanks.
Oops, following error happened with s5pv210_defconfig after
applying this.
arch/arm/plat-samsung/built-in.o: In function
`s3c_hsotg_set_platdata': arch/arm/plat-samsung/devs.c:1449:
undefined reference to `s5p_usb_phy_init'
arch/arm/plat-samsung/devs.c:1449: undefined reference to
`s5p_usb_phy_init'
arch/arm/plat-samsung/devs.c:1451: undefined reference to
`s5p_usb_phy_exit'
arch/arm/plat-samsung/devs.c:1451: undefined reference to
`s5p_usb_phy_exit'
make: *** [.tmp_vmlinux1] Error 1
Also the s5pv210 needs setup-usb-phy.c file. I think the attached
patch will solve this errors. This patch was tested only compile.
Thanks.
Thank you for the patch.
I've extended your's patch by adding GONI dependent platform code.
It has been tested and works with s3c-hsotg driver.
Test HW:
GONI S5PC110
Tested-by: Lukasz Majewski l.majew...@samsung.com
--
Best regards,
Lukasz Majewski
Samsung Poland RD Center
Platform Group
From a18166a6e87df8ade29f1d4e37b96f932d2a8909 Mon Sep 17 00:00:00 2001
From: Joonyoung Shim jy0922.s...@samsung.com
Date: Thu, 8 Mar 2012 19:52:25 +0900
Subject: [PATCH] ARM: S5PV210: Add usb otg phy control
This patch supports to control usb otg phy of S5PV210. Based on
setup-usb-phy.c of S3C64XX.
Signed-off-by: Joonyoung Shim jy0922.s...@samsung.com
Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com
---
arch/arm/mach-s5pv210/Kconfig |7 ++
arch/arm/mach-s5pv210/Makefile|1 +
arch/arm/mach-s5pv210/include/mach/regs-sys.h |4 -
arch/arm/mach-s5pv210/mach-goni.c |6 ++
arch/arm/mach-s5pv210/setup-usb-phy.c | 90 +
5 files changed, 104 insertions(+), 4 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 2ae6a5f..b51210c 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -65,6 +65,11 @@ config S5PV210_SETUP_SPI
help
Common setup code for SPI GPIO configurations.
+config S5PV210_SETUP_USB_PHY
+ bool
+ help
+ Common setup code for USB PHY controller
+
menu S5PC110 Machines
config MACH_AQUILA
@@ -81,6 +86,7 @@ config MACH_AQUILA
select S3C_DEV_USB_HSOTG
select S5PV210_SETUP_FB_24BPP
select S5PV210_SETUP_SDHCI
+ select S5PV210_SETUP_USB_PHY
help
Machine support for the Samsung Aquila target based on S5PC110 SoC
@@ -108,6 +114,7 @@ config MACH_GONI
select S5PV210_SETUP_KEYPAD
select S5PV210_SETUP_SDHCI
select S5PV210_SETUP_FIMC
+ select S5PV210_SETUP_USB_PHY
help
Machine support for Samsung GONI board
S5PC110(MCP) is one of package option of S5PV210
diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile
index 76a121d..1c4e419 100644
--- a/arch/arm/mach-s5pv210/Makefile
+++ b/arch/arm/mach-s5pv210/Makefile
@@ -39,3 +39,4 @@ obj-$(CONFIG_S5PV210_SETUP_IDE) += setup-ide.o
obj-$(CONFIG_S5PV210_SETUP_KEYPAD) += setup-keypad.o
obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
obj-$(CONFIG_S5PV210_SETUP_SPI) += setup-spi.o
+obj-$(CONFIG_S5PV210_SETUP_USB_PHY) += setup-usb-phy.o
diff --git a/arch/arm/mach-s5pv210/include/mach/regs-sys.h b/arch/arm/mach-s5pv210/include/mach/regs-sys.h
index 26691d3..cccb1ed 100644
--- a/arch/arm/mach-s5pv210/include/mach/regs-sys.h
+++ b/arch/arm/mach-s5pv210/include/mach/regs-sys.h
@@ -13,7 +13,3 @@
#define S5PV210_USB_PHY_CON (S3C_VA_SYS + 0xE80C)
#define S5PV210_USB_PHY0_EN (1 0)
#define S5PV210_USB_PHY1_EN (1 1)
-
-/* compatibility defines for s3c-hsotg driver */
-#define S3C64XX_OTHERS S5PV210_USB_PHY_CON
-#define S3C64XX_OTHERS_USBMASK S5PV210_USB_PHY0_EN
diff --git a/arch/arm/mach-s5pv210/mach-goni.c b/arch/arm/mach-s5pv210/mach-goni.c
index 2cf5ed7..f5f4926 100644
--- a/arch/arm/mach-s5pv210/mach-goni.c
+++ b/arch/arm/mach-s5pv210/mach-goni.c
@@ -49,6 +49,7 @@
#include plat/mfc.h
#include plat/regs-fb-v4.h
#include plat/camport.h
+#include plat/udc-hs.h
#include media/v4l2-mediabus.h
#include media/s5p_fimc.h
@@ -277,6 +278,9 @@ static void __init goni_tsp_init(void)
i2c2_devs[0].irq = gpio_to_irq(gpio);
}
+/* USB OTG */
+static struct s3c_hsotg_plat goni_hsotg_pdata;
+
static void goni_camera_init(void)
{
s5pv210_fimc_setup_gpio(S5P_CAMPORT_A);
@@ -939,6 +943,8 @@ static void __init goni_machine_init(void)
Re: [GIT PULL] Samsung Cleanup EXYNOS clock for v3.4
Hi, On Thu, Mar 8, 2012 at 3:13 AM, Kukjin Kim kgene@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, move mach/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. -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 S3C24XX for v3.4
On Thu, Mar 8, 2012 at 3:08 AM, Kukjin Kim kgene@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! -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: [PATCH] ARM: S3C2440: Fixed build error for s3c244x
On Thu, Mar 8, 2012 at 1:48 AM, Kukjin Kim kgene@samsung.com wrote: Fixed following: arch/arm/mach-s3c2440/s3c244x.c: In function 's3c244x_restart': arch/arm/mach-s3c2440/s3c244x.c:209: error: expected declaration or statement at end of input make[1]: *** [arch/arm/mach-s3c24xx/s3c244x.o] Error 1 make: *** [arch/arm/mach-s3c24xx] Error 2 Signed-off-by: Kukjin Kim kgene@samsung.com Thanks, applied to fixes and I'll send out a pull request for the branch today. -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: [PATCH v3 0/4] mmc: sdhci-s3c: use the sdhci-pltfm.c and move the header file
On 03/08/2012 08:01 PM, Mark Brown wrote: On Thu, Mar 08, 2012 at 02:35:53PM +0900, Jaehoon Chung wrote: So i think no problem that removed #include plat/regs-sdhci.h. is it wrong? Just touching the setup-gpio- files is problem? It should be fine, like I say I didn't really read the patches in enough detail as the diffstat set off alarm bells. If you have any opinions, let me know. I believe that these patches can be maintain more efficiently for eMMC Best Regards, Jaehoon Chung -- 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
Hi Arnd, Olof, Here is cleanup clock part for EXYNOS SoCs from: git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/cleanup-exynos-clock Please pull and if any problems, please kindly let me know. Hello, It appears that some patches are missing in this branch; i.e., you seemed not to have pulled one required by this patchset: http://permalink.gmane.org/gmane.linux.kernel.samsung-soc/8474 If the missing patches are included in another branch of yours and being pulled at somewhere else, please never mind. However, it doesn't appear so. Anyway, I'm rebasing the pull-requested branch upon most recent RC, so it'll be available soon (in an hour?) at http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/devfreq-for-samsung Cheers! MyungJoo. The following changes since commit b01543dfe67bb1d191998e90d20534dc354de059: Linux 3.3-rc4 (2012-02-18 15:53:33 -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 Kukjin Kim (2): ARM: EXYNOS: cleanup clock part for new EXYNOS SoCs PM / devfreq: update the name of EXYNOS clock register arch/arm/mach-exynos/Makefile |3 +- arch/arm/mach-exynos/clock-exynos4.c | 1564 + arch/arm/mach-exynos/clock-exynos4.h | 32 + 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| 364 +++--- arch/arm/mach-exynos/pm.c | 40 +- drivers/devfreq/exynos4_bus.c | 224 ++-- 11 files changed, 1959 insertions(+), 1960 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
Re: [PATCH 1/2] mmc: sdhci-s3c: Use CONFIG_PM_SLEEP to ifdef system suspend
Hi Mark,
On Fri, Mar 02 2012, Mark Brown wrote:
This matches current best practice as one can have runtime PM enabled
without system sleep and CONFIG_PM is defined for both.
Signed-off-by: Mark Brown broo...@opensource.wolfsonmicro.com
---
drivers/mmc/host/sdhci-s3c.c |9 +
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index ea0767e..46152d6 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -22,6 +22,7 @@
#include linux/module.h
#include linux/of.h
#include linux/of_gpio.h
+#include linux/pm.h
#include linux/mmc/host.h
@@ -807,8 +808,7 @@ static int __devexit sdhci_s3c_remove(struct
platform_device *pdev)
return 0;
}
-#ifdef CONFIG_PM
-
+#ifdef CONFIG_PM_SLEEP
static int sdhci_s3c_suspend(struct device *dev)
{
struct sdhci_host *host = dev_get_drvdata(dev);
@@ -822,10 +822,11 @@ static int sdhci_s3c_resume(struct device *dev)
return sdhci_resume_host(host);
}
+#endif
+#ifdef CONFIG_PM
static const struct dev_pm_ops sdhci_s3c_pmops = {
- .suspend= sdhci_s3c_suspend,
- .resume = sdhci_s3c_resume,
+ SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume)
};
#define SDHCI_S3C_PMOPS (sdhci_s3c_pmops)
Thanks, pushed to mmc-next for 3.4 with Jaehoon's ACK.
- Chris.
--
Chris Ball c...@laptop.org http://printf.net/
One Laptop Per Child
--
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/2] mmc: sdhci-s3c: Enable runtime power management
Hi,
On Fri, Mar 02 2012, Mark Brown wrote:
Since most of the work is already done by the core we just need to add
runtime suspend methods and tell the PM core that runtime PM is enabled
for this device.
Signed-off-by: Mark Brown broo...@opensource.wolfsonmicro.com
---
drivers/mmc/host/sdhci-s3c.c | 28
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 46152d6..6926ac9 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -23,6 +23,7 @@
#include linux/of.h
#include linux/of_gpio.h
#include linux/pm.h
+#include linux/pm_runtime.h
#include linux/mmc/host.h
@@ -721,6 +722,11 @@ static int __devinit sdhci_s3c_probe(struct
platform_device *pdev)
if (pdata-host_caps2)
host-mmc-caps2 |= pdata-host_caps2;
+ pm_runtime_enable(pdev-dev);
+ pm_runtime_set_autosuspend_delay(pdev-dev, 50);
+ pm_runtime_use_autosuspend(pdev-dev);
+ pm_suspend_ignore_children(pdev-dev, 1);
+
ret = sdhci_add_host(host);
if (ret) {
dev_err(dev, sdhci_add_host() failed\n);
@@ -740,6 +746,8 @@ static int __devinit sdhci_s3c_probe(struct
platform_device *pdev)
err_add_host:
release_resource(sc-ioarea);
+ pm_runtime_forbid(pdev-dev);
+ pm_runtime_get_noresume(pdev-dev);
kfree(sc-ioarea);
err_req_regs:
@@ -784,6 +792,8 @@ static int __devexit sdhci_s3c_remove(struct
platform_device *pdev)
sdhci_remove_host(host, 1);
+ pm_runtime_disable(pdev-dev);
+
for (ptr = 0; ptr 3; ptr++) {
if (sc-clk_bus[ptr]) {
clk_disable(sc-clk_bus[ptr]);
@@ -824,9 +834,27 @@ static int sdhci_s3c_resume(struct device *dev)
}
#endif
+#ifdef CONFIG_PM_RUNTIME
+static int sdhci_s3c_runtime_suspend(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+
+ return sdhci_runtime_suspend_host(host);
+}
+
+static int sdhci_s3c_runtime_resume(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+
+ return sdhci_runtime_resume_host(host);
+}
+#endif
+
#ifdef CONFIG_PM
static const struct dev_pm_ops sdhci_s3c_pmops = {
SET_SYSTEM_SLEEP_PM_OPS(sdhci_s3c_suspend, sdhci_s3c_resume)
+ SET_RUNTIME_PM_OPS(sdhci_s3c_runtime_suspend, sdhci_s3c_runtime_resume,
+NULL)
};
#define SDHCI_S3C_PMOPS (sdhci_s3c_pmops)
I had to rework this patch to avoid a conflict with Julia Lawall's patch
mmc: sdhci-s3c: use devm_ functions: https://lkml.org/lkml/2012/2/18/76
The reworked patch is below, please let me know if it looks incorrect:
From: Mark Brown broo...@opensource.wolfsonmicro.com
Subject: [PATCH] mmc: sdhci-s3c: Enable runtime power management
Since most of the work is already done by the core we just need to add
runtime suspend methods and tell the PM core that runtime PM is enabled
for this device.
Signed-off-by: Mark Brown broo...@opensource.wolfsonmicro.com
Acked-by: Jaehoon Chung jh80.ch...@samsung.com
Signed-off-by: Chris Ball c...@laptop.org
---
drivers/mmc/host/sdhci-s3c.c | 28
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/drivers/mmc/host/sdhci-s3c.c b/drivers/mmc/host/sdhci-s3c.c
index 9683322..312aaf4 100644
--- a/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@ -23,6 +23,7 @@
#include linux/of.h
#include linux/of_gpio.h
#include linux/pm.h
+#include linux/pm_runtime.h
#include linux/mmc/host.h
@@ -705,9 +706,16 @@ static int __devinit sdhci_s3c_probe(struct
platform_device *pdev)
if (pdata-host_caps)
host-mmc-caps |= pdata-host_caps;
+ pm_runtime_enable(pdev-dev);
+ pm_runtime_set_autosuspend_delay(pdev-dev, 50);
+ pm_runtime_use_autosuspend(pdev-dev);
+ pm_suspend_ignore_children(pdev-dev, 1);
+
ret = sdhci_add_host(host);
if (ret) {
dev_err(dev, sdhci_add_host() failed\n);
+ pm_runtime_forbid(pdev-dev);
+ pm_runtime_get_noresume(pdev-dev);
goto err_req_regs;
}
@@ -764,6 +772,8 @@ static int __devexit sdhci_s3c_remove(struct
platform_device *pdev)
sdhci_remove_host(host, 1);
+ pm_runtime_disable(pdev-dev);
+
for (ptr = 0; ptr 3; ptr++) {
if (sc-clk_bus[ptr]) {
clk_disable(sc-clk_bus[ptr]);
@@ -800,9 +810,27 @@ static int sdhci_s3c_resume(struct device *dev)
}
#endif
+#ifdef CONFIG_PM_RUNTIME
+static int sdhci_s3c_runtime_suspend(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+
+ return sdhci_runtime_suspend_host(host);
+}
+
+static int sdhci_s3c_runtime_resume(struct device *dev)
+{
+ struct sdhci_host *host = dev_get_drvdata(dev);
+
+ return sdhci_runtime_resume_host(host);
+}
