Samsung plat-samsung moves round 2

PATCH New Ben Dooks 1 participant 4 messages Jan 20, 2010

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Ben Dooks

author

2010-01-20 03:48 UTC #0 lore raw

More file movement, mostly for header files and some core support.

Ben Dooks

author

2010-01-20 03:48 UTC #1 lore raw

PATCH 1/1 ARM: SAMSUNG: Move more support into plat-samsung

Move header files which are not likely to be touched in any further support addition out of plat-s3c's include directory into plat-samsung.

Signed-off-by Ben Dooks <[email protected]>

---
 .../include/plat => plat-samsung}/dma-core.h       |    0
 .../include/plat/hwmon.h                           |    0
 .../include/plat/iic-core.h                        |    0
 .../{plat-s3c => plat-samsung}/include/plat/iic.h  |    0
 .../{plat-s3c => plat-samsung}/include/plat/nand.h |    0
 .../include/plat/regs-ac97.h                       |    0
 .../include/plat/regs-adc.h                        |    0
 .../include/plat/regs-iic.h                        |    0
 .../include/plat/regs-irqtype.h                    |    0
 .../include/plat/regs-nand.h                       |    0
 .../include/plat/regs-rtc.h                        |    0
 .../include/plat/regs-s3c2412-iis.h                |    0
 .../include/plat/regs-sdhci.h                      |    0
 .../include/plat/regs-timer.h                      |    0
 .../include/plat/regs-usb-hsotg-phy.h              |    0
 .../include/plat/regs-usb-hsotg.h                  |    0
 .../include/plat/regs-watchdog.h                   |    0
 .../include/plat/sdhci.h                           |    0
 .../include/plat/udc-hs.h                          |    0
 .../include/plat/watchdog-reset.h                  |    0
 20 files changed, 0 insertions(+), 0 deletions(-)
 rename arch/arm/{plat-s3c/include/plat => plat-samsung}/dma-core.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/hwmon.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/iic-core.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/iic.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/nand.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-ac97.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-adc.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-iic.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-irqtype.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-nand.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-rtc.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-s3c2412-iis.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-sdhci.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-timer.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-usb-hsotg-phy.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-usb-hsotg.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/regs-watchdog.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/sdhci.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/udc-hs.h (100%)
 rename arch/arm/{plat-s3c => plat-samsung}/include/plat/watchdog-reset.h (100%)

arch/arm/plat-samsung/dma-core.h renamed from arch/arm/plat-s3c/include/plat/dma-core.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/dma-core.h
rename to arch/arm/plat-samsung/dma-core.h

arch/arm/plat-samsung/include/plat/hwmon.h renamed from arch/arm/plat-s3c/include/plat/hwmon.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/hwmon.h
rename to arch/arm/plat-samsung/include/plat/hwmon.h

arch/arm/plat-samsung/include/plat/iic-core.h renamed from arch/arm/plat-s3c/include/plat/iic-core.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/iic-core.h
rename to arch/arm/plat-samsung/include/plat/iic-core.h

arch/arm/plat-samsung/include/plat/iic.h renamed from arch/arm/plat-s3c/include/plat/iic.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/iic.h
rename to arch/arm/plat-samsung/include/plat/iic.h

arch/arm/plat-samsung/include/plat/nand.h renamed from arch/arm/plat-s3c/include/plat/nand.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/nand.h
rename to arch/arm/plat-samsung/include/plat/nand.h

arch/arm/plat-samsung/include/plat/regs-ac97.h renamed from arch/arm/plat-s3c/include/plat/regs-ac97.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-ac97.h
rename to arch/arm/plat-samsung/include/plat/regs-ac97.h

arch/arm/plat-samsung/include/plat/regs-adc.h renamed from arch/arm/plat-s3c/include/plat/regs-adc.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-adc.h
rename to arch/arm/plat-samsung/include/plat/regs-adc.h

arch/arm/plat-samsung/include/plat/regs-iic.h renamed from arch/arm/plat-s3c/include/plat/regs-iic.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-iic.h
rename to arch/arm/plat-samsung/include/plat/regs-iic.h

