* [GIT PULL 6/7] Samsung devel-3 for v3.8
@ 2012-11-28 0:16 ` Kukjin Kim
0 siblings, 0 replies; 4+ messages in thread
From: Kukjin Kim @ 2012-11-28 0:16 UTC (permalink / raw)
To: Arnd Bergmann, 'Olof Johansson'
Cc: linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org
Arnd, Olof
This is including Samsung small updates(developments) for v3.8.
add node PL330 MDMA1 and UART3 for DEBUG_LL and secondary cpu bring-up
for exynos4412.
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/devel-samsung-3
Note, if happens merge conflicts, see my prefer resulotin below.
diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index 8858068,6df99c0..92757ff
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -77,8 -77,7 +77,9 @@@ static const struct of_dev_auxdata exyn
"exynos4210-spi.2", NULL),
OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL),
OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL),
+ OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
+ OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
+ "exynos-tmu", NULL),
{},
};
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 f4a75d2eb7b1e2206094b901be09adb31ba63681:
Linux 3.7-rc6 (2012-11-16 17:42:40 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/devel-samsung-3
Bartlomiej Zolnierkiewicz (1):
ARM: dts: add node for PL330 MDMA1 controller for exynos4
Olof Johansson (1):
ARM: EXYNOS: add UART3 to DEBUG_LL ports
Tomasz Figa (1):
ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
arch/arm/Kconfig.debug | 11 +++++++++++
arch/arm/boot/dts/exynos4.dtsi | 6 ++++++
arch/arm/mach-exynos/mach-exynos4-dt.c | 1 +
arch/arm/mach-exynos/platsmp.c | 30
++++++++++++++++++++++++------
arch/arm/plat-samsung/Kconfig | 1 +
5 files changed, 43 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [GIT PULL 6/7] Samsung devel-3 for v3.8
@ 2012-11-28 0:16 ` Kukjin Kim
0 siblings, 0 replies; 4+ messages in thread
From: Kukjin Kim @ 2012-11-28 0:16 UTC (permalink / raw)
To: linux-arm-kernel
Arnd, Olof
This is including Samsung small updates(developments) for v3.8.
add node PL330 MDMA1 and UART3 for DEBUG_LL and secondary cpu bring-up
for exynos4412.
Please pull from:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/devel-samsung-3
Note, if happens merge conflicts, see my prefer resulotin below.
diff --cc arch/arm/mach-exynos/mach-exynos4-dt.c
index 8858068,6df99c0..92757ff
--- a/arch/arm/mach-exynos/mach-exynos4-dt.c
+++ b/arch/arm/mach-exynos/mach-exynos4-dt.c
@@@ -77,8 -77,7 +77,9 @@@ static const struct of_dev_auxdata exyn
"exynos4210-spi.2", NULL),
OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA0, "dma-pl330.0", NULL),
OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_PDMA1, "dma-pl330.1", NULL),
+ OF_DEV_AUXDATA("arm,pl330", EXYNOS4_PA_MDMA1, "dma-pl330.2", NULL),
+ OF_DEV_AUXDATA("samsung,exynos4210-tmu", EXYNOS4_PA_TMU,
+ "exynos-tmu", NULL),
{},
};
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 f4a75d2eb7b1e2206094b901be09adb31ba63681:
Linux 3.7-rc6 (2012-11-16 17:42:40 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/devel-samsung-3
Bartlomiej Zolnierkiewicz (1):
ARM: dts: add node for PL330 MDMA1 controller for exynos4
Olof Johansson (1):
ARM: EXYNOS: add UART3 to DEBUG_LL ports
Tomasz Figa (1):
ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
arch/arm/Kconfig.debug | 11 +++++++++++
arch/arm/boot/dts/exynos4.dtsi | 6 ++++++
arch/arm/mach-exynos/mach-exynos4-dt.c | 1 +
arch/arm/mach-exynos/platsmp.c | 30
++++++++++++++++++++++++------
arch/arm/plat-samsung/Kconfig | 1 +
5 files changed, 43 insertions(+), 6 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [GIT PULL 6/7] Samsung devel-3 for v3.8
2012-11-28 0:16 ` Kukjin Kim
@ 2012-11-30 17:33 ` Olof Johansson
-1 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2012-11-30 17:33 UTC (permalink / raw)
To: Kukjin Kim
Cc: Arnd Bergmann, linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org
Hi,
On Wed, Nov 28, 2012 at 09:16:14AM +0900, Kukjin Kim wrote:
> Arnd, Olof
>
> This is including Samsung small updates(developments) for v3.8.
>
> add node PL330 MDMA1 and UART3 for DEBUG_LL and secondary cpu
> bring-up for exynos4412.
>
> Please pull from:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/devel-samsung-3
Please try to avoid these "devel" branches -- call them a proper topic
instead. These seem to be:
> Bartlomiej Zolnierkiewicz (1):
> ARM: dts: add node for PL330 MDMA1 controller for exynos4
That's a dt patch.
>
> Olof Johansson (1):
> ARM: EXYNOS: add UART3 to DEBUG_LL ports
This is a soc support patch, or maybe driver.
> Tomasz Figa (1):
> ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
That's another soc support patch.
I will pull this into next/soc since 2 out of the three patches belong there.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL 6/7] Samsung devel-3 for v3.8
@ 2012-11-30 17:33 ` Olof Johansson
0 siblings, 0 replies; 4+ messages in thread
From: Olof Johansson @ 2012-11-30 17:33 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Wed, Nov 28, 2012 at 09:16:14AM +0900, Kukjin Kim wrote:
> Arnd, Olof
>
> This is including Samsung small updates(developments) for v3.8.
>
> add node PL330 MDMA1 and UART3 for DEBUG_LL and secondary cpu
> bring-up for exynos4412.
>
> Please pull from:
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/devel-samsung-3
Please try to avoid these "devel" branches -- call them a proper topic
instead. These seem to be:
> Bartlomiej Zolnierkiewicz (1):
> ARM: dts: add node for PL330 MDMA1 controller for exynos4
That's a dt patch.
>
> Olof Johansson (1):
> ARM: EXYNOS: add UART3 to DEBUG_LL ports
This is a soc support patch, or maybe driver.
> Tomasz Figa (1):
> ARM: EXYNOS: Add support for secondary CPU bring-up on Exynos4412
That's another soc support patch.
I will pull this into next/soc since 2 out of the three patches belong there.
-Olof
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-30 17:33 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-28 0:16 [GIT PULL 6/7] Samsung devel-3 for v3.8 Kukjin Kim
2012-11-28 0:16 ` Kukjin Kim
2012-11-30 17:33 ` Olof Johansson
2012-11-30 17:33 ` Olof Johansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.