linux-next: manual merge of the samsung tree with the tree

linux-next: manual merge of the samsung tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 545 bytes --]

Hi Ben,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-s5pv210/gpiolib.c between commit
ea5f50706385b61c1c0d24271bbe7c6e93129fbc ("ARM: S5PV210: Add GPIOlib
support") from Linus' tree and commit
026fcae436e846b0cc1db8d4af11890dfdde3689 ("ARM: S5PV210: Add S5PV210 GPIO
support") from the samsung tree.

Two versions of the same commit.  I used the version in Linus' tree as
that was dated later.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: manual merge of the samsung tree with the tree

[Ben Dooks]

On Thu, May 20, 2010 at 11:04:11AM +1000, Stephen Rothwell wrote:
> Hi Ben,
> 
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/mach-s5pv210/gpiolib.c between commit
> ea5f50706385b61c1c0d24271bbe7c6e93129fbc ("ARM: S5PV210: Add GPIOlib
> support") from Linus' tree and commit
> 026fcae436e846b0cc1db8d4af11890dfdde3689 ("ARM: S5PV210: Add S5PV210 GPIO
> support") from the samsung tree.
> 
> Two versions of the same commit.  I used the version in Linus' tree as
> that was dated later.

sorry, the tree that went to linus had that one replaced due to a minor
bug in the GPH banks that got fixed. Decided to replace the patch than
put a patch ontop.

-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.

linux-next: manual merge of the samsung tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1480 bytes --]

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/exynos.c between commit 46bfc99c9225 ("ARM: l2c:
exynos: convert to generic l2c OF initialisation (and thereby fix it)")
from the arm tree and commit 3919fb954b3a ("ARM: EXYNOS: Remove
exynos_subsys registration") from the samsung tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm/mach-exynos/exynos.c
index afce154f83f9,93507ee98c86..000000000000
--- a/arch/arm/mach-exynos/exynos.c
+++ b/arch/arm/mach-exynos/exynos.c
@@@ -241,17 -246,22 +243,6 @@@ void __init exynos_init_io(void
  	exynos_map_io();
  }
  
- struct bus_type exynos_subsys = {
- 	.name		= "exynos-core",
- 	.dev_name	= "exynos-core",
- };
- 
- static int __init exynos_core_init(void)
 -static int __init exynos4_l2x0_cache_init(void)
--{
- 	return subsys_system_register(&exynos_subsys, NULL);
 -	int ret;
 -
 -	ret = l2x0_of_init(L2_AUX_VAL, L2_AUX_MASK);
 -	if (ret)
 -		return ret;
 -
 -	if (IS_ENABLED(CONFIG_S5P_SLEEP)) {
 -		l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
 -		clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
 -	}
 -	return 0;
--}
- core_initcall(exynos_core_init);
 -early_initcall(exynos4_l2x0_cache_init);
--
  static void __init exynos_dt_machine_init(void)
  {
  	struct device_node *i2c_np;

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

RE: linux-next: manual merge of the samsung tree with the tree

[Kukjin Kim]

Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi Stephen,

> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/mach-exynos/exynos.c between commit 46bfc99c9225 ("ARM: l2c:
> exynos: convert to generic l2c OF initialisation (and thereby fix it)")
> from the arm tree and commit 3919fb954b3a ("ARM: EXYNOS: Remove
> exynos_subsys registration") from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
Looks good to me, thanks.

- Kukjin

> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc arch/arm/mach-exynos/exynos.c
> index afce154f83f9,93507ee98c86..000000000000
> --- a/arch/arm/mach-exynos/exynos.c
> +++ b/arch/arm/mach-exynos/exynos.c
> @@@ -241,17 -246,22 +243,6 @@@ void __init exynos_init_io(void
>   	exynos_map_io();
>   }
> 
> - struct bus_type exynos_subsys = {
> - 	.name		= "exynos-core",
> - 	.dev_name	= "exynos-core",
> - };
> -
> - static int __init exynos_core_init(void)
>  -static int __init exynos4_l2x0_cache_init(void)
> --{
> - 	return subsys_system_register(&exynos_subsys, NULL);
>  -	int ret;
>  -
>  -	ret = l2x0_of_init(L2_AUX_VAL, L2_AUX_MASK);
>  -	if (ret)
>  -		return ret;
>  -
>  -	if (IS_ENABLED(CONFIG_S5P_SLEEP)) {
>  -		l2x0_regs_phys = virt_to_phys(&l2x0_saved_regs);
>  -		clean_dcache_area(&l2x0_regs_phys, sizeof(unsigned long));
>  -	}
>  -	return 0;
> --}
> - core_initcall(exynos_core_init);
>  -early_initcall(exynos4_l2x0_cache_init);
> --
>   static void __init exynos_dt_machine_init(void)
>   {
>   	struct device_node *i2c_np;

linux-next: manual merge of the samsung tree with the tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1328 bytes --]

Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm64/Kconfig between commit 419043609689 ("arm64: amd-seattle:
Adding device tree for AMD Seattle platform") from the arm-soc tree and
commit ab93f6ca6394 ("arm64: Enable ARMv8 based exynos7 SoC support")
from the samsung tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/arm64/Kconfig
index 44cb996e3cd7,7351199f0a42..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -142,11 -142,23 +142,28 @@@ source "kernel/Kconfig.freezer
  
  menu "Platform selection"
  
 +config ARCH_SEATTLE
 +	bool "AMD Seattle SoC Family"
 +	help
 +	  This enables support for AMD Seattle SOC Family
 +
+ config ARCH_EXYNOS
+ 	bool
+ 	help
+ 	  This enables support for Samsung Exynos SoC family
+ 
+ config ARCH_EXYNOS7
+ 	bool "ARMv8 based Samsung Exynos7"
+ 	select ARCH_EXYNOS
+ 	select COMMON_CLK_SAMSUNG
+ 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
+ 	select HAVE_S3C_RTC if RTC_CLASS
+ 	select PINCTRL
+ 	select PINCTRL_EXYNOS
+ 
+ 	help
+ 	  This enables support for Samsung Exynos7 SoC family
+ 
  config ARCH_THUNDER
  	bool "Cavium Inc. Thunder SoC Family"
  	help

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]