arch/arm/plat-samsung/include/plat/regs-irqtype.h renamed from arch/arm/plat-s3c/include/plat/regs-irqtype.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-irqtype.h
rename to arch/arm/plat-samsung/include/plat/regs-irqtype.h

arch/arm/plat-samsung/include/plat/regs-nand.h renamed from arch/arm/plat-s3c/include/plat/regs-nand.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-nand.h
rename to arch/arm/plat-samsung/include/plat/regs-nand.h

arch/arm/plat-samsung/include/plat/regs-rtc.h renamed from arch/arm/plat-s3c/include/plat/regs-rtc.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-rtc.h
rename to arch/arm/plat-samsung/include/plat/regs-rtc.h

arch/arm/plat-samsung/include/plat/regs-s3c2412-iis.h renamed from arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-s3c2412-iis.h
rename to arch/arm/plat-samsung/include/plat/regs-s3c2412-iis.h

arch/arm/plat-samsung/include/plat/regs-sdhci.h renamed from arch/arm/plat-s3c/include/plat/regs-sdhci.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-sdhci.h
rename to arch/arm/plat-samsung/include/plat/regs-sdhci.h

arch/arm/plat-samsung/include/plat/regs-timer.h renamed from arch/arm/plat-s3c/include/plat/regs-timer.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-timer.h
rename to arch/arm/plat-samsung/include/plat/regs-timer.h

arch/arm/plat-samsung/include/plat/regs-usb-hsotg-phy.h renamed from arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-usb-hsotg-phy.h
rename to arch/arm/plat-samsung/include/plat/regs-usb-hsotg-phy.h

arch/arm/plat-samsung/include/plat/regs-usb-hsotg.h renamed from arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-usb-hsotg.h
rename to arch/arm/plat-samsung/include/plat/regs-usb-hsotg.h

arch/arm/plat-samsung/include/plat/regs-watchdog.h renamed from arch/arm/plat-s3c/include/plat/regs-watchdog.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/regs-watchdog.h
rename to arch/arm/plat-samsung/include/plat/regs-watchdog.h

arch/arm/plat-samsung/include/plat/sdhci.h renamed from arch/arm/plat-s3c/include/plat/sdhci.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/sdhci.h
rename to arch/arm/plat-samsung/include/plat/sdhci.h

arch/arm/plat-samsung/include/plat/udc-hs.h renamed from arch/arm/plat-s3c/include/plat/udc-hs.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/udc-hs.h
rename to arch/arm/plat-samsung/include/plat/udc-hs.h

arch/arm/plat-samsung/include/plat/watchdog-reset.h renamed from arch/arm/plat-s3c/include/plat/watchdog-reset.h +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/include/plat/watchdog-reset.h
rename to arch/arm/plat-samsung/include/plat/watchdog-reset.h

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-20 03:48 UTC #2 lore raw

PATCH 1/1 ARM: SAMSUNG: Move pmw.c to plat-samsung

In reply to Ben Dooks

Move the PWM driver support to plat-samsung, as these PWM blocks are close enough across the current range to be supported by this driver.

Signed-off-by Ben Dooks <[email protected]>

---
 arch/arm/plat-s3c/Makefile                |    4 ----
 arch/arm/plat-samsung/Makefile            |    4 ++++
 arch/arm/{plat-s3c => plat-samsung}/pwm.c |    0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/arm/{plat-s3c => plat-samsung}/pwm.c (100%)

arch/arm/plat-s3c/Makefile +0 -4

index 20cb335..095bc97 100644
@@ -22,7 +22,3 @@ obj-$(CONFIG_S3C_DMA)		+= dma.o
 
 obj-$(CONFIG_PM)		+= pm.o
 obj-$(CONFIG_S3C2410_PM_CHECK)	+= pm-check.o
-
-# PWM support
-
-obj-$(CONFIG_HAVE_PWM)		+= pwm.o

arch/arm/plat-samsung/Makefile +4 -0

