Skip to contentSkip to conversation

ARM: exynos multiplatform series, part 1

PATCH Superseded Arnd Bergmann 6 participants 21 messages Apr 11, 2013 – Apr 23, 2013

Subsystems (11)
lore
Share & tools
lore
#0 lore raw

v3 cover ARM: exynos multiplatform series, part 1

Hi Kukjin,

These are the patches that I would like to apply directly to the arm-soc next/multiplatform branch, unless you have any objections. This would get all the simple stuff out of the way, and I don't think there is a big risk of introducing regressions with these.

A lot of the other patches have already been merged into subsystem trees. After this series in in arm-soc, what is left comes down to

* The ASoC conversion to dmaengine won't make it unless someone who knows that code better steps up to do it right away. This means that we won't have audio in a 3.10 multiplatform kernel on Exynos, but it will still work for users that don't enable multiplatform.

* The irqchip (combiner), clk and clksource patches are all based
on top of other changesets we pulled in from your trees, so I
would not make them part of the next/multiplatform branch. We can apply them on top of the next/drivers branch once they are tested successfully.

* A trivial patch is needed in the end to actually make CONFIG_ARCH_EXYNOS visible in multiplatform configurations. We will do that as a separate patch once everything else is there.

Please provide an ACK so I can put this into arm-soc, or let me know if I screwed up somewhere.

Arnd

Arnd Bergmann (10):
ARM: exynos: introduce EXYNOS_ATAGS symbol
ARM: exynos: prepare for sparse IRQ
ARM: exynos: move debug-macro.S to include/debug/
ARM: samsung: move mfc device definition to s5p-dev-mfc.c
i2c: s3c2410: make header file local
mmc: sdhci-s3c: remove platform dependencies thermal/exynos: remove unnecessary header inclusions
mtd: onenand/samsung: make regs-onenand.h file local
rtc: s3c: make header file local
ARM: exynos: enable multiplatform support

 arch/arm/Kconfig                                   |  9 +---
 arch/arm/Kconfig.debug                             |  8 ++++
 arch/arm/configs/exynos4_defconfig                 |  2 +-
 .../mach/debug-macro.S => include/debug/exynos.S}  | 12 ++---
 .../plat/debug-macro.S => include/debug/samsung.S} |  2 +-
 arch/arm/mach-exynos/Kconfig                       | 41 ++++++++++++++--
 arch/arm/mach-exynos/Makefile                      |  5 +-
 arch/arm/mach-exynos/common.c                      |  6 +++
 arch/arm/mach-exynos/dev-uart.c                    |  1 +
 arch/arm/mach-exynos/include/mach/irqs.h           |  5 +-
 arch/arm/mach-exynos/mach-armlex4210.c             |  2 +
 arch/arm/mach-exynos/mach-exynos4-dt.c             |  2 +
 arch/arm/mach-exynos/mach-exynos5-dt.c             |  2 +
 arch/arm/mach-exynos/mach-nuri.c                   |  2 +
 arch/arm/mach-exynos/mach-origen.c                 |  2 +
 arch/arm/mach-exynos/mach-smdk4x12.c               |  2 +
 arch/arm/mach-exynos/mach-smdkv310.c               |  3 ++
 arch/arm/mach-exynos/setup-sdhci-gpio.c            |  2 +-
 arch/arm/mach-s3c24xx/include/mach/debug-macro.S   |  2 +-
 arch/arm/mach-s3c24xx/mach-rx1950.c                |  1 -
 arch/arm/mach-s3c64xx/include/mach/debug-macro.S   |  2 +-
 arch/arm/mach-s5p64x0/include/mach/debug-macro.S   |  2 +-
 arch/arm/mach-s5pc100/include/mach/debug-macro.S   |  2 +-
 arch/arm/mach-s5pc100/setup-sdhci-gpio.c           |  1 -
 arch/arm/mach-s5pv210/include/mach/debug-macro.S   |  2 +-
 arch/arm/mach-s5pv210/setup-sdhci-gpio.c           |  1 -
 arch/arm/plat-samsung/Kconfig                      |  7 ++-
 arch/arm/plat-samsung/Makefile                     |  8 +++-
 arch/arm/plat-samsung/devs.c                       | 46 ------------------
 arch/arm/plat-samsung/include/plat/pm.h            |  5 ++
 arch/arm/plat-samsung/include/plat/sdhci.h         | 56 +---------------------
 arch/arm/plat-samsung/irq-vic-timer.c              |  1 +
 arch/arm/plat-samsung/pm.c                         |  1 +
 arch/arm/plat-samsung/s5p-dev-mfc.c                | 42 +++++++++++++++-
 arch/arm/plat-samsung/s5p-irq.c                    |  1 +
 drivers/gpio/Makefile                              |  2 +-
 drivers/i2c/busses/i2c-s3c2410.c                   |  3 +-
 .../regs-iic.h => drivers/i2c/busses/i2c-s3c2410.h |  0
 drivers/mmc/host/Kconfig                           |  2 +-
 .../mmc/host/sdhci-s3c-regs.h                      |  0
 drivers/mmc/host/sdhci-s3c.c                       |  5 +-
 drivers/mtd/onenand/samsung.c                      |  4 +-
 .../mtd/onenand/samsung.h                          |  2 -
 drivers/rtc/rtc-s3c.c                              |  3 +-
 .../plat/regs-rtc.h => drivers/rtc/rtc-s3c.h       |  3 +-
 drivers/thermal/exynos_thermal.c                   |  2 -
 include/linux/platform_data/mmc-sdhci-s3c.h        | 56 ++++++++++++++++++++++
 47 files changed, 217 insertions(+), 153 deletions(-)
 rename arch/arm/{mach-exynos/include/mach/debug-macro.S => include/debug/exynos.S} (84%)
 rename arch/arm/{plat-samsung/include/plat/debug-macro.S => include/debug/samsung.S} (98%)
 rename arch/arm/plat-samsung/include/plat/regs-iic.h => drivers/i2c/busses/i2c-s3c2410.h (100%)
 rename arch/arm/plat-samsung/include/plat/regs-sdhci.h => drivers/mmc/host/sdhci-s3c-regs.h (100%)
 rename arch/arm/plat-samsung/include/plat/regs-onenand.h => drivers/mtd/onenand/samsung.h (98%)
 rename arch/arm/plat-samsung/include/plat/regs-rtc.h => drivers/rtc/rtc-s3c.h (97%)
 create mode 100644 include/linux/platform_data/mmc-sdhci-s3c.h
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH v3 1/10 ARM: exynos: introduce EXYNOS_ATAGS symbol

As a preparation for multiplatform support, this introduces a new Kconfig symbol to split the ATAGS based EXYNOS platforms from the DT based ones. Turning off CONFIG_EXYNOS_ATAGS disables all platforms that are not yet converted to DT, and we can have code that relies on DT checking for this symbol being disabled.

---
 arch/arm/mach-exynos/Kconfig | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
arch/arm/mach-exynos/Kconfig +15 -0
index 70f94c8..33e2336 100644
@@ -85,6 +85,19 @@ config EXYNOS4_MCT
 	help
 	  Use MCT (Multi Core Timer) as kernel timers
 
+config EXYNOS_ATAGS
+	bool "ATAGS based boot for EXYNOS (deprecated)"
+	depends on ARCH_EXYNOS_SINGLE
+	depends on ATAGS
+	default y
+	help
+	  The EXYNOS platform is moving towards being completely probed
+	  through device tree. This enables support for board files using
+	  the traditional ATAGS boot format.
+	  Note that this option is not available for multiplatform builds.
+
+if EXYNOS_ATAGS
+
 config EXYNOS_DEV_DMA
 	bool
 	help
@@ -400,6 +413,8 @@ config MACH_SMDK4412
 	  Machine support for Samsung SMDK4412
 endif
 
+endif
+
 comment "Flattened Device Tree based board for EXYNOS SoCs"
 
 config MACH_EXYNOS4_DT
Signature · 1 line
1.8.1.2
#2 lore raw

PATCH v3 2/10 ARM: exynos: prepare for sparse IRQ

In reply to Arnd Bergmann

When we enable CONFIG_SPARSE_IRQ, we have to set the value of NR_IRQS in the machine_desc for legacy IRQ domains, and any file referring to the number of interrupts or a specific number must include the mach/irqs.h header file explicitly.

---
 arch/arm/mach-exynos/dev-uart.c          | 1 +
 arch/arm/mach-exynos/include/mach/irqs.h | 5 ++++-
 arch/arm/mach-exynos/mach-armlex4210.c   | 2 ++
 arch/arm/mach-exynos/mach-exynos4-dt.c   | 2 ++
 arch/arm/mach-exynos/mach-exynos5-dt.c   | 2 ++
 arch/arm/mach-exynos/mach-nuri.c         | 2 ++
 arch/arm/mach-exynos/mach-origen.c       | 2 ++
 arch/arm/mach-exynos/mach-smdk4x12.c     | 2 ++
 arch/arm/mach-exynos/mach-smdkv310.c     | 3 +++
 arch/arm/plat-samsung/irq-vic-timer.c    | 1 +
 arch/arm/plat-samsung/pm.c               | 1 +
 arch/arm/plat-samsung/s5p-irq.c          | 1 +
 12 files changed, 23 insertions(+), 1 deletion(-)
