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

2014-07-20 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/pm.c between commit 7310d99ffcd1 ("ARM: EXYNOS:
Fix build breakge with PM_SLEEP=n") from the arm-soc tree and commit
66df3ce29804 ("ARM: EXYNOS: Refactored code for using PMU address via
DT") from the samsung tree.

I fixed it up (the code modified by the latter was moved by the former,
so I applied the following patch to the new file) and can carry the fix
as necessary (no action is required).

From: Stephen Rothwell 
Date: Mon, 21 Jul 2014 11:11:17 +1000
Subject: [PATCH] ARM: EXYNOS: fixup for code movement

Signed-off-by: Stephen Rothwell 
---
 arch/arm/mach-exynos/platsmp.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 8b66a9e02b87..1e43b53d23b7 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -43,7 +43,7 @@ extern void exynos4_secondary_startup(void);
  */
 void exynos_cpu_power_down(int cpu)
 {
-   __raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
+   pmu_raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
 }
 
 /**
@@ -54,8 +54,8 @@ void exynos_cpu_power_down(int cpu)
  */
 void exynos_cpu_power_up(int cpu)
 {
-   __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-EXYNOS_ARM_CORE_CONFIGURATION(cpu));
+   pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,
+  EXYNOS_ARM_CORE_CONFIGURATION(cpu));
 }
 
 /**
@@ -65,7 +65,7 @@ void exynos_cpu_power_up(int cpu)
  */
 int exynos_cpu_power_state(int cpu)
 {
-   return (__raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) &
+   return (pmu_raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) &
S5P_CORE_LOCAL_PWR_EN);
 }
 
@@ -75,7 +75,7 @@ int exynos_cpu_power_state(int cpu)
  */
 void exynos_cluster_power_down(int cluster)
 {
-   __raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
+   pmu_raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
 }
 
 /**
@@ -84,8 +84,8 @@ void exynos_cluster_power_down(int cluster)
  */
 void exynos_cluster_power_up(int cluster)
 {
-   __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-EXYNOS_COMMON_CONFIGURATION(cluster));
+   pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,
+  EXYNOS_COMMON_CONFIGURATION(cluster));
 }
 
 /**
@@ -95,7 +95,7 @@ void exynos_cluster_power_up(int cluster)
  */
 int exynos_cluster_power_state(int cluster)
 {
-   return (__raw_readl(EXYNOS_COMMON_STATUS(cluster)) &
+   return (pmu_raw_readl(EXYNOS_COMMON_STATUS(cluster)) &
S5P_CORE_LOCAL_PWR_EN);
 }
 
-- 
2.0.1


-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-07-20 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/pm.c between commit 7310d99ffcd1 (ARM: EXYNOS:
Fix build breakge with PM_SLEEP=n) from the arm-soc tree and commit
66df3ce29804 (ARM: EXYNOS: Refactored code for using PMU address via
DT) from the samsung tree.

I fixed it up (the code modified by the latter was moved by the former,
so I applied the following patch to the new file) and can carry the fix
as necessary (no action is required).

From: Stephen Rothwell s...@canb.auug.org.au
Date: Mon, 21 Jul 2014 11:11:17 +1000
Subject: [PATCH] ARM: EXYNOS: fixup for code movement

Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
---
 arch/arm/mach-exynos/platsmp.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 8b66a9e02b87..1e43b53d23b7 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -43,7 +43,7 @@ extern void exynos4_secondary_startup(void);
  */
 void exynos_cpu_power_down(int cpu)
 {
-   __raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
+   pmu_raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
 }
 
 /**
@@ -54,8 +54,8 @@ void exynos_cpu_power_down(int cpu)
  */
 void exynos_cpu_power_up(int cpu)
 {
-   __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-EXYNOS_ARM_CORE_CONFIGURATION(cpu));
+   pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,
+  EXYNOS_ARM_CORE_CONFIGURATION(cpu));
 }
 
 /**
@@ -65,7 +65,7 @@ void exynos_cpu_power_up(int cpu)
  */
 int exynos_cpu_power_state(int cpu)
 {
-   return (__raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) 
+   return (pmu_raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) 
S5P_CORE_LOCAL_PWR_EN);
 }
 