index 27d5bfb..f31e64f 100644
@@ -42,3 +42,7 @@ obj-$(CONFIG_S3C_DEV_NAND)	+= dev-nand.o
 # PM support
 
 obj-$(CONFIG_PM)		+= pm-gpio.o
+
+# PWM support
+
+obj-$(CONFIG_HAVE_PWM)		+= pwm.o

arch/arm/plat-samsung/pwm.c renamed from arch/arm/plat-s3c/pwm.c +0 -0

similarity index 100%
rename from arch/arm/plat-s3c/pwm.c
rename to arch/arm/plat-samsung/pwm.c

Signature · 1 line

1.6.0.4

Ben Dooks

author

2010-01-20 03:48 UTC #3 lore raw

PATCH 1/1 ARM: SAMSUNG: Move pm-check.c to plat-samsung

In reply to Ben Dooks

Move the pm-check.c file to plat-samsung for all Samsung SoC users, and update Kconfig names to make them SAMSUNG_ instead of S3C2410_

Sed expresions used to make the change:

    s/S3C2410_PM_DEBUG/SAMSUNG_PM_DEBUG/g
    s/S3C2410_PM_CHECK/SAMSUNG_PM_CHECK/g

Signed-off-by Ben Dooks <[email protected]>

---
 arch/arm/configs/mini2440_defconfig            |    4 +-
 arch/arm/configs/s3c2410_defconfig             |    4 +-
 arch/arm/plat-s3c/Kconfig                      |   44 -----------------------
 arch/arm/plat-s3c/Makefile                     |    1 -
 arch/arm/plat-s3c/include/plat/pm.h            |    4 +-
 arch/arm/plat-s3c/pm.c                         |    6 ++--
 arch/arm/plat-samsung/Kconfig                  |   45 ++++++++++++++++++++++++
 arch/arm/plat-samsung/Makefile                 |    1 +
 arch/arm/{plat-s3c => plat-samsung}/pm-check.c |    8 ++--
 9 files changed, 59 insertions(+), 58 deletions(-)
 rename arch/arm/{plat-s3c => plat-samsung}/pm-check.c (95%)

arch/arm/configs/mini2440_defconfig +2 -2

index 4c46644..ff44bd1 100644
@@ -199,8 +199,8 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
 #
 # Power management
 #
-# CONFIG_S3C2410_PM_DEBUG is not set
-# CONFIG_S3C2410_PM_CHECK is not set
+# CONFIG_SAMSUNG_PM_DEBUG is not set
+# CONFIG_SAMSUNG_PM_CHECK is not set
 CONFIG_S3C_LOWLEVEL_UART_PORT=0
 CONFIG_S3C_GPIO_SPACE=0

arch/arm/configs/s3c2410_defconfig +2 -2

index 9697e97..8e94c3c 100644
@@ -203,8 +203,8 @@ CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
 #
 # Power management
 #
-# CONFIG_S3C2410_PM_DEBUG is not set
-# CONFIG_S3C2410_PM_CHECK is not set
+# CONFIG_SAMSUNG_PM_DEBUG is not set
+# CONFIG_SAMSUNG_PM_CHECK is not set
 CONFIG_S3C_LOWLEVEL_UART_PORT=0
 CONFIG_S3C_GPIO_SPACE=0
 CONFIG_S3C_DEV_HSMMC=y

arch/arm/plat-s3c/Kconfig +0 ~~-44~~

50 lines not on this page · raw message

arch/arm/plat-s3c/Makefile +0 -1

index 095bc97..89dbdb0 100644
@@ -21,4 +21,3 @@ obj-$(CONFIG_S3C_DMA)		+= dma.o
 # PM support
 
 obj-$(CONFIG_PM)		+= pm.o
-obj-$(CONFIG_S3C2410_PM_CHECK)	+= pm-check.o

arch/arm/plat-s3c/include/plat/pm.h +2 -2

index 7a79719..2543bd2 100644
@@ -111,7 +111,7 @@ extern int s3c24xx_irq_resume(struct sys_device *dev);
 
 /* PM debug functions */
 