arch/arm/mach-exynos/dev-uart.c +1 -0
index 7c42f4b..c48aff0 100644
@@ -20,6 +20,7 @@
 #include <asm/mach/irq.h>
 #include <mach/hardware.h>
 #include <mach/map.h>
+#include <mach/irqs.h>
 
 #include <plat/devs.h>
 
arch/arm/mach-exynos/include/mach/irqs.h +4 -1
index 1f4dc35..8bd5dde 100644
@@ -466,7 +466,10 @@
 #define IRQ_TIMER_BASE			(IRQ_GPIO_END + 64)
 
 /* Set the default NR_IRQS */
+#define EXYNOS_NR_IRQS			(IRQ_TIMER_BASE + IRQ_TIMER_COUNT)
 
-#define NR_IRQS				(IRQ_TIMER_BASE + IRQ_TIMER_COUNT)
+#ifndef CONFIG_SPARSE_IRQ
+#define NR_IRQS				EXYNOS_NR_IRQS
+#endif
 
 #endif /* __ASM_ARCH_IRQS_H */
arch/arm/mach-exynos/mach-armlex4210.c +2 -0
index 685f291..cb95992 100644
@@ -25,6 +25,7 @@
 #include <plat/regs-srom.h>
 #include <plat/sdhci.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 
 #include "common.h"
@@ -197,6 +198,7 @@ static void __init armlex4210_machine_init(void)
 MACHINE_START(ARMLEX4210, "ARMLEX4210")
 	/* Maintainer: Alim Akhtar <[email protected]> */
 	.atag_offset	= 0x100,
+	.nr_irqs	= EXYNOS_NR_IRQS,
 	.smp		= smp_ops(exynos_smp_ops),
 	.init_irq	= exynos4_init_irq,
 	.map_io		= armlex4210_map_io,
arch/arm/mach-exynos/mach-exynos4-dt.c +2 -0
index 3358088..55aa611 100644
@@ -16,6 +16,7 @@
 
 #include <asm/mach/arch.h>
 #include <mach/map.h>
+#include <mach/irqs.h>
 
 #include <plat/cpu.h>
 #include <plat/regs-serial.h>
@@ -137,6 +138,7 @@ static char const *exynos4_dt_compat[] __initdata = {
 
 DT_MACHINE_START(EXYNOS4210_DT, "Samsung Exynos4 (Flattened Device Tree)")
 	/* Maintainer: Thomas Abraham <[email protected]> */
+	.nr_irqs	= EXYNOS_NR_IRQS,
 	.smp		= smp_ops(exynos_smp_ops),
 	.init_irq	= exynos4_init_irq,
 	.map_io		= exynos4_dt_map_io,
arch/arm/mach-exynos/mach-exynos5-dt.c +2 -0
index acaeb14..c674e7f 100644
@@ -17,6 +17,7 @@
 
 #include <asm/mach/arch.h>
 #include <mach/map.h>
+#include <mach/irqs.h>
 #include <mach/regs-pmu.h>
 
 #include <plat/cpu.h>
@@ -211,6 +212,7 @@ static void __init exynos5_reserve(void)
 
 DT_MACHINE_START(EXYNOS5_DT, "SAMSUNG EXYNOS5 (Flattened Device Tree)")
 	/* Maintainer: Kukjin Kim <[email protected]> */
+	.nr_irqs	= EXYNOS_NR_IRQS,
 	.init_irq	= exynos5_init_irq,
 	.smp		= smp_ops(exynos_smp_ops),
 	.map_io		= exynos5_dt_map_io,
arch/arm/mach-exynos/mach-nuri.c +2 -0
index 1ea7973..fee0885 100644
@@ -53,6 +53,7 @@
 #include <plat/fimc-core.h>
 #include <plat/camport.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 
 #include "common.h"
@@ -1375,6 +1376,7 @@ static void __init nuri_machine_init(void)
 MACHINE_START(NURI, "NURI")
 	/* Maintainer: Kyungmin Park <[email protected]> */
 	.atag_offset	= 0x100,
+	.nr_irqs	= EXYNOS_NR_IRQS,
 	.smp		= smp_ops(exynos_smp_ops),
 	.init_irq	= exynos4_init_irq,
 	.map_io		= nuri_map_io,
arch/arm/mach-exynos/mach-origen.c +2 -0
index 579d2d1..d1849d1 100644
@@ -46,6 +46,7 @@
 #include <plat/hdmi.h>
 
 #include <mach/map.h>
+#include <mach/irqs.h>
 
 #include <drm/exynos_drm.h>
 #include "common.h"
@@ -810,6 +811,7 @@ static void __init origen_machine_init(void)
 MACHINE_START(ORIGEN, "ORIGEN")
 	/* Maintainer: JeongHyeon Kim <[email protected]> */
 	.atag_offset	= 0x100,
+	.nr_irqs	= EXYNOS_NR_IRQS,
 	.smp		= smp_ops(exynos_smp_ops),
 	.init_irq	= exynos4_init_irq,
 	.map_io		= origen_map_io,
arch/arm/mach-exynos/mach-smdk4x12.c +2 -0
index fe61496..46c7fc7 100644
@@ -39,6 +39,7 @@
 #include <plat/regs-serial.h>
 #include <plat/sdhci.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 
 #include <drm/exynos_drm.h>
@@ -385,6 +386,7 @@ MACHINE_START(SMDK4412, "SMDK4412")
 	/* Maintainer: Kukjin Kim <[email protected]> */
 	/* Maintainer: Changhwan Youn <[email protected]> */
 	.atag_offset	= 0x100,
+	.nr_irqs	= EXYNOS_NR_IRQS,
 	.smp		= smp_ops(exynos_smp_ops),
 	.init_irq	= exynos4_init_irq,
 	.map_io		= smdk4x12_map_io,
arch/arm/mach-exynos/mach-smdkv310.c +3 -0
index d716729..5187687 100644
@@ -43,6 +43,7 @@
 #include <plat/clock.h>
 #include <plat/hdmi.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 
 #include <drm/exynos_drm.h>
@@ -419,6 +420,7 @@ MACHINE_START(SMDKV310, "SMDKV310")
 	/* Maintainer: Kukjin Kim <[email protected]> */
 	/* Maintainer: Changhwan Youn <[email protected]> */
 	.atag_offset	= 0x100,
+	.nr_irqs	= EXYNOS_NR_IRQS,
 	.smp		= smp_ops(exynos_smp_ops),
 	.init_irq	= exynos4_init_irq,
 	.map_io		= smdkv310_map_io,
@@ -431,6 +433,7 @@ MACHINE_END
 MACHINE_START(SMDKC210, "SMDKC210")
 	/* Maintainer: Kukjin Kim <[email protected]> */
 	.atag_offset	= 0x100,
+	.nr_irqs	= EXYNOS_NR_IRQS,
 	.smp		= smp_ops(exynos_smp_ops),
 	.init_irq	= exynos4_init_irq,
 	.map_io		= smdkv310_map_io,
arch/arm/plat-samsung/irq-vic-timer.c +1 -0
index f980cf3..1113066 100644
@@ -19,6 +19,7 @@
 #include <linux/io.h>
 
 #include <mach/map.h>
+#include <mach/irqs.h>
 #include <plat/cpu.h>
 #include <plat/irq-vic-timer.h>
 #include <plat/regs-timer.h>
arch/arm/plat-samsung/pm.c +1 -0
index 002b147..53210ec 100644
@@ -27,6 +27,7 @@
 #include <plat/regs-serial.h>
 #include <mach/regs-clock.h>
 #include <mach/regs-irq.h>
+#include <mach/irqs.h>
 #include <asm/irq.h>
 
 #include <plat/pm.h>
arch/arm/plat-samsung/s5p-irq.c +1 -0
index 103e371..ff1a760 100644
@@ -15,6 +15,7 @@
 #include <linux/io.h>
 #include <linux/irqchip/arm-vic.h>
 
+#include <mach/irqs.h>
 #include <mach/map.h>
 #include <plat/regs-timer.h>
 #include <plat/cpu.h>
Signature · 1 line
1.8.1.2
#3 lore raw

PATCH v3 3/10 ARM: exynos: move debug-macro.S to include/debug/

In reply to Arnd Bergmann

The move is necessary to support early debug output on exynos with multiplatform configurations. This implies also moving the plat/debug-macro.S file, but we are leaving the remaining users of that file in place, to avoid adding large numbers of extra configuration options to Kconfig.debug

---
 arch/arm/Kconfig.debug                                       |  8 ++++++++
 .../include/mach/debug-macro.S => include/debug/exynos.S}    | 12 ++++++------
 .../include/plat/debug-macro.S => include/debug/samsung.S}   |  2 +-
 arch/arm/mach-s3c24xx/include/mach/debug-macro.S             |  2 +-
 arch/arm/mach-s3c64xx/include/mach/debug-macro.S             |  2 +-
 arch/arm/mach-s5p64x0/include/mach/debug-macro.S             |  2 +-
 arch/arm/mach-s5pc100/include/mach/debug-macro.S             |  2 +-
 arch/arm/mach-s5pv210/include/mach/debug-macro.S             |  2 +-
 8 files changed, 20 insertions(+), 12 deletions(-)
 rename arch/arm/{mach-exynos/include/mach/debug-macro.S => include/debug/exynos.S} (84%)
 rename arch/arm/{plat-samsung/include/plat/debug-macro.S => include/debug/samsung.S} (98%)
