* [GIT PULL] Samsung S5P for 2.6.40 merge window
@ 2011-05-25 18:11 Kukjin Kim
2011-05-25 20:50 ` Russell King - ARM Linux
0 siblings, 1 reply; 3+ messages in thread
From: Kukjin Kim @ 2011-05-25 18:11 UTC (permalink / raw)
To: linux-arm-kernel
Hi Russell,
Please pull Samsung S5P updates from:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
for-rmk
These things are for 2.6.40 and it includes removing ARCH_S5P6442.
Actually there is no user now and if required will merge it into other
ARCH like ARCH_S5P64X0 later.
As a note, I missed 'pull request' some fixes for s5p last -rc duration
and I don't have it in my laptop. I'm out of office now :( so will send
fixes after rc1.
If any problems, please let me know.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
The following changes since commit 693d92a1bbc9e42681c42ed190bd42b636ca876f
Linux 2.6.39-rc7
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
for-rmk
Jaecheol Lee (1):
ARM: EXYNOS4: CPUIDLE Support
Joonyoung Shim (2):
ARM: EXYNOS4: Add Atmel mXT touchscreen device to the NURI board
ARM: S3C64XX: Remove gpio-bank-X header files
Kukjin Kim (4):
ARM: exynos4_defconfig: Update for adding machines
ARM: S5P6442: Removing ARCH_S5P6442
ASoC: Remove to support sound for S5P6442
Merge branch 'dev/removing-s5p6442' into for-next
Documentation/arm/Samsung/Overview.txt | 2 -
arch/arm/Kconfig | 16 +-
arch/arm/Makefile | 1 -
arch/arm/common/Kconfig | 2 +-
arch/arm/configs/exynos4_defconfig | 2 +
arch/arm/configs/s5p6442_defconfig | 65 ----
arch/arm/mach-exynos4/Kconfig | 2 +
arch/arm/mach-exynos4/Makefile | 1 +
arch/arm/mach-exynos4/cpuidle.c | 86 +++++
arch/arm/mach-exynos4/mach-nuri.c | 89 +++++
arch/arm/mach-s3c64xx/dev-spi.c | 20 +-
arch/arm/mach-s3c64xx/include/mach/gpio-bank-a.h | 48 ---
arch/arm/mach-s3c64xx/include/mach/gpio-bank-b.h | 60 ---
arch/arm/mach-s3c64xx/include/mach/gpio-bank-c.h | 53 ---
arch/arm/mach-s3c64xx/include/mach/gpio-bank-d.h | 49 ---
arch/arm/mach-s3c64xx/include/mach/gpio-bank-e.h | 44 ---
arch/arm/mach-s3c64xx/include/mach/gpio-bank-f.h | 71 ----
arch/arm/mach-s3c64xx/include/mach/gpio-bank-g.h | 42 ---
arch/arm/mach-s3c64xx/include/mach/gpio-bank-h.h | 74 ----
arch/arm/mach-s3c64xx/include/mach/gpio-bank-i.h | 40 --
arch/arm/mach-s3c64xx/include/mach/gpio-bank-j.h | 36 --
arch/arm/mach-s3c64xx/include/mach/gpio-bank-n.h | 54 ---
arch/arm/mach-s3c64xx/include/mach/gpio-bank-o.h | 70 ----
arch/arm/mach-s3c64xx/include/mach/gpio-bank-p.h | 69 ----
arch/arm/mach-s3c64xx/include/mach/gpio-bank-q.h | 46 ---
arch/arm/mach-s3c64xx/mach-smdk6410.c | 1 -
arch/arm/mach-s3c64xx/pm.c | 34 +-
arch/arm/mach-s3c64xx/setup-i2c0.c | 7 +-
arch/arm/mach-s3c64xx/setup-i2c1.c | 7 +-
arch/arm/mach-s3c64xx/sleep.S | 8 +-
arch/arm/mach-s5p6442/Kconfig | 25 --
arch/arm/mach-s5p6442/Makefile | 24 --
arch/arm/mach-s5p6442/Makefile.boot | 2 -
arch/arm/mach-s5p6442/clock.c | 420
----------------------
arch/arm/mach-s5p6442/cpu.c | 143 --------
arch/arm/mach-s5p6442/dev-audio.c | 217 -----------
arch/arm/mach-s5p6442/dev-spi.c | 121 -------
arch/arm/mach-s5p6442/clock.c | 420
----------------------
arch/arm/mach-s5p6442/cpu.c | 143 --------
arch/arm/mach-s5p6442/dev-audio.c | 217 -----------
arch/arm/mach-s5p6442/dev-spi.c | 121 -------
arch/arm/mach-s5p6442/dma.c | 105 ------
arch/arm/mach-s5p6442/include/mach/debug-macro.S | 35 --
arch/arm/mach-s5p6442/include/mach/dma.h | 26 --
arch/arm/mach-s5p6442/include/mach/entry-macro.S | 48 ---
arch/arm/mach-s5p6442/include/mach/gpio.h | 123 -------
arch/arm/mach-s5p6442/include/mach/hardware.h | 18 -
arch/arm/mach-s5p6442/include/mach/io.h | 17 -
arch/arm/mach-s5p6442/include/mach/irqs.h | 87 -----
arch/arm/mach-s5p6442/include/mach/map.h | 76 ----
arch/arm/mach-s5p6442/include/mach/memory.h | 19 -
arch/arm/mach-s5p6442/include/mach/pwm-clock.h | 70 ----
arch/arm/mach-s5p6442/include/mach/regs-clock.h | 104 ------
arch/arm/mach-s5p6442/include/mach/regs-irq.h | 19 -
arch/arm/mach-s5p6442/include/mach/spi-clocks.h | 17 -
arch/arm/mach-s5p6442/include/mach/system.h | 23 --
arch/arm/mach-s5p6442/include/mach/tick.h | 26 --
arch/arm/mach-s5p6442/include/mach/timex.h | 24 --
arch/arm/mach-s5p6442/include/mach/uncompress.h | 24 --
arch/arm/mach-s5p6442/include/mach/vmalloc.h | 17 -
arch/arm/mach-s5p6442/init.c | 44 ---
arch/arm/mach-s5p6442/mach-smdk6442.c | 102 ------
arch/arm/mach-s5p6442/setup-i2c0.c | 28 --
arch/arm/plat-s5p/Kconfig | 2 +-
arch/arm/plat-s5p/cpu.c | 10 -
arch/arm/plat-s5p/include/plat/s5p6442.h | 33 --
arch/arm/plat-samsung/include/plat/cpu.h | 1 -
arch/arm/plat-samsung/include/plat/debug-macro.S | 2 +-
arch/arm/plat-samsung/include/plat/devs.h | 6 -
arch/arm/plat-samsung/include/plat/regs-serial.h | 2 +-
arch/arm/plat-samsung/include/plat/s3c64xx-spi.h | 1 -
sound/soc/samsung/Kconfig | 4 +-
sound/soc/samsung/smdk_wm8580.c | 2 +-
69 files changed, 226 insertions(+), 2940 deletions(-)
--
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL] Samsung S5P for 2.6.40 merge window
2011-05-25 18:11 [GIT PULL] Samsung S5P for 2.6.40 merge window Kukjin Kim
@ 2011-05-25 20:50 ` Russell King - ARM Linux
2011-05-25 21:22 ` Kukjin Kim
0 siblings, 1 reply; 3+ messages in thread
From: Russell King - ARM Linux @ 2011-05-25 20:50 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, May 25, 2011 at 11:11:37AM -0700, Kukjin Kim wrote:
> These things are for 2.6.40 and it includes removing ARCH_S5P6442.
> Actually there is no user now and if required will merge it into other
> ARCH like ARCH_S5P64X0 later.
I have a merge conflict with this, and resolved it as below. Please check
whether this is correct.
diff --cc arch/arm/Kconfig
index 3bc1a58,e81c72c..f7cce8b
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -2028,7 -1998,7 +2016,7 @@@ menu "Power management options
source "kernel/power/Kconfig"
config ARCH_SUSPEND_POSSIBLE
- depends on !ARCH_S5P64X0 && !ARCH_S5P6442 && !ARCH_S5PC100
- depends on !ARCH_S5P64X0
++ depends on !ARCH_S5P64X0 && !ARCH_S5PC100
depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
def_bool y
diff --cc arch/arm/mach-exynos4/Kconfig
index 8051962,11b57a4..b92c1e5
--- a/arch/arm/mach-exynos4/Kconfig
+++ b/arch/arm/mach-exynos4/Kconfig
@@@ -169,9 -169,10 +169,11 @@@ config MACH_NUR
select S3C_DEV_HSMMC2
select S3C_DEV_HSMMC3
select S3C_DEV_I2C1
+ select S3C_DEV_I2C3
select S3C_DEV_I2C5
+ select S5P_DEV_USB_EHCI
select EXYNOS4_SETUP_I2C1
+ select EXYNOS4_SETUP_I2C3
select EXYNOS4_SETUP_I2C5
select EXYNOS4_SETUP_SDHCI
select SAMSUNG_DEV_PWM
diff --cc arch/arm/mach-exynos4/mach-nuri.c
index bb5d12f,d13c5e8..642702b
--- a/arch/arm/mach-exynos4/mach-nuri.c
+++ b/arch/arm/mach-exynos4/mach-nuri.c
@@@ -30,8 -31,8 +31,10 @@@
#include <plat/cpu.h>
#include <plat/devs.h>
#include <plat/sdhci.h>
+#include <plat/ehci.h>
+#include <plat/clock.h>
+ #include <plat/gpio-cfg.h>
+ #include <plat/iic.h>
#include <mach/map.h>
@@@ -282,7 -355,7 +367,8 @@@ static struct platform_device *nuri_dev
&s3c_device_hsmmc3,
&s3c_device_wdt,
&s3c_device_timer[0],
+ &s5p_device_ehci,
+ &s3c_device_i2c3,
/* NURI Devices */
&nuri_gpio_keys,
@@@ -300,13 -373,13 +386,16 @@@ static void __init nuri_map_io(void
static void __init nuri_machine_init(void)
{
nuri_sdhci_init();
+ nuri_tsp_init();
i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
+ s3c_i2c3_set_platdata(&i2c3_data);
+ i2c_register_board_info(3, i2c3_devs, ARRAY_SIZE(i2c3_devs));
i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));
+ nuri_ehci_init();
+ clk_xusbxti.rate = 24000000;
+
/* Last */
platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [GIT PULL] Samsung S5P for 2.6.40 merge window
2011-05-25 20:50 ` Russell King - ARM Linux
@ 2011-05-25 21:22 ` Kukjin Kim
0 siblings, 0 replies; 3+ messages in thread
From: Kukjin Kim @ 2011-05-25 21:22 UTC (permalink / raw)
To: linux-arm-kernel
On 05/25/11 13:50, Russell King - ARM Linux wrote:
> On Wed, May 25, 2011 at 11:11:37AM -0700, Kukjin Kim wrote:
>> These things are for 2.6.40 and it includes removing ARCH_S5P6442.
>> Actually there is no user now and if required will merge it into other
>> ARCH like ARCH_S5P64X0 later.
>
> I have a merge conflict with this, and resolved it as below. Please check
> whether this is correct.
>
Hi Russell,
It's correct :)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> diff --cc arch/arm/Kconfig
> index 3bc1a58,e81c72c..f7cce8b
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@@ -2028,7 -1998,7 +2016,7 @@@ menu "Power management options
> source "kernel/power/Kconfig"
>
> config ARCH_SUSPEND_POSSIBLE
> - depends on !ARCH_S5P64X0&& !ARCH_S5P6442&& !ARCH_S5PC100
> - depends on !ARCH_S5P64X0
> ++ depends on !ARCH_S5P64X0&& !ARCH_S5PC100
> depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
> CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE
> def_bool y
> diff --cc arch/arm/mach-exynos4/Kconfig
> index 8051962,11b57a4..b92c1e5
> --- a/arch/arm/mach-exynos4/Kconfig
> +++ b/arch/arm/mach-exynos4/Kconfig
> @@@ -169,9 -169,10 +169,11 @@@ config MACH_NUR
> select S3C_DEV_HSMMC2
> select S3C_DEV_HSMMC3
> select S3C_DEV_I2C1
> + select S3C_DEV_I2C3
> select S3C_DEV_I2C5
> + select S5P_DEV_USB_EHCI
> select EXYNOS4_SETUP_I2C1
> + select EXYNOS4_SETUP_I2C3
> select EXYNOS4_SETUP_I2C5
> select EXYNOS4_SETUP_SDHCI
> select SAMSUNG_DEV_PWM
> diff --cc arch/arm/mach-exynos4/mach-nuri.c
> index bb5d12f,d13c5e8..642702b
> --- a/arch/arm/mach-exynos4/mach-nuri.c
> +++ b/arch/arm/mach-exynos4/mach-nuri.c
> @@@ -30,8 -31,8 +31,10 @@@
> #include<plat/cpu.h>
> #include<plat/devs.h>
> #include<plat/sdhci.h>
> +#include<plat/ehci.h>
> +#include<plat/clock.h>
> + #include<plat/gpio-cfg.h>
> + #include<plat/iic.h>
>
> #include<mach/map.h>
>
> @@@ -282,7 -355,7 +367,8 @@@ static struct platform_device *nuri_dev
> &s3c_device_hsmmc3,
> &s3c_device_wdt,
> &s3c_device_timer[0],
> + &s5p_device_ehci,
> + &s3c_device_i2c3,
>
> /* NURI Devices */
> &nuri_gpio_keys,
> @@@ -300,13 -373,13 +386,16 @@@ static void __init nuri_map_io(void
> static void __init nuri_machine_init(void)
> {
> nuri_sdhci_init();
> + nuri_tsp_init();
>
> i2c_register_board_info(1, i2c1_devs, ARRAY_SIZE(i2c1_devs));
> + s3c_i2c3_set_platdata(&i2c3_data);
> + i2c_register_board_info(3, i2c3_devs, ARRAY_SIZE(i2c3_devs));
> i2c_register_board_info(5, i2c5_devs, ARRAY_SIZE(i2c5_devs));
>
> + nuri_ehci_init();
> + clk_xusbxti.rate = 24000000;
> +
> /* Last */
> platform_add_devices(nuri_devices, ARRAY_SIZE(nuri_devices));
> }
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-25 21:22 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-25 18:11 [GIT PULL] Samsung S5P for 2.6.40 merge window Kukjin Kim
2011-05-25 20:50 ` Russell King - ARM Linux
2011-05-25 21:22 ` Kukjin Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).