* [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
@ 2012-05-12 23:18 ` Kukjin Kim
0 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-12 23:18 UTC (permalink / raw)
To: Arnd Bergmann, 'Olof Johansson'
Cc: linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org
Hi Arnd, Olof
Please pull cleanup plat-s3c24xx-s5p for v3.5 Samsung stuff.
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-plat-s3c24xx-s5p
We can remove plat-s5p directory with this series and I think, the
plat-s3c24xx can be removed next time for one plat-samsung of Samsung stuff.
Note, this is including cleanup-samsung-iommu which is removing s5p
iommu stuff in plat-s5p.
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 d48b97b403d23f6df0b990cee652bdf9a52337a3:
Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-plat-s3c24xx-s5p
Heiko Stuebner (4):
ARM: S3C24XX: move plat-s3c24xx/cpu.c
ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c
ARM: S3C24XX: move common power-management code to mach-s3c24xx
ARM: S3C24XX: move common clock init into common.c
Kukjin Kim (9):
ARM: SAMSUNG: move clock part for common s5p into plat-samsung
ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung
ARM: SAMSUNG: move pm part for common s5p into plat-samsung
ARM: SAMSUNG: move hr timer for common s5p into plat-samsung
ARM: SAMSUNG: move platform device for s5p uart into plat-samsung
ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into
plat-samsung
ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig
ARM: SAMSUNG: merge plat-s5p into plat-samsung
Merge branch 'next/cleanup-plat-s3c24xx' into
next/cleanup-plat-s3c24xx-s5p
KyongHo Cho (2):
S5P: SYSMMU: Remove System MMU device driver
ARM: EXYNOS: Change System MMU platform device definitions
arch/arm/mach-exynos/clock-exynos4.h | 2 +
arch/arm/mach-exynos/clock-exynos4210.c | 11 +
arch/arm/mach-exynos/clock-exynos4212.c | 28 ++-
arch/arm/mach-exynos/clock-exynos5.c | 90 ++++
arch/arm/mach-exynos/dev-sysmmu.c | 457
+++++++++++---------
arch/arm/mach-exynos/include/mach/irqs.h | 25 +-
arch/arm/mach-exynos/include/mach/map.h | 38 ++
arch/arm/mach-exynos/include/mach/regs-clock.h | 5 +
arch/arm/mach-exynos/include/mach/regs-sysmmu.h | 28 --
arch/arm/mach-exynos/include/mach/sysmmu.h | 88 +++--
arch/arm/mach-exynos/mach-armlex4210.c | 1 -
arch/arm/mach-exynos/mach-smdkv310.c | 1 -
arch/arm/mach-s3c24xx/Makefile | 6 +
.../{plat-s3c24xx/cpu.c => mach-s3c24xx/common.c} | 69 +++-
arch/arm/{plat-s3c24xx => mach-s3c24xx}/irq-pm.c | 0
arch/arm/{plat-s3c24xx => mach-s3c24xx}/pm.c | 0
arch/arm/{plat-s3c24xx => mach-s3c24xx}/sleep.S | 0
arch/arm/plat-s3c24xx/Makefile | 6 -
arch/arm/plat-s3c24xx/clock.c | 59 ---
arch/arm/plat-s3c24xx/dev-uart.c | 100 -----
arch/arm/plat-s5p/Kconfig | 140 ------
arch/arm/plat-s5p/Makefile | 28 --
arch/arm/plat-s5p/sysmmu.c | 313 --------------
arch/arm/plat-samsung/Kconfig | 140 ++++++
arch/arm/plat-samsung/Makefile | 13 +
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/sysmmu.h | 95 ----
.../{plat-s5p/clock.c => plat-samsung/s5p-clock.c} | 3 +-
.../dev-mfc.c => plat-samsung/s5p-dev-mfc.c} | 4 +-
.../dev-uart.c => plat-samsung/s5p-dev-uart.c} | 78 +---
.../irq-eint.c => plat-samsung/s5p-irq-eint.c} | 3 +-
.../s5p-irq-gpioint.c} | 3 +-
.../irq-pm.c => plat-samsung/s5p-irq-pm.c} | 3 +-
.../arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} | 3 +-
arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c} | 3 +-
.../{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} | 3 +-
arch/arm/{plat-s5p => plat-samsung}/s5p-time.c | 3 +-
.../arm/{plat-s5p => plat-samsung}/setup-mipiphy.c | 0
43 files changed, 781 insertions(+), 1163 deletions(-)
delete mode 100644 arch/arm/mach-exynos/include/mach/regs-sysmmu.h
rename arch/arm/{plat-s3c24xx/cpu.c => mach-s3c24xx/common.c} (76%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/irq-pm.c (100%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/pm.c (100%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/sleep.S (100%)
delete mode 100644 arch/arm/plat-s3c24xx/clock.c
delete mode 100644 arch/arm/plat-s3c24xx/dev-uart.c
delete mode 100644 arch/arm/plat-s5p/Kconfig
delete mode 100644 arch/arm/plat-s5p/Makefile
delete mode 100644 arch/arm/plat-s5p/sysmmu.c
delete mode 100644 arch/arm/plat-samsung/include/plat/sysmmu.h
rename arch/arm/{plat-s5p/clock.c => plat-samsung/s5p-clock.c} (99%)
rename arch/arm/{plat-s5p/dev-mfc.c => plat-samsung/s5p-dev-mfc.c} (97%)
rename arch/arm/{plat-s5p/dev-uart.c => plat-samsung/s5p-dev-uart.c} (57%)
rename arch/arm/{plat-s5p/irq-eint.c => plat-samsung/s5p-irq-eint.c} (99%)
rename arch/arm/{plat-s5p/irq-gpioint.c =>
plat-samsung/s5p-irq-gpioint.c} (99%)
rename arch/arm/{plat-s5p/irq-pm.c => plat-samsung/s5p-irq-pm.c} (98%)
rename arch/arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} (96%)
rename arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c} (95%)
rename arch/arm/{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} (98%)
rename arch/arm/{plat-s5p => plat-samsung}/s5p-time.c (99%)
rename arch/arm/{plat-s5p => plat-samsung}/setup-mipiphy.c (100%)
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
@ 2012-05-12 23:18 ` Kukjin Kim
0 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-12 23:18 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd, Olof
Please pull cleanup plat-s3c24xx-s5p for v3.5 Samsung stuff.
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-plat-s3c24xx-s5p
We can remove plat-s5p directory with this series and I think, the
plat-s3c24xx can be removed next time for one plat-samsung of Samsung stuff.
Note, this is including cleanup-samsung-iommu which is removing s5p
iommu stuff in plat-s5p.
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 d48b97b403d23f6df0b990cee652bdf9a52337a3:
Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-plat-s3c24xx-s5p
Heiko Stuebner (4):
ARM: S3C24XX: move plat-s3c24xx/cpu.c
ARM: S3C24XX: move plat-s3c24xx/dev-uart.c into common.c
ARM: S3C24XX: move common power-management code to mach-s3c24xx
ARM: S3C24XX: move common clock init into common.c
Kukjin Kim (9):
ARM: SAMSUNG: move clock part for common s5p into plat-samsung
ARM: SAMSUNG: move interrupt part for common s5p into plat-samsung
ARM: SAMSUNG: move pm part for common s5p into plat-samsung
ARM: SAMSUNG: move hr timer for common s5p into plat-samsung
ARM: SAMSUNG: move platform device for s5p uart into plat-samsung
ARM: SAMSUNG: move setup code for s5p mfc and mipiphy into
plat-samsung
ARM: SAMSUNG: move options for common s5p into plat-samsung/Kconfig
ARM: SAMSUNG: merge plat-s5p into plat-samsung
Merge branch 'next/cleanup-plat-s3c24xx' into
next/cleanup-plat-s3c24xx-s5p
KyongHo Cho (2):
S5P: SYSMMU: Remove System MMU device driver
ARM: EXYNOS: Change System MMU platform device definitions
arch/arm/mach-exynos/clock-exynos4.h | 2 +
arch/arm/mach-exynos/clock-exynos4210.c | 11 +
arch/arm/mach-exynos/clock-exynos4212.c | 28 ++-
arch/arm/mach-exynos/clock-exynos5.c | 90 ++++
arch/arm/mach-exynos/dev-sysmmu.c | 457
+++++++++++---------
arch/arm/mach-exynos/include/mach/irqs.h | 25 +-
arch/arm/mach-exynos/include/mach/map.h | 38 ++
arch/arm/mach-exynos/include/mach/regs-clock.h | 5 +
arch/arm/mach-exynos/include/mach/regs-sysmmu.h | 28 --
arch/arm/mach-exynos/include/mach/sysmmu.h | 88 +++--
arch/arm/mach-exynos/mach-armlex4210.c | 1 -
arch/arm/mach-exynos/mach-smdkv310.c | 1 -
arch/arm/mach-s3c24xx/Makefile | 6 +
.../{plat-s3c24xx/cpu.c => mach-s3c24xx/common.c} | 69 +++-
arch/arm/{plat-s3c24xx => mach-s3c24xx}/irq-pm.c | 0
arch/arm/{plat-s3c24xx => mach-s3c24xx}/pm.c | 0
arch/arm/{plat-s3c24xx => mach-s3c24xx}/sleep.S | 0
arch/arm/plat-s3c24xx/Makefile | 6 -
arch/arm/plat-s3c24xx/clock.c | 59 ---
arch/arm/plat-s3c24xx/dev-uart.c | 100 -----
arch/arm/plat-s5p/Kconfig | 140 ------
arch/arm/plat-s5p/Makefile | 28 --
arch/arm/plat-s5p/sysmmu.c | 313 --------------
arch/arm/plat-samsung/Kconfig | 140 ++++++
arch/arm/plat-samsung/Makefile | 13 +
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/sysmmu.h | 95 ----
.../{plat-s5p/clock.c => plat-samsung/s5p-clock.c} | 3 +-
.../dev-mfc.c => plat-samsung/s5p-dev-mfc.c} | 4 +-
.../dev-uart.c => plat-samsung/s5p-dev-uart.c} | 78 +---
.../irq-eint.c => plat-samsung/s5p-irq-eint.c} | 3 +-
.../s5p-irq-gpioint.c} | 3 +-
.../irq-pm.c => plat-samsung/s5p-irq-pm.c} | 3 +-
.../arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} | 3 +-
arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c} | 3 +-
.../{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} | 3 +-
arch/arm/{plat-s5p => plat-samsung}/s5p-time.c | 3 +-
.../arm/{plat-s5p => plat-samsung}/setup-mipiphy.c | 0
43 files changed, 781 insertions(+), 1163 deletions(-)
delete mode 100644 arch/arm/mach-exynos/include/mach/regs-sysmmu.h
rename arch/arm/{plat-s3c24xx/cpu.c => mach-s3c24xx/common.c} (76%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/irq-pm.c (100%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/pm.c (100%)
rename arch/arm/{plat-s3c24xx => mach-s3c24xx}/sleep.S (100%)
delete mode 100644 arch/arm/plat-s3c24xx/clock.c
delete mode 100644 arch/arm/plat-s3c24xx/dev-uart.c
delete mode 100644 arch/arm/plat-s5p/Kconfig
delete mode 100644 arch/arm/plat-s5p/Makefile
delete mode 100644 arch/arm/plat-s5p/sysmmu.c
delete mode 100644 arch/arm/plat-samsung/include/plat/sysmmu.h
rename arch/arm/{plat-s5p/clock.c => plat-samsung/s5p-clock.c} (99%)
rename arch/arm/{plat-s5p/dev-mfc.c => plat-samsung/s5p-dev-mfc.c} (97%)
rename arch/arm/{plat-s5p/dev-uart.c => plat-samsung/s5p-dev-uart.c} (57%)
rename arch/arm/{plat-s5p/irq-eint.c => plat-samsung/s5p-irq-eint.c} (99%)
rename arch/arm/{plat-s5p/irq-gpioint.c =>
plat-samsung/s5p-irq-gpioint.c} (99%)
rename arch/arm/{plat-s5p/irq-pm.c => plat-samsung/s5p-irq-pm.c} (98%)
rename arch/arm/{plat-s5p/irq.c => plat-samsung/s5p-irq.c} (96%)
rename arch/arm/{plat-s5p/pm.c => plat-samsung/s5p-pm.c} (95%)
rename arch/arm/{plat-s5p/sleep.S => plat-samsung/s5p-sleep.S} (98%)
rename arch/arm/{plat-s5p => plat-samsung}/s5p-time.c (99%)
rename arch/arm/{plat-s5p => plat-samsung}/setup-mipiphy.c (100%)
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
2012-05-12 23:18 ` Kukjin Kim
@ 2012-05-13 5:21 ` Olof Johansson
-1 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2012-05-13 5:21 UTC (permalink / raw)
To: Kukjin Kim
Cc: Arnd Bergmann, linux-arm-kernel@lists.infradead.org,
linux-samsung-soc@vger.kernel.org
Hi,
On Sat, May 12, 2012 at 4:18 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Hi Arnd, Olof
>
> Please pull cleanup plat-s3c24xx-s5p for v3.5 Samsung stuff.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/cleanup-plat-s3c24xx-s5p
>
> We can remove plat-s5p directory with this series and I think, the
> plat-s3c24xx can be removed next time for one plat-samsung of Samsung stuff.
Nice!
> Note, this is including cleanup-samsung-iommu which is removing s5p iommu
> stuff in plat-s5p.
What branch is that? I've not seen a pull request for it.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
@ 2012-05-13 5:21 ` Olof Johansson
0 siblings, 0 replies; 12+ messages in thread
From: Olof Johansson @ 2012-05-13 5:21 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Sat, May 12, 2012 at 4:18 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> Hi Arnd, Olof
>
> Please pull cleanup plat-s3c24xx-s5p for v3.5 Samsung stuff.
>
> ?git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/cleanup-plat-s3c24xx-s5p
>
> We can remove plat-s5p directory with this series and I think, the
> plat-s3c24xx can be removed next time for one plat-samsung of Samsung stuff.
Nice!
> Note, this is including cleanup-samsung-iommu which is removing s5p iommu
> stuff in plat-s5p.
What branch is that? I've not seen a pull request for it.
-Olof
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
2012-05-13 5:21 ` Olof Johansson
@ 2012-05-14 7:38 ` Kukjin Kim
-1 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-14 7:38 UTC (permalink / raw)
To: 'Olof Johansson'
Cc: 'Arnd Bergmann', linux-arm-kernel, linux-samsung-soc
Olof Johansson wrote:
> Hi,
>
Hi,
> On Sat, May 12, 2012 at 4:18 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > Hi Arnd, Olof
> >
> > Please pull cleanup plat-s3c24xx-s5p for v3.5 Samsung stuff.
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> > next/cleanup-plat-s3c24xx-s5p
> >
> > We can remove plat-s5p directory with this series and I think, the
> > plat-s3c24xx can be removed next time for one plat-samsung of Samsung
> stuff.
>
> Nice!
>
> > Note, this is including cleanup-samsung-iommu which is removing s5p
> iommu
> > stuff in plat-s5p.
>
> What branch is that? I've not seen a pull request for it.
>
It is next/cleanup-samsung-iommu branch and already included in
next/cleanup-plat-s3c24xx branch as a base because as I said, that is needed
to remove plat-s5p directory.
So in this case, would be better if you could pull following branch before
pulling next/cleanup-plat-s3c24xx-s5p and sorry for missing pull request it.
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-samsung-iommu
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 d48b97b403d23f6df0b990cee652bdf9a52337a3:
Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-samsung-iommu
KyongHo Cho (2):
S5P: SYSMMU: Remove System MMU device driver
ARM: EXYNOS: Change System MMU platform device definitions
arch/arm/mach-exynos/Kconfig | 10 +-
arch/arm/mach-exynos/Makefile | 2 +-
arch/arm/mach-exynos/clock-exynos4.c | 79 ++--
arch/arm/mach-exynos/clock-exynos4.h | 2 +
arch/arm/mach-exynos/clock-exynos4210.c | 11 +
arch/arm/mach-exynos/clock-exynos4212.c | 28 ++-
arch/arm/mach-exynos/clock-exynos5.c | 90 +++++
arch/arm/mach-exynos/dev-sysmmu.c | 457
++++++++++++----------
arch/arm/mach-exynos/include/mach/irqs.h | 25 +-
arch/arm/mach-exynos/include/mach/map.h | 38 ++
arch/arm/mach-exynos/include/mach/regs-clock.h | 5 +
arch/arm/mach-exynos/include/mach/regs-sysmmu.h | 28 --
arch/arm/mach-exynos/include/mach/sysmmu.h | 88 +++--
arch/arm/mach-exynos/mach-armlex4210.c | 1 -
arch/arm/mach-exynos/mach-smdkv310.c | 1 -
arch/arm/plat-s5p/Kconfig | 8 -
arch/arm/plat-s5p/Makefile | 1 -
arch/arm/plat-s5p/sysmmu.c | 313 ----------------
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/sysmmu.h | 95 -----
20 files changed, 529 insertions(+), 754 deletions(-)
delete mode 100644 arch/arm/mach-exynos/include/mach/regs-sysmmu.h
delete mode 100644 arch/arm/plat-s5p/sysmmu.c
delete mode 100644 arch/arm/plat-samsung/include/plat/sysmmu.h
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
@ 2012-05-14 7:38 ` Kukjin Kim
0 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-14 7:38 UTC (permalink / raw)
To: linux-arm-kernel
Olof Johansson wrote:
> Hi,
>
Hi,
> On Sat, May 12, 2012 at 4:18 PM, Kukjin Kim <kgene.kim@samsung.com> wrote:
> > Hi Arnd, Olof
> >
> > Please pull cleanup plat-s3c24xx-s5p for v3.5 Samsung stuff.
> >
> > ?git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> > next/cleanup-plat-s3c24xx-s5p
> >
> > We can remove plat-s5p directory with this series and I think, the
> > plat-s3c24xx can be removed next time for one plat-samsung of Samsung
> stuff.
>
> Nice!
>
> > Note, this is including cleanup-samsung-iommu which is removing s5p
> iommu
> > stuff in plat-s5p.
>
> What branch is that? I've not seen a pull request for it.
>
It is next/cleanup-samsung-iommu branch and already included in
next/cleanup-plat-s3c24xx branch as a base because as I said, that is needed
to remove plat-s5p directory.
So in this case, would be better if you could pull following branch before
pulling next/cleanup-plat-s3c24xx-s5p and sorry for missing pull request it.
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-samsung-iommu
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 d48b97b403d23f6df0b990cee652bdf9a52337a3:
Linux 3.4-rc6 (2012-05-06 15:07:32 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
next/cleanup-samsung-iommu
KyongHo Cho (2):
S5P: SYSMMU: Remove System MMU device driver
ARM: EXYNOS: Change System MMU platform device definitions
arch/arm/mach-exynos/Kconfig | 10 +-
arch/arm/mach-exynos/Makefile | 2 +-
arch/arm/mach-exynos/clock-exynos4.c | 79 ++--
arch/arm/mach-exynos/clock-exynos4.h | 2 +
arch/arm/mach-exynos/clock-exynos4210.c | 11 +
arch/arm/mach-exynos/clock-exynos4212.c | 28 ++-
arch/arm/mach-exynos/clock-exynos5.c | 90 +++++
arch/arm/mach-exynos/dev-sysmmu.c | 457
++++++++++++----------
arch/arm/mach-exynos/include/mach/irqs.h | 25 +-
arch/arm/mach-exynos/include/mach/map.h | 38 ++
arch/arm/mach-exynos/include/mach/regs-clock.h | 5 +
arch/arm/mach-exynos/include/mach/regs-sysmmu.h | 28 --
arch/arm/mach-exynos/include/mach/sysmmu.h | 88 +++--
arch/arm/mach-exynos/mach-armlex4210.c | 1 -
arch/arm/mach-exynos/mach-smdkv310.c | 1 -
arch/arm/plat-s5p/Kconfig | 8 -
arch/arm/plat-s5p/Makefile | 1 -
arch/arm/plat-s5p/sysmmu.c | 313 ----------------
arch/arm/plat-samsung/include/plat/devs.h | 1 -
arch/arm/plat-samsung/include/plat/sysmmu.h | 95 -----
20 files changed, 529 insertions(+), 754 deletions(-)
delete mode 100644 arch/arm/mach-exynos/include/mach/regs-sysmmu.h
delete mode 100644 arch/arm/plat-s5p/sysmmu.c
delete mode 100644 arch/arm/plat-samsung/include/plat/sysmmu.h
^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
2012-05-14 7:38 ` Kukjin Kim
@ 2012-05-14 19:17 ` Arnd Bergmann
-1 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2012-05-14 19:17 UTC (permalink / raw)
To: Kukjin Kim; +Cc: 'Olof Johansson', linux-arm-kernel, linux-samsung-soc
On Monday 14 May 2012, Kukjin Kim wrote:
> It is next/cleanup-samsung-iommu branch and already included in
> next/cleanup-plat-s3c24xx branch as a base because as I said, that is needed
> to remove plat-s5p directory.
> So in this case, would be better if you could pull following branch before
> pulling next/cleanup-plat-s3c24xx-s5p and sorry for missing pull request it.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/cleanup-samsung-iommu
>
> If any problems, please let me know.
I've pulled the next/cleanup-samsung-iommu into next/drivers and the
next/cleanup-plat-s3c24xx-s5p branch into next/cleanup2, which creates
a new dependency between our two branches in arm-soc.
Arnd
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
@ 2012-05-14 19:17 ` Arnd Bergmann
0 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2012-05-14 19:17 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 14 May 2012, Kukjin Kim wrote:
> It is next/cleanup-samsung-iommu branch and already included in
> next/cleanup-plat-s3c24xx branch as a base because as I said, that is needed
> to remove plat-s5p directory.
> So in this case, would be better if you could pull following branch before
> pulling next/cleanup-plat-s3c24xx-s5p and sorry for missing pull request it.
>
> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> next/cleanup-samsung-iommu
>
> If any problems, please let me know.
I've pulled the next/cleanup-samsung-iommu into next/drivers and the
next/cleanup-plat-s3c24xx-s5p branch into next/cleanup2, which creates
a new dependency between our two branches in arm-soc.
Arnd
^ permalink raw reply [flat|nested] 12+ messages in thread
* RE: [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
2012-05-14 19:17 ` Arnd Bergmann
@ 2012-05-15 8:11 ` Kukjin Kim
-1 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-15 8:11 UTC (permalink / raw)
To: 'Arnd Bergmann'
Cc: 'Olof Johansson', linux-arm-kernel, linux-samsung-soc
Arnd Bergmann wrote:
>
> On Monday 14 May 2012, Kukjin Kim wrote:
> > It is next/cleanup-samsung-iommu branch and already included in
> > next/cleanup-plat-s3c24xx branch as a base because as I said, that is needed
> > to remove plat-s5p directory.
> > So in this case, would be better if you could pull following branch before
> > pulling next/cleanup-plat-s3c24xx-s5p and sorry for missing pull request it.
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> > next/cleanup-samsung-iommu
> >
> > If any problems, please let me know.
>
First of all, thanks for your pulling.
> I've pulled the next/cleanup-samsung-iommu into next/drivers and the
But I think would be better if you could pull the next/devel-samsung-iommu into next/drivers instead of next/cleanup-samsung-iommu.
Because actual iommu driver is included in next/devel-samsung-iommu branch and the next/cleanup-samsung-iommu branch includes just
cleanup current Samsung iommu driver.
> next/cleanup-plat-s3c24xx-s5p branch into next/cleanup2, which creates
> a new dependency between our two branches in arm-soc.
>
Sorry for creating a new dependency :( But now, it is needed and looks ok to me.
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] 12+ messages in thread
* [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
@ 2012-05-15 8:11 ` Kukjin Kim
0 siblings, 0 replies; 12+ messages in thread
From: Kukjin Kim @ 2012-05-15 8:11 UTC (permalink / raw)
To: linux-arm-kernel
Arnd Bergmann wrote:
>
> On Monday 14 May 2012, Kukjin Kim wrote:
> > It is next/cleanup-samsung-iommu branch and already included in
> > next/cleanup-plat-s3c24xx branch as a base because as I said, that is needed
> > to remove plat-s5p directory.
> > So in this case, would be better if you could pull following branch before
> > pulling next/cleanup-plat-s3c24xx-s5p and sorry for missing pull request it.
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> > next/cleanup-samsung-iommu
> >
> > If any problems, please let me know.
>
First of all, thanks for your pulling.
> I've pulled the next/cleanup-samsung-iommu into next/drivers and the
But I think would be better if you could pull the next/devel-samsung-iommu into next/drivers instead of next/cleanup-samsung-iommu.
Because actual iommu driver is included in next/devel-samsung-iommu branch and the next/cleanup-samsung-iommu branch includes just
cleanup current Samsung iommu driver.
> next/cleanup-plat-s3c24xx-s5p branch into next/cleanup2, which creates
> a new dependency between our two branches in arm-soc.
>
Sorry for creating a new dependency :( But now, it is needed and looks ok to me.
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] 12+ messages in thread
* Re: [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
2012-05-15 8:11 ` Kukjin Kim
@ 2012-05-15 14:45 ` Arnd Bergmann
-1 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2012-05-15 14:45 UTC (permalink / raw)
To: Kukjin Kim; +Cc: 'Olof Johansson', linux-arm-kernel, linux-samsung-soc
On Tuesday 15 May 2012, Kukjin Kim wrote:
> > I've pulled the next/cleanup-samsung-iommu into next/drivers and the
>
> But I think would be better if you could pull the next/devel-samsung-iommu into next/drivers instead of next/cleanup-samsung-iommu.
> Because actual iommu driver is included in next/devel-samsung-iommu branch and the next/cleanup-samsung-iommu branch includes just
> cleanup current Samsung iommu driver.
Ah, right. I though this was going through Jörg's IOMMU tree, but I saw now
that he agreed to having the new driver merged through arm-soc.
I've pulled both branches into next/drivers now.
Arnd
^ permalink raw reply [flat|nested] 12+ messages in thread
* [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5
@ 2012-05-15 14:45 ` Arnd Bergmann
0 siblings, 0 replies; 12+ messages in thread
From: Arnd Bergmann @ 2012-05-15 14:45 UTC (permalink / raw)
To: linux-arm-kernel
On Tuesday 15 May 2012, Kukjin Kim wrote:
> > I've pulled the next/cleanup-samsung-iommu into next/drivers and the
>
> But I think would be better if you could pull the next/devel-samsung-iommu into next/drivers instead of next/cleanup-samsung-iommu.
> Because actual iommu driver is included in next/devel-samsung-iommu branch and the next/cleanup-samsung-iommu branch includes just
> cleanup current Samsung iommu driver.
Ah, right. I though this was going through J?rg's IOMMU tree, but I saw now
that he agreed to having the new driver merged through arm-soc.
I've pulled both branches into next/drivers now.
Arnd
^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2012-05-15 14:45 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-12 23:18 [GIT PULL] cleanup samsung plat-s3c24xx and s5p for v3.5 Kukjin Kim
2012-05-12 23:18 ` Kukjin Kim
2012-05-13 5:21 ` Olof Johansson
2012-05-13 5:21 ` Olof Johansson
2012-05-14 7:38 ` Kukjin Kim
2012-05-14 7:38 ` Kukjin Kim
2012-05-14 19:17 ` Arnd Bergmann
2012-05-14 19:17 ` Arnd Bergmann
2012-05-15 8:11 ` Kukjin Kim
2012-05-15 8:11 ` Kukjin Kim
2012-05-15 14:45 ` Arnd Bergmann
2012-05-15 14:45 ` Arnd Bergmann
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.