arch/arm/Kconfig.debug +8 -0
index 9b31f43..59ce26a 100644
@@ -330,6 +330,7 @@ choice
 
 	config DEBUG_S3C_UART0
 		depends on PLAT_SAMSUNG
+		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
 		bool "Use S3C UART 0 for low-level debug"
 		help
 		  Say Y here if you want the debug print routines to direct
@@ -341,6 +342,7 @@ choice
 
 	config DEBUG_S3C_UART1
 		depends on PLAT_SAMSUNG
+		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
 		bool "Use S3C UART 1 for low-level debug"
 		help
 		  Say Y here if you want the debug print routines to direct
@@ -352,6 +354,7 @@ choice
 
 	config DEBUG_S3C_UART2
 		depends on PLAT_SAMSUNG
+		select DEBUG_EXYNOS_UART if ARCH_EXYNOS
 		bool "Use S3C UART 2 for low-level debug"
 		help
 		  Say Y here if you want the debug print routines to direct
@@ -363,6 +366,7 @@ choice
 
 	config DEBUG_S3C_UART3
 		depends on PLAT_SAMSUNG && ARCH_EXYNOS
+		select DEBUG_EXYNOS_UART
 		bool "Use S3C UART 3 for low-level debug"
 		help
 		  Say Y here if you want the debug print routines to direct
@@ -485,6 +489,9 @@ choice
 
 endchoice
 
+config DEBUG_EXYNOS_UART
+	bool
+
 config DEBUG_IMX_UART_PORT
 	int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \
 						DEBUG_IMX25_UART || \
@@ -580,6 +587,7 @@ endchoice
 
 config DEBUG_LL_INCLUDE
 	string
+	default "debug/exynos.S" if DEBUG_EXYNOS_UART
 	default "debug/icedcc.S" if DEBUG_ICEDCC
 	default "debug/imx.S" if DEBUG_IMX1_UART || \
 				 DEBUG_IMX25_UART || \
arch/arm/include/debug/exynos.S renamed from arch/arm/mach-exynos/include/mach/debug-macro.S +6 -6
similarity index 84%
rename from arch/arm/mach-exynos/include/mach/debug-macro.S
rename to arch/arm/include/debug/exynos.S
index e0c86ea..b17fdb7 100644
@@ -1,10 +1,7 @@
-/* linux/arch/arm/mach-exynos4/include/mach/debug-macro.S
- *
+/*
  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
  *		http://www.samsung.com
  *
- * Based on arch/arm/mach-s3c6400/include/mach/debug-macro.S
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -12,7 +9,10 @@
 
 /* pull in the relevant register and map files. */
 
-#include <mach/map.h>
+#define S3C_ADDR_BASE   0xF6000000
+#define S3C_VA_UART	S3C_ADDR_BASE + 0x01000000
+#define EXYNOS4_PA_UART	0x13800000
+#define EXYNOS5_PA_UART	0x12C00000
 
 	/* note, for the boot process to work we have to keep the UART
 	 * virtual address aligned to an 1MiB boundary for the L1
@@ -36,4 +36,4 @@
 #define fifo_full fifo_full_s5pv210
 #define fifo_level fifo_level_s5pv210
 
-#include <plat/debug-macro.S>
+#include <debug/samsung.S>
arch/arm/include/debug/samsung.S renamed from arch/arm/plat-samsung/include/plat/debug-macro.S +1 -1
similarity index 98%
rename from arch/arm/plat-samsung/include/plat/debug-macro.S
rename to arch/arm/include/debug/samsung.S
index f3a9cff..8d8d922 100644
@@ -9,7 +9,7 @@
  * published by the Free Software Foundation.
 */
 
-#include <plat/regs-serial.h>
+#include <linux/serial_s3c.h>
 
 /* The S5PV210/S5PC110 implementations are as belows. */
 
arch/arm/mach-s3c24xx/include/mach/debug-macro.S +1 -1
index 13ed33c..2558952 100644
@@ -98,4 +98,4 @@
 
 /* include the reset of the code which will do the work */
 
-#include <plat/debug-macro.S>
+#include <debug/samsung.S>
arch/arm/mach-s3c64xx/include/mach/debug-macro.S +1 -1
index c0c076a..dd9ccca 100644
@@ -35,4 +35,4 @@
  * will be fine with us.
  */
 
-#include <plat/debug-macro.S>
+#include <debug/samsung.S>
arch/arm/mach-s5p64x0/include/mach/debug-macro.S +1 -1
index e80ba3c..5e2916f 100644
@@ -30,4 +30,4 @@
 #endif
 	.endm
 
-#include <plat/debug-macro.S>
+#include <debug/samsung.S>
arch/arm/mach-s5pc100/include/mach/debug-macro.S +1 -1
index 694f759..66cb7f1 100644
@@ -36,4 +36,4 @@
  * will be fine with us.
  */
 
-#include <plat/debug-macro.S>
+#include <debug/samsung.S>
arch/arm/mach-s5pv210/include/mach/debug-macro.S +1 -1
index 79e5559..80c2199 100644
@@ -38,4 +38,4 @@
  * will be fine with us.
  */
 
-#include <plat/debug-macro.S>
+#include <debug/samsung.S>
Signature · 1 line
1.8.1.2
#4 lore raw

PATCH v3 4/10 ARM: samsung: move mfc device definition to s5p-dev-mfc.c

In reply to Arnd Bergmann

For a DT-only build we don't want to compile devs.c, but we do need the mfc device, which is also referenced by the DT based platforms, so move it all into one place.

---
 arch/arm/plat-samsung/devs.c        | 45 -------------------------------------
 arch/arm/plat-samsung/s5p-dev-mfc.c | 42 +++++++++++++++++++++++++++++++++-
 2 files changed, 41 insertions(+), 46 deletions(-)
arch/arm/plat-samsung/devs.c +0 -45
index 51afedd..de9ad27 100644
@@ -878,51 +878,6 @@ void __init s3c24xx_fb_set_platdata(struct s3c2410fb_mach_info *pd)
 }
 #endif /* CONFIG_PLAT_S3C24XX */
 
-/* MFC */
-
-#ifdef CONFIG_S5P_DEV_MFC
-static struct resource s5p_mfc_resource[] = {
-	[0] = DEFINE_RES_MEM(S5P_PA_MFC, SZ_64K),
-	[1] = DEFINE_RES_IRQ(IRQ_MFC),
-};
-
-struct platform_device s5p_device_mfc = {
-	.name		= "s5p-mfc",
-	.id		= -1,
-	.num_resources	= ARRAY_SIZE(s5p_mfc_resource),
-	.resource	= s5p_mfc_resource,
-};
-
-/*
- * MFC hardware has 2 memory interfaces which are modelled as two separate
- * platform devices to let dma-mapping distinguish between them.
- *
- * MFC parent device (s5p_device_mfc) must be registered before memory
- * interface specific devices (s5p_device_mfc_l and s5p_device_mfc_r).
- */
-
-struct platform_device s5p_device_mfc_l = {
-	.name		= "s5p-mfc-l",
-	.id		= -1,
-	.dev		= {
-		.parent			= &s5p_device_mfc.dev,
-		.dma_mask		= &samsung_device_dma_mask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-	},
-};
-
-struct platform_device s5p_device_mfc_r = {
-	.name		= "s5p-mfc-r",
-	.id		= -1,
-	.dev		= {
-		.parent			= &s5p_device_mfc.dev,
-		.dma_mask		= &samsung_device_dma_mask,
-		.coherent_dma_mask	= DMA_BIT_MASK(32),
-	},
-};
-
-#endif /* CONFIG_S5P_DEV_MFC */
-
 /* MIPI CSIS */
 
 #ifdef CONFIG_S5P_DEV_CSIS0
arch/arm/plat-samsung/s5p-dev-mfc.c +41 -1

51 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#5 lore raw

PATCH v3 5/10 i2c: s3c2410: make header file local

In reply to Arnd Bergmann

No other file in the kernel besides i2c-s3c2410.c uses the current plat/regs-iic.h, so we can simply move the header file to live in the same directory as the driver, as a preparation to multiplatform builds.

Cc linux-i2c at vger.kernel.org
Cc Wolfram Sang <[email protected]>
Cc Ben Dooks <[email protected]>
---
 arch/arm/mach-s3c24xx/mach-rx1950.c                                    | 1 -
 arch/arm/plat-samsung/devs.c                                           | 1 -
 drivers/i2c/busses/i2c-s3c2410.c                                       | 3 ++-
 .../include/plat/regs-iic.h => drivers/i2c/busses/i2c-s3c2410.h        | 0
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename arch/arm/plat-samsung/include/plat/regs-iic.h => drivers/i2c/busses/i2c-s3c2410.h (100%)
arch/arm/mach-s3c24xx/mach-rx1950.c +0 -1
index 1f9ba2a..43f3ac5 100644
@@ -56,7 +56,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
-#include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 
 #include "common.h"
arch/arm/plat-samsung/devs.c +0 -1
index de9ad27..5e37051 100644
@@ -62,7 +62,6 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/usb-phy.h>
-#include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
 #include <linux/platform_data/spi-s3c64xx.h>