-#ifdef CONFIG_S3C2410_PM_DEBUG
+#ifdef CONFIG_SAMSUNG_PM_DEBUG
 /**
  * s3c_pm_dbg() - low level debug function for use in suspend/resume.
  * @msg: The message to print.

@@ -141,7 +141,7 @@ static inline void s3c_pm_debug_smdkled(u32 set, u32 clear) { }
 
 /* suspend memory checking */
 
-#ifdef CONFIG_S3C2410_PM_CHECK
+#ifdef CONFIG_SAMSUNG_PM_CHECK
 extern void s3c_pm_check_prepare(void);
 extern void s3c_pm_check_restore(void);
 extern void s3c_pm_check_cleanup(void);

arch/arm/plat-s3c/pm.c +3 -3

index 7674706..e5eef12 100644
@@ -41,7 +41,7 @@ unsigned long s3c_pm_flags;
  * resume before the console layer is available.
 */
 
-#ifdef CONFIG_S3C2410_PM_DEBUG
+#ifdef CONFIG_SAMSUNG_PM_DEBUG
 extern void printascii(const char *);
 
 void s3c_pm_dbg(const char *fmt, ...)

@@ -65,13 +65,13 @@ static inline void s3c_pm_debug_init(void)
 #else
 #define s3c_pm_debug_init() do { } while(0)
 
-#endif /* CONFIG_S3C2410_PM_DEBUG */
+#endif /* CONFIG_SAMSUNG_PM_DEBUG */
 
 /* Save the UART configurations if we are configured for debug. */
 
 unsigned char pm_uart_udivslot;
 
-#ifdef CONFIG_S3C2410_PM_DEBUG
+#ifdef CONFIG_SAMSUNG_PM_DEBUG
 
 struct pm_uart_save uart_save[CONFIG_SERIAL_SAMSUNG_UARTS];

arch/arm/plat-samsung/Kconfig +45 -0

49 lines not on this page · raw message

arch/arm/plat-samsung/Makefile +1 -0

index f31e64f..c8c8cae 100644
@@ -42,6 +42,7 @@ obj-$(CONFIG_S3C_DEV_NAND)	+= dev-nand.o
 # PM support
 
 obj-$(CONFIG_PM)		+= pm-gpio.o
+obj-$(CONFIG_SAMSUNG_PM_CHECK)	+= pm-check.o
 
 # PWM support

arch/arm/plat-samsung/pm-check.c renamed from arch/arm/plat-s3c/pm-check.c +4 -4

similarity index 95%
rename from arch/arm/plat-s3c/pm-check.c
rename to arch/arm/plat-samsung/pm-check.c
index 8eb1f43..0b5bb77 100644
@@ -20,8 +20,8 @@
 
 #include <plat/pm.h>
 
-#if CONFIG_S3C2410_PM_CHECK_CHUNKSIZE < 1
-#error CONFIG_S3C2410_PM_CHECK_CHUNKSIZE must be a positive non-zero value
+#if CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE < 1
+#error CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE must be a positive non-zero value
 #endif
 
 /* suspend checking code...

@@ -29,12 +29,12 @@
  * this next area does a set of crc checks over all the installed
  * memory, so the system can verify if the resume was ok.
  *
- * CONFIG_S3C2410_PM_CHECK_CHUNKSIZE defines the block-size for the CRC,
+ * CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE defines the block-size for the CRC,
  * increasing it will mean that the area corrupted will be less easy to spot,
  * and reducing the size will cause the CRC save area to grow
 */
 
-#define CHECK_CHUNKSIZE (CONFIG_S3C2410_PM_CHECK_CHUNKSIZE * 1024)
+#define CHECK_CHUNKSIZE (CONFIG_SAMSUNG_PM_CHECK_CHUNKSIZE * 1024)
 
 static u32 crc_size;	/* size needed for the crc block */
 static u32 *crcs;	/* allocated over suspend/resume */

Signature · 1 line

1.6.0.4