@@ -75,7 +75,7 @@ int exynos_cpu_power_state(int cpu)
  */
 void exynos_cluster_power_down(int cluster)
 {
-   __raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
+   pmu_raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
 }
 
 /**
@@ -84,8 +84,8 @@ void exynos_cluster_power_down(int cluster)
  */
 void exynos_cluster_power_up(int cluster)
 {
-   __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-EXYNOS_COMMON_CONFIGURATION(cluster));
+   pmu_raw_writel(S5P_CORE_LOCAL_PWR_EN,
+  EXYNOS_COMMON_CONFIGURATION(cluster));
 }
 
 /**
@@ -95,7 +95,7 @@ void exynos_cluster_power_up(int cluster)
  */
 int exynos_cluster_power_state(int cluster)
 {
-   return (__raw_readl(EXYNOS_COMMON_STATUS(cluster)) 
+   return (pmu_raw_readl(EXYNOS_COMMON_STATUS(cluster)) 
S5P_CORE_LOCAL_PWR_EN);
 }
 
-- 
2.0.1


-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-07-16 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got conflicts in
arch/arm/mach-s5pv210/dev-audio.c,
arch/arm/mach-s5pv210/include/mach/gpio-samsung.h,
arch/arm/mach-s5pv210/mach-aquila.c, arch/arm/mach-s5pv210/mach-goni.c,
arch/arm/mach-s5pv210/mach-smdkv210.c,
arch/arm/mach-s5pv210/setup-fb-24bpp.c,
arch/arm/mach-s5pv210/setup-fimc.c, arch/arm/mach-s5pv210/setup-i2c0.c,
arch/arm/mach-s5pv210/setup-i2c1.c, arch/arm/mach-s5pv210/setup-i2c2.c,
arch/arm/mach-s5pv210/setup-ide.c,
arch/arm/mach-s5pv210/setup-keypad.c,
arch/arm/mach-s5pv210/setup-sdhci-gpio.c,
arch/arm/mach-s5pv210/setup-spi.c and
arch/arm/plat-samsung/s5p-irq-eint.c between commit 2fd48f94426d ("ARM:
mach-s5p: get rid of all  headers") from the arm-soc tree
and commits 36278bb98dc7 ("ARM: S5PV210: Remove support for board
files") and 2722091e711f ("ARM: SAMSUNG: Remove remaining legacy code")
from the samsung tree.

I fixed it up (I just removed the files removed by the latter commits)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-07-16 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/Kconfig between commit ab275b132a79 ("ARM: s5p:
cut the custom ARCH_NR_GPIOS definition") from the arm-soc tree and
commit 2722091e711f ("ARM: SAMSUNG: Remove remaining legacy code") from
the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/plat-samsung/Kconfig
index 6910c8669742,1091b0a3729a..
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -65,48 -51,22 +51,6 @@@ config SAMSUNG_ATAG
  
  if SAMSUNG_ATAGS
  
- # clock options
- 
- config SAMSUNG_CLOCK
-   bool
-   default y if !COMMON_CLK
- 
- config SAMSUNG_CLKSRC
-   bool
-   help
- Select the clock code for the clksrc implementation
- used by newer systems such as the S3C64XX.
- 
- config S5P_CLOCK
-   def_bool ARCH_S5PV210
-   help
- Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
- 
- # options for IRQ support
- 
- config S5P_IRQ
-   def_bool ARCH_S5PV210
-   help
- Support common interrupt part for ARCH_S5P SoCs
- 
- config S5P_EXT_INT
-   bool
 -config SAMSUNG_GPIO_EXTRA
 -  int "Number of additional GPIO pins"
 -  default 128 if SAMSUNG_GPIO_EXTRA128
 -  default 64 if SAMSUNG_GPIO_EXTRA64
 -  default 0
--  help
- Use the external interrupts (other than GPIO interrupts.)
 -Use additional GPIO space in addition to the GPIO's the SOC
 -provides. This allows expanding the GPIO space for use with
 -GPIO expanders.
--
- config S5P_GPIO_INT
 -config SAMSUNG_GPIO_EXTRA64
--  bool
-   help
- Common code for the GPIO interrupts (other than external interrupts.)
- 
- # options for gpio configuration support
--
- config S5P_GPIO_DRVSTR
 -config SAMSUNG_GPIO_EXTRA128
--  bool
-   help
- Internal configuration to get and set correct GPIO driver strength
- helper
--
  config S3C_GPIO_SPACE
int "Space between gpio banks"
default 0


signature.asc
Description: PGP signature

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

2014-07-16 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig between commit 2fd48f94426d ("ARM: mach-s5p: get rid
of all  headers") from the arm-soc tree and commit
72dc5e8f84b0 ("ARM: S5PV210: Enable multi-platform build support") from
the samsung tree.

I fixed it up (the latter is a superset of the former) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-07-16 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig between commit 2fd48f94426d (ARM: mach-s5p: get rid
of all mach/gpio.h headers) from the arm-soc tree and commit
72dc5e8f84b0 (ARM: S5PV210: Enable multi-platform build support) from
the samsung tree.

I fixed it up (the latter is a superset of the former) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-07-16 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/Kconfig between commit ab275b132a79 (ARM: s5p:
cut the custom ARCH_NR_GPIOS definition) from the arm-soc tree and
commit 2722091e711f (ARM: SAMSUNG: Remove remaining legacy code) from
the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/plat-samsung/Kconfig
index 6910c8669742,1091b0a3729a..
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@@ -65,48 -51,22 +51,6 @@@ config SAMSUNG_ATAG
  
  if SAMSUNG_ATAGS
  
- # clock options
- 
- config SAMSUNG_CLOCK
-   bool
-   default y if !COMMON_CLK
- 
- config SAMSUNG_CLKSRC
-   bool
-   help
- Select the clock code for the clksrc implementation
- used by newer systems such as the S3C64XX.
- 
- config S5P_CLOCK
-   def_bool ARCH_S5PV210
-   help
- Support common clock part for ARCH_S5P and ARCH_EXYNOS SoCs
- 
- # options for IRQ support
- 
- config S5P_IRQ
-   def_bool ARCH_S5PV210
-   help
- Support common interrupt part for ARCH_S5P SoCs
- 
- config S5P_EXT_INT
-   bool
 -config SAMSUNG_GPIO_EXTRA
 -  int Number of additional GPIO pins
 -  default 128 if SAMSUNG_GPIO_EXTRA128
 -  default 64 if SAMSUNG_GPIO_EXTRA64
 -  default 0
--  help
- Use the external interrupts (other than GPIO interrupts.)
 -Use additional GPIO space in addition to the GPIO's the SOC
 -provides. This allows expanding the GPIO space for use with
 -GPIO expanders.
--
- config S5P_GPIO_INT
 -config SAMSUNG_GPIO_EXTRA64
--  bool
-   help
- Common code for the GPIO interrupts (other than external interrupts.)
- 
- # options for gpio configuration support
--
- config S5P_GPIO_DRVSTR
 -config SAMSUNG_GPIO_EXTRA128
--  bool
-   help
- Internal configuration to get and set correct GPIO driver strength
- helper
--
  config S3C_GPIO_SPACE
int Space between gpio banks
default 0


signature.asc
Description: PGP signature

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

2014-07-16 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got conflicts in
arch/arm/mach-s5pv210/dev-audio.c,
arch/arm/mach-s5pv210/include/mach/gpio-samsung.h,
arch/arm/mach-s5pv210/mach-aquila.c, arch/arm/mach-s5pv210/mach-goni.c,
arch/arm/mach-s5pv210/mach-smdkv210.c,
arch/arm/mach-s5pv210/setup-fb-24bpp.c,
arch/arm/mach-s5pv210/setup-fimc.c, arch/arm/mach-s5pv210/setup-i2c0.c,
arch/arm/mach-s5pv210/setup-i2c1.c, arch/arm/mach-s5pv210/setup-i2c2.c,
arch/arm/mach-s5pv210/setup-ide.c,
arch/arm/mach-s5pv210/setup-keypad.c,
arch/arm/mach-s5pv210/setup-sdhci-gpio.c,
arch/arm/mach-s5pv210/setup-spi.c and
arch/arm/plat-samsung/s5p-irq-eint.c between commit 2fd48f94426d (ARM:
mach-s5p: get rid of all mach/gpio.h headers) from the arm-soc tree
and commits 36278bb98dc7 (ARM: S5PV210: Remove support for board
files) and 2722091e711f (ARM: SAMSUNG: Remove remaining legacy code)
from the samsung tree.

I fixed it up (I just removed the files removed by the latter commits)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-05-25 Thread Stephen Rothwell 
Hi all,

On Mon, 26 May 2014 10:17:41 +1000 Stephen Rothwell  
wrote:
>
> Today's linux-next merge of the samsung tree got a conflict in
> arch/arm/Kconfig.debug between commit 7098cff2a3f4 ("ARM: debug: qcom:
> make UART address selection configuration option") from the arm-soc
> tree and commit 1899de289497 ("ARM: S3C24XX: use generic
> DEBUG_UART_PHY/_VIRT in debug macro") from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
> 
> -- 
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
> 
> diff --cc arch/arm/Kconfig.debug
> index 6ff3dc661fdd,4678870f8ee8..
> --- a/arch/arm/Kconfig.debug
> +++ b/arch/arm/Kconfig.debug
> @@@ -966,10 -1007,10 +1003,11 @@@ config DEBUG_LL_INCLUD
>DEBUG_IMX51_UART || \
>DEBUG_IMX53_UART ||\
>DEBUG_IMX6Q_UART || \
>  - DEBUG_IMX6SL_UART
>  -default "debug/msm.S" if DEBUG_MSM_UART
>  + DEBUG_IMX6SL_UART || \
>  + DEBUG_IMX6SX_UART
>  +default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
>   default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
> + default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
>   default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || 
> DEBUG_SIRFMARCO_UART1
>   default "debug/sti.S" if DEBUG_STI_UART
>   default "debug/tegra.S" if DEBUG_TEGRA_UART
> @@@ -1057,8 -1102,7 +1101,8 @@@ config DEBUG_UART_PHY
>   default 0xf700 if ARCH_IOP33X
>   depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
>   DEBUG_LL_UART_EFM32 || \
> - DEBUG_UART_8250 || DEBUG_UART_PL01X || \
>  -DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
> ++DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \

I forgot the || at the end, sorry.  I fixed this up.

>  +DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
>   
>   config DEBUG_UART_VIRT
>   hex "Virtual base address of debug UART"
> @@@ -1118,8 -1166,7 +1168,8 @@@
>   default 0xff003000 if DEBUG_U300_UART
>   default DEBUG_UART_PHYS if !MMU
>   depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
> - DEBUG_UART_8250 || DEBUG_UART_PL01X || \
>  -DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
> ++DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \

Same here.

>  +DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
>   
>   config DEBUG_UART_8250_SHIFT
>   int "Register offset shift for the 8250 debug UART"

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-05-25 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig.debug between commit 7098cff2a3f4 ("ARM: debug: qcom:
make UART address selection configuration option") from the arm-soc
tree and commit 1899de289497 ("ARM: S3C24XX: use generic
DEBUG_UART_PHY/_VIRT in debug macro") from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index 6ff3dc661fdd,4678870f8ee8..
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -966,10 -1007,10 +1003,11 @@@ config DEBUG_LL_INCLUD
 DEBUG_IMX51_UART || \
 DEBUG_IMX53_UART ||\
 DEBUG_IMX6Q_UART || \
 -   DEBUG_IMX6SL_UART
 -  default "debug/msm.S" if DEBUG_MSM_UART
 +   DEBUG_IMX6SL_UART || \
 +   DEBUG_IMX6SX_UART
 +  default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
+   default "debug/s3c24xx.S" if DEBUG_S3C24XX_UART
default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || 
DEBUG_SIRFMARCO_UART1
default "debug/sti.S" if DEBUG_STI_UART
default "debug/tegra.S" if DEBUG_TEGRA_UART
@@@ -1057,8 -1102,7 +1101,8 @@@ config DEBUG_UART_PHY
default 0xf700 if ARCH_IOP33X
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
DEBUG_LL_UART_EFM32 || \
-   DEBUG_UART_8250 || DEBUG_UART_PL01X || \
 -  DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
++  DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \
 +  DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
  
  config DEBUG_UART_VIRT
hex "Virtual base address of debug UART"
@@@ -1118,8 -1166,7 +1168,8 @@@
default 0xff003000 if DEBUG_U300_UART
default DEBUG_UART_PHYS if !MMU
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
-   DEBUG_UART_8250 || DEBUG_UART_PL01X || \
 -  DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
++  DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \
 +  DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
  
  config DEBUG_UART_8250_SHIFT
int "Register offset shift for the 8250 debug UART"


signature.asc
Description: PGP signature

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

2014-05-25 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig.debug between commit 7098cff2a3f4 (ARM: debug: qcom:
make UART address selection configuration option) from the arm-soc
tree and commit 1899de289497 (ARM: S3C24XX: use generic
DEBUG_UART_PHY/_VIRT in debug macro) from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index 6ff3dc661fdd,4678870f8ee8..
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -966,10 -1007,10 +1003,11 @@@ config DEBUG_LL_INCLUD
 DEBUG_IMX51_UART || \
 DEBUG_IMX53_UART ||\
 DEBUG_IMX6Q_UART || \
 -   DEBUG_IMX6SL_UART
 -  default debug/msm.S if DEBUG_MSM_UART
 +   DEBUG_IMX6SL_UART || \
 +   DEBUG_IMX6SX_UART
 +  default debug/msm.S if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
default debug/omap2plus.S if DEBUG_OMAP2PLUS_UART
+   default debug/s3c24xx.S if DEBUG_S3C24XX_UART
default debug/sirf.S if DEBUG_SIRFPRIMA2_UART1 || 
DEBUG_SIRFMARCO_UART1
default debug/sti.S if DEBUG_STI_UART
default debug/tegra.S if DEBUG_TEGRA_UART
@@@ -1057,8 -1102,7 +1101,8 @@@ config DEBUG_UART_PHY
default 0xf700 if ARCH_IOP33X
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
DEBUG_LL_UART_EFM32 || \
-   DEBUG_UART_8250 || DEBUG_UART_PL01X || \
 -  DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
++  DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \
 +  DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
  
  config DEBUG_UART_VIRT
hex Virtual base address of debug UART
@@@ -1118,8 -1166,7 +1168,8 @@@
default 0xff003000 if DEBUG_U300_UART
default DEBUG_UART_PHYS if !MMU
depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
-   DEBUG_UART_8250 || DEBUG_UART_PL01X || \
 -  DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
++  DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \
 +  DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
  
  config DEBUG_UART_8250_SHIFT
int Register offset shift for the 8250 debug UART


signature.asc
Description: PGP signature

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

2014-05-25 Thread Stephen Rothwell 
Hi all,

On Mon, 26 May 2014 10:17:41 +1000 Stephen Rothwell s...@canb.auug.org.au 
wrote:

 Today's linux-next merge of the samsung tree got a conflict in
 arch/arm/Kconfig.debug between commit 7098cff2a3f4 (ARM: debug: qcom:
 make UART address selection configuration option) from the arm-soc
 tree and commit 1899de289497 (ARM: S3C24XX: use generic
 DEBUG_UART_PHY/_VIRT in debug macro) from the samsung tree.
 
 I fixed it up (see below) and can carry the fix as necessary (no action
 is required).
 
 -- 
 Cheers,
 Stephen Rothwells...@canb.auug.org.au
 
 diff --cc arch/arm/Kconfig.debug
 index 6ff3dc661fdd,4678870f8ee8..
 --- a/arch/arm/Kconfig.debug
 +++ b/arch/arm/Kconfig.debug
 @@@ -966,10 -1007,10 +1003,11 @@@ config DEBUG_LL_INCLUD
DEBUG_IMX51_UART || \
DEBUG_IMX53_UART ||\
DEBUG_IMX6Q_UART || \
  - DEBUG_IMX6SL_UART
  -default debug/msm.S if DEBUG_MSM_UART
  + DEBUG_IMX6SL_UART || \
  + DEBUG_IMX6SX_UART
  +default debug/msm.S if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
   default debug/omap2plus.S if DEBUG_OMAP2PLUS_UART
 + default debug/s3c24xx.S if DEBUG_S3C24XX_UART
   default debug/sirf.S if DEBUG_SIRFPRIMA2_UART1 || 
 DEBUG_SIRFMARCO_UART1
   default debug/sti.S if DEBUG_STI_UART
   default debug/tegra.S if DEBUG_TEGRA_UART
 @@@ -1057,8 -1102,7 +1101,8 @@@ config DEBUG_UART_PHY
   default 0xf700 if ARCH_IOP33X
   depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
   DEBUG_LL_UART_EFM32 || \
 - DEBUG_UART_8250 || DEBUG_UART_PL01X || \
  -DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
 ++DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \

I forgot the || at the end, sorry.  I fixed this up.

  +DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
   
   config DEBUG_UART_VIRT
   hex Virtual base address of debug UART
 @@@ -1118,8 -1166,7 +1168,8 @@@
   default 0xff003000 if DEBUG_U300_UART
   default DEBUG_UART_PHYS if !MMU
   depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
 - DEBUG_UART_8250 || DEBUG_UART_PL01X || \
  -DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART
 ++DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_S3C24XX_UART \

Same here.

  +DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
   
   config DEBUG_UART_8250_SHIFT
   int Register offset shift for the 8250 debug UART

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


signature.asc
Description: PGP signature

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

2014-03-23 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig.debug between commit 886545ea7d0b ("ARM: efm32: allow
uncompress debug output") from the arm-soc tree and commit 90266754801c
("ARM: SAMSUNG: use generic uncompress.h") from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index e5a00d421cc4,a160744312ab..
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1167,7 -1162,7 +1167,7 @@@ config DEBUG_UNCOMPRES
  config UNCOMPRESS_INCLUDE
string
default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM || \
-   ARCH_EXYNOS || ARCH_EFM32
 -  PLAT_SAMSUNG
++  PLAT_SAMSUNG || ARCH_EFM32
default "mach/uncompress.h"
  
  config EARLY_PRINTK


pgphXOH7mMPkC.pgp
Description: PGP signature

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

2014-03-23 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/Kconfig.debug between commit 886545ea7d0b (ARM: efm32: allow
uncompress debug output) from the arm-soc tree and commit 90266754801c
(ARM: SAMSUNG: use generic uncompress.h) from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/Kconfig.debug
index e5a00d421cc4,a160744312ab..
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1167,7 -1162,7 +1167,7 @@@ config DEBUG_UNCOMPRES
  config UNCOMPRESS_INCLUDE
string
default debug/uncompress.h if ARCH_MULTIPLATFORM || ARCH_MSM || \
-   ARCH_EXYNOS || ARCH_EFM32
 -  PLAT_SAMSUNG
++  PLAT_SAMSUNG || ARCH_EFM32
default mach/uncompress.h
  
  config EARLY_PRINTK


pgphXOH7mMPkC.pgp
Description: PGP signature

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

2013-04-05 Thread Kukjin Kim 
Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi,

> Today's linux-next merge of the samsung tree got a conflict in
> drivers/irqchip/irq-s3c24xx.c between commit de88cbb7b244 ("arm: Move
> chained_irq_(enter|exit) to a generic file") from the arm-soc tree (where
> it is called arch/arm/mach-s3c24xx/irq.c) and commit f0774d41da0e
> ("irqchip: s3c24xx: add devicetree support") 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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-04-05 Thread Kukjin Kim 
Stephen Rothwell wrote:
 
 Hi Kukjin,
 
Hi,

 Today's linux-next merge of the samsung tree got a conflict in
 drivers/irqchip/irq-s3c24xx.c between commit de88cbb7b244 (arm: Move
 chained_irq_(enter|exit) to a generic file) from the arm-soc tree (where
 it is called arch/arm/mach-s3c24xx/irq.c) and commit f0774d41da0e
 (irqchip: s3c24xx: add devicetree support) 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

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-04-04 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
drivers/irqchip/irq-s3c24xx.c between commit de88cbb7b244 ("arm: Move
chained_irq_(enter|exit) to a generic file") from the arm-soc tree (where
it is called arch/arm/mach-s3c24xx/irq.c) and commit f0774d41da0e
("irqchip: s3c24xx: add devicetree support") from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/irqchip/irq-s3c24xx.c
index 8296d94,5e40b34..000
--- a/drivers/irqchip/irq-s3c24xx.c
+++ b/drivers/irqchip/irq-s3c24xx.c
@@@ -25,8 -25,11 +25,12 @@@
  #include 
  #include 
  #include 
 +#include 
+ #include 
+ #include 
+ #include 
  
+ #include 
  #include 
  
  #include 


pgp5ZaRPVbbZr.pgp
Description: PGP signature

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

2013-04-04 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
drivers/irqchip/irq-s3c24xx.c between commit de88cbb7b244 (arm: Move
chained_irq_(enter|exit) to a generic file) from the arm-soc tree (where
it is called arch/arm/mach-s3c24xx/irq.c) and commit f0774d41da0e
(irqchip: s3c24xx: add devicetree support) from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/irqchip/irq-s3c24xx.c
index 8296d94,5e40b34..000
--- a/drivers/irqchip/irq-s3c24xx.c
+++ b/drivers/irqchip/irq-s3c24xx.c
@@@ -25,8 -25,11 +25,12 @@@
  #include linux/ioport.h
  #include linux/device.h
  #include linux/irqdomain.h
 +#include linux/irqchip/chained_irq.h
+ #include linux/of.h
+ #include linux/of_irq.h
+ #include linux/of_address.h
  
+ #include asm/exception.h
  #include asm/mach/irq.h
  
  #include mach/regs-irq.h


pgp5ZaRPVbbZr.pgp
Description: PGP signature

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

2013-02-12 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got conflicts in quite a few
files between commits from the arm-soc tree and commits from the samsung
tree.

I took Olof's advice and just dropped the samsung tree for today.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpKPnNii2EUK.pgp
Description: PGP signature

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

2013-02-12 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got conflicts in quite a few
files between commits from the arm-soc tree and commits from the samsung
tree.

I took Olof's advice and just dropped the samsung tree for today.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpKPnNii2EUK.pgp
Description: PGP signature

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

2013-02-09 Thread Grant Likely 
On Thu, 31 Jan 2013 01:48:01 +1100, Stephen Rothwell  
wrote:
> Hi Kukjin,
> 
> Today's linux-next merge of the samsung tree got a conflict in
> drivers/gpio/gpio-samsung.c between commits f69254328793 ("ARM: dts: Fix
> compatible value of pinctrl module on EXYNOS5440") and b533c8685b16
> ("ARM: dts: fix compatible value for exynos pinctrl") from the arm-soc
> tree and commit bda7f6d4e198 ("gpio: samsung: skip gpiolib registration
> if pinctrl support is enabled for exynos5250") from the samsung tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks Stephen.

g.

> 
> -- 
> Cheers,
> Stephen Rothwells...@canb.auug.org.au
> 
> diff --cc drivers/gpio/gpio-samsung.c
> index b2016ed,0d46db6..000
> --- a/drivers/gpio/gpio-samsung.c
> +++ b/drivers/gpio/gpio-samsung.c
> @@@ -3023,9 -3023,9 +3022,10 @@@ static __init int samsung_gpiolib_init(
>   */
>   struct device_node *pctrl_np;
>   static const struct of_device_id exynos_pinctrl_ids[] = {
>  -{ .compatible = "samsung,pinctrl-exynos4210", },
>  -{ .compatible = "samsung,pinctrl-exynos4x12", },
>  -{ .compatible = "samsung,pinctrl-exynos5250", },
>  +{ .compatible = "samsung,exynos4210-pinctrl", },
>  +{ .compatible = "samsung,exynos4x12-pinctrl", },
> ++{ .compatible = "samsung,exynos5250-pinctrl", },
>  +{ .compatible = "samsung,exynos5440-pinctrl", },
>   };
>   for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
>   if (pctrl_np && of_device_is_available(pctrl_np))
> ___
> linux-arm-kernel mailing list
> linux-arm-ker...@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-02-09 Thread Grant Likely 
On Thu, 31 Jan 2013 01:48:01 +1100, Stephen Rothwell s...@canb.auug.org.au 
wrote:
 Hi Kukjin,
 
 Today's linux-next merge of the samsung tree got a conflict in
 drivers/gpio/gpio-samsung.c between commits f69254328793 (ARM: dts: Fix
 compatible value of pinctrl module on EXYNOS5440) and b533c8685b16
 (ARM: dts: fix compatible value for exynos pinctrl) from the arm-soc
 tree and commit bda7f6d4e198 (gpio: samsung: skip gpiolib registration
 if pinctrl support is enabled for exynos5250) from the samsung tree.
 
 I fixed it up (see below) and can carry the fix as necessary (no action
 is required).

Thanks Stephen.

g.

 
 -- 
 Cheers,
 Stephen Rothwells...@canb.auug.org.au
 
 diff --cc drivers/gpio/gpio-samsung.c
 index b2016ed,0d46db6..000
 --- a/drivers/gpio/gpio-samsung.c
 +++ b/drivers/gpio/gpio-samsung.c
 @@@ -3023,9 -3023,9 +3022,10 @@@ static __init int samsung_gpiolib_init(
   */
   struct device_node *pctrl_np;
   static const struct of_device_id exynos_pinctrl_ids[] = {
  -{ .compatible = samsung,pinctrl-exynos4210, },
  -{ .compatible = samsung,pinctrl-exynos4x12, },
  -{ .compatible = samsung,pinctrl-exynos5250, },
  +{ .compatible = samsung,exynos4210-pinctrl, },
  +{ .compatible = samsung,exynos4x12-pinctrl, },
 ++{ .compatible = samsung,exynos5250-pinctrl, },
  +{ .compatible = samsung,exynos5440-pinctrl, },
   };
   for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
   if (pctrl_np  of_device_is_available(pctrl_np))
 ___
 linux-arm-kernel mailing list
 linux-arm-ker...@lists.infradead.org
 http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

-- 
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies, Ltd.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-30 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/common.c between commit b533c8685b16 ("ARM: dts: fix
compatible value for exynos pinctrl") from the arm-soc tree and commit
d28a60d89c83 ("ARM: EXYNOS: skip wakeup interrupt registration for
exynos5250 if pinctrl is enabled") from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-exynos/common.c
index 68c0689,cdaa55f..000
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -1035,8 -1112,9 +1116,9 @@@ static int __init exynos_init_irq_eint(
 * interrupt support code here can be completely removed.
 */
static const struct of_device_id exynos_pinctrl_ids[] = {
 -  { .compatible = "samsung,pinctrl-exynos4210", },
 -  { .compatible = "samsung,pinctrl-exynos4x12", },
 -  { .compatible = "samsung,pinctrl-exynos5250", },
 +  { .compatible = "samsung,exynos4210-pinctrl", },
 +  { .compatible = "samsung,exynos4x12-pinctrl", },
++  { .compatible = "samsung,exynos5250-pinctrl", },
};
struct device_node *pctrl_np, *wkup_np;
const char *wkup_compat = "samsung,exynos4210-wakeup-eint";


pgptb_CgSQijX.pgp
Description: PGP signature

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

2013-01-30 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
drivers/gpio/gpio-samsung.c between commits f69254328793 ("ARM: dts: Fix
compatible value of pinctrl module on EXYNOS5440") and b533c8685b16
("ARM: dts: fix compatible value for exynos pinctrl") from the arm-soc
tree and commit bda7f6d4e198 ("gpio: samsung: skip gpiolib registration
if pinctrl support is enabled for exynos5250") from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/gpio/gpio-samsung.c
index b2016ed,0d46db6..000
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@@ -3023,9 -3023,9 +3022,10 @@@ static __init int samsung_gpiolib_init(
*/
struct device_node *pctrl_np;
static const struct of_device_id exynos_pinctrl_ids[] = {
 -  { .compatible = "samsung,pinctrl-exynos4210", },
 -  { .compatible = "samsung,pinctrl-exynos4x12", },
 -  { .compatible = "samsung,pinctrl-exynos5250", },
 +  { .compatible = "samsung,exynos4210-pinctrl", },
 +  { .compatible = "samsung,exynos4x12-pinctrl", },
++  { .compatible = "samsung,exynos5250-pinctrl", },
 +  { .compatible = "samsung,exynos5440-pinctrl", },
};
for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
if (pctrl_np && of_device_is_available(pctrl_np))


pgpHIbygCTjky.pgp
Description: PGP signature

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

2013-01-30 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
drivers/gpio/gpio-samsung.c between commits f69254328793 (ARM: dts: Fix
compatible value of pinctrl module on EXYNOS5440) and b533c8685b16
(ARM: dts: fix compatible value for exynos pinctrl) from the arm-soc
tree and commit bda7f6d4e198 (gpio: samsung: skip gpiolib registration
if pinctrl support is enabled for exynos5250) from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc drivers/gpio/gpio-samsung.c
index b2016ed,0d46db6..000
--- a/drivers/gpio/gpio-samsung.c
+++ b/drivers/gpio/gpio-samsung.c
@@@ -3023,9 -3023,9 +3022,10 @@@ static __init int samsung_gpiolib_init(
*/
struct device_node *pctrl_np;
static const struct of_device_id exynos_pinctrl_ids[] = {
 -  { .compatible = samsung,pinctrl-exynos4210, },
 -  { .compatible = samsung,pinctrl-exynos4x12, },
 -  { .compatible = samsung,pinctrl-exynos5250, },
 +  { .compatible = samsung,exynos4210-pinctrl, },
 +  { .compatible = samsung,exynos4x12-pinctrl, },
++  { .compatible = samsung,exynos5250-pinctrl, },
 +  { .compatible = samsung,exynos5440-pinctrl, },
};
for_each_matching_node(pctrl_np, exynos_pinctrl_ids)
if (pctrl_np  of_device_is_available(pctrl_np))


pgpHIbygCTjky.pgp
Description: PGP signature

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

2013-01-30 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/common.c between commit b533c8685b16 (ARM: dts: fix
compatible value for exynos pinctrl) from the arm-soc tree and commit
d28a60d89c83 (ARM: EXYNOS: skip wakeup interrupt registration for
exynos5250 if pinctrl is enabled) from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-exynos/common.c
index 68c0689,cdaa55f..000
--- a/arch/arm/mach-exynos/common.c
+++ b/arch/arm/mach-exynos/common.c
@@@ -1035,8 -1112,9 +1116,9 @@@ static int __init exynos_init_irq_eint(
 * interrupt support code here can be completely removed.
 */
static const struct of_device_id exynos_pinctrl_ids[] = {
 -  { .compatible = samsung,pinctrl-exynos4210, },
 -  { .compatible = samsung,pinctrl-exynos4x12, },
 -  { .compatible = samsung,pinctrl-exynos5250, },
 +  { .compatible = samsung,exynos4210-pinctrl, },
 +  { .compatible = samsung,exynos4x12-pinctrl, },
++  { .compatible = samsung,exynos5250-pinctrl, },
};
struct device_node *pctrl_np, *wkup_np;
const char *wkup_compat = samsung,exynos4210-wakeup-eint;


pgptb_CgSQijX.pgp
Description: PGP signature

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

2013-01-17 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/platsmp.c between commit b1cffebf1029 ("ARM: GIC:
remove direct use of gic_raise_softirq") from the arm-soc tree and commit
3c49d3583839 ("ARM: EXYNOS: Add secure firmware support to secondary CPU
bring-up") from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-exynos/platsmp.c
index 60f7c5b,3226893..000
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@@ -20,11 -20,12 +20,12 @@@
  #include 
  #include 
  #include 
 +#include 
  
  #include 
 -#include 
  #include 
  #include 
+ #include 
  
  #include 
  #include 
@@@ -145,11 -146,22 +146,22 @@@ static int __cpuinit exynos_boot_second
  
timeout = jiffies + (1 * HZ);
while (time_before(jiffies, timeout)) {
+   unsigned long boot_addr;
+ 
smp_rmb();
  
-   __raw_writel(virt_to_phys(exynos4_secondary_startup),
-   cpu_boot_reg(phys_cpu));
+   boot_addr = virt_to_phys(exynos4_secondary_startup);
+ 
+   /*
+* Try to set boot address using firmware first
+* and fall back to boot register if it fails.
+*/
+   if (call_firmware_op(set_cpu_boot_addr, phys_cpu, boot_addr))
+   __raw_writel(boot_addr, cpu_boot_reg(phys_cpu));
+ 
+   call_firmware_op(cpu_boot, phys_cpu);
+ 
 -  gic_raise_softirq(cpumask_of(cpu), 0);
 +  arch_send_wakeup_ipi_mask(cpumask_of(cpu));
  
if (pen_release == -1)
break;


pgp2DzsS7B0rO.pgp
Description: PGP signature

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

2013-01-17 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/mach-exynos4-dt.c between commit 1d5cc604f42f ("ARM:
remove mach .handle_irq for GIC users") from the arm-soc tree and commit
d99de316e599 ("ARM: EXYNOS: Add support for Exynos secure firmware") from
the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index 112d10e,ab1dacc..000
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -106,9 -107,11 +106,10 @@@ DT_MACHINE_START(EXYNOS4210_DT, "Samsun
.smp= smp_ops(exynos_smp_ops),
.init_irq   = exynos4_init_irq,
.map_io = exynos4_dt_map_io,
 -  .handle_irq = gic_handle_irq,
+   .init_early = exynos_firmware_init,
.init_machine   = exynos4_dt_machine_init,
.init_late  = exynos_init_late,
 -  .timer  = _timer,
 +  .init_time  = exynos4_timer_init,
.dt_compat  = exynos4_dt_compat,
.restart= exynos4_restart,
  MACHINE_END


pgp5TWVZknSCH.pgp
Description: PGP signature

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

2013-01-17 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/common/Makefile between commit 81243e444c6e ("irqchip: Move ARM
GIC to drivers/irqchip") from the arm-soc tree and commit cbafeaaa418e
("ARM: Add interface for registering and calling firmware-specific
operations") from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/common/Makefile
index dc8dd0d,55d4182..000
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@@ -2,6 -2,10 +2,8 @@@
  # Makefile for the linux kernel.
  #
  
+ obj-y += firmware.o
+ 
 -obj-$(CONFIG_ARM_GIC) += gic.o
 -obj-$(CONFIG_ARM_VIC) += vic.o
  obj-$(CONFIG_ICST)+= icst.o
  obj-$(CONFIG_SA)  += sa.o
  obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o


pgpeStGM6XqAL.pgp
Description: PGP signature

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

2013-01-17 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/common/Makefile between commit 81243e444c6e (irqchip: Move ARM
GIC to drivers/irqchip) from the arm-soc tree and commit cbafeaaa418e
(ARM: Add interface for registering and calling firmware-specific
operations) from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/common/Makefile
index dc8dd0d,55d4182..000
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@@ -2,6 -2,10 +2,8 @@@
  # Makefile for the linux kernel.
  #
  
+ obj-y += firmware.o
+ 
 -obj-$(CONFIG_ARM_GIC) += gic.o
 -obj-$(CONFIG_ARM_VIC) += vic.o
  obj-$(CONFIG_ICST)+= icst.o
  obj-$(CONFIG_SA)  += sa.o
  obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o


pgpeStGM6XqAL.pgp
Description: PGP signature

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

2013-01-17 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/mach-exynos4-dt.c between commit 1d5cc604f42f (ARM:
remove mach .handle_irq for GIC users) from the arm-soc tree and commit
d99de316e599 (ARM: EXYNOS: Add support for Exynos secure firmware) from
the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index 112d10e,ab1dacc..000
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -106,9 -107,11 +106,10 @@@ DT_MACHINE_START(EXYNOS4210_DT, Samsun
.smp= smp_ops(exynos_smp_ops),
.init_irq   = exynos4_init_irq,
.map_io = exynos4_dt_map_io,
 -  .handle_irq = gic_handle_irq,
+   .init_early = exynos_firmware_init,
.init_machine   = exynos4_dt_machine_init,
.init_late  = exynos_init_late,
 -  .timer  = exynos4_timer,
 +  .init_time  = exynos4_timer_init,
.dt_compat  = exynos4_dt_compat,
.restart= exynos4_restart,
  MACHINE_END


pgp5TWVZknSCH.pgp
Description: PGP signature

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

2013-01-17 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/platsmp.c between commit b1cffebf1029 (ARM: GIC:
remove direct use of gic_raise_softirq) from the arm-soc tree and commit
3c49d3583839 (ARM: EXYNOS: Add secure firmware support to secondary CPU
bring-up) from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/mach-exynos/platsmp.c
index 60f7c5b,3226893..000
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@@ -20,11 -20,12 +20,12 @@@
  #include linux/jiffies.h
  #include linux/smp.h
  #include linux/io.h
 +#include linux/irqchip/arm-gic.h
  
  #include asm/cacheflush.h
 -#include asm/hardware/gic.h
  #include asm/smp_plat.h
  #include asm/smp_scu.h
+ #include asm/firmware.h
  
  #include mach/hardware.h
  #include mach/regs-clock.h
@@@ -145,11 -146,22 +146,22 @@@ static int __cpuinit exynos_boot_second
  
timeout = jiffies + (1 * HZ);
while (time_before(jiffies, timeout)) {
+   unsigned long boot_addr;
+ 
smp_rmb();
  
-   __raw_writel(virt_to_phys(exynos4_secondary_startup),
-   cpu_boot_reg(phys_cpu));
+   boot_addr = virt_to_phys(exynos4_secondary_startup);
+ 
+   /*
+* Try to set boot address using firmware first
+* and fall back to boot register if it fails.
+*/
+   if (call_firmware_op(set_cpu_boot_addr, phys_cpu, boot_addr))
+   __raw_writel(boot_addr, cpu_boot_reg(phys_cpu));
+ 
+   call_firmware_op(cpu_boot, phys_cpu);
+ 
 -  gic_raise_softirq(cpumask_of(cpu), 0);
 +  arch_send_wakeup_ipi_mask(cpumask_of(cpu));
  
if (pen_release == -1)
break;


pgp2DzsS7B0rO.pgp
Description: PGP signature

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

2013-01-16 Thread Stephen Rothwell 
Hi Kukjin,

On Wed, 16 Jan 2013 21:13:00 -0800 Kukjin Kim  wrote:
>
> One more, following is my preferred resolution when merge conflict happens
> between Samsung tree and arm-soc tree:

Thanks, I will use this resolution tomorrow.  You will still get
notification emails just to double check.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpOeNP6hfLvN.pgp
Description: PGP signature

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

2013-01-16 Thread Kukjin Kim 
Kukjin Kim wrote:

[...]

> Hmm, updating timer patches in Samsung tree cause the merge conflicts with
> arm-soc, so for now I dropped them in my tree just now.
> And note that regarding topic branch which are including it will be
re-worked
> soon :-)
> 
> Now to merge Samsung tree for linux-next should be fine.
> 
> Thanks again.
> 
One more, following is my preferred resolution when merge conflict happens
between Samsung tree and arm-soc tree:

8<---

diff --cc arch/arm/common/Makefile
index 55d4182,dc8dd0d..7a5df8b
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@@ -2,10 -2,6 +2,8 @@@
  # Makefile for the linux kernel.
  #
  
 +obj-y += firmware.o
 +
- obj-$(CONFIG_ARM_GIC) += gic.o
- obj-$(CONFIG_ARM_VIC) += vic.o
  obj-$(CONFIG_ICST)+= icst.o
  obj-$(CONFIG_SA)  += sa.o
  obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index ab1dacc,112d10e..3ac73ed
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -107,11 -106,9 +106,10 @@@ DT_MACHINE_START(EXYNOS4210_DT, "Samsun
.smp= smp_ops(exynos_smp_ops),
.init_irq   = exynos4_init_irq,
.map_io = exynos4_dt_map_io,
-   .handle_irq = gic_handle_irq,
 +  .init_early = exynos_firmware_init,
.init_machine   = exynos4_dt_machine_init,
.init_late  = exynos_init_late,
-   .timer  = _timer,
+   .init_time  = exynos4_timer_init,
.dt_compat  = exynos4_dt_compat,
.restart= exynos4_restart,
  MACHINE_END
diff --cc arch/arm/mach-exynos/platsmp.c
index 3226893,60f7c5b..a083e05
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@@ -20,12 -20,11 +20,12 @@@
  #include 
  #include 
  #include 
+ #include 
  
  #include 
- #include 
  #include 
  #include 
 +#include 
  
  #include 
  #include 
@@@ -146,22 -145,11 +146,22 @@@ static int __cpuinit exynos_boot_second
  
timeout = jiffies + (1 * HZ);
while (time_before(jiffies, timeout)) {
 +  unsigned long boot_addr;
 +
smp_rmb();
  
 -  __raw_writel(virt_to_phys(exynos4_secondary_startup),
 -
cpu_boot_reg(phys_cpu));
 +  boot_addr = virt_to_phys(exynos4_secondary_startup);
 +
 +  /*
 +   * Try to set boot address using firmware first
 +   * and fall back to boot register if it fails.
 +   */
 +  if (call_firmware_op(set_cpu_boot_addr, phys_cpu,
boot_addr))
 +  __raw_writel(boot_addr, cpu_boot_reg(phys_cpu));
 +
 +  call_firmware_op(cpu_boot, phys_cpu);
 +
-   gic_raise_softirq(cpumask_of(cpu), 0);
+   arch_send_wakeup_ipi_mask(cpumask_of(cpu));
  
if (pen_release == -1)
break;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-16 Thread Kukjin Kim 
Kukjin Kim wrote:
> 
> Stephen Rothwell wrote:
> >
> > Hi Kukjin,
> >
> Hi,
> 
> > On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell
> 
> > wrote:
> > >
> > > Today's linux-next merge of the samsung tree got conflicts in
> > > many files with the arm-soc tree.
> > >
> > > I just dropped the samsung tree for today.  Please have a look and try
to
> > > fix this mess up, thanks.
> >
> > Ping?
> 
> Oops, I missed above e-mail. Anyway, really?
> 
> Let me look at it soon and I will fix.
> 
> Thanks for your information.
> 
Hmm, updating timer patches in Samsung tree cause the merge conflicts with
arm-soc, so for now I dropped them in my tree just now.
And note that regarding topic branch which are including it will be
re-worked soon :-)

Now to merge Samsung tree for linux-next should be fine.

Thanks again.

- Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-16 Thread Kukjin Kim 
Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi,

> On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell 
> wrote:
> >
> > Today's linux-next merge of the samsung tree got conflicts in
> > many files with the arm-soc tree.
> >
> > I just dropped the samsung tree for today.  Please have a look and try
to
> > fix this mess up, thanks.
> 
> Ping?

Oops, I missed above e-mail. Anyway, really?

Let me look at it soon and I will fix.

Thanks for your information.

- Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-16 Thread Kukjin Kim 
Stephen Rothwell wrote:
> 
> Hi Kukjin,
> 
Hi,

> On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell 
> wrote:
> >
> > Today's linux-next merge of the samsung tree got conflicts in
> > many files with the arm-soc tree.
> >
> > I just dropped the samsung tree for today.  Please have a look and try
to
> > fix this mess up, thanks.
> 
> Ping?
> 
Oops, I missed above e-mail. Anyway, really?

Let me look at soon and I will fix.

Thanks for your information.

- Kukjin

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-16 Thread Stephen Rothwell 
Hi Kukjin,

On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell  
wrote:
>
> Today's linux-next merge of the samsung tree got conflicts in
> many files with the arm-soc tree.
> 
> I just dropped the samsung tree for today.  Please have a look and try to
> fix this mess up, thanks.

Ping?

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpvx70DbKAyc.pgp
Description: PGP signature

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

2013-01-16 Thread Stephen Rothwell 
Hi Kukjin,

On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell s...@canb.auug.org.au 
wrote:

 Today's linux-next merge of the samsung tree got conflicts in
 many files with the arm-soc tree.
 
 I just dropped the samsung tree for today.  Please have a look and try to
 fix this mess up, thanks.

Ping?

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpvx70DbKAyc.pgp
Description: PGP signature

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

2013-01-16 Thread Kukjin Kim 
Stephen Rothwell wrote:
 
 Hi Kukjin,
 
Hi,

 On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell s...@canb.auug.org.au
 wrote:
 
  Today's linux-next merge of the samsung tree got conflicts in
  many files with the arm-soc tree.
 
  I just dropped the samsung tree for today.  Please have a look and try
to
  fix this mess up, thanks.
 
 Ping?
 
Oops, I missed above e-mail. Anyway, really?

Let me look at soon and I will fix.

Thanks for your information.

- Kukjin

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-16 Thread Kukjin Kim 
Stephen Rothwell wrote:
 
 Hi Kukjin,
 
Hi,

 On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell s...@canb.auug.org.au
 wrote:
 
  Today's linux-next merge of the samsung tree got conflicts in
  many files with the arm-soc tree.
 
  I just dropped the samsung tree for today.  Please have a look and try
to
  fix this mess up, thanks.
 
 Ping?

Oops, I missed above e-mail. Anyway, really?

Let me look at it soon and I will fix.

Thanks for your information.

- Kukjin

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-16 Thread Kukjin Kim 
Kukjin Kim wrote:
 
 Stephen Rothwell wrote:
 
  Hi Kukjin,
 
 Hi,
 
  On Fri, 11 Jan 2013 15:32:06 +1100 Stephen Rothwell
 s...@canb.auug.org.au
  wrote:
  
   Today's linux-next merge of the samsung tree got conflicts in
   many files with the arm-soc tree.
  
   I just dropped the samsung tree for today.  Please have a look and try
to
   fix this mess up, thanks.
 
  Ping?
 
 Oops, I missed above e-mail. Anyway, really?
 
 Let me look at it soon and I will fix.
 
 Thanks for your information.
 
Hmm, updating timer patches in Samsung tree cause the merge conflicts with
arm-soc, so for now I dropped them in my tree just now.
And note that regarding topic branch which are including it will be
re-worked soon :-)

Now to merge Samsung tree for linux-next should be fine.

Thanks again.

- Kukjin

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-16 Thread Kukjin Kim 
Kukjin Kim wrote:

[...]

 Hmm, updating timer patches in Samsung tree cause the merge conflicts with
 arm-soc, so for now I dropped them in my tree just now.
 And note that regarding topic branch which are including it will be
re-worked
 soon :-)
 
 Now to merge Samsung tree for linux-next should be fine.
 
 Thanks again.
 
One more, following is my preferred resolution when merge conflict happens
between Samsung tree and arm-soc tree:

8---

diff --cc arch/arm/common/Makefile
index 55d4182,dc8dd0d..7a5df8b
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@@ -2,10 -2,6 +2,8 @@@
  # Makefile for the linux kernel.
  #
  
 +obj-y += firmware.o
 +
- obj-$(CONFIG_ARM_GIC) += gic.o
- obj-$(CONFIG_ARM_VIC) += vic.o
  obj-$(CONFIG_ICST)+= icst.o
  obj-$(CONFIG_SA)  += sa.o
  obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index ab1dacc,112d10e..3ac73ed
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -107,11 -106,9 +106,10 @@@ DT_MACHINE_START(EXYNOS4210_DT, Samsun
.smp= smp_ops(exynos_smp_ops),
.init_irq   = exynos4_init_irq,
.map_io = exynos4_dt_map_io,
-   .handle_irq = gic_handle_irq,
 +  .init_early = exynos_firmware_init,
.init_machine   = exynos4_dt_machine_init,
.init_late  = exynos_init_late,
-   .timer  = exynos4_timer,
+   .init_time  = exynos4_timer_init,
.dt_compat  = exynos4_dt_compat,
.restart= exynos4_restart,
  MACHINE_END
diff --cc arch/arm/mach-exynos/platsmp.c
index 3226893,60f7c5b..a083e05
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@@ -20,12 -20,11 +20,12 @@@
  #include linux/jiffies.h
  #include linux/smp.h
  #include linux/io.h
+ #include linux/irqchip/arm-gic.h
  
  #include asm/cacheflush.h
- #include asm/hardware/gic.h
  #include asm/smp_plat.h
  #include asm/smp_scu.h
 +#include asm/firmware.h
  
  #include mach/hardware.h
  #include mach/regs-clock.h
@@@ -146,22 -145,11 +146,22 @@@ static int __cpuinit exynos_boot_second
  
timeout = jiffies + (1 * HZ);
while (time_before(jiffies, timeout)) {
 +  unsigned long boot_addr;
 +
smp_rmb();
  
 -  __raw_writel(virt_to_phys(exynos4_secondary_startup),
 -
cpu_boot_reg(phys_cpu));
 +  boot_addr = virt_to_phys(exynos4_secondary_startup);
 +
 +  /*
 +   * Try to set boot address using firmware first
 +   * and fall back to boot register if it fails.
 +   */
 +  if (call_firmware_op(set_cpu_boot_addr, phys_cpu,
boot_addr))
 +  __raw_writel(boot_addr, cpu_boot_reg(phys_cpu));
 +
 +  call_firmware_op(cpu_boot, phys_cpu);
 +
-   gic_raise_softirq(cpumask_of(cpu), 0);
+   arch_send_wakeup_ipi_mask(cpumask_of(cpu));
  
if (pen_release == -1)
break;

--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

2013-01-16 Thread Stephen Rothwell 
Hi Kukjin,

On Wed, 16 Jan 2013 21:13:00 -0800 Kukjin Kim kgene@samsung.com wrote:

 One more, following is my preferred resolution when merge conflict happens
 between Samsung tree and arm-soc tree:

Thanks, I will use this resolution tomorrow.  You will still get
notification emails just to double check.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpOeNP6hfLvN.pgp
Description: PGP signature

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

2013-01-10 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got conflicts in
many files with the arm-soc tree.

I just dropped the samsung tree for today.  Please have a look and try to
fix this mess up, thanks.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpHt77sd_Rgs.pgp
Description: PGP signature

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

2013-01-10 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/time.c between various commits from the arm-soc
tree and commit 0e4a0a6e970e ("ARM: SAMSUNG: Remove unused
plat-samsung/time.c") from the samsung tree.

The latter removes the file, so I did that.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpkU1CI7oVKm.pgp
Description: PGP signature

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

2013-01-10 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/plat-samsung/time.c between various commits from the arm-soc
tree and commit 0e4a0a6e970e (ARM: SAMSUNG: Remove unused
plat-samsung/time.c) from the samsung tree.

The latter removes the file, so I did that.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpkU1CI7oVKm.pgp
Description: PGP signature

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

2013-01-10 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got conflicts in
many files with the arm-soc tree.

I just dropped the samsung tree for today.  Please have a look and try to
fix this mess up, thanks.

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpHt77sd_Rgs.pgp
Description: PGP signature

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

2012-11-26 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250.dtsi between commit 24025f6f5821 ("Merge
branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt") from the arm-soc tree and commit 5d706af5ab0b ("Merge branch
'next/dt-samsung' into for-next") from the samsung tree.

I fixed it up (by using the samsung tree version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpU7uigJI0mv.pgp
Description: PGP signature

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

2012-11-26 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250-smdk5250.dts between commit 24025f6f5821
("Merge branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt") from the arm-soc tree and commit 65fc7232786b ("Merge branch
'next/devel-samsung-3' into for-next") from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/boot/dts/exynos5250-smdk5250.dts
index 29f1333,cdeb4f2..000
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@@ -208,4 -200,31 +204,27 @@@
samsung,mfc-r = <0x4300 0x80>;
samsung,mfc-l = <0x5100 0x80>;
};
+ 
 -  hdmi {
 -  hpd-gpio = < 7 0xf 1 3>;
 -  };
 -
+   i2s_0: i2s@0383 {
+   gpios = < 0 2 0 0>, < 1 2 0 0>, < 2 2 0 0>,
+   < 3 2 0 0>, < 4 2 0 0>, < 5 2 0 0>,
+   < 6 2 0 0>;
+   };
+ 
+   i2s_1: i2s@12D6 {
+   status = "disabled";
+   };
+ 
+   i2s_2: i2s@12D7 {
+   status = "disabled";
+   };
+ 
+   dp-controller {
+   samsung,color-space = <0>;
+   samsung,dynamic-range = <0>;
+   samsung,ycbcr-coeff = <0>;
+   samsung,color-depth = <1>;
+   samsung,link-rate = <0x0a>;
+   samsung,lane-count = <4>;
+   };
  };


pgpxT3rfplw7r.pgp
Description: PGP signature

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

2012-11-26 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250-smdk5250.dts between commit 24025f6f5821
(Merge branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt) from the arm-soc tree and commit 65fc7232786b (Merge branch
'next/devel-samsung-3' into for-next) from the samsung tree.

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

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au

diff --cc arch/arm/boot/dts/exynos5250-smdk5250.dts
index 29f1333,cdeb4f2..000
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@@ -208,4 -200,31 +204,27 @@@
samsung,mfc-r = 0x4300 0x80;
samsung,mfc-l = 0x5100 0x80;
};
+ 
 -  hdmi {
 -  hpd-gpio = gpx3 7 0xf 1 3;
 -  };
 -
+   i2s_0: i2s@0383 {
+   gpios = gpz 0 2 0 0, gpz 1 2 0 0, gpz 2 2 0 0,
+   gpz 3 2 0 0, gpz 4 2 0 0, gpz 5 2 0 0,
+   gpz 6 2 0 0;
+   };
+ 
+   i2s_1: i2s@12D6 {
+   status = disabled;
+   };
+ 
+   i2s_2: i2s@12D7 {
+   status = disabled;
+   };
+ 
+   dp-controller {
+   samsung,color-space = 0;
+   samsung,dynamic-range = 0;
+   samsung,ycbcr-coeff = 0;
+   samsung,color-depth = 1;
+   samsung,link-rate = 0x0a;
+   samsung,lane-count = 4;
+   };
  };


pgpxT3rfplw7r.pgp
Description: PGP signature

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

2012-11-26 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/boot/dts/exynos5250.dtsi between commit 24025f6f5821 (Merge
branch 'next/dt-samsung' of
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into
next/dt) from the arm-soc tree and commit 5d706af5ab0b (Merge branch
'next/dt-samsung' into for-next) from the samsung tree.

I fixed it up (by using the samsung tree version) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpU7uigJI0mv.pgp
Description: PGP signature

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

2012-09-24 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/Makefile.boot between commit 360a0cab5041 ("ARM:
move all dtb targets out of Makefile.boot") from the arm-soc tree and
commit d105f0b1215d ("ARM: dts: Add basic dts file for Samsung Trats
board") from the samsung tree.

I removed the bit from Makefile.boot and added the following merge fix
patch and can carry the fix as necessary (no action is required).

From: Stephen Rothwell 
Date: Mon, 24 Sep 2012 20:47:44 +1000
Subject: [PATCH] ARM: fix up for movemment of dtb targets

Signed-off-by: Stephen Rothwell 
---
 arch/arm/boot/dts/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d4ad2df..99e5e8e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -21,7 +21,7 @@ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
dove-cubox.dtb \
dove-dove-db.dtb
 dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
-   exynos4210-smdkv310.dtb \
+   exynos4210-smdkv310.dtb exynos4210-trats.dtb \
exynos5250-smdk5250.dtb
 dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
 dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpRzQLaT5lUr.pgp
Description: PGP signature

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

2012-09-24 Thread Stephen Rothwell 
Hi Kukjin,

Today's linux-next merge of the samsung tree got a conflict in
arch/arm/mach-exynos/Makefile.boot between commit 360a0cab5041 (ARM:
move all dtb targets out of Makefile.boot) from the arm-soc tree and
commit d105f0b1215d (ARM: dts: Add basic dts file for Samsung Trats
board) from the samsung tree.

I removed the bit from Makefile.boot and added the following merge fix
patch and can carry the fix as necessary (no action is required).

From: Stephen Rothwell s...@canb.auug.org.au
Date: Mon, 24 Sep 2012 20:47:44 +1000
Subject: [PATCH] ARM: fix up for movemment of dtb targets

Signed-off-by: Stephen Rothwell s...@canb.auug.org.au
---
 arch/arm/boot/dts/Makefile |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index d4ad2df..99e5e8e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -21,7 +21,7 @@ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
dove-cubox.dtb \
dove-dove-db.dtb
 dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
-   exynos4210-smdkv310.dtb \
+   exynos4210-smdkv310.dtb exynos4210-trats.dtb \
exynos5250-smdk5250.dtb
 dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb
 dtb-$(CONFIG_ARCH_IMX5) += imx51-babbage.dtb \
-- 
1.7.10.280.gaa39

-- 
Cheers,
Stephen Rothwells...@canb.auug.org.au


pgpRzQLaT5lUr.pgp
Description: PGP signature