drivers/i2c/busses/i2c-s3c2410.c +2 -1
index f6b880b..d042ad0 100644
@@ -42,9 +42,10 @@
 
 #include <asm/irq.h>
 
-#include <plat/regs-iic.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
+#include "i2c-s3c2410.h"
+
 /* Treat S3C2410 as baseline hardware, anything else is supported via quirks */
 #define QUIRK_S3C2440		(1 << 0)
 #define QUIRK_HDMIPHY		(1 << 1)
drivers/i2c/busses/i2c-s3c2410.h renamed from arch/arm/plat-samsung/include/plat/regs-iic.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/regs-iic.h
rename to drivers/i2c/busses/i2c-s3c2410.h
Signature · 1 line
1.8.1.2
#6 lore raw

PATCH v3 5/10 i2c: s3c2410: make header file local

Hi Arnd,

Am Donnerstag, 11. April 2013, 23:37:20 schrieb Arnd Bergmann:

Quoted 3 lines

No other file in the kernel besides i2c-s3c2410.c uses the current plat/regs-iic.h, so we can simply move the header file to live in the same directory as the driver, as a preparation to multiplatform builds.

There is already a patch doing similar changes [0] in the i2c tree for 3.10

Heiko

[0]
https://git.kernel.org/cgit/linux/kernel/git/wsa/linux.git/commit/?h=i2c/for-
next&id=e636602ac2613da8c1777cb42443223994be4107

Quoted 57 lines
Cc linux-i2c at vger.kernel.org
Cc Wolfram Sang <[email protected]>
Cc Ben Dooks <[email protected]>
---
 arch/arm/mach-s3c24xx/mach-rx1950.c                                    | 1

- arch/arm/plat-samsung/devs.c |
1 - drivers/i2c/busses/i2c-s3c2410.c
| 3 ++- .../include/plat/regs-iic.h => drivers/i2c/busses/i2c-s3c2410.h
| 0 4 files changed, 2 insertions(+), 3 deletions(-)

 rename arch/arm/plat-samsung/include/plat/regs-iic.h =>

drivers/i2c/busses/i2c-s3c2410.h (100%)

(quoted diff) +0 -0

b/arch/arm/mach-s3c24xx/mach-rx1950.c index 1f9ba2a..43f3ac5 100644

arch/arm/mach-s3c24xx/mach-rx1950.c +0 -1
@@ -56,7 +56,6 @@
 #include <plat/cpu.h>
 #include <plat/devs.h>
 #include <plat/pm.h>
-#include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 
 #include "common.h"
arch/arm/plat-samsung/devs.c +0 -1
index de9ad27..5e37051 100644
@@ -62,7 +62,6 @@
 #include <linux/platform_data/usb-s3c2410_udc.h>
 #include <linux/platform_data/usb-ohci-s3c2410.h>
 #include <plat/usb-phy.h>
-#include <plat/regs-iic.h>
 #include <plat/regs-serial.h>
 #include <plat/regs-spi.h>
 #include <linux/platform_data/spi-s3c64xx.h>
(quoted diff) +0 -0

b/drivers/i2c/busses/i2c-s3c2410.c index f6b880b..d042ad0 100644

drivers/i2c/busses/i2c-s3c2410.c +2 -1
@@ -42,9 +42,10 @@
 
 #include <asm/irq.h>
 
-#include <plat/regs-iic.h>
 #include <linux/platform_data/i2c-s3c2410.h>
 
+#include "i2c-s3c2410.h"
+
 /* Treat S3C2410 as baseline hardware, anything else is supported via
 quirks */ #define QUIRK_S3C2440		(1 << 0)
 #define QUIRK_HDMIPHY		(1 << 1)
(quoted diff) +0 -0

b/drivers/i2c/busses/i2c-s3c2410.h similarity index 100% rename from arch/arm/plat-samsung/include/plat/regs-iic.h rename to drivers/i2c/busses/i2c-s3c2410.h

#7 lore raw

PATCH v3 5/10 i2c: s3c2410: make header file local

Quoted 7 lines · Heiko St?bner

Am Donnerstag, 11. April 2013, 23:37:20 schrieb Arnd Bergmann:

Quoted 3 lines

No other file in the kernel besides i2c-s3c2410.c uses the current plat/regs-iic.h, so we can simply move the header file to live in the same directory as the driver, as a preparation to multiplatform builds.

There is already a patch doing similar changes [0] in the i2c tree for 3.10

Excellent, that patch is actually nicer than my version, thanks for taking care of this! I'll drop my patch from the series then.

Arnd

#8 lore raw

PATCH v3 6/10 mmc: sdhci-s3c: remove platform dependencies

In reply to Arnd Bergmann

plat/regs-sdhci.h is not used anywhere but in the sdhci-s3c driver, so it can become a local file there and all other inclusions removed.

plat/sdhci.h is used only to define the platform devices, and with the exception of the platform_data structure not needed by the driver, so we can split out the platform_data definition instead and leave the rest to platform code.

---
 arch/arm/mach-exynos/setup-sdhci-gpio.c            |  2 +-
 arch/arm/mach-s5pc100/setup-sdhci-gpio.c           |  1 -
 arch/arm/mach-s5pv210/setup-sdhci-gpio.c           |  1 -
 arch/arm/plat-samsung/include/plat/sdhci.h         | 56 +---------------------
 drivers/mmc/host/Kconfig                           |  2 +-
 .../mmc/host/sdhci-s3c-regs.h                      |  0
 drivers/mmc/host/sdhci-s3c.c                       |  5 +-
 include/linux/platform_data/mmc-sdhci-s3c.h        | 56 ++++++++++++++++++++++
 8 files changed, 61 insertions(+), 62 deletions(-)
 rename arch/arm/plat-samsung/include/plat/regs-sdhci.h => drivers/mmc/host/sdhci-s3c-regs.h (100%)
 create mode 100644 include/linux/platform_data/mmc-sdhci-s3c.h
arch/arm/mach-exynos/setup-sdhci-gpio.c +1 -1
index e8d08bf..d5b98c8 100644
@@ -19,8 +19,8 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/card.h>
 
+#include <mach/gpio.h>
 #include <plat/gpio-cfg.h>
-#include <plat/regs-sdhci.h>
 #include <plat/sdhci.h>
 
 void exynos4_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
arch/arm/mach-s5pc100/setup-sdhci-gpio.c +0 -1
index 03c02d0..6010c03 100644
@@ -19,7 +19,6 @@
 #include <linux/mmc/card.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/regs-sdhci.h>
 #include <plat/sdhci.h>
 
 void s5pc100_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
arch/arm/mach-s5pv210/setup-sdhci-gpio.c +0 -1
index 3e3ac05..0512ada 100644
@@ -20,7 +20,6 @@
 #include <linux/mmc/card.h>
 
 #include <plat/gpio-cfg.h>
-#include <plat/regs-sdhci.h>
 #include <plat/sdhci.h>
 
 void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
arch/arm/plat-samsung/include/plat/sdhci.h +1 -55

68 lines not on this page · raw message

drivers/mmc/host/Kconfig +1 -1
index d88219e..d054744 100644
@@ -180,7 +180,7 @@ config MMC_SDHCI_TEGRA
 
 config MMC_SDHCI_S3C
 	tristate "SDHCI support on Samsung S3C SoC"
-	depends on MMC_SDHCI && PLAT_SAMSUNG
+	depends on MMC_SDHCI && PLAT_SAMSUNG_SINGLE
 	help
 	  This selects the Secure Digital Host Controller Interface (SDHCI)
 	  often referrered to as the HSMMC block in some of the Samsung S3C
drivers/mmc/host/sdhci-s3c-regs.h renamed from arch/arm/plat-samsung/include/plat/regs-sdhci.h +0 -0
similarity index 100%
rename from arch/arm/plat-samsung/include/plat/regs-sdhci.h
rename to drivers/mmc/host/sdhci-s3c-regs.h
drivers/mmc/host/sdhci-s3c.c +2 -3
index 7363efe..e4f52b5 100644
@@ -15,6 +15,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
+#include <linux/platform_data/mmc-sdhci-s3c.h>
 #include <linux/slab.h>
 #include <linux/clk.h>
 #include <linux/io.h>
@@ -28,9 +29,7 @@
 
 #include <linux/mmc/host.h>
 
-#include <plat/sdhci.h>
-#include <plat/regs-sdhci.h>
-
+#include "sdhci-s3c-regs.h"
 #include "sdhci.h"
 
 #define MAX_BUS_CLK	(4)
include/linux/platform_data/mmc-sdhci-s3c.h new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
1.8.1.2
#9 lore raw

PATCH v3 7/10 thermal/exynos: remove unnecessary header inclusions

In reply to Arnd Bergmann

In multiplatform configurations, we cannot include headers provided by only the exynos platform. Fortunately a number of drivers that include those headers do not actually need them, so we can just remove the inclusions.

---
 drivers/thermal/exynos_thermal.c | 2 --
 1 file changed, 2 deletions(-)
drivers/thermal/exynos_thermal.c +0 -2
index 46568c0..b777ae6 100644
@@ -39,8 +39,6 @@
 #include <linux/cpu_cooling.h>
 #include <linux/of.h>
 
-#include <plat/cpu.h>
-
 /* Exynos generic registers */
 #define EXYNOS_TMU_REG_TRIMINFO		0x0
 #define EXYNOS_TMU_REG_CONTROL		0x20
Signature · 1 line
1.8.1.2
#10 lore raw

PATCH v3 8/10 mtd: onenand/samsung: make regs-onenand.h file local

In reply to Arnd Bergmann

Nothing uses the NAND register definitions other than the actual driver, so we can move the header file into the same local directory, which lets us build it in a multiplatform configuration.

Cc linux-mtd at lists.infradead.org
Cc David Woodhouse <[email protected]>
---
 drivers/mtd/onenand/samsung.c                                         | 4 ++--
 .../include/plat/regs-onenand.h => drivers/mtd/onenand/samsung.h      | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename arch/arm/plat-samsung/include/plat/regs-onenand.h => drivers/mtd/onenand/samsung.h (98%)
drivers/mtd/onenand/samsung.c +2 -2
index 33f2a8f..2cf7408 100644
@@ -23,11 +23,11 @@
 #include <linux/mtd/partitions.h>
 #include <linux/dma-mapping.h>
 #include <linux/interrupt.h>
+#include <linux/io.h>
 
 #include <asm/mach/flash.h>
-#include <plat/regs-onenand.h>
 
-#include <linux/io.h>
+#include "samsung.h"
 
 enum soc_type {
 	TYPE_S3C6400,
drivers/mtd/onenand/samsung.h renamed from arch/arm/plat-samsung/include/plat/regs-onenand.h +0 -2
similarity index 98%
rename from arch/arm/plat-samsung/include/plat/regs-onenand.h
rename to drivers/mtd/onenand/samsung.h
index 930ea8b..c4a80e6 100644
@@ -11,8 +11,6 @@
 #ifndef __SAMSUNG_ONENAND_H__
 #define __SAMSUNG_ONENAND_H__
 
-#include <mach/hardware.h>
-
 /*
  * OneNAND Controller
  */
Signature · 1 line
1.8.1.2
#11 lore raw

PATCH v3 9/10 rtc: s3c: make header file local

In reply to Arnd Bergmann

Nothing outside of the rtc driver includes plat/regs-rtc.h, so we can simply move the file into the same directory, which allows us to build the file as platform-independent code.

Cc rtc-linux at googlegroups.com
Cc Alessandro Zummo <[email protected]>
---
 drivers/rtc/rtc-s3c.c                                                  | 3 +--
 arch/arm/plat-samsung/include/plat/regs-rtc.h => drivers/rtc/rtc-s3c.h | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename arch/arm/plat-samsung/include/plat/regs-rtc.h => drivers/rtc/rtc-s3c.h (97%)
drivers/rtc/rtc-s3c.c +1 -2
index fb994e9..7995f79 100644
@@ -29,9 +29,8 @@
 #include <linux/uaccess.h>
 #include <linux/io.h>
 
-#include <mach/hardware.h>
 #include <asm/irq.h>
-#include <plat/regs-rtc.h>
+#include "rtc-s3c.h"
 
 enum s3c_cpu_type {
 	TYPE_S3C2410,
drivers/rtc/rtc-s3c.h renamed from arch/arm/plat-samsung/include/plat/regs-rtc.h +1 -2
similarity index 97%
rename from arch/arm/plat-samsung/include/plat/regs-rtc.h
rename to drivers/rtc/rtc-s3c.h
index 0f8263e..004b61a 100644
@@ -1,5 +1,4 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-rtc.h
- *
+/*
  * Copyright (c) 2003 Simtec Electronics <[email protected]>
  *		      http://www.simtec.co.uk/products/SWLINUX/
  *
Signature · 1 line
1.8.1.2
#12 lore raw

PATCH v3 10/10 ARM: exynos: enable multiplatform support

In reply to Arnd Bergmann

This makes it possible to enable the exynos platform as part of a multiplatform kernel, in addition to keeping the single-platform exynos support.

The multiplatform variant has a number of limitations at the moment:

* It only supports DT-enabled machines. This is not a problem in the long run, as non-DT machines for exynos are going away. The main problem here is that the gpio code and the exynos_eint irqchip are not multiplatform capable but still required for ATAGS based boot.
* The watchdog driver is still missing a conversion.
* sparsemem and memory_holes are currently not supported in multiplatform.

The the multiplatform aware ARCH_EXYNOS Kconfig symbol is disabled for now, as dependent patches are still pending in other subsystem trees. We will enable it once everything comes together.

---
 arch/arm/Kconfig                        |  9 +--------
 arch/arm/configs/exynos4_defconfig      |  2 +-
 arch/arm/mach-exynos/Kconfig            | 26 ++++++++++++++++++++++----
 arch/arm/mach-exynos/Makefile           |  5 +++--
 arch/arm/mach-exynos/common.c           |  6 ++++++
 arch/arm/plat-samsung/Kconfig           |  7 ++++++-
 arch/arm/plat-samsung/Makefile          |  8 ++++++--
 arch/arm/plat-samsung/include/plat/pm.h |  5 +++++
 drivers/gpio/Makefile                   |  2 +-
 9 files changed, 51 insertions(+), 19 deletions(-)
arch/arm/Kconfig +1 -8
index 13b7394..b375a94 100644
@@ -853,18 +853,11 @@ config ARCH_S5PV210
 	help
 	  Samsung S5PV210/S5PC110 series based systems
 
-config ARCH_EXYNOS
+config ARCH_EXYNOS_SINGLE
 	bool "Samsung EXYNOS"
-	select ARCH_HAS_CPUFREQ
 	select ARCH_HAS_HOLES_MEMORYMODEL
 	select ARCH_SPARSEMEM_ENABLE
-	select CLKDEV_LOOKUP
-	select CPU_V7
-	select GENERIC_CLOCKEVENTS
-	select HAVE_CLK
-	select HAVE_S3C2410_I2C if I2C
 	select HAVE_S3C2410_WATCHDOG if WATCHDOG
-	select HAVE_S3C_RTC if RTC_CLASS
 	select NEED_MACH_GPIO_H
 	select NEED_MACH_MEMORY_H
 	help
arch/arm/configs/exynos4_defconfig +1 -1
index bffe68e..ae90a0f 100644
@@ -4,7 +4,7 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_EXYNOS=y
+CONFIG_ARCH_EXYNOS_SINGLE=y
 CONFIG_S3C_LOWLEVEL_UART_PORT=1
 CONFIG_MACH_SMDKC210=y
 CONFIG_MACH_ARMLEX4210=y
arch/arm/mach-exynos/Kconfig +22 -4
index 33e2336..e4ee875 100644
@@ -7,6 +7,21 @@
 
 # Configuration options for the EXYNOS4
 
+config ARCH_EXYNOS
+	# TODO: make this visible after all drivers are converted
+	bool "Samsung EXYNOS" if ARCH_MULTI_V7 && BROKEN
+	default ARCH_EXYNOS_SINGLE
+	select ARCH_HAS_CPUFREQ
+	select CLKDEV_LOOKUP
+	select COMMON_CLK
+	select CPU_V7
+	select GENERIC_CLOCKEVENTS
+	select HAVE_CLK
+	select HAVE_S3C2410_I2C if I2C
+	select HAVE_S3C_RTC if RTC_CLASS
+	help
+	  Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
+
 if ARCH_EXYNOS
 
 menu "SAMSUNG EXYNOS SoCs Support"
@@ -19,6 +34,9 @@ config ARCH_EXYNOS4
 	help
 	  Samsung EXYNOS4 SoCs based systems
 
+config ARCH_EXYNOS4_SINGLE
+	def_bool ARCH_EXYNOS4 && ARCH_EXYNOS_SINGLE
+
 config ARCH_EXYNOS5
 	bool "SAMSUNG EXYNOS5"
 	select HAVE_SMP
@@ -35,7 +53,7 @@ config CPU_EXYNOS4210
 	select PM_GENERIC_DOMAINS
 	select S5P_PM if PM
 	select S5P_SLEEP if PM
-	select SAMSUNG_DMADEV
+	select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
 	help
 	  Enable EXYNOS4210 CPU support
 
@@ -45,7 +63,7 @@ config SOC_EXYNOS4212
 	depends on ARCH_EXYNOS4
 	select S5P_PM if PM
 	select S5P_SLEEP if PM
-	select SAMSUNG_DMADEV
+	select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
 	help
 	  Enable EXYNOS4212 SoC support
 
@@ -53,7 +71,7 @@ config SOC_EXYNOS4412
 	bool "SAMSUNG EXYNOS4412"
 	default y
 	depends on ARCH_EXYNOS4
-	select SAMSUNG_DMADEV
+	select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
 	help
 	  Enable EXYNOS4412 SoC support
 
@@ -64,7 +82,7 @@ config SOC_EXYNOS5250
 	select S5P_PM if PM
 	select S5P_SLEEP if PM
 	select S5P_DEV_MFC
-	select SAMSUNG_DMADEV
+	select SAMSUNG_DMADEV if ARCH_EXYNOS_SINGLE
 	help
 	  Enable EXYNOS5250 SoC support
 
arch/arm/mach-exynos/Makefile +3 -2
index 435757e..57e9124 100644
@@ -4,6 +4,7 @@
 #		http://www.samsung.com/
 #
 # Licensed under GPLv2
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) += -I$(srctree)/$(src)/include -I$(srctree)/arch/arm/plat-samsung/include
 
 obj-y				:=
 obj-m				:=
@@ -48,12 +49,12 @@ obj-$(CONFIG_MACH_EXYNOS5_DT)		+= mach-exynos5-dt.o
 # device support
 
 obj-y					+= dev-uart.o
-obj-$(CONFIG_ARCH_EXYNOS4)		+= dev-audio.o
+obj-$(CONFIG_ARCH_EXYNOS4_SINGLE)	+= dev-audio.o
 obj-$(CONFIG_EXYNOS4_DEV_AHCI)		+= dev-ahci.o
 obj-$(CONFIG_EXYNOS_DEV_DMA)		+= dma.o
 obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI)	+= dev-ohci.o
 
-obj-$(CONFIG_ARCH_EXYNOS)		+= setup-i2c0.o
+obj-$(CONFIG_ARCH_EXYNOS_SINGLE)	+= setup-i2c0.o
 obj-$(CONFIG_EXYNOS4_SETUP_FIMC)	+= setup-fimc.o
 obj-$(CONFIG_EXYNOS4_SETUP_FIMD0)	+= setup-fimd0.o
 obj-$(CONFIG_EXYNOS4_SETUP_I2C1)	+= setup-i2c1.o
arch/arm/mach-exynos/common.c +6 -0
index d63d399..83bd3f0 100644
@@ -368,6 +368,9 @@ static void __init exynos4_map_io(void)
 	else
 		iotable_init(exynos4_iodesc1, ARRAY_SIZE(exynos4_iodesc1));
 
+	if (!IS_ENABLED(CONFIG_EXYNOS_ATAGS))
+		return
+
 	/* initialize device information early */
 	exynos4_default_sdhci0();
 	exynos4_default_sdhci1();
@@ -570,6 +573,8 @@ static void __init exynos4_init_uarts(struct s3c2410_uartcfg *cfg, int no)
 	s3c24xx_init_uartdevs("exynos4210-uart", exynos4_uart_resources, cfg, no);
 }
 
+
+#ifdef CONFIG_EXYNOS_ATAGS
 static void __iomem *exynos_eint_base;
 
 static DEFINE_SPINLOCK(eint_lock);
@@ -875,3 +880,4 @@ static int __init exynos_init_irq_eint(void)
 	return 0;
 }
 arch_initcall(exynos_init_irq_eint);
+#endif
arch/arm/plat-samsung/Kconfig +6 -1
index a9d5216..8aae681 100644
@@ -13,6 +13,10 @@ config PLAT_SAMSUNG
 	help
 	  Base platform code for all Samsung SoC based systems
 
+config PLAT_SAMSUNG_SINGLE
+	def_bool PLAT_SAMSUNG && !ARCH_MULTIPLATFORM
+	
+
 config PLAT_S5P
 	bool
 	depends on (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS)
@@ -23,7 +27,7 @@ config PLAT_S5P
 	select GIC_NON_BANKED if ARCH_EXYNOS4
 	select NO_IOPORT
 	select PLAT_SAMSUNG
-	select S3C_GPIO_TRACK
+	select S3C_GPIO_TRACK if PLAT_SAMSUNG_SINGLE
 	select S5P_GPIO_DRVSTR
 	select SAMSUNG_CLKSRC
 	select SAMSUNG_GPIOLIB_4BIT
@@ -178,6 +182,7 @@ config S5P_DEV_UART
 
 config S3C_ADC
 	bool "ADC common driver support"
+	depends on PLAT_SAMSUNG_SINGLE
 	help
 	  Core support for the ADC block found in the Samsung SoC systems
 	  for drivers such as the touchscreen and hwmon to use to share
arch/arm/plat-samsung/Makefile +6 -2
index 3a7c64d..cf684b2 100644
@@ -4,6 +4,9 @@
 #
 # Licensed under GPLv2
 
+ccflags-$(CONFIG_ARCH_MULTI_V7) += -I$(srctree)/$(src)/include
+ccflags-$(CONFIG_ARCH_EXYNOS)	+= -I$(srctree)/arch/arm/mach-exynos/include
+
 obj-y				:=
 obj-m				:=
 obj-n				:= dummy.o
@@ -34,7 +37,7 @@ obj-$(CONFIG_S3C_ADC)	+= adc.o
 
 obj-y				+= platformdata.o
 
-obj-y				+= devs.o
+obj-$(CONFIG_PLAT_SAMSUNG_SINGLE)	+= devs.o
 obj-y				+= dev-uart.o
 obj-$(CONFIG_S5P_DEV_MFC)	+= s5p-dev-mfc.o
 obj-$(CONFIG_S5P_DEV_UART)	+= s5p-dev-uart.o
@@ -51,9 +54,10 @@ obj-$(CONFIG_S3C_DMA)		+= dma.o s3c-dma-ops.o
 obj-$(CONFIG_SAMSUNG_DMADEV)	+= dma-ops.o
 
 # PM support
-
 obj-$(CONFIG_PM)		+= pm.o
+ifdef CONFIG_PLAT_SAMSUNG_SINGLE
 obj-$(CONFIG_PM)		+= pm-gpio.o
+endif
 obj-$(CONFIG_SAMSUNG_PM_CHECK)	+= pm-check.o
 
 obj-$(CONFIG_SAMSUNG_WAKEMASK)	+= wakeup-mask.o
arch/arm/plat-samsung/include/plat/pm.h +5 -0
index f6fcade..266a4e3 100644
@@ -166,6 +166,7 @@ extern void s3c_pm_check_store(void);
  */
 extern void s3c_pm_configure_extint(void);
 
+#ifdef CONFIG_PLAT_SAMSUNG_SINGLE
 /**
  * samsung_pm_restore_gpios() - restore the state of the gpios after sleep.
  *
@@ -181,6 +182,10 @@ extern void samsung_pm_restore_gpios(void);
  * Save the GPIO states for resotration on resume. See samsung_pm_restore_gpios().
  */
 extern void samsung_pm_save_gpios(void);
+#else
+#define samsung_pm_restore_gpios()	do { } while(0)
+#define samsung_pm_save_gpios()		do { } while(0)
+#endif
 
 extern void s3c_pm_save_core(void);
 extern void s3c_pm_restore_core(void);
drivers/gpio/Makefile +1 -1
index 22e07bc..6c16050 100644
@@ -57,7 +57,7 @@ obj-$(CONFIG_GPIO_PL061)	+= gpio-pl061.o
 obj-$(CONFIG_GPIO_PXA)		+= gpio-pxa.o
 obj-$(CONFIG_GPIO_RC5T583)	+= gpio-rc5t583.o
 obj-$(CONFIG_GPIO_RDC321X)	+= gpio-rdc321x.o
-obj-$(CONFIG_PLAT_SAMSUNG)	+= gpio-samsung.o
+obj-$(CONFIG_PLAT_SAMSUNG_SINGLE)	+= gpio-samsung.o
 obj-$(CONFIG_ARCH_SA1100)	+= gpio-sa1100.o
 obj-$(CONFIG_GPIO_SCH)		+= gpio-sch.o
 obj-$(CONFIG_GPIO_SODAVILLE)	+= gpio-sodaville.o
Signature · 1 line
1.8.1.2
#13 lore raw

v3 cover ARM: exynos multiplatform series, part 1

In reply to Arnd Bergmann
Quoted 22 lines · Arnd Bergmann

These are the patches that I would like to apply directly to the arm-soc next/multiplatform branch, unless you have any objections. This would get all the simple stuff out of the way, and I don't think there is a big risk of introducing regressions with these.

A lot of the other patches have already been merged into subsystem trees. After this series in in arm-soc, what is left comes down to

* The ASoC conversion to dmaengine won't make it unless someone who knows that code better steps up to do it right away. This means that we won't have audio in a 3.10 multiplatform kernel on Exynos, but it will still work for users that don't enable multiplatform.

* The irqchip (combiner), clk and clksource patches are all based
on top of other changesets we pulled in from your trees, so I
would not make them part of the next/multiplatform branch. We can apply them on top of the next/drivers branch once they are tested successfully.

Quoted 7 lines

* A trivial patch is needed in the end to actually make CONFIG_ARCH_EXYNOS visible in multiplatform configurations. We will do that as a separate patch once everything else is there.

Please provide an ACK so I can put this into arm-soc, or let me know if I screwed up somewhere.

No reply?

I'm putting them into the next/multiplatform branch now, with the exception of the i2c patch that is already in the i2c tree.

I've tested this on the Arndale board and am putting it into the next/multiplatform branch now as a stepping stone for part two, which will be a late branch at best, if we decide to merge it in 3.10.

Arnd

#14 lore raw

v3 cover ARM: exynos multiplatform series, part 1

Quoted 33 lines · Arnd Bergmann
Quoted 22 lines · Arnd Bergmann

These are the patches that I would like to apply directly to the arm-soc next/multiplatform branch, unless you have any objections. This would get all the simple stuff out of the way, and I don't think there is a big risk of introducing regressions with these.

A lot of the other patches have already been merged into subsystem trees. After this series in in arm-soc, what is left comes down to

* The ASoC conversion to dmaengine won't make it unless someone who knows that code better steps up to do it right away. This means that we won't have audio in a 3.10 multiplatform kernel on Exynos, but it will still work for users that don't enable multiplatform.

* The irqchip (combiner), clk and clksource patches are all based
on top of other changesets we pulled in from your trees, so I
would not make them part of the next/multiplatform branch. We can apply them on top of the next/drivers branch once they are tested successfully.

Quoted 7 lines

* A trivial patch is needed in the end to actually make CONFIG_ARCH_EXYNOS visible in multiplatform configurations. We will do that as a separate patch once everything else is there.

Please provide an ACK so I can put this into arm-soc, or let me know if I screwed up somewhere.

No reply?

Quoted 8 lines

I'm putting them into the next/multiplatform branch now, with the exception of the i2c patch that is already in the i2c tree.

I've tested this on the Arndale board and am putting it into the next/multiplatform branch now as a stepping stone for part two, which will be a late branch at best, if we decide to merge it in 3.10.

I've reviewed this patch series and nothing concerning jumps. Please feel free to add

if still possible.

Thanks.

Sylwester

#15 lore raw

v3 cover ARM: exynos multiplatform series, part 1

In reply to Arnd Bergmann

Hi Arnd,

Quoted 33 lines · Arnd Bergmann
Quoted 22 lines · Arnd Bergmann

These are the patches that I would like to apply directly to the arm-soc next/multiplatform branch, unless you have any objections. This would get all the simple stuff out of the way, and I don't think there is a big risk of introducing regressions with these.

A lot of the other patches have already been merged into subsystem trees. After this series in in arm-soc, what is left comes down to

* The ASoC conversion to dmaengine won't make it unless someone who knows that code better steps up to do it right away. This means that we won't have audio in a 3.10 multiplatform kernel on Exynos, but it will still work for users that don't enable multiplatform.

* The irqchip (combiner), clk and clksource patches are all based
on top of other changesets we pulled in from your trees, so I
would not make them part of the next/multiplatform branch. We can apply them on top of the next/drivers branch once they are tested successfully.

Quoted 7 lines

* A trivial patch is needed in the end to actually make CONFIG_ARCH_EXYNOS visible in multiplatform configurations. We will do that as a separate patch once everything else is there.

Please provide an ACK so I can put this into arm-soc, or let me know if I screwed up somewhere.

No reply?

Quoted 8 lines

I'm putting them into the next/multiplatform branch now, with the exception of the i2c patch that is already in the i2c tree.

I've tested this on the Arndale board and am putting it into the next/multiplatform branch now as a stepping stone for part two, which will be a late branch at best, if we decide to merge it in 3.10.

With this branch now available (merged) in linux-next (20130422), looks like exynos4 DT support is broken on it. Tested on Origen 4210 and 4412 and I get the following warnings on 4412 Origen board with exynos_defconfig (Note that clocks are all 0). However, it boots fine on Arndale board.

SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=2, Nodes=1 Preemptible hierarchical RCU implementation. NR_IRQS:549
Exynos4x12 clocks: sclk_apll = 0, sclk_mpll = 0

        sclk_epll = 0, sclk_vpll = 0, arm_clk = 0
Division by zero in kernel.
CPU: 0 PID: 0 Comm: swapper/0 Not tainted

3.9.0-rc8-next-20130422-00038-g20ff84f #50
[<c0013fc8>] (unwind_backtrace+0x0/0xf8) from [<c0010ee4>] (show_stack+0x10/0x14)
[<c0010ee4>] (show_stack+0x10/0x14) from [<c0190704>] (Ldiv0_64+0x8/0x18) [<c0190704>] (Ldiv0_64+0x8/0x18) from [<c00549c4>] (__clocksource_updatefreq_scale+0x44/0x19c)
[<c00549c4>] (__clocksource_updatefreq_scale+0x44/0x19c) from [<c0054b28>] (__clocksource_register_scale+0xc/0x44)
[<c0054b28>] (__clocksource_register_scale+0xc/0x44) from [<c04895b0>] (exynos4_clocksource_init+0x20/0x40)
[<c04895b0>] (exynos4_clocksource_init+0x20/0x40) from [<c0489638>] (mct_init_dt+0x68/0x74)
[<c0489638>] (mct_init_dt+0x68/0x74) from [<c0489384>] (clocksource_of_init+0x30/0x58)
[<c0489384>] (clocksource_of_init+0x30/0x58) from [<c0473ae0>] (time_init+0x1c/0x30)
[<c0473ae0>] (time_init+0x1c/0x30) from [<c04706a0>] (start_kernel+0x1a0/0x37c) [<c04706a0>] (start_kernel+0x1a0/0x37c) from [<40008074>] (0x40008074) Division by zero in kernel.

Signature · 2 lines
With warm regards,
Sachin
#16 lore raw

v3 cover ARM: exynos multiplatform series, part 1

Quoted 6 lines · Sachin Kamat

With this branch now available (merged) in linux-next (20130422), looks like exynos4 DT support is broken on it. Tested on Origen 4210 and 4412 and I get the following warnings on 4412 Origen board with exynos_defconfig (Note that clocks are all 0). However, it boots fine on Arndale board.

I think this issue should be fixed with the patch that Thomas Abraham just sent. Thomas, can you confirm?

Quoted 18 lines

SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=2, Nodes=1 Preemptible hierarchical RCU implementation. NR_IRQS:549
Exynos4x12 clocks: sclk_apll = 0, sclk_mpll = 0

        sclk_epll = 0, sclk_vpll = 0, arm_clk = 0
Division by zero in kernel.
CPU: 0 PID: 0 Comm: swapper/0 Not tainted

3.9.0-rc8-next-20130422-00038-g20ff84f #50
[<c0013fc8>] (unwind_backtrace+0x0/0xf8) from [<c0010ee4>] (show_stack+0x10/0x14)
[<c0010ee4>] (show_stack+0x10/0x14) from [<c0190704>] (Ldiv0_64+0x8/0x18) [<c0190704>] (Ldiv0_64+0x8/0x18) from [<c00549c4>] (__clocksource_updatefreq_scale+0x44/0x19c)
[<c00549c4>] (__clocksource_updatefreq_scale+0x44/0x19c) from [<c0054b28>] (__clocksource_register_scale+0xc/0x44) [<c0054b28>] (__clocksource_register_scale+0xc/0x44) from [<c04895b0>] (exynos4_clocksource_init+0x20/0x40)
[<c04895b0>] (exynos4_clocksource_init+0x20/0x40) from [<c0489638>]

Quoted 8 lines

(mct_init_dt+0x68/0x74)
[<c0489638>] (mct_init_dt+0x68/0x74) from [<c0489384>] (clocksource_of_init+0x30/0x58)
[<c0489384>] (clocksource_of_init+0x30/0x58) from [<c0473ae0>] (time_init+0x1c/0x30)
[<c0473ae0>] (time_init+0x1c/0x30) from [<c04706a0>] (start_kernel+0x1a0/0x37c) [<c04706a0>] (start_kernel+0x1a0/0x37c) from [<40008074>] (0x40008074) Division by zero in kernel.

Arnd

#17 lore raw

v3 cover ARM: exynos multiplatform series, part 1

Quoted 10 lines · Arnd Bergmann
Quoted 6 lines · Sachin Kamat

With this branch now available (merged) in linux-next (20130422), looks like exynos4 DT support is broken on it. Tested on Origen 4210 and 4412 and I get the following warnings on 4412 Origen board with exynos_defconfig (Note that clocks are all 0). However, it boots fine on Arndale board.

I think this issue should be fixed with the patch that Thomas Abraham just sent. Thomas, can you confirm?

Yes, this issue is resolved with chip-id dt support patches, without which the parent of fin_pll clock is set as xxti (which is set to 0Hz for Origen4210) instead of xusbxti.

Thomas.

Quoted 29 lines
Quoted 19 lines

SLUB: HWalign=64, Order=0-3, MinObjects=0, CPUs=2, Nodes=1 Preemptible hierarchical RCU implementation. NR_IRQS:549
Exynos4x12 clocks: sclk_apll = 0, sclk_mpll = 0

        sclk_epll = 0, sclk_vpll = 0, arm_clk = 0
Division by zero in kernel.
CPU: 0 PID: 0 Comm: swapper/0 Not tainted

3.9.0-rc8-next-20130422-00038-g20ff84f #50
[<c0013fc8>] (unwind_backtrace+0x0/0xf8) from [<c0010ee4>] (show_stack+0x10/0x14)
[<c0010ee4>] (show_stack+0x10/0x14) from [<c0190704>] (Ldiv0_64+0x8/0x18) [<c0190704>] (Ldiv0_64+0x8/0x18) from [<c00549c4>] (__clocksource_updatefreq_scale+0x44/0x19c)
[<c00549c4>] (__clocksource_updatefreq_scale+0x44/0x19c) from [<c0054b28>] (__clocksource_register_scale+0xc/0x44) [<c0054b28>] (__clocksource_register_scale+0xc/0x44) from [<c04895b0>] (exynos4_clocksource_init+0x20/0x40)
[<c04895b0>] (exynos4_clocksource_init+0x20/0x40) from [<c0489638>]

Quoted 8 lines

(mct_init_dt+0x68/0x74)
[<c0489638>] (mct_init_dt+0x68/0x74) from [<c0489384>] (clocksource_of_init+0x30/0x58)
[<c0489384>] (clocksource_of_init+0x30/0x58) from [<c0473ae0>] (time_init+0x1c/0x30)
[<c0473ae0>] (time_init+0x1c/0x30) from [<c04706a0>] (start_kernel+0x1a0/0x37c) [<c04706a0>] (start_kernel+0x1a0/0x37c) from [<40008074>] (0x40008074) Division by zero in kernel.

Arnd

#18 lore raw

v3 cover ARM: exynos multiplatform series, part 1

In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann
Quoted 6 lines · Sachin Kamat

With this branch now available (merged) in linux-next (20130422), looks like exynos4 DT support is broken on it. Tested on Origen 4210 and 4412 and I get the following warnings on 4412 Origen board with exynos_defconfig (Note that clocks are all 0). However, it boots fine on Arndale board.

I think this issue should be fixed with the patch that Thomas Abraham just sent. Thomas, can you confirm?

Boot tested Origen 4210, 4412 and Arndale boards after applying Thomas Abraham's chip-id dt support patches.
They all boot fine.

However I could not see multiplatform support for Exynos in exynos_defconfig (i.e., CONFIG_ARCH_EXYNOS and CONFIG_ARCH_MULTIPLATFORM are not set together). This was available in your 'samsung/exynos-multiplatform' branch. Has this been disabled in next?

---
With warm regards,
Sachin

#19 lore raw

v3 cover ARM: exynos multiplatform series, part 1

Quoted 16 lines · On Tuesday 23 April 2013 09:32:30 Sachin Kamat wrote:
Quoted 10 lines · Arnd Bergmann
Quoted 6 lines · Sachin Kamat

With this branch now available (merged) in linux-next (20130422), looks like exynos4 DT support is broken on it. Tested on Origen 4210 and 4412 and I get the following warnings on 4412 Origen board with exynos_defconfig (Note that clocks are all 0). However, it boots fine on Arndale board.

I think this issue should be fixed with the patch that Thomas Abraham just sent. Thomas, can you confirm?

Boot tested Origen 4210, 4412 and Arndale boards after applying Thomas Abraham's chip-id dt support patches.
They all boot fine.

Quoted 5 lines

However I could not see multiplatform support for Exynos in exynos_defconfig (i.e., CONFIG_ARCH_EXYNOS and CONFIG_ARCH_MULTIPLATFORM are not set together). This was available in your 'samsung/exynos-multiplatform' branch. Has this been disabled in next?

Yes, you have to remove the "depends on BROKEN" part in arch/arm/mach-exynos/Kconfig. The problem is that multiplatform support on Exynos only works when you have many the patches that are in linux-next at the moment, but it does not work with arm-soc alone, so I cannot enable it yet.

Arnd

#20 lore raw

v3 cover ARM: exynos multiplatform series, part 1

In reply to Arnd Bergmann
Quoted 2 lines · Arnd Bergmann

Hi Kukjin,

Hi Arnd,

Quoted 2 lines

These are the patches that I would like to apply directly to the arm-soc next/multiplatform branch, unless you have any

Yeah, looks good to me.

Quoted 4 lines

objections. This would get all the simple stuff out of the way, and I don't think there is a big risk of introducing regressions with these.

OK, please go ahead and if you want to add my ack:

Thanks.

- Kukjin

Quoted 93 lines

A lot of the other patches have already been merged into subsystem trees. After this series in in arm-soc, what is left comes down to

* The ASoC conversion to dmaengine won't make it unless someone who knows that code better steps up to do it right away. This means that we won't have audio in a 3.10 multiplatform kernel on Exynos, but it will still work for users that don't enable multiplatform.

* The irqchip (combiner), clk and clksource patches are all based
on top of other changesets we pulled in from your trees, so I
would not make them part of the next/multiplatform branch. We can apply them on top of the next/drivers branch once they are tested successfully.

* A trivial patch is needed in the end to actually make CONFIG_ARCH_EXYNOS visible in multiplatform configurations. We will do that as a separate patch once everything else is there.

Please provide an ACK so I can put this into arm-soc, or let me know if I screwed up somewhere.

Arnd

Arnd Bergmann (10):
ARM: exynos: introduce EXYNOS_ATAGS symbol
ARM: exynos: prepare for sparse IRQ
ARM: exynos: move debug-macro.S to include/debug/
ARM: samsung: move mfc device definition to s5p-dev-mfc.c
i2c: s3c2410: make header file local
mmc: sdhci-s3c: remove platform dependencies thermal/exynos: remove unnecessary header inclusions
mtd: onenand/samsung: make regs-onenand.h file local
rtc: s3c: make header file local
ARM: exynos: enable multiplatform support

  arch/arm/Kconfig                                   |  9 +---
  arch/arm/Kconfig.debug                             |  8 ++++
  arch/arm/configs/exynos4_defconfig                 |  2 +-
  .../mach/debug-macro.S =>  include/debug/exynos.S}  | 12 ++---
  .../plat/debug-macro.S =>  include/debug/samsung.S} |  2 +-
  arch/arm/mach-exynos/Kconfig                       | 41 ++++++++++++++--
  arch/arm/mach-exynos/Makefile                      |  5 +-
  arch/arm/mach-exynos/common.c                      |  6 +++
  arch/arm/mach-exynos/dev-uart.c                    |  1 +
  arch/arm/mach-exynos/include/mach/irqs.h           |  5 +-
  arch/arm/mach-exynos/mach-armlex4210.c             |  2 +
  arch/arm/mach-exynos/mach-exynos4-dt.c             |  2 +
  arch/arm/mach-exynos/mach-exynos5-dt.c             |  2 +
  arch/arm/mach-exynos/mach-nuri.c                   |  2 +
  arch/arm/mach-exynos/mach-origen.c                 |  2 +
  arch/arm/mach-exynos/mach-smdk4x12.c               |  2 +
  arch/arm/mach-exynos/mach-smdkv310.c               |  3 ++
  arch/arm/mach-exynos/setup-sdhci-gpio.c            |  2 +-
  arch/arm/mach-s3c24xx/include/mach/debug-macro.S   |  2 +-
  arch/arm/mach-s3c24xx/mach-rx1950.c                |  1 -
  arch/arm/mach-s3c64xx/include/mach/debug-macro.S   |  2 +-
  arch/arm/mach-s5p64x0/include/mach/debug-macro.S   |  2 +-
  arch/arm/mach-s5pc100/include/mach/debug-macro.S   |  2 +-
  arch/arm/mach-s5pc100/setup-sdhci-gpio.c           |  1 -
  arch/arm/mach-s5pv210/include/mach/debug-macro.S   |  2 +-
  arch/arm/mach-s5pv210/setup-sdhci-gpio.c           |  1 -
  arch/arm/plat-samsung/Kconfig                      |  7 ++-
  arch/arm/plat-samsung/Makefile                     |  8 +++-
  arch/arm/plat-samsung/devs.c                       | 46 ------------------
  arch/arm/plat-samsung/include/plat/pm.h            |  5 ++
  arch/arm/plat-samsung/include/plat/sdhci.h         | 56 +---------------------
  arch/arm/plat-samsung/irq-vic-timer.c              |  1 +
  arch/arm/plat-samsung/pm.c                         |  1 +
  arch/arm/plat-samsung/s5p-dev-mfc.c                | 42 +++++++++++++++-
  arch/arm/plat-samsung/s5p-irq.c                    |  1 +
  drivers/gpio/Makefile                              |  2 +-
  drivers/i2c/busses/i2c-s3c2410.c                   |  3 +-
  .../regs-iic.h =>  drivers/i2c/busses/i2c-s3c2410.h |  0
  drivers/mmc/host/Kconfig                           |  2 +-
  .../mmc/host/sdhci-s3c-regs.h                      |  0
  drivers/mmc/host/sdhci-s3c.c                       |  5 +-
  drivers/mtd/onenand/samsung.c                      |  4 +-
  .../mtd/onenand/samsung.h                          |  2 -
  drivers/rtc/rtc-s3c.c                              |  3 +-
  .../plat/regs-rtc.h =>  drivers/rtc/rtc-s3c.h       |  3 +-
  drivers/thermal/exynos_thermal.c                   |  2 -
  include/linux/platform_data/mmc-sdhci-s3c.h        | 56 ++++++++++++++++++++++
  47 files changed, 217 insertions(+), 153 deletions(-)

rename arch/arm/{mach-exynos/include/mach/debug-macro.S => include/debug/exynos.S} (84%) rename arch/arm/{plat-samsung/include/plat/debug-macro.S => include/debug/samsung.S} (98%) rename arch/arm/plat-samsung/include/plat/regs-iic.h => drivers/i2c/busses/i2c-s3c2410.h (100%) rename arch/arm/plat-samsung/include/plat/regs-sdhci.h => drivers/mmc/host/sdhci-s3c-regs.h (100%) rename arch/arm/plat-samsung/include/plat/regs-onenand.h => drivers/mtd/onenand/samsung.h (98%) rename arch/arm/plat-samsung/include/plat/regs-rtc.h => drivers/rtc/rtc-s3c.h (97%) create mode 100644 include/linux/platform_data/mmc-sdhci-s3c.h