ARM: Samsung: S5PC100 platform cleanup
Subsystems (3)
PATCH v2 1/1 ARM: Samsung: S5PC100 platform cleanup
Hello,
This patch series perform a general cleanup in Samsung S5PC100 SoC support. This chip is moved from custom s5pc1xx platform framework to new plat-s5p framework, so more common code can be easily reused in upcomming extensions for S5PV210/S5PC110 SoCs.
This patch series is prepared against next-samsung tree, with assumption that the "[PATCH v3] ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p" has been applied.
I've tried to split my changes as much as possible to clearly show how the transition from plat-s5pc1xx to plat-s5p is being done.
Changes since v1:
- bases on completely new clock code provided by Kukjin Kim
- added some plat-s5p fixes required for transition
- removed custom functions from gpiolib implementation (now uses common code from plat-samsung)
- restructured the changes to avoid breaking the functionality beteen the patches
- some other minor cleanups (mainly c1xx to c100 renames)
This patch series includes:
[PATCH 01/15] ARM: Samsung: fix broken timer irq base
[PATCH 02/15] ARM: Samsung: move common I2C0 device helpers to machine directories [PATCH 03/15] ARM: Samsung: move driver strength gpio configuration helper to common dir [PATCH 04/15] drivers: serial: S5PC100 serial driver cleanup
[PATCH 05/15] ARM: S5PC100: Use common functions for gpiolib implementation [PATCH 06/15] ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100 [PATCH 07/15] ARM: S5PC100: rename gpio registers from s5pc1xx to s5pc100 [PATCH 08/15] ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100 [PATCH 09/15] ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100 [PATCH 10/15] ARM: S5PC100: Move sdhci helpers from plat-s5pc1xx to mach-s5pc100 [PATCH 11/15] ARM: Samsung: move S5PC100 support from plat-s5pc1xx to plat-s5p framework [PATCH 12/15] ARM: SMDKC100: fix frame buffer definitions
[PATCH 13/15] ARM: Samsung: Move external interrupts support from plat-s5pc1xx to plat-s5p [PATCH 14/15] ARM: S5PC100: Add support for gpio interrupt
[PATCH 15/15] ARM: remove obsolete plat-s5pc1xx directory
PATCH 1/15 ARM: Samsung: fix broken timer irq base
Timer interrupts range was defined as 43-47, what overlaps with VIC0 range (32-64). This was caused probably by a typo while the common interrupts definition was refactored. This patch moves timer interrupt range to safe area of 11-15 (just before uart range).
--- arch/arm/plat-s5p/include/plat/irqs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/plat-s5p/include/plat/irqs.h +1 -1
@@ -79,7 +79,7 @@#define S5P_IRQ_VIC2 (x) (S5P_VIC2_BASE + (x))#define S5P_IRQ_VIC3 (x) (S5P_VIC3_BASE + (x)) -#define S5P_TIMER_IRQ (x) S5P_IRQ(11 + (x)) +#define S5P_TIMER_IRQ (x) (11 + (x))#define IRQ_TIMER0 S5P_TIMER_IRQ(0)#define IRQ_TIMER1 S5P_TIMER_IRQ(1)
Signature · 1 line
1.6.4
PATCH 1/15 ARM: Samsung: fix broken timer irq base
Quoted 18 lines · Marek Szyprowski
Timer interrupts range was defined as 43-47, what overlaps with VIC0 range (32-64). This was caused probably by a typo while the common interrupts definition was refactored. This patch moves timer interrupt range to safe area of 11-15 (just before uart range).
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/plat-s5p/include/plat/irqs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/arm/plat- renamed from arch/arm/plat-s5p/include/plat/irqs.h +0
-0
s5p/include/plat/irqs.h
index 42e757f..9ff3d71 100644
arch/arm/plat-s5p/include/plat/irqs.h
Quoted 9 lines
arch/arm/plat-s5p/include/plat/irqs.h +1
-2@@ -79,7 +79,7 @@#define S5P_IRQ_VIC2 (x) (S5P_VIC2_BASE + (x))#define S5P_IRQ_VIC3 (x) (S5P_VIC3_BASE + (x)) -#define S5P_TIMER_IRQ (x) S5P_IRQ(11 + (x)) +#define S5P_TIMER_IRQ (x) (11 + (x))#define IRQ_TIMER0 S5P_TIMER_IRQ(0)#define IRQ_TIMER1 S5P_TIMER_IRQ(1) --
Ok, you're right.
Had to move to ISA IRQ space not VIC area for avoid conflicting.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 1/15 ARM: Samsung: fix broken timer irq base
In reply to Marek SzyprowskiQuoted 4 lines · Marek Szyprowski
Timer interrupts range was defined as 43-47, what overlaps with VIC0 range (32-64). This was caused probably by a typo while the common interrupts definition was refactored. This patch moves timer interrupt range to safe area of 11-15 (just before uart range).
I've put this on for-2635/s5p-general as it is a reasonably important bugfix for s5p. Have updated the comment to reference the commit that caused the problem in the first place.
Quoted 26 lines
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/plat-s5p/include/plat/irqs.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)arch/arm/plat-s5p/include/plat/irqs.h +1
-1@@ -79,7 +79,7 @@#define S5P_IRQ_VIC2 (x) (S5P_VIC2_BASE + (x))#define S5P_IRQ_VIC3 (x) (S5P_VIC3_BASE + (x)) -#define S5P_TIMER_IRQ (x) S5P_IRQ(11 + (x)) +#define S5P_TIMER_IRQ (x) (11 + (x))#define IRQ_TIMER0 S5P_TIMER_IRQ(0)#define IRQ_TIMER1 S5P_TIMER_IRQ(1)Signature · 6 lines
1.6.4 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
-- Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH 2/15 ARM: Samsung: move common I2C0 device helpers to machine directories
In reply to Marek Szyprowski---
arch/arm/mach-s5p6440/Makefile | 1 +
arch/arm/{plat-s5p => mach-s5p6440}/setup-i2c0.c | 2 +-
arch/arm/mach-s5p6442/Makefile | 1 +
arch/arm/{plat-s5p => mach-s5p6442}/setup-i2c0.c | 2 +-
arch/arm/mach-s5pv210/Makefile | 1 +
arch/arm/{plat-s5p => mach-s5pv210}/setup-i2c0.c | 10 +++++-----
arch/arm/plat-s5p/Makefile | 1 -
7 files changed, 10 insertions(+), 8 deletions(-)
copy arch/arm/{plat-s5p => mach-s5p6440}/setup-i2c0.c (92%)
copy arch/arm/{plat-s5p => mach-s5p6442}/setup-i2c0.c (92%)
rename arch/arm/{plat-s5p => mach-s5pv210}/setup-i2c0.c (69%)arch/arm/mach-s5p6440/Makefile +1 -0
@@ -13,6 +13,7 @@ obj- := # Core support for S5P6440 system obj-$(CONFIG_CPU_S5P6440) += cpu.o init.o clock.o gpio.o +obj-$(CONFIG_CPU_S5P6440) += setup-i2c0.o # machine support
arch/arm/mach-s5p6440/setup-i2c0.c renamed from arch/arm/plat-s5p/setup-i2c0.c +1 -1
@@ -1,4 +1,4 @@ -/* linux/arch/arm/plat-s5p/setup-i2c0.c +/* linux/arch/arm/mach-s5p6440/setup-i2c0.c * * Copyright (c) 2009 Samsung Electronics Co., Ltd. * http://www.samsung.com/
arch/arm/mach-s5p6442/Makefile +1 -0
@@ -13,6 +13,7 @@ obj- := # Core support for S5P6442 system obj-$(CONFIG_CPU_S5P6442) += cpu.o init.o clock.o +obj-$(CONFIG_CPU_S5P6442) += setup-i2c0.o # machine support
arch/arm/mach-s5p6442/setup-i2c0.c renamed from arch/arm/plat-s5p/setup-i2c0.c +1 -1
@@ -1,4 +1,4 @@ -/* linux/arch/arm/plat-s5p/setup-i2c0.c +/* linux/arch/arm/mach-s5p6442/setup-i2c0.c * * Copyright (c) 2009 Samsung Electronics Co., Ltd. * http://www.samsung.com/
arch/arm/mach-s5pv210/Makefile +1 -0
@@ -13,6 +13,7 @@ obj- := # Core support for S5PV210 system obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o +obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o # machine support
arch/arm/mach-s5pv210/setup-i2c0.c renamed from arch/arm/plat-s5p/setup-i2c0.c +5 -5
@@ -1,11 +1,11 @@ -/* linux/arch/arm/plat-s5p/setup-i2c0.c +/* +* linux/arch/arm/mach-s5pv210/setup-i2c2.c * -* Copyright (c) 2009 Samsung Electronics Co., Ltd. -* http://www.samsung.com/ +* Copyright 2009 Samsung Electronics Co. * -* I2C0 GPIO configuration. +* Base S5PV210 I2C bus 0 gpio configuration * -* Based on plat-s3c64xx/setup-i2c0.c +* Based on mach-s3c64xx/setup-i2c0.c * * 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
arch/arm/plat-s5p/Makefile +0 -1
@@ -16,4 +16,3 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o -obj-y += setup-i2c0.o
Signature · 1 line
1.6.4
PATCH 2/15 ARM: Samsung: move common I2C0 device helpers to machine directories
Quoted 4 lines · Marek Szyprowski
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>---
See your new 2nd patch of 'Common plat-s5p fixes patch set'.
Quoted 12 lines
arch/arm/mach-s5p6440/Makefile | 1 +
arch/arm/{plat-s5p => mach-s5p6440}/setup-i2c0.c | 2 +-
arch/arm/mach-s5p6442/Makefile | 1 +
arch/arm/{plat-s5p => mach-s5p6442}/setup-i2c0.c | 2 +-
arch/arm/mach-s5pv210/Makefile | 1 +
arch/arm/{plat-s5p => mach-s5pv210}/setup-i2c0.c | 10 +++++-----
arch/arm/plat-s5p/Makefile | 1 -
7 files changed, 10 insertions(+), 8 deletions(-)
copy arch/arm/{plat-s5p => mach-s5p6440}/setup-i2c0.c (92%)
copy arch/arm/{plat-s5p => mach-s5p6442}/setup-i2c0.c (92%)
rename arch/arm/{plat-s5p => mach-s5pv210}/setup-i2c0.c (69%)Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/mach-s5p6440/Makefile
Review
Quoted 12 lines
index 1ad894b..9646cdf 100644
arch/arm/mach-s5p6440/Makefile +1
-0@@ -13,6 +13,7 @@ obj- := # Core support for S5P6440 system obj-$(CONFIG_CPU_S5P6440) += cpu.o init.o clock.o gpio.o +obj-$(CONFIG_CPU_S5P6440) += setup-i2c0.o # machine support(quoted diff) +0
-0
b/arch/arm/mach-s5p6440/setup-i2c0.c
Review
Quoted 13 lines
similarity index 92%
copy fromarch/arm/plat-s5p/setup-i2c0.c
copy toarch/arm/mach-s5p6440/setup-i2c0.c
index 67a66e0..69e8a66 100644arch/arm/mach-s5p6440/setup-i2c0.c renamed from arch/arm/plat-s5p/setup-i2c0.c +1
-1@@ -1,4 +1,4 @@ -/* linux/arch/arm/plat-s5p/setup-i2c0.c +/* linux/arch/arm/mach-s5p6440/setup-i2c0.c * * Copyright (c) 2009 Samsung Electronics Co., Ltd. * http://www.samsung.com/ (quoted diff) +0
-0
b/arch/arm/mach-s5p6442/Makefile
Review
Quoted 12 lines
index dde39a6..4942c14 100644
arch/arm/mach-s5p6442/Makefile +1
-0@@ -13,6 +13,7 @@ obj- := # Core support for S5P6442 system obj-$(CONFIG_CPU_S5P6442) += cpu.o init.o clock.o +obj-$(CONFIG_CPU_S5P6442) += setup-i2c0.o # machine support(quoted diff) +0
-0
b/arch/arm/mach-s5p6442/setup-i2c0.c
Review
Quoted 13 lines
similarity index 92%
copy fromarch/arm/plat-s5p/setup-i2c0.c
copy toarch/arm/mach-s5p6442/setup-i2c0.c
index 67a66e0..662695d 100644arch/arm/mach-s5p6442/setup-i2c0.c renamed from arch/arm/plat-s5p/setup-i2c0.c +1
-1@@ -1,4 +1,4 @@ -/* linux/arch/arm/plat-s5p/setup-i2c0.c +/* linux/arch/arm/mach-s5p6442/setup-i2c0.c * * Copyright (c) 2009 Samsung Electronics Co., Ltd. * http://www.samsung.com/ (quoted diff) +0
-0
b/arch/arm/mach-s5pv210/Makefile
Review
Quoted 12 lines
index 8ebf51c..1a972a5 100644
arch/arm/mach-s5pv210/Makefile +1
-0@@ -13,6 +13,7 @@ obj- := # Core support for S5PV210 system obj-$(CONFIG_CPU_S5PV210) += cpu.o init.o clock.o +obj-$(CONFIG_CPU_S5PV210) += setup-i2c0.o # machine support(quoted diff) +0
-0
b/arch/arm/mach-s5pv210/setup-i2c0.c
Quoted 28 lines
similarity index 69%
rename fromarch/arm/plat-s5p/setup-i2c0.c
rename toarch/arm/mach-s5pv210/setup-i2c0.c
index 67a66e0..27de0c1 100644arch/arm/mach-s5pv210/setup-i2c0.c renamed from arch/arm/plat-s5p/setup-i2c0.c +5
-5@@ -1,11 +1,11 @@ -/* linux/arch/arm/plat-s5p/setup-i2c0.c +/* +* linux/arch/arm/mach-s5pv210/setup-i2c2.c * -* Copyright (c) 2009 Samsung Electronics Co., Ltd. -* http://www.samsung.com/ +* Copyright 2009 Samsung Electronics Co. * -* I2C0 GPIO configuration. +* Base S5PV210 I2C bus 0 gpio configuration * -* Based on plat-s3c64xx/setup-i2c0.c +* Based on mach-s3c64xx/setup-i2c0.c * * 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 arch/arm/plat-s5p/Makefile +0
-0
arch/arm/plat-s5p/Makefile obj-y += dev-uart.o
Quoted 5 lines
arch/arm/plat-s5p/Makefile +0
-2@@ -16,4 +16,3 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o -obj-y += setup-i2c0.o --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 3/15 ARM: Samsung: move driver strength gpio configuration helper to common dir
In reply to Marek SzyprowskiDriver strength parameter can be changed not only on S5PC100 but also on S5PV210/S5PC110 platforms, so move the helper functions to the common plat-samsung directory.
--- arch/arm/plat-s5p/Kconfig | 1 + arch/arm/plat-s5pc1xx/Kconfig | 2 +- arch/arm/plat-s5pc1xx/Makefile | 1 - arch/arm/plat-s5pc1xx/gpio-config.c | 62 -------------------- .../plat-s5pc1xx/include/plat/gpio-cfg-s5pc1xx.h | 32 ---------- arch/arm/plat-s5pc1xx/setup-fb-24bpp.c | 1 - arch/arm/plat-samsung/Kconfig | 12 ++-- arch/arm/plat-samsung/gpio-config.c | 48 +++++++++++++++ arch/arm/plat-samsung/include/plat/gpio-cfg.h | 30 ++++++++++ 9 files changed, 86 insertions(+), 103 deletions(-) delete mode 100644 arch/arm/plat-s5pc1xx/gpio-config.c delete mode 100644 arch/arm/plat-s5pc1xx/include/plat/gpio-cfg-s5pc1xx.h
arch/arm/plat-s5p/Kconfig +1 -0
@@ -13,6 +13,7 @@ config PLAT_S5P select NO_IOPORT select ARCH_REQUIRE_GPIOLIB select S3C_GPIO_TRACK + select S5P_GPIO_DRVSTR select SAMSUNG_GPIOLIB_4BIT select S3C_GPIO_CFG_S3C64XX select S3C_GPIO_PULL_UPDOWN
arch/arm/plat-s5pc1xx/Kconfig +1 -1
@@ -16,9 +16,9 @@ config PLAT_S5PC1XX select SAMSUNG_IRQ_VIC_TIMER select S3C_GPIO_TRACK select S3C_GPIO_PULL_UPDOWN + select S5P_GPIO_DRVSTR select S3C_GPIO_CFG_S3C24XX select S3C_GPIO_CFG_S3C64XX - select S5P_GPIO_CFG_S5PC1XX help Base platform code for any Samsung S5PC1XX device
arch/arm/plat-s5pc1xx/Makefile +0 -1
@@ -24,7 +24,6 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o # Device setup -obj-$(CONFIG_S5P_GPIO_CFG_S5PC1XX) += gpio-config.o obj-$(CONFIG_S5PC1XX_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC1XX_SETUP_I2C0) += setup-i2c0.o obj-$(CONFIG_S5PC1XX_SETUP_I2C1) += setup-i2c1.o
arch/arm/plat-s5pc1xx/gpio-config.c deleted +0 -62
62 lines not on this page · raw message
arch/arm/plat-s5pc1xx/include/plat/gpio-cfg-s5pc1xx.h deleted +0 -32
@@ -1,32 +0,0 @@ -/* linux/arch/arm/plat-s5pc1xx/include/plat/gpio-cfg.h -* -* Copyright 2009 Samsung Electronic -* -* S5PC1XX Platform - GPIO pin configuration -* -* 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. -*/ - -/* This file contains the necessary definitions to get the basic gpio -* pin configuration done such as setting a pin to input or output or -* changing the pull-{up,down} configurations. -*/ - -#ifndef __GPIO_CFG_S5PC1XX_H -#define __GPIO_CFG_S5PC1XX_H __FILE__ - -typedef unsigned int __bitwise__ s5p_gpio_drvstr_t; - -#define S5P_GPIO_DRVSTR_LV1 0x00 -#define S5P_GPIO_DRVSTR_LV2 0x01 -#define S5P_GPIO_DRVSTR_LV3 0x10 -#define S5P_GPIO_DRVSTR_LV4 0x11 - -extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr (unsigned int pin,unsigned int off); - -extern int s5p_gpio_set_drvstr (unsigned int pin,unsigned int off, -s5p_gpio_drvstr_t drvstr); - -#endif /* __GPIO_CFG_S5PC1XX_H */
arch/arm/plat-s5pc1xx/setup-fb-24bpp.c +0 -1
@@ -19,7 +19,6 @@#include <mach/map.h> #include <plat/fb.h> #include <plat/gpio-cfg.h> -#include <plat/gpio-cfg-s5pc1xx.h> #define DISR_OFFSET 0x7008
arch/arm/plat-samsung/Kconfig +6 -6
@@ -90,12 +90,6 @@ config S3C_GPIO_CFG_S3C64XX Internal configuration to enable S3C64XX style GPIO configuration functions. -config S5P_GPIO_CFG_S5PC1XX - bool - help - Internal configuration to enable S5PC1XX style GPIO configuration - functions. - config S3C_GPIO_PULL_UPDOWN bool help
@@ -111,6 +105,12 @@ config S3C_GPIO_PULL_UP help Internal configuration to enable the correct GPIO pull helper +config S5P_GPIO_DRVSTR + bool + help + Internal configuration to get and set correct GPIO driver strength + helper + config SAMSUNG_GPIO_EXTRA int "Number of additional GPIO pins" default 0
arch/arm/plat-samsung/gpio-config.c +48 -0
51 lines not on this page · raw message
arch/arm/plat-samsung/include/plat/gpio-cfg.h +30 -0
@@ -25,6 +25,7 @@#define __PLAT_GPIO_CFG_H __FILE__ typedef unsigned int __bitwise__ s3c_gpio_pull_t; +typedef unsigned int __bitwise__ s5p_gpio_drvstr_t;/* forward declaration if gpio-core.h hasn't been included */ struct s3c_gpio_chip ;
@@ -118,4 +119,33 @@ extern int s3c_gpio_setpull(unsigned int pin, s3c_gpio_pull_t pull);*/ extern s3c_gpio_pull_t s3c_gpio_getpull (unsigned int pin); +/* Define values for the drvstr available for each gpio pin. +* +* These values control the value of the output signal driver strength, +* configurable on most pins on the S5C series. +*/ +#define S5P_GPIO_DRVSTR_LV1 ((__force s5p_gpio_drvstr_t)0x00) +#define S5P_GPIO_DRVSTR_LV2 ((__force s5p_gpio_drvstr_t)0x01) +#define S5P_GPIO_DRVSTR_LV3 ((__force s5p_gpio_drvstr_t)0x10) +#define S5P_GPIO_DRVSTR_LV4 ((__force s5p_gpio_drvstr_t)0x11) + +/** +* s5c_gpio_get_drvstr() - get the driver streght value of a gpio pin +* @pin: The pin number to get the settings for +* +* Read the driver streght value for the specified pin. +*/ +extern s5p_gpio_drvstr_t s5p_gpio_get_drvstr (unsigned int pin); + +/** +* s3c_gpio_set_drvstr() - set the driver streght value of a gpio pin +* @pin: The pin number to configure the driver streght value +* @drvstr: The new value of the driver strength +* +* This function sets the driver strength value for the specified pin. +* It will return 0 if successfull, or a negative error code if the pin +* cannot support the requested setting. +*/ +extern int s5p_gpio_set_drvstr (unsigned int pin,s5p_gpio_drvstr_t drvstr); +#endif /* __PLAT_GPIO_CFG_H */
Signature · 1 line
1.6.4
PATCH 4/15 drivers: serial: S5PC100 serial driver cleanup
In reply to Marek SzyprowskiRemove unnecessary Kconfig entry. S5PC100 has exactly the same driver as S3C6400/S3C6410/S5P6440.
--- drivers/serial/Kconfig | 16 ++++------------ drivers/serial/Makefile | 1 - 2 files changed, 4 insertions(+), 13 deletions(-)
drivers/serial/Kconfig +4 -12
@@ -534,21 +534,13 @@ config SERIAL_S3C24A0 Serial port support for the Samsung S3C24A0 SoC config SERIAL_S3C6400 - tristate "Samsung S3C6400/S3C6410/S5P6440 Seria port support" - depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440) + tristate "Samsung S3C6400/S3C6410/S5P6440/S5PC100 Serial port support" + depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440 || CPU_S5PC100) select SERIAL_SAMSUNG_UARTS_4 default y help - Serial port support for the Samsung S3C6400, S3C6410 and S5P6440 - SoCs - -config SERIAL_S5PC100 - tristate "Samsung S5PC100 Serial port support" - depends on SERIAL_SAMSUNG && CPU_S5PC100 - select SERIAL_SAMSUNG_UARTS_4 - default y - help - Serial port support for the Samsung S5PC100 SoCs + Serial port support for the Samsung S3C6400, S3C6410, S5P6440 + and S5PC100 SoCs config SERIAL_S5PV210 tristate "Samsung S5PV210 Serial port support"
drivers/serial/Makefile +0 -1
@@ -44,7 +44,6 @@ obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o -obj-$(CONFIG_SERIAL_S5PC100) += s3c6400.o obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o obj-$(CONFIG_SERIAL_MAX3100) += max3100.o obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o
Signature · 1 line
1.6.4
PATCH 4/15 drivers: serial: S5PC100 serial driver cleanup
Quoted 49 lines · Marek Szyprowski
Remove unnecessary
Kconfigentry. S5PC100 has exactly the same driver as S3C6400/S3C6410/S5P6440.Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- drivers/serial/Kconfig | 16 ++++------------ drivers/serial/Makefile | 1 - 2 files changed, 4 insertions(+), 13 deletions(-)drivers/serial/Kconfig +1
-2@@ -534,21 +534,13 @@ config SERIAL_S3C24A0 Serial port support for the Samsung S3C24A0 SoC config SERIAL_S3C6400 - tristate "Samsung S3C6400/S3C6410/S5P6440 Seria port support" - depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 || CPU_S5P6440) + tristate "Samsung S3C6400/S3C6410/S5P6440/S5PC100 Serial portsupport"
drivers/serial/Kconfig +1
-0+ depends on SERIAL_SAMSUNG && (CPU_S3C6400 || CPU_S3C6410 ||
CPU_S5P6440||CPU_S5PC100)drivers/serial/Kconfig +2
-10select SERIAL_SAMSUNG_UARTS_4 default y help - Serial port support for the Samsung S3C6400, S3C6410 and S5P6440 - SoCs - -config SERIAL_S5PC100 - tristate "Samsung S5PC100 Serial port support" - depends on SERIAL_SAMSUNG && CPU_S5PC100 - select SERIAL_SAMSUNG_UARTS_4 - default y - help - Serial port support for the Samsung S5PC100 SoCs + Serial port support for the Samsung S3C6400, S3C6410, S5P6440 + and S5PC100 SoCs config SERIAL_S5PV210 tristate "Samsung S5PV210 Serial port support"drivers/serial/Makefile +0
-0
drivers/serial/Makefile obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o
Quoted 8 lines
drivers/serial/Makefile +0
-2@@ -44,7 +44,6 @@ obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o obj-$(CONFIG_SERIAL_S3C24A0) += s3c24a0.o obj-$(CONFIG_SERIAL_S3C6400) += s3c6400.o -obj-$(CONFIG_SERIAL_S5PC100) += s3c6400.o obj-$(CONFIG_SERIAL_S5PV210) += s5pv210.o obj-$(CONFIG_SERIAL_MAX3100) += max3100.o obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o --
Ok, updated the list of supported devices.
Looks good.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 5/15 ARM: S5PC100: Use common functions for gpiolib implementation
In reply to Marek SzyprowskiGPIOlib helpers from plat-samsung already have functions for accessing 4bit gpio banks. This patch removes the duplicated functions from plat-s5pc1xx/gpiolib.c.
--- arch/arm/plat-s5pc1xx/Kconfig | 1 + arch/arm/plat-s5pc1xx/gpiolib.c | 96 ++++----------------------------------- 2 files changed, 10 insertions(+), 87 deletions(-)
arch/arm/plat-s5pc1xx/Kconfig +1 -0
@@ -19,6 +19,7 @@ config PLAT_S5PC1XX select S5P_GPIO_DRVSTR select S3C_GPIO_CFG_S3C24XX select S3C_GPIO_CFG_S3C64XX + select SAMSUNG_GPIOLIB_4BIT help Base platform code for any Samsung S5PC1XX device
arch/arm/plat-s5pc1xx/gpiolib.c +9 -87
120 lines not on this page · raw message
Signature · 1 line
1.6.4
PATCH 5/15 ARM: S5PC100: Use common functions for gpiolib implementation
Quoted 10 lines · Marek Szyprowski
GPIOlib helpers from plat-samsung already have functions for accessing 4bit gpio banks. This patch removes the duplicated functions from
plat-s5pc1xx/gpiolib.c.Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/plat-s5pc1xx/Kconfig | 1 + arch/arm/plat-s5pc1xx/gpiolib.c | 96
++++-----------------------------------
Review
Quoted 15 lines
2 files changed, 10 insertions(+), 87 deletions(-)arch/arm/plat-s5pc1xx/Kconfig +1
-0@@ -19,6 +19,7 @@ config PLAT_S5PC1XX select S5P_GPIO_DRVSTR select S3C_GPIO_CFG_S3C24XX select S3C_GPIO_CFG_S3C64XX + select SAMSUNG_GPIOLIB_4BIT help Base platform code for any Samsung S5PC1XX device(quoted diff) +0
-0
b/arch/arm/plat-s5pc1xx/gpiolib.c
Quoted 66 lines
index 1ffc57a..5a97a8f 100644
arch/arm/plat-s5pc1xx/gpiolib.c +0
-59@@ -61,74 +61,6 @@* L3 8 4Bit None */ -#define OFF_GPCON (0x00) -#define OFF_GPDAT (0x04) - -#define con_4bit_shift (__off) ((__off) * 4) - -#if 1 -#define gpio_dbg(x...) do { } while (0) -#else -#define gpio_dbg(x...) printk(KERN_DEBUG x) -#endif - -/* The s5pc1xx_gpiolib routines are to control the gpio banks where -* the gpio configuration register (GPxCON) has 4 bits per GPIO, as the -* following example: -* -* base + 0x00: Control register, 4 bits per gpio -* gpio n: 4 bits starting at (4*n) -* 0000 = input, 0001 = output, others mean special-function -* base + 0x04: Data register, 1 bit per gpio -* bit n: data bit n -* -* Note, since the data register is one bit per gpio and is at base + 0x4 -* we can use s3c_gpiolib_get and s3c_gpiolib_set to change the state of -* the output. -*/ - -static int s5pc1xx_gpiolib_input (struct gpio_chip *chip,unsigned offset) -{ -struct s3c_gpio_chip *ourchip =to_s3c_gpio (chip); -void __iomem *base = ourchip->base; -unsigned long con; - - con =__raw_readl (base +OFF_GPCON ); - con &= ~(0xf <<con_4bit_shift (offset)); -__raw_writel (con, base +OFF_GPCON ); - -gpio_dbg ("%s: %p: CON now %08lx\n" , __func__, base, con); - -return 0 ; -} - -static int s5pc1xx_gpiolib_output (struct gpio_chip *chip, -unsigned offset,int value) -{ -struct s3c_gpio_chip *ourchip =to_s3c_gpio (chip); -void __iomem *base = ourchip->base; -unsigned long con; -unsigned long dat; - - con =__raw_readl (base +OFF_GPCON ); - con &= ~(0xf <<con_4bit_shift (offset)); - con |=0x1 <<con_4bit_shift (offset); - - dat =__raw_readl (base +OFF_GPDAT ); -if (value) - dat |=1 << offset; -else - dat &= ~(1 << offset); -
arch/arm/plat-s5pc1xx/gpiolib.c line 64
Quoted 10 lines
arch/arm/plat-s5pc1xx/gpiolib.c +0
-9-__raw_writel (dat, base +OFF_GPDAT ); -__raw_writel (con, base +OFF_GPCON ); -__raw_writel (dat, base +OFF_GPDAT ); - -gpio_dbg ("%s: %p: CON %08lx, DAT %08lx\n" , __func__, base, con, dat); - -return 0 ; -} - static int s5pc1xx_gpiolib_to_irq(struct gpio_chip *chip, unsigned int
offset)
arch/arm/plat-s5pc1xx/gpiolib.c line 66
Quoted 2 lines
arch/arm/plat-s5pc1xx/gpiolib.c +0
-0{return S3C_IRQ_GPIO (chip->base + offset);
The following is from 137th line in the same file.
static int s5pc1xx_gpiolib_to_eint(struct gpio_chip *chip, unsigned int offset)
{
...
Really need above function in this file?
How about handling gpio external interrupt to other file?
And the following is from 175th line in the same file.
static struct s3c_gpio_chip s5pc100_gpio_chips[] = {
{
.base = S5PC100_GPA0_BASE,
.config = &gpio_cfg,
.chip = {
.base = S5PC100_GPA0(0),
.ngpio = S5PC100_GPIO_A0_NR,
.label = "GPA0",
},...
1. the &gpio_cfg is default, it means any null config setting to gpio_cfg.
2. avoid a whole pile of defines in the plat-s5pc1xx/include/plat/regs-gpio.h The S5PC100_GPxx_BASE defines look like they could be defined as offset from a base and each bank given its own index.
arch/arm/plat-s5pc1xx/gpiolib.c static struct s3c_gpio_chip s5pc100_gpio_chips[] = { · line 385
Quoted 3 lines
arch/arm/plat-s5pc1xx/gpiolib.c +0
-0@@ -452,11 +384,8 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = {extern struct irq_chip s5pc1xx_gpioint; extern void s5pc1xx_irq_gpioint_handler(unsigned int irq, struct irq_desc
*desc);
Quoted 33 lines
arch/arm/plat-s5pc1xx/gpiolib.c +2
-17-static __init void s5pc1xx_gpiolib_link (struct s3c_gpio_chip *chip) +static __init void s5pc100_gpiolib_link (struct s3c_gpio_chip *chip) { - chip->chip.direction_input = s5pc1xx_gpiolib_input; - chip->chip.direction_output = s5pc1xx_gpiolib_output; - chip->pm =__gpio_pm (&s3c_gpio_pm_4bit);/* Interrupt */ if (chip->config == &gpio_cfg) {@@ -475,26 +404,19 @@ static __init void s5pc1xx_gpiolib_link(struct s3c_gpio_chip *chip) chip->chip.to_irq = s5pc1xx_gpiolib_to_eint; } -static __init void s5pc1xx_gpiolib_add (struct s3c_gpio_chip *chips, -int nr_chips, -void (*fn)(struct s3c_gpio_chip *)) -{ -for (; nr_chips >0 ; nr_chips--, chips++) { -if (fn) - (fn)(chips); -s3c_gpiolib_add (chips); - } -} -static __init int s5pc1xx_gpiolib_init (void ) { -struct s3c_gpio_chip *chips; +struct s3c_gpio_chip *chip;int nr_chips; - chips = s5pc100_gpio_chips;
arch/arm/plat-s5pc1xx/gpiolib.c static __init void s5pc1xx_gpiolib_link(struct · line 420
Quoted 10 lines
arch/arm/plat-s5pc1xx/gpiolib.c +7
-2- nr_chips =ARRAY_SIZE (s5pc100_gpio_chips); + chip = s5pc100_gpio_chips; + nr_chips =ARRAY_SIZE (s5pc100_gpio_chips); + +for (; nr_chips >0 ; nr_chips--, chip++) +s5pc100_gpiolib_link (chip); -s5pc1xx_gpiolib_add (chips, nr_chips, s5pc1xx_gpiolib_link); +samsung_gpiolib_add_4bit_chips (s5pc100_gpio_chips, +ARRAY_SIZE (s5pc100_gpio_chips));
nr_chips?
arch/arm/plat-s5pc1xx/gpiolib.c static __init void s5pc1xx_gpiolib_link(struct s3c_gpio_chip *chip)
Quoted 4 lines
arch/arm/plat-s5pc1xx/gpiolib.c +0
-1/* Interrupt */ set_irq_chained_handler (IRQ_GPIOINT , s5pc1xx_irq_gpioint_handler); --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 5/15 ARM: S5PC100: Use common functions for gpiolib implementation
Op 17-05-10 13:14, Kukjin Kim schreef:
Quoted 18 lines
Marek Szyprowski wrote:
<snip>
Quoted 15 lines
arch/arm/plat-s5pc1xx/gpiolib.c +6
-4-static __init int s5pc1xx_gpiolib_init (void ) { -struct s3c_gpio_chip *chips; +struct s3c_gpio_chip *chip;int nr_chips; - chips = s5pc100_gpio_chips; - nr_chips =ARRAY_SIZE (s5pc100_gpio_chips); + chip = s5pc100_gpio_chips; + nr_chips =ARRAY_SIZE (s5pc100_gpio_chips); + +for (; nr_chips >0 ; nr_chips--, chip++) +s5pc100_gpiolib_link (chip);
Quoted 6 lines
arch/arm/plat-s5pc1xx/gpiolib.c static __init void s5pc1xx_gpiolib_link(struct s3c_gpio_chip *chip) · line 419
Quoted 4 lines
arch/arm/plat-s5pc1xx/gpiolib.c +2
-1-s5pc1xx_gpiolib_add (chips, nr_chips, s5pc1xx_gpiolib_link); +samsung_gpiolib_add_4bit_chips (s5pc100_gpio_chips, +ARRAY_SIZE (s5pc100_gpio_chips));
nr_chips?
You can't use nr_chips as it has been decremented to 0 in the for loop above it.
Signature · 1 line
Maurus Cuelenaere
PATCH 6/15 ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100
In reply to Marek SzyprowskiMove gpio-lib support from plat-s5pc1xx to mach-s5pc100. Only basic gpio functionality is now supported. Gpio interrupts are disabled temporarly and will be added later.
---
arch/arm/mach-s5pc100/Makefile | 2 +-
.../gpiolib.c => mach-s5pc100/gpio.c} | 11 +++++++----
.../plat => mach-s5pc100/include/mach}/regs-gpio.h | 0
arch/arm/mach-s5pc100/mach-smdkc100.c | 1 -
arch/arm/plat-s5pc1xx/Makefile | 3 +--
5 files changed, 9 insertions(+), 8 deletions(-)
rename arch/arm/{plat-s5pc1xx/gpiolib.c => mach-s5pc100/gpio.c} (99%)
rename arch/arm/{plat-s5pc1xx/include/plat => mach-s5pc100/include/mach}/regs-gpio.h (100%)arch/arm/mach-s5pc100/Makefile +1 -1
@@ -11,7 +11,7 @@ obj- := # Core support for S5PC100 system -obj-$(CONFIG_CPU_S5PC100) += cpu.o +obj-$(CONFIG_CPU_S5PC100) += cpu.o gpio.o # Helper and device support
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +7 -4
@@ -17,11 +17,11 @@#include <linux/gpio.h> #include <mach/map.h> +#include <mach/regs-gpio.h> #include <plat/gpio-core.h> #include <plat/gpio-cfg.h> #include <plat/gpio-cfg-helpers.h> -#include <plat/regs-gpio.h> /* S5PC100 GPIO bank summary: *
@@ -61,6 +61,7 @@* L3 8 4Bit None */ +#if 0 static int s5pc1xx_gpiolib_to_irq (struct gpio_chip *chip,unsigned int offset) {return S3C_IRQ_GPIO (chip->base + offset);
@@ -84,7 +85,7 @@ static int s5pc1xx_gpiolib_to_eint(struct gpio_chip *chip, unsigned int offset)return IRQ_EINT (24 + offset);return -EINVAL ; } - +#endif static struct s3c_gpio_cfg gpio_cfg = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit, .set_pull = s3c_gpio_setpull_updown,
@@ -386,7 +387,7 @@ extern void s5pc1xx_irq_gpioint_handler(unsigned int irq, struct irq_desc *desc)static __init void s5pc100_gpiolib_link (struct s3c_gpio_chip *chip) { - +#if 0 /* Interrupt */ if (chip->config == &gpio_cfg) {int i, irq;
@@ -402,6 +403,7 @@ static __init void s5pc100_gpiolib_link(struct s3c_gpio_chip *chip) } }else if (chip->config == &gpio_cfg_eint) chip->chip.to_irq = s5pc1xx_gpiolib_to_eint; +#endif }static __init int s5pc1xx_gpiolib_init (void )
@@ -417,9 +419,10 @@ static __init int s5pc1xx_gpiolib_init(void)samsung_gpiolib_add_4bit_chips (s5pc100_gpio_chips,ARRAY_SIZE (s5pc100_gpio_chips)); +#if 0 /* Interrupt */ set_irq_chained_handler (IRQ_GPIOINT , s5pc1xx_irq_gpioint_handler); - +#endif return 0 ; }core_initcall (s5pc1xx_gpiolib_init);
arch/arm/mach-s5pc100/include/mach/regs-gpio.h renamed from arch/arm/plat-s5pc1xx/include/plat/regs-gpio.h +0 -0
arch/arm/mach-s5pc100/mach-smdkc100.c +0 -1
@@ -35,7 +35,6 @@#include <plat/regs-serial.h> #include <plat/gpio-cfg.h> -#include <plat/regs-gpio.h> #include <plat/clock.h> #include <plat/devs.h>
arch/arm/plat-s5pc1xx/Makefile +1 -2
@@ -13,9 +13,8 @@ obj- := obj-y += dev-uart.o obj-y += cpu.o -obj-y += irq.o irq-gpio.o irq-eint.o +obj-y += irq.o obj-y += clock.o -obj-y += gpiolib.o # CPU support
Signature · 1 line
1.6.4
PATCH 6/15 ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100
Quoted 7 lines · Marek Szyprowski
Move gpio-lib support from plat-s5pc1xx to mach-s5pc100. Only basic gpio functionality is now supported. Gpio interrupts are disabled temporarly and will be added later.
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>
Quoted 9 lines
---
arch/arm/mach-s5pc100/Makefile | 2 +-
.../gpiolib.c => mach-s5pc100/gpio.c} | 11 +++++++----
.../plat => mach-s5pc100/include/mach}/regs-gpio.h | 0
arch/arm/mach-s5pc100/mach-smdkc100.c | 1 -
arch/arm/plat-s5pc1xx/Makefile | 3 +--
5 files changed, 9 insertions(+), 8 deletions(-)
rename arch/arm/{plat-s5pc1xx/gpiolib.c => mach-s5pc100/gpio.c} (99%)
rename arch/arm/{plat-s5pc1xx/include/plat =>mach-s5pc100/include/mach}/regs-
Review
Quoted 3 lines
gpio.h(100%)(quoted diff) +0
-0
b/arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pc100/Makefile obj- := · line 14
Quoted 9 lines
index 809ff10..e1afdbf 100644
arch/arm/mach-s5pc100/Makefile +1
-1@@ -11,7 +11,7 @@ obj- := # Core support for S5PC100 system -obj-$(CONFIG_CPU_S5PC100) += cpu.o +obj-$(CONFIG_CPU_S5PC100) += cpu.o gpio.o
How about changing gpiolib like gpiolib.c of mach-s3c64xx/ and mach-s5pv210/. I will change the file name of mach-s5p6440/ also.
Quoted 24 lines
arch/arm/mach-s5pc100/Makefile +0
-0# Helper and device supportarch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-1@@ -17,11 +17,11 @@#include <linux/gpio.h> #include <mach/map.h> +#include <mach/regs-gpio.h> #include <plat/gpio-core.h> #include <plat/gpio-cfg.h> #include <plat/gpio-cfg-helpers.h> -#include <plat/regs-gpio.h> /* S5PC100 GPIO bank summary: *
arch/arm/mach-s5pc100/gpio.c line 65
Quoted 5 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-0@@ -61,6 +61,7 @@* L3 8 4Bit None */ +#if 0 static int s5pc1xx_gpiolib_to_irq(struct gpio_chip *chip, unsigned int
offset)
arch/arm/mach-s5pc100/gpio.c static int s5pc1xx_gpiolib_to_eint(struct gpio_chip
Quoted 3 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0{return S3C_IRQ_GPIO (chip->base + offset);@@ -84,7 +85,7 @@ static int s5pc1xx_gpiolib_to_eint(struct gpio_chip
*chip,
arch/arm/mach-s5pc100/gpio.c extern void s5pc1xx_irq_gpioint_handler(unsigned int
Quoted 10 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-1unsigned int offset)return IRQ_EINT (24 + offset);return -EINVAL ; } - +#endif static struct s3c_gpio_cfg gpio_cfg = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit,arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0.set_pull = s3c_gpio_setpull_updown,@@ -386,7 +387,7 @@ extern void s5pc1xx_irq_gpioint_handler(unsigned int
irq,
arch/arm/mach-s5pc100/gpio.c static __init void s5pc100_gpiolib_link(struct
Quoted 10 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-1struct irq_desc *desc)static __init void s5pc100_gpiolib_link (struct s3c_gpio_chip *chip) { - +#if 0 /* Interrupt */ if (chip->config == &gpio_cfg) {arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0int i, irq;@@ -402,6 +403,7 @@ static __init void s5pc100_gpiolib_link(struct
s3c_gpio_chip
Quoted 10 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-0*chip) } }else if (chip->config == &gpio_cfg_eint) chip->chip.to_irq = s5pc1xx_gpiolib_to_eint; +#endif }static
__initints5pc1xx_gpiolib_init(void)arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0@@ -417,9 +419,10 @@ static __init int s5pc1xx_gpiolib_init(void)
arch/arm/mach-s5pc100/gpio.c static __init int s5pc1xx_gpiolib_init(void) · line 428
Quoted 10 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +2
-1samsung_gpiolib_add_4bit_chips (s5pc100_gpio_chips,ARRAY_SIZE (s5pc100_gpio_chips)); +#if 0 /* Interrupt */ set_irq_chained_handler (IRQ_GPIOINT , s5pc1xx_irq_gpioint_handler); - +#endif return 0 ; }core_initcall (s5pc1xx_gpiolib_init);
Is there any way to avoid compile compatibility without #if 0?
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/mach-
Review
Quoted 18 lines
s5pc100/include/mach/regs-gpio.h
similarity index 100%
rename fromarch/arm/plat-s5pc1xx/include/plat/regs-gpio.hrename toarch/arm/mach-s5pc100/include/mach/regs-gpio.harch/arm/mach- renamed from arch/arm/mach-s5pc100/mach-smdkc100.c +0
-0
s5pc100/mach-smdkc100.c
index ae3c52c..bfe67db 100644arch/arm/mach-s5pc100/mach-smdkc100.c renamed from arch/arm/mach-s5pc100/mach-smdkc100.cgg +0
-1@@ -35,7 +35,6 @@#include <plat/regs-serial.h> #include <plat/gpio-cfg.h> -#include <plat/regs-gpio.h> #include <plat/clock.h> #include <plat/devs.h> (quoted diff) +0
-0
b/arch/arm/plat-s5pc1xx/Makefile
Quoted 5 lines
index 66a8f3e..540fca5 100644
arch/arm/plat-s5pc1xx/Makefile +0
-0@@ -13,9 +13,8 @@ obj- :=
arch/arm/plat-s5pc1xx/Makefile obj- :=
Quoted 10 lines
arch/arm/plat-s5pc1xx/Makefile +1
-3obj-y += dev-uart.o obj-y += cpu.o -obj-y += irq.o irq-gpio.o irq-eint.o +obj-y += irq.o obj-y += clock.o -obj-y += gpiolib.o # CPU support --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 6/15 ARM: S5PC100: Move gpio support from plat-s5pc1xx to mach-s5pc100
Hello,
Quoted 27 lines · Kukjin Kim
Quoted 7 lines · Marek Szyprowski
Move gpio-lib support from plat-s5pc1xx to mach-s5pc100. Only basic gpio functionality is now supported. Gpio interrupts are disabled temporarly and will be added later.
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>Quoted 9 lines
--- arch/arm/mach-s5pc100/Makefile | 2 +- .../gpiolib.c => mach-s5pc100/gpio.c} | 11 +++++++---- .../plat => mach-s5pc100/include/mach}/regs-gpio.h | 0 arch/arm/mach-s5pc100/mach-smdkc100.c | 1 - arch/arm/plat-s5pc1xx/Makefile | 3 +-- 5 files changed, 9 insertions(+), 8 deletions(-) rename arch/arm/{plat-s5pc1xx/gpiolib.c => mach-s5pc100/gpio.c} (99%) rename arch/arm/{plat-s5pc1xx/include/plat =>mach-s5pc100/include/mach}/regs-
Review
Quoted 3 lines
gpio.h(100%)(quoted diff) +0
-0b/arch/arm/mach-s5pc100/Makefile
Quoted 5 lines
index 809ff10..e1afdbf 100644
arch/arm/mach-s5pc100/Makefile +0
-0@@ -11,7 +11,7 @@ obj- :=
Quoted 8 lines
arch/arm/mach-s5pc100/Makefile obj- := · line 14
Quoted 4 lines
arch/arm/mach-s5pc100/Makefile +1
-1# Core support for S5PC100 system -obj-$(CONFIG_CPU_S5PC100) += cpu.o +obj-$(CONFIG_CPU_S5PC100) += cpu.o gpio.oHow about changing gpiolib like
gpiolib.cof mach-s3c64xx/ and mach- s5pv210/.
I will change the file name of mach-s5p6440/ also.
I you don't mind I wanted first move the existing and working code and then, later update it to match common s5p style.
Quoted 67 lines
arch/arm/mach-
Quoted 4 lines
arch/arm/mach-s5pc100/Makefile +0
-0# Helper and device supportarch/arm/mach- renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0
s5pc100/gpio.cQuoted 20 lines
similarity index 99%
rename fromarch/arm/plat-s5pc1xx/gpiolib.c
rename toarch/arm/mach-s5pc100/gpio.c
index 5a97a8f..c8e8336 100644arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-1@@ -17,11 +17,11 @@#include <linux/gpio.h> #include <mach/map.h> +#include <mach/regs-gpio.h> #include <plat/gpio-core.h> #include <plat/gpio-cfg.h> #include <plat/gpio-cfg-helpers.h> -#include <plat/regs-gpio.h> /* S5PC100 GPIO bank summary: * arch/arm/mach-s5pc100/gpio.c line 65
Quoted 5 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-0@@ -61,6 +61,7 @@* L3 8 4Bit None */ +#if 0 static int s5pc1xx_gpiolib_to_irq(struct gpio_chip *chip, unsigned intoffset)
arch/arm/mach-s5pc100/gpio.c static int s5pc1xx_gpiolib_to_eint(struct gpio_chip
Quoted 3 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0{return S3C_IRQ_GPIO (chip->base + offset);@@ -84,7 +85,7 @@ static int s5pc1xx_gpiolib_to_eint(struct gpio_chip*chip,
arch/arm/mach-s5pc100/gpio.c extern void s5pc1xx_irq_gpioint_handler(unsigned int
Quoted 10 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-1unsigned int offset)return IRQ_EINT (24 + offset);return -EINVAL ; } - +#endif static struct s3c_gpio_cfg gpio_cfg = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit,arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0.set_pull = s3c_gpio_setpull_updown,@@ -386,7 +387,7 @@ extern void s5pc1xx_irq_gpioint_handler(unsigned intirq,
arch/arm/mach-s5pc100/gpio.c static __init void s5pc100_gpiolib_link(struct
Quoted 10 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-1struct irq_desc *desc)static __init void s5pc100_gpiolib_link (struct s3c_gpio_chip *chip) { - +#if 0 /* Interrupt */ if (chip->config == &gpio_cfg) {arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0int i, irq;@@ -402,6 +403,7 @@ static __init void s5pc100_gpiolib_link(struct
s3c_gpio_chipQuoted 10 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +1
-0*chip) } }else if (chip->config == &gpio_cfg_eint) chip->chip.to_irq = s5pc1xx_gpiolib_to_eint; +#endif }static
__initints5pc1xx_gpiolib_init(void)arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +0
-0@@ -417,9 +419,10 @@ static __init int s5pc1xx_gpiolib_init(void)
Quoted 12 lines
arch/arm/mach-s5pc100/gpio.c static __init int s5pc1xx_gpiolib_init(void) · line 428
Quoted 10 lines
arch/arm/mach-s5pc100/gpio.c renamed from arch/arm/plat-s5pc1xx/gpiolib.c +2
-1samsung_gpiolib_add_4bit_chips (s5pc100_gpio_chips,ARRAY_SIZE (s5pc100_gpio_chips)); +#if 0 /* Interrupt */ set_irq_chained_handler (IRQ_GPIOINT , s5pc1xx_irq_gpioint_handler); - +#endif return 0 ; }core_initcall (s5pc1xx_gpiolib_init);Is there any way to avoid compile compatibility without #if 0?
The other way would be to completely remove that code and add it in the next patches. I don't think that this is really required.
Quoted 1 line
...
Best regards
--
Marek Szyprowski
Samsung Poland R&D Center
PATCH 7/15 ARM: S5PC100: rename gpio registers from s5pc1xx to s5pc100
In reply to Marek SzyprowskiThis patch renames gpio related registers from s5pc1xx to s5pc100 to better match the plat-s5p framework style.
--- arch/arm/mach-s5pc100/include/mach/gpio.h | 82 ++++++++++++------------ arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 8 +- 2 files changed, 45 insertions(+), 45 deletions(-)
arch/arm/mach-s5pc100/include/mach/gpio.h +41 -41
@@ -65,50 +65,50 @@* change from one gpio bank to another can be caught. */ -#define S5PC1XX_GPIO_NEXT (__gpio) \ +#define S5PC100_GPIO_NEXT (__gpio) \ ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)enum s3c_gpio_number {S5PC100_GPIO_A0_START =0 , -S5PC100_GPIO_A1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_A0 ), -S5PC100_GPIO_B_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_A1 ), -S5PC100_GPIO_C_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_B ), -S5PC100_GPIO_D_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_C ), -S5PC100_GPIO_E0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_D ), -S5PC100_GPIO_E1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_E0 ), -S5PC100_GPIO_F0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_E1 ), -S5PC100_GPIO_F1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_F0 ), -S5PC100_GPIO_F2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_F1 ), -S5PC100_GPIO_F3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_F2 ), -S5PC100_GPIO_G0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_F3 ), -S5PC100_GPIO_G1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_G0 ), -S5PC100_GPIO_G2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_G1 ), -S5PC100_GPIO_G3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_G2 ), -S5PC100_GPIO_H0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_G3 ), -S5PC100_GPIO_H1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_H0 ), -S5PC100_GPIO_H2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_H1 ), -S5PC100_GPIO_H3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_H2 ), -S5PC100_GPIO_I_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_H3 ), -S5PC100_GPIO_J0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_I ), -S5PC100_GPIO_J1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_J0 ), -S5PC100_GPIO_J2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_J1 ), -S5PC100_GPIO_J3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_J2 ), -S5PC100_GPIO_J4_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_J3 ), -S5PC100_GPIO_K0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_J4 ), -S5PC100_GPIO_K1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_K0 ), -S5PC100_GPIO_K2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_K1 ), -S5PC100_GPIO_K3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_K2 ), -S5PC100_GPIO_L0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_K3 ), -S5PC100_GPIO_L1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_L0 ), -S5PC100_GPIO_L2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_L1 ), -S5PC100_GPIO_L3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_L2 ), -S5PC100_GPIO_L4_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_L3 ), -S5PC100_GPIO_MP00_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_L4 ), -S5PC100_GPIO_MP01_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_MP00 ), -S5PC100_GPIO_MP02_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_MP01 ), -S5PC100_GPIO_MP03_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_MP02 ), -S5PC100_GPIO_MP04_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_MP03 ), -S5PC100_GPIO_END =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_MP04 ), +S5PC100_GPIO_A1_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_A0 ), +S5PC100_GPIO_B_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_A1 ), +S5PC100_GPIO_C_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_B ), +S5PC100_GPIO_D_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_C ), +S5PC100_GPIO_E0_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_D ), +S5PC100_GPIO_E1_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_E0 ), +S5PC100_GPIO_F0_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_E1 ), +S5PC100_GPIO_F1_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_F0 ), +S5PC100_GPIO_F2_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_F1 ), +S5PC100_GPIO_F3_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_F2 ), +S5PC100_GPIO_G0_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_F3 ), +S5PC100_GPIO_G1_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_G0 ), +S5PC100_GPIO_G2_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_G1 ), +S5PC100_GPIO_G3_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_G2 ), +S5PC100_GPIO_H0_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_G3 ), +S5PC100_GPIO_H1_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_H0 ), +S5PC100_GPIO_H2_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_H1 ), +S5PC100_GPIO_H3_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_H2 ), +S5PC100_GPIO_I_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_H3 ), +S5PC100_GPIO_J0_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_I ), +S5PC100_GPIO_J1_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_J0 ), +S5PC100_GPIO_J2_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_J1 ), +S5PC100_GPIO_J3_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_J2 ), +S5PC100_GPIO_J4_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_J3 ), +S5PC100_GPIO_K0_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_J4 ), +S5PC100_GPIO_K1_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_K0 ), +S5PC100_GPIO_K2_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_K1 ), +S5PC100_GPIO_K3_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_K2 ), +S5PC100_GPIO_L0_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_K3 ), +S5PC100_GPIO_L1_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_L0 ), +S5PC100_GPIO_L2_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_L1 ), +S5PC100_GPIO_L3_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_L2 ), +S5PC100_GPIO_L4_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_L3 ), +S5PC100_GPIO_MP00_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_L4 ), +S5PC100_GPIO_MP01_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_MP00 ), +S5PC100_GPIO_MP02_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_MP01 ), +S5PC100_GPIO_MP03_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_MP02 ), +S5PC100_GPIO_MP04_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_MP03 ), +S5PC100_GPIO_END =S5PC100_GPIO_NEXT (S5PC100_GPIO_MP04 ), };/* S5PC100 GPIO number definitions. */
@@ -153,7 +153,7 @@ enum s3c_gpio_number {#define S5PC100_MP04 (_nr) (S5PC100_GPIO_MP04_START + (_nr))#define S5PC100_MP05 (_nr) (S5PC100_GPIO_MP05_START + (_nr)) -/* It used the end of the S5PC1XX gpios */ +/* It used the end of the S5PC100 gpios */ #define S3C_GPIO_END S5PC100_GPIO_END/* define the number of gpios we need to the one after the MP04() range */
arch/arm/mach-s5pc100/include/mach/regs-gpio.h +4 -4
@@ -3,11 +3,11 @@* Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* S5PC1XX - GPIO register definitions +* S5PC100 - GPIO register definitions */ -#ifndef __ASM_PLAT_S5PC1XX_REGS_GPIO_H -#define __ASM_PLAT_S5PC1XX_REGS_GPIO_H __FILE__ +#ifndef __ASM_MACH_S5PC100_REGS_GPIO_H +#define __ASM_MACH_S5PC100_REGS_GPIO_H __FILE__#include <mach/map.h>
@@ -66,5 +66,5 @@#define S5PC100_GPx_OUTPUT (__gpio) (0x1 << ((__gpio) * 4))#define S5PC100_GPx_CONMASK (__gpio) (0xf << ((__gpio) * 4)) -#endif /* __ASM_PLAT_S5PC1XX_REGS_GPIO_H */ +#endif /* __ASM_MACH_S5PC100_REGS_GPIO_H */
Signature · 1 line
1.6.4
PATCH 7/15 ARM: S5PC100: rename gpio registers from s5pc1xx to s5pc100
Quoted 8 lines · Marek Szyprowski
This patch renames gpio related registers from s5pc1xx to s5pc100 to better match the plat-s5p framework style.
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/mach-s5pc100/include/mach/gpio.h | 82
++++++++++++------------
arch/arm/mach-s5pc100/include/mach/gpio.h
Quoted 8 lines
arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 8 +- 2 files changed, 45 insertions(+), 45 deletions(-)arch/arm/mach- renamed from arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
s5pc100/include/mach/gpio.h
index 2c4cbe8..fb2f40a 100644arch/arm/mach-s5pc100/include/mach/gpio.h +0
-0
It would be nice that to add following for avoid duplication including.
#ifndef __ASM_ARCH_GPIO_H
#define __ASM_ARCH_GPIO_H __FILE__
arch/arm/mach-s5pc100/include/mach/gpio.h line 71
Quoted 9 lines
arch/arm/mach-s5pc100/include/mach/gpio.h +1
-1@@ -65,50 +65,50 @@* change from one gpio bank to another can be caught. */ -#define S5PC1XX_GPIO_NEXT (__gpio) \ +#define S5PC100_GPIO_NEXT (__gpio) \ ((__gpio##_START) + (__gpio##_NR) + CONFIG_S3C_GPIO_SPACE + 1)enum s3c_gpio_number {
How about s5p_gpio_number instead of s3c_...
Quoted 155 lines
arch/arm/mach-s5pc100/include/mach/gpio.h +0
-23S5PC100_GPIO_A0_START =0 , -S5PC100_GPIO_A1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_A0 ), -S5PC100_GPIO_B_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_A1 ), -S5PC100_GPIO_C_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_B ), -S5PC100_GPIO_D_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_C ), -S5PC100_GPIO_E0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_D ), -S5PC100_GPIO_E1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_E0 ), -S5PC100_GPIO_F0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_E1 ), -S5PC100_GPIO_F1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_F0 ), -S5PC100_GPIO_F2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_F1 ), -S5PC100_GPIO_F3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_F2 ), -S5PC100_GPIO_G0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_F3 ), -S5PC100_GPIO_G1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_G0 ), -S5PC100_GPIO_G2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_G1 ), -S5PC100_GPIO_G3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_G2 ), -S5PC100_GPIO_H0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_G3 ), -S5PC100_GPIO_H1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_H0 ), -S5PC100_GPIO_H2_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_H1 ), -S5PC100_GPIO_H3_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_H2 ), -S5PC100_GPIO_I_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_H3 ), -S5PC100_GPIO_J0_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_I ), -S5PC100_GPIO_J1_START =S5PC1XX_GPIO_NEXT (S5PC100_GPIO_J0 ), -S5PC100_GPIO_J2_START = S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J1), - S5PC100_GPIO_J3_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J2),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_J4_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J3),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_K0_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_J4),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_K1_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_K0),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_K2_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_K1),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_K3_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_K2),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_L0_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_K3),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_L1_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L0),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_L2_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L1),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_L3_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L2),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_L4_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L3),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_MP00_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_L4),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_MP01_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP00),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_MP02_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP01),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_MP03_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP02),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_MP04_START =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP03),arch/arm/mach-s5pc100/include/mach/gpio.h +0
-1- S5PC100_GPIO_END =
S5PC1XX_GPIO_NEXT(S5PC100_GPIO_MP04),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_A1_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_A0),arch/arm/mach-s5pc100/include/mach/gpio.h +3
-0+S5PC100_GPIO_B_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_A1 ), +S5PC100_GPIO_C_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_B ), + S5PC100_GPIO_D_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_C),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_E0_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_D),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_E1_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_E0),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_F0_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_E1),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_F1_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_F0),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_F2_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_F1),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_F3_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_F2),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_G0_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_F3),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_G1_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_G0),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_G2_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_G1),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_G3_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_G2),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_H0_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_G3),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_H1_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_H0),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_H2_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_H1),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_H3_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_H2),arch/arm/mach-s5pc100/include/mach/gpio.h +2
-0+S5PC100_GPIO_I_START =S5PC100_GPIO_NEXT (S5PC100_GPIO_H3 ), + S5PC100_GPIO_J0_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_I),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_J1_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_J0),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_J2_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_J1),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_J3_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_J2),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_J4_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_J3),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_K0_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_J4),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_K1_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_K0),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_K2_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_K1),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_K3_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_K2),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_L0_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_K3),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_L1_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_L0),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_L2_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_L1),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_L3_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_L2),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_L4_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_L3),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_MP00_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_L4),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_MP01_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_MP00),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_MP02_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_MP01),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_MP03_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_MP02),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_MP04_START =
S5PC100_GPIO_NEXT(S5PC100_GPIO_MP03),arch/arm/mach-s5pc100/include/mach/gpio.h +1
-0+ S5PC100_GPIO_END =
S5PC100_GPIO_NEXT(S5PC100_GPIO_MP04),
};/* S5PC100 GPIO number definitions. */
arch/arm/mach-s5pc100/include/mach/gpio.h enum s3c_gpio_number { · line 159
Quoted 8 lines
arch/arm/mach-s5pc100/include/mach/gpio.h +1
-1@@ -153,7 +153,7 @@ enum s3c_gpio_number {#define S5PC100_MP04 (_nr) (S5PC100_GPIO_MP04_START + (_nr))#define S5PC100_MP05 (_nr) (S5PC100_GPIO_MP05_START + (_nr)) -/* It used the end of the S5PC1XX gpios */ +/* It used the end of the S5PC100 gpios */ #define S3C_GPIO_END S5PC100_GPIO_END/* define the number of gpios we need to the one after the MP04() range */
Last is MP04 or MP05?
In the s3c_gpio_number, MP04 is last one.
And there is S5PC100_MP05 definition also.
Review
Quoted 1 line
(quoted diff) +0
-0
b/arch/arm/mach-
Quoted 20 lines
s5pc100/include/mach/regs-gpio.h
index 43c7bc8..6866691 100644arch/arm/mach-s5pc100/include/mach/regs-gpio.h +3
-3@@ -3,11 +3,11 @@* Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* S5PC1XX - GPIO register definitions +* S5PC100 - GPIO register definitions */ -#ifndef __ASM_PLAT_S5PC1XX_REGS_GPIO_H -#define __ASM_PLAT_S5PC1XX_REGS_GPIO_H __FILE__ +#ifndef __ASM_MACH_S5PC100_REGS_GPIO_H +#define __ASM_MACH_S5PC100_REGS_GPIO_H __FILE__#include <mach/map.h>
arch/arm/mach-s5pc100/include/mach/regs-gpio.h
Quoted 7 lines
arch/arm/mach-s5pc100/include/mach/regs-gpio.h +1
-2@@ -66,5 +66,5 @@#define S5PC100_GPx_OUTPUT (__gpio) (0x1 << ((__gpio) * 4))#define S5PC100_GPx_CONMASK (__gpio) (0xf << ((__gpio) * 4)) -#endif /* __ASM_PLAT_S5PC1XX_REGS_GPIO_H */ +#endif /* __ASM_MACH_S5PC100_REGS_GPIO_H */ --
It is better that above chages is in the your previous patch. Because the file already moved in the [PATCH 06/15].
And how about __ASM_ARCH_REGS_GPIO_H instead of __ASM_MACH_S5PC100_xxx That makes unitified look and feel for a same Samsung SoC.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 8/15 ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100
In reply to Marek SzyprowskiMove frame buffer helpers from plat-s5pc1xx to mach-s5pc100.
---
arch/arm/mach-s5pc100/Kconfig | 7 ++++++-
arch/arm/mach-s5pc100/Makefile | 1 +
.../setup-fb-24bpp.c | 4 ++--
arch/arm/plat-s5pc1xx/Kconfig | 5 -----
arch/arm/plat-s5pc1xx/Makefile | 1 -
5 files changed, 9 insertions(+), 9 deletions(-)
rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-fb-24bpp.c (91%)arch/arm/mach-s5pc100/Kconfig +6 -1
@@ -12,6 +12,11 @@ config CPU_S5PC100 help Enable S5PC100 CPU support +config S5PC100_SETUP_FB_24BPP + bool + help + Common setup code for S5PC1XX with an 24bpp RGB display helper. + config S5PC100_SETUP_SDHCI bool select S5PC1XX_SETUP_SDHCI_GPIO
@@ -28,7 +33,7 @@ config MACH_SMDKC100 select S3C_DEV_HSMMC2 select S5PC1XX_SETUP_I2C0 select S5PC1XX_SETUP_I2C1 - select S5PC1XX_SETUP_FB_24BPP + select S5PC100_SETUP_FB_24BPP select S5PC100_SETUP_SDHCI help Machine support for the Samsung SMDKC100
arch/arm/mach-s5pc100/Makefile +1 -0
@@ -15,6 +15,7 @@ obj-$(CONFIG_CPU_S5PC100) += cpu.o gpio.o # Helper and device support +obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o # machine support
arch/arm/mach-s5pc100/setup-fb-24bpp.c renamed from arch/arm/plat-s5pc1xx/setup-fb-24bpp.c +2 -2
@@ -1,9 +1,9 @@/* -* linux/arch/arm/plat-s5pc100/setup-fb-24bpp.c +* linux/arch/arm/mach-s5pc100/setup-fb-24bpp.c * * Copyright 2009 Samsung Electronics * -* Base S5PC1XX setup information for 24bpp LCD framebuffer +* Base S5PC100 setup information for 24bpp LCD framebuffer * * 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
arch/arm/plat-s5pc1xx/Kconfig +0 -5
@@ -39,11 +39,6 @@ config CPU_S5PC100_CLOCK # platform specific device setup -config S5PC1XX_SETUP_FB_24BPP - bool - help - Common setup code for S5PC1XX with an 24bpp RGB display helper. - config S5PC1XX_SETUP_I2C0 bool default y
arch/arm/plat-s5pc1xx/Makefile +0 -1
@@ -23,7 +23,6 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o # Device setup -obj-$(CONFIG_S5PC1XX_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC1XX_SETUP_I2C0) += setup-i2c0.o obj-$(CONFIG_S5PC1XX_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
Signature · 1 line
1.6.4
PATCH 8/15 ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100
Quoted 19 lines · Marek Szyprowski
Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100.
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/mach-s5pc100/Kconfig | 7 ++++++- arch/arm/mach-s5pc100/Makefile | 1 + .../setup-fb-24bpp.c | 4 ++-- arch/arm/plat-s5pc1xx/Kconfig | 5 ----- arch/arm/plat-s5pc1xx/Makefile | 1 - 5 files changed, 9 insertions(+), 9 deletions(-) rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-fb-24bpp.c (91%)arch/arm/mach-s5pc100/Kconfig +0
-0
arch/arm/mach-s5pc100/Kconfig config CPU_S5PC100 · line 18
Quoted 7 lines
arch/arm/mach-s5pc100/Kconfig +4
-0@@ -12,6 +12,11 @@ config CPU_S5PC100 help Enable S5PC100 CPU support +config S5PC100_SETUP_FB_24BPP + bool + help + Common setup code for S5PC1XX with an 24bpp RGB display helper.
Double tab and 2 white spaces.
Review
Quoted 14 lines
arch/arm/mach-s5pc100/Kconfig +2
-1+ config S5PC100_SETUP_SDHCI bool select S5PC1XX_SETUP_SDHCI_GPIO@@ -28,7 +33,7 @@ config MACH_SMDKC100 select S3C_DEV_HSMMC2 select S5PC1XX_SETUP_I2C0 select S5PC1XX_SETUP_I2C1 - select S5PC1XX_SETUP_FB_24BPP + select S5PC100_SETUP_FB_24BPP select S5PC100_SETUP_SDHCI help Machine support for the Samsung SMDKC100(quoted diff) +0
-0
b/arch/arm/mach-s5pc100/Makefile
Review
Quoted 12 lines
index e1afdbf..ccf0dca 100644
arch/arm/mach-s5pc100/Makefile +1
-0@@ -15,6 +15,7 @@ obj-$(CONFIG_CPU_S5PC100) += cpu.o gpio.o # Helper and device support +obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o # machine support(quoted diff) +0
-0
b/arch/arm/mach-s5pc100/setup-
Review
Quoted 36 lines
fb-24bpp.c
similarity index 91%
rename fromarch/arm/plat-s5pc1xx/setup-fb-24bpp.crename toarch/arm/mach-s5pc100/setup-fb-24bpp.cindex b02c36f..6eba6cb 100644arch/arm/mach-s5pc100/setup-fb-24bpp.c renamed from arch/arm/plat-s5pc1xx/setup-fb-24bpp.c +2
-2@@ -1,9 +1,9 @@/* -* linux/arch/arm/plat-s5pc100/setup-fb-24bpp.c +* linux/arch/arm/mach-s5pc100/setup-fb-24bpp.c * * Copyright 2009 Samsung Electronics * -* Base S5PC1XX setup information for 24bpp LCD framebuffer +* Base S5PC100 setup information for 24bpp LCD framebuffer * * 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 arch/arm/plat-s5pc1xx/Kconfig +0
-5@@ -39,11 +39,6 @@ config CPU_S5PC100_CLOCK # platform specific device setup -config S5PC1XX_SETUP_FB_24BPP - bool - help - Common setup code for S5PC1XX with an 24bpp RGB display helper. - config S5PC1XX_SETUP_I2C0 bool default y(quoted diff) +0
-0
b/arch/arm/plat-s5pc1xx/Makefile
arch/arm/plat-s5pc1xx/Makefile obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o
Quoted 12 lines
index 540fca5..a5b90c0 100644
arch/arm/plat-s5pc1xx/Makefile +0
-2@@ -23,7 +23,6 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o # Device setup -obj-$(CONFIG_S5PC1XX_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC1XX_SETUP_I2C0) += setup-i2c0.o obj-$(CONFIG_S5PC1XX_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 9/15 ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100
In reply to Marek SzyprowskiMove i2c helpers from plat-s5pc1xx to mach-s5pc100.
---
arch/arm/mach-s5pc100/Kconfig | 8 ++++++--
arch/arm/mach-s5pc100/Makefile | 2 ++
.../{plat-s5pc1xx => mach-s5pc100}/setup-i2c0.c | 4 ++--
.../{plat-s5pc1xx => mach-s5pc100}/setup-i2c1.c | 4 ++--
arch/arm/plat-s5pc1xx/Kconfig | 14 --------------
arch/arm/plat-s5pc1xx/Makefile | 2 --
6 files changed, 12 insertions(+), 22 deletions(-)
rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-i2c0.c (89%)
rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-i2c1.c (89%)arch/arm/mach-s5pc100/Kconfig +6 -2
@@ -23,6 +23,11 @@ config S5PC100_SETUP_SDHCI help Internal helper functions for S5PC100 based SDHCI systems +config S5PC100_SETUP_I2C1 + bool + help + Common setup code for i2c bus 1. + config MACH_SMDKC100 bool "SMDKC100" select CPU_S5PC100
@@ -31,9 +36,8 @@ config MACH_SMDKC100 select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 - select S5PC1XX_SETUP_I2C0 - select S5PC1XX_SETUP_I2C1 select S5PC100_SETUP_FB_24BPP + select S5PC100_SETUP_I2C1 select S5PC100_SETUP_SDHCI help Machine support for the Samsung SMDKC100
arch/arm/mach-s5pc100/Makefile +2 -0
@@ -12,10 +12,12 @@ obj- := # Core support for S5PC100 system obj-$(CONFIG_CPU_S5PC100) += cpu.o gpio.o +obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o # Helper and device support obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o +obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o # machine support
arch/arm/mach-s5pc100/setup-i2c0.c renamed from arch/arm/plat-s5pc1xx/setup-i2c0.c +2 -2
@@ -1,9 +1,9 @@ -/* linux/arch/arm/plat-s5pc1xx/setup-i2c0.c +/* linux/arch/arm/mach-s5pc100/setup-i2c0.c * * Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* Base S5PC1XX I2C bus 0 gpio configuration +* Base S5PC100 I2C bus 0 gpio configuration * * Based on plat-s3c64xx/setup-i2c0.c *
arch/arm/mach-s5pc100/setup-i2c1.c renamed from arch/arm/plat-s5pc1xx/setup-i2c1.c +2 -2
@@ -1,9 +1,9 @@ -/* linux/arch/arm/plat-s3c64xx/setup-i2c1.c +/* linux/arch/arm/mach-s5pc100/setup-i2c1.c * * Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* Base S5PC1XX I2C bus 1 gpio configuration +* Base S5PC100 I2C bus 1 gpio configuration * * Based on plat-s3c64xx/setup-i2c1.c *
arch/arm/plat-s5pc1xx/Kconfig +0 -14
@@ -39,20 +39,6 @@ config CPU_S5PC100_CLOCK # platform specific device setup -config S5PC1XX_SETUP_I2C0 - bool - default y - help - Common setup code for i2c bus 0. - - Note, currently since i2c0 is always compiled, this setup helper - is always compiled with it. - -config S5PC1XX_SETUP_I2C1 - bool - help - Common setup code for i2c bus 1. - config S5PC1XX_SETUP_SDHCI_GPIO bool help
arch/arm/plat-s5pc1xx/Makefile +0 -2
@@ -23,6 +23,4 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o # Device setup -obj-$(CONFIG_S5PC1XX_SETUP_I2C0) += setup-i2c0.o -obj-$(CONFIG_S5PC1XX_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
Signature · 1 line
1.6.4
PATCH 9/15 ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100
Quoted 2 lines · Marek Szyprowski
Move i2c helpers from plat-s5pc1xx to mach-s5pc100.
It would be nice that separate submitting this patch from c100 clean up with your [PATCH 2/3] ARM: Samsung: move common I2C0 device helpers to machine directories.
1. Moving common I2C0 device helpers to each mach directory
2. And then C100's I2Cx moving.
Review
Quoted 42 lines
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/mach-s5pc100/Kconfig | 8 ++++++-- arch/arm/mach-s5pc100/Makefile | 2 ++ .../{plat-s5pc1xx => mach-s5pc100}/setup-i2c0.c | 4 ++-- .../{plat-s5pc1xx => mach-s5pc100}/setup-i2c1.c | 4 ++-- arch/arm/plat-s5pc1xx/Kconfig | 14 -------------- arch/arm/plat-s5pc1xx/Makefile | 2 -- 6 files changed, 12 insertions(+), 22 deletions(-) rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-i2c0.c (89%) rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-i2c1.c (89%)arch/arm/mach-s5pc100/Kconfig +6
-2@@ -23,6 +23,11 @@ config S5PC100_SETUP_SDHCI help Internal helper functions for S5PC100 based SDHCI systems +config S5PC100_SETUP_I2C1 + bool + help + Common setup code for i2c bus 1. + config MACH_SMDKC100 bool "SMDKC100" select CPU_S5PC100@@ -31,9 +36,8 @@ config MACH_SMDKC100 select S3C_DEV_HSMMC select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC2 - select S5PC1XX_SETUP_I2C0 - select S5PC1XX_SETUP_I2C1 select S5PC100_SETUP_FB_24BPP + select S5PC100_SETUP_I2C1 select S5PC100_SETUP_SDHCI help Machine support for the Samsung SMDKC100(quoted diff) +0
-0
b/arch/arm/mach-s5pc100/Makefile
Review
Quoted 17 lines
index ccf0dca..741fba0 100644
arch/arm/mach-s5pc100/Makefile +2
-0@@ -12,10 +12,12 @@ obj- := # Core support for S5PC100 system obj-$(CONFIG_CPU_S5PC100) += cpu.o gpio.o +obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o # Helper and device support obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o +obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o # machine support(quoted diff) +0
-0
b/arch/arm/mach-s5pc100/setup-
Review
Quoted 20 lines
i2c0.c
similarity index 89%
rename fromarch/arm/plat-s5pc1xx/setup-i2c0.c
rename toarch/arm/mach-s5pc100/setup-i2c0.c
index 5e4a7c3..dd3174e 100644arch/arm/mach-s5pc100/setup-i2c0.c renamed from arch/arm/plat-s5pc1xx/setup-i2c0.c +2
-2@@ -1,9 +1,9 @@ -/* linux/arch/arm/plat-s5pc1xx/setup-i2c0.c +/* linux/arch/arm/mach-s5pc100/setup-i2c0.c * * Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* Base S5PC1XX I2C bus 0 gpio configuration +* Base S5PC100 I2C bus 0 gpio configuration * * Based on plat-s3c64xx/setup-i2c0.c * (quoted diff) +0
-0
b/arch/arm/mach-s5pc100/setup-
Review
Quoted 45 lines
i2c1.c
similarity index 89%
rename fromarch/arm/plat-s5pc1xx/setup-i2c1.c
rename toarch/arm/mach-s5pc100/setup-i2c1.c
index a0a8b4a..d1fec26 100644arch/arm/mach-s5pc100/setup-i2c1.c renamed from arch/arm/plat-s5pc1xx/setup-i2c1.c +2
-2@@ -1,9 +1,9 @@ -/* linux/arch/arm/plat-s3c64xx/setup-i2c1.c +/* linux/arch/arm/mach-s5pc100/setup-i2c1.c * * Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* Base S5PC1XX I2C bus 1 gpio configuration +* Base S5PC100 I2C bus 1 gpio configuration * * Based on plat-s3c64xx/setup-i2c1.c * arch/arm/plat-s5pc1xx/Kconfig +0
-14@@ -39,20 +39,6 @@ config CPU_S5PC100_CLOCK # platform specific device setup -config S5PC1XX_SETUP_I2C0 - bool - default y - help - Common setup code for i2c bus 0. - - Note, currently since i2c0 is always compiled, this setup helper - is always compiled with it. - -config S5PC1XX_SETUP_I2C1 - bool - help - Common setup code for i2c bus 1. - config S5PC1XX_SETUP_SDHCI_GPIO bool help(quoted diff) +0
-0
b/arch/arm/plat-s5pc1xx/Makefile
arch/arm/plat-s5pc1xx/Makefile obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o
Quoted 11 lines
index a5b90c0..9ce6409 100644
arch/arm/plat-s5pc1xx/Makefile +0
-3@@ -23,6 +23,4 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o # Device setup -obj-$(CONFIG_S5PC1XX_SETUP_I2C0) += setup-i2c0.o -obj-$(CONFIG_S5PC1XX_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 10/15 ARM: S5PC100: Move sdhci helpers from plat-s5pc1xx to mach-s5pc100
In reply to Marek SzyprowskiMove sdhci helpers from plat-s5pc1xx to mach-s5pc100.
---
arch/arm/mach-s5pc100/Kconfig | 11 +++++++++++
arch/arm/mach-s5pc100/Makefile | 1 +
.../setup-sdhci-gpio.c | 4 ++--
arch/arm/plat-s5pc1xx/Kconfig | 5 -----
arch/arm/plat-s5pc1xx/Makefile | 1 -
5 files changed, 14 insertions(+), 8 deletions(-)
rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-sdhci-gpio.c (95%)arch/arm/mach-s5pc100/Kconfig +11 -0
@@ -28,6 +28,17 @@ config S5PC100_SETUP_I2C1 help Common setup code for i2c bus 1. +config S5PC100_SETUP_SDHCI + bool + select S5PC100_SETUP_SDHCI_GPIO + help + Internal helper functions for S5PC100 based SDHCI systems + +config S5PC100_SETUP_SDHCI_GPIO + bool + help + Common setup code for SDHCI gpio. + config MACH_SMDKC100 bool "SMDKC100" select CPU_S5PC100
arch/arm/mach-s5pc100/Makefile +1 -0
@@ -19,6 +19,7 @@ obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o +obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o # machine support obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.o
arch/arm/mach-s5pc100/setup-sdhci-gpio.c renamed from arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c +2 -2
@@ -1,8 +1,8 @@ -/* linux/arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c +/* linux/arch/arm/plat-s5pc100/setup-sdhci-gpio.c * * Copyright 2009 Samsung Eletronics * -* S5PC1XX - Helper functions for setting up SDHCI device(s) GPIO (HSMMC) +* S5PC100 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC) * * 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
arch/arm/plat-s5pc1xx/Kconfig +0 -5
@@ -39,9 +39,4 @@ config CPU_S5PC100_CLOCK # platform specific device setup -config S5PC1XX_SETUP_SDHCI_GPIO - bool - help - Common setup code for SDHCI gpio. - endif
arch/arm/plat-s5pc1xx/Makefile +0 -1
@@ -23,4 +23,3 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o # Device setup -obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
Signature · 1 line
1.6.4
PATCH 10/15 ARM: S5PC100: Move sdhci helpers from plat-s5pc1xx to mach-s5pc100
Quoted 19 lines · Marek Szyprowski
Move sdhci helpers from plat-s5pc1xx to mach-s5pc100.
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/mach-s5pc100/Kconfig | 11 +++++++++++ arch/arm/mach-s5pc100/Makefile | 1 + .../setup-sdhci-gpio.c | 4 ++-- arch/arm/plat-s5pc1xx/Kconfig | 5 ----- arch/arm/plat-s5pc1xx/Makefile | 1 - 5 files changed, 14 insertions(+), 8 deletions(-) rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/setup-sdhci-gpio.c (95%)arch/arm/mach-s5pc100/Kconfig +0
-0
arch/arm/mach-s5pc100/Kconfig config S5PC100_SETUP_I2C1 · line 32
Quoted 5 lines
arch/arm/mach-s5pc100/Kconfig +2
-0@@ -28,6 +28,17 @@ config S5PC100_SETUP_I2C1 help Common setup code for i2c bus 1. +config S5PC100_SETUP_SDHCI + bool
Please use double tab instead of white space.
arch/arm/mach-s5pc100/Kconfig config S5PC100_SETUP_I2C1 · line 33
Quoted 1 line
arch/arm/mach-s5pc100/Kconfig +1
-0+ select S5PC100_SETUP_SDHCI_GPIO
Same.
arch/arm/mach-s5pc100/Kconfig config S5PC100_SETUP_I2C1 · line 34
Quoted 1 line
arch/arm/mach-s5pc100/Kconfig +1
-0+ help
Same.
arch/arm/mach-s5pc100/Kconfig config S5PC100_SETUP_I2C1 · line 35
Quoted 1 line
arch/arm/mach-s5pc100/Kconfig +1
-0+ Internal helper functions for S5PC100 based SDHCI systems
2 tabs and 2 white space.
Review
Quoted 10 lines
arch/arm/mach-s5pc100/Kconfig +6
-0+ +config S5PC100_SETUP_SDHCI_GPIO + bool + help + Common setup code for SDHCI gpio. + config MACH_SMDKC100 bool "SMDKC100" select CPU_S5PC100(quoted diff) +0
-0
b/arch/arm/mach-s5pc100/Makefile
arch/arm/mach-s5pc100/Makefile obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o · line 21
Quoted 7 lines
index 741fba0..1e3180e 100644
arch/arm/mach-s5pc100/Makefile +0
-0@@ -19,6 +19,7 @@ obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o obj-$(CONFIG_S5PC100_SETUP_FB_24BPP) += setup-fb-24bpp.o obj-$(CONFIG_S5PC100_SETUP_I2C1) += setup-i2c1.o obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o
How about fix the above blank with tab.
Review
Quoted 38 lines
arch/arm/mach-s5pc100/Makefile +1
-0+obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o # machine support obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.oarch/arm/mach- renamed from arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c +0
-0
s5pc100/setup-sdhci-gpio.c
similarity index 95%
rename fromarch/arm/plat-s5pc1xx/setup-sdhci-gpio.crename toarch/arm/mach-s5pc100/setup-sdhci-gpio.cindex 185c894..7769c76 100644arch/arm/mach-s5pc100/setup-sdhci-gpio.c renamed from arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c +2
-2@@ -1,8 +1,8 @@ -/* linux/arch/arm/plat-s5pc1xx/setup-sdhci-gpio.c +/* linux/arch/arm/plat-s5pc100/setup-sdhci-gpio.c * * Copyright 2009 Samsung Eletronics * -* S5PC1XX - Helper functions for setting up SDHCI device(s) GPIO (HSMMC) +* S5PC100 - Helper functions for setting up SDHCI device(s) GPIO (HSMMC) * * 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 arch/arm/plat-s5pc1xx/Kconfig +0
-5@@ -39,9 +39,4 @@ config CPU_S5PC100_CLOCK # platform specific device setup -config S5PC1XX_SETUP_SDHCI_GPIO - bool - help - Common setup code for SDHCI gpio. - endif(quoted diff) +0
-0
b/arch/arm/plat-s5pc1xx/Makefile
arch/arm/plat-s5pc1xx/Makefile obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o
Quoted 9 lines
index 9ce6409..d490543 100644
arch/arm/plat-s5pc1xx/Makefile +0
-2@@ -23,4 +23,3 @@ obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o # Device setup -obj-$(CONFIG_S5PC1XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 11/15 ARM: Samsung: move S5PC100 support from plat-s5pc1xx to plat-s5p framework
In reply to Marek SzyprowskiThis patch moves S5PC100 SoC support to plat-s5p framework. Most periperal support code has been already moved from plat-s5pc1xx to mach-s5pc100.
---
arch/arm/Kconfig | 9 +-
arch/arm/Makefile | 3 +-
arch/arm/mach-s5pc100/Kconfig | 7 +-
arch/arm/mach-s5pc100/Makefile | 3 +-
arch/arm/mach-s5pc100/cpu.c | 56 ++++---
arch/arm/mach-s5pc100/gpio.c | 24 ++--
arch/arm/mach-s5pc100/include/mach/debug-macro.S | 6 +-
arch/arm/mach-s5pc100/include/mach/entry-macro.S | 8 +-
arch/arm/mach-s5pc100/include/mach/irqs.h | 101 +++++++++++++-
arch/arm/mach-s5pc100/include/mach/map.h | 156 +++++---------------
arch/arm/mach-s5pc100/include/mach/regs-clock.h | 6 +
arch/arm/mach-s5pc100/include/mach/regs-gpio.h | 6 +-
arch/arm/mach-s5pc100/include/mach/regs-irq.h | 7 +-
arch/arm/mach-s5pc100/include/mach/system.h | 9 +-
arch/arm/mach-s5pc100/include/mach/tick.h | 4 +-
.../s5pc100-init.c => mach-s5pc100/init.c} | 7 +-
arch/arm/mach-s5pc100/mach-smdkc100.c | 11 +-
arch/arm/plat-s5p/Kconfig | 2 +-
arch/arm/plat-s5p/cpu.c | 10 ++
arch/arm/plat-s5p/include/plat/s5pc100.h | 33 ++++
arch/arm/plat-samsung/Kconfig | 2 +-
21 files changed, 267 insertions(+), 203 deletions(-)
rename arch/arm/{plat-s5pc1xx/s5pc100-init.c => mach-s5pc100/init.c} (68%)
create mode 100644 arch/arm/plat-s5p/include/plat/s5pc100.harch/arm/Kconfig +3 -6
@@ -699,14 +699,14 @@ config ARCH_S5P6442 help Samsung S5P6442 CPU based systems -config ARCH_S5PC1XX - bool "Samsung S5PC1XX" +config ARCH_S5PC100 + bool "Samsung S5PC100" select GENERIC_GPIO select HAVE_CLK select CPU_V7 select ARM_L1_CACHE_SHIFT_6 help - Samsung S5PC1XX series based systems + Samsung S5PC100 series based systems config ARCH_S5PV210 bool "Samsung S5PV210/S5PC110"
@@ -890,7 +890,6 @@ source "arch/arm/mach-sa1100/Kconfig" source "arch/arm/plat-samsung/Kconfig" source "arch/arm/plat-s3c24xx/Kconfig" source "arch/arm/plat-s5p/Kconfig" -source "arch/arm/plat-s5pc1xx/Kconfig" if ARCH_S3C2410 source "arch/arm/mach-s3c2400/Kconfig"
@@ -909,9 +908,7 @@ source "arch/arm/mach-s5p6440/Kconfig" source "arch/arm/mach-s5p6442/Kconfig" -if ARCH_S5PC1XX source "arch/arm/mach-s5pc100/Kconfig" -endif source "arch/arm/mach-s5pv210/Kconfig"
arch/arm/Makefile +1 -2
@@ -167,7 +167,7 @@ machine-$(CONFIG_ARCH_S3C24A0) := s3c24a0 machine-$(CONFIG_ARCH_S3C64XX) := s3c64xx machine-$(CONFIG_ARCH_S5P6440) := s5p6440 machine-$(CONFIG_ARCH_S5P6442) := s5p6442 -machine-$(CONFIG_ARCH_S5PC1XX) := s5pc100 +machine-$(CONFIG_ARCH_S5PC100) := s5pc100 machine-$(CONFIG_ARCH_S5PV210) := s5pv210 machine-$(CONFIG_ARCH_SA1100) := sa1100 machine-$(CONFIG_ARCH_SHARK) := shark
@@ -192,7 +192,6 @@ plat-$(CONFIG_PLAT_NOMADIK) := nomadik plat-$(CONFIG_PLAT_ORION) := orion plat-$(CONFIG_PLAT_PXA) := pxa plat-$(CONFIG_PLAT_S3C24XX) := s3c24xx samsung -plat-$(CONFIG_PLAT_S5PC1XX) := s5pc1xx samsung plat-$(CONFIG_PLAT_S5P) := s5p samsung ifeq ($(CONFIG_ARCH_EBSA110),y)
arch/arm/mach-s5pc100/Kconfig +5 -2
@@ -5,10 +5,11 @@ # Configuration options for the S5PC100 CPU +if ARCH_S5PC100 + config CPU_S5PC100 bool - select CPU_S5PC100_INIT - select CPU_S5PC100_CLOCK + select PLAT_S5P help Enable S5PC100 CPU support
@@ -52,3 +53,5 @@ config MACH_SMDKC100 select S5PC100_SETUP_SDHCI help Machine support for the Samsung SMDKC100 + +endif
arch/arm/mach-s5pc100/Makefile +2 -1
@@ -11,7 +11,7 @@ obj- := # Core support for S5PC100 system -obj-$(CONFIG_CPU_S5PC100) += cpu.o gpio.o +obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o gpio.o obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o # Helper and device support
@@ -22,4 +22,5 @@ obj-$(CONFIG_S5PC100_SETUP_SDHCI) += setup-sdhci.o obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o # machine support + obj-$(CONFIG_MACH_SMDKC100) += mach-smdkc100.o
arch/arm/mach-s5pc100/cpu.c +32 -24
110 lines not on this page · raw message
arch/arm/mach-s5pc100/gpio.c +12 -12
@@ -1,10 +1,10 @@/* -* arch/arm/plat-s5pc1xx/gpiolib.c +* arch/arm/plat-s5pc100/gpiolib.c * * Copyright 2009 Samsung Electronics Co * Kyungmin Park <[email protected]> * -* S5PC1XX - GPIOlib support +* S5PC100 - GPIOlib support * * 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
@@ -62,12 +62,12 @@*/ #if 0 -static int s5pc1xx_gpiolib_to_irq (struct gpio_chip *chip,unsigned int offset) +static int s5pc100_gpiolib_to_irq (struct gpio_chip *chip,unsigned int offset) {return S3C_IRQ_GPIO (chip->base + offset); } -static int s5pc1xx_gpiolib_to_eint (struct gpio_chip *chip,unsigned int offset) +static int s5pc100_gpiolib_to_eint (struct gpio_chip *chip,unsigned int offset) {int base;
@@ -382,8 +382,8 @@ static struct s3c_gpio_chip s5pc100_gpio_chips[] = { };/* FIXME move from irq-gpio.c */ -extern struct irq_chip s5pc1xx_gpioint; -extern void s5pc1xx_irq_gpioint_handler (unsigned int irq,struct irq_desc *desc); +extern struct irq_chip s5pc100_gpioint; +extern void s5pc100_irq_gpioint_handler (unsigned int irq,struct irq_desc *desc);static __init void s5pc100_gpiolib_link (struct s3c_gpio_chip *chip) {
@@ -392,21 +392,21 @@ static __init void s5pc100_gpiolib_link(struct s3c_gpio_chip *chip)if (chip->config == &gpio_cfg) {int i, irq; - chip->chip.to_irq = s5pc1xx_gpiolib_to_irq; + chip->chip.to_irq = s5pc100_gpiolib_to_irq;for (i =0 ; i < chip->chip.ngpio; i++) { irq =S3C_IRQ_GPIO_BASE + chip->chip.base + i; -set_irq_chip (irq, &s5pc1xx_gpioint); +set_irq_chip (irq, &s5pc100_gpioint);set_irq_data (irq, &chip->chip);set_irq_handler (irq, handle_level_irq);set_irq_flags (irq,IRQF_VALID ); } }else if (chip->config == &gpio_cfg_eint) - chip->chip.to_irq = s5pc1xx_gpiolib_to_eint; + chip->chip.to_irq = s5pc100_gpiolib_to_eint;#endif } -static __init int s5pc1xx_gpiolib_init (void ) +static __init int s5pc100_gpiolib_init (void ) {struct s3c_gpio_chip *chip;int nr_chips;
@@ -421,8 +421,8 @@ static __init int s5pc1xx_gpiolib_init(void) ARRAY_SIZE(s5pc100_gpio_chips));#if 0 /* Interrupt */ -set_irq_chained_handler (IRQ_GPIOINT , s5pc1xx_irq_gpioint_handler); +set_irq_chained_handler (IRQ_GPIOINT , s5pc100_irq_gpioint_handler);#endif return 0 ; } -core_initcall (s5pc1xx_gpiolib_init); +core_initcall (s5pc100_gpiolib_init);
arch/arm/mach-s5pc100/include/mach/debug-macro.S +4 -2
@@ -22,12 +22,14 @@ * aligned and add in the offset when we load the value here. */ - .macro addruart, rx, tmp + .macro addruart, rx, rtmp mrc p15, 0, \rx, c1, c0 tst \rx, #1 ldreq \rx, = S3C_PA_UART - ldrne \rx, = (S3C_VA_UART + S3C_PA_UART & 0xfffff) + ldrne \rx, = S3C_VA_UART +#if CONFIG_DEBUG_S3C_UART != 0 add \rx, \rx, #(0x400 * CONFIG_DEBUG_S3C_UART) +#endif .endm /* include the reset of the code which will do the work, we're only
arch/arm/mach-s5pc100/include/mach/entry-macro.S +4 -4
@@ -20,7 +20,7 @@ .endm .macro get_irqnr_preamble, base, tmp - ldr \base, =S3C_VA_VIC0 + ldr \base, =VA_VIC0 .endm .macro arch_ret_to_user, tmp1, tmp2
@@ -29,18 +29,18 @@ .macro get_irqnr_and_base, irqnr, irqstat, base, tmp @ check the vic0 - mov \irqnr, # S3C_IRQ_OFFSET + 31 + mov \irqnr, # S5P_IRQ_OFFSET + 31 ldr \irqstat, [ \base, # VIC_IRQ_STATUS ] teq \irqstat, #0 @ otherwise try vic1 - addeq \tmp, \base, #(S3C_VA_VIC1 - S3C_VA_VIC0) + addeq \tmp, \base, #(VA_VIC1 - VA_VIC0) addeq \irqnr, \irqnr, #32 ldreq \irqstat, [ \tmp, # VIC_IRQ_STATUS ] teqeq \irqstat, #0 @ otherwise try vic2 - addeq \tmp, \base, #(S3C_VA_VIC2 - S3C_VA_VIC0) + addeq \tmp, \base, #(VA_VIC2 - VA_VIC0) addeq \irqnr, \irqnr, #32 ldreq \irqstat, [ \tmp, # VIC_IRQ_STATUS ] teqeq \irqstat, #0
arch/arm/mach-s5pc100/include/mach/irqs.h +99 -2
108 lines not on this page · raw message
arch/arm/mach-s5pc100/include/mach/map.h +39 -117
183 lines not on this page · raw message
arch/arm/mach-s5pc100/include/mach/regs-clock.h +6 -0
@@ -17,6 +17,8 @@#define S5P_CLKREG (x) (S3C_VA_SYS + (x)) +#define S5PC100_REG_OTHERS (x) (S5PC100_VA_OTHERS + (x)) +#define S5P_APLL_LOCK S5P_CLKREG(0x00)#define S5P_MPLL_LOCK S5P_CLKREG(0x04)#define S5P_EPLL_LOCK S5P_CLKREG(0x08)
@@ -68,4 +70,8 @@#define S5P_CLKDIV1_PCLKD1_MASK (0x7<<16)#define S5P_CLKDIV1_PCLKD1_SHIFT (16) +#define S5PC100_SWRESET S5PC100_REG_OTHERS(0x000) + +#define S5PC100_SWRESET_RESETVAL 0xc100 +#endif /* __ASM_ARCH_REGS_CLOCK_H */
arch/arm/mach-s5pc100/include/mach/regs-gpio.h +3 -3
@@ -1,4 +1,4 @@ -/* linux/arch/arm/plat-s5pc1xx/include/plat/regs-gpio.h +/* linux/arch/arm/plat-s5pc100/include/plat/regs-gpio.h * * Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]>
@@ -12,7 +12,7 @@#include <mach/map.h> /* S5PC100 */ -#define S5PC100_GPIO_BASE S5PC1XX_VA_GPIO +#define S5PC100_GPIO_BASE S5P_VA_GPIO#define S5PC100_GPA0_BASE (S5PC100_GPIO_BASE + 0x0000)#define S5PC100_GPA1_BASE (S5PC100_GPIO_BASE + 0x0020)#define S5PC100_GPB_BASE (S5PC100_GPIO_BASE + 0x0040)
@@ -60,7 +60,7 @@/* Common part */ /* External interrupt base is same at both s5pc100 and s5pc110 */ -#define S5PC1XX_EINT_BASE (S5PC100_EINT_BASE) +#define S5P_EINT_BASE (S5PC100_EINT_BASE)#define S5PC100_GPx_INPUT (__gpio) (0x0 << ((__gpio) * 4))#define S5PC100_GPx_OUTPUT (__gpio) (0x1 << ((__gpio) * 4))
arch/arm/mach-s5pc100/include/mach/regs-irq.h +1 -6
@@ -3,7 +3,7 @@* Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* S5PC1XX - IRQ register definitions +* S5PC100 - IRQ register definitions * * 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
@@ -16,9 +16,4 @@#include <mach/map.h> #include <asm/hardware/vic.h> -/* interrupt controller */ -#define S5PC1XX_VIC0REG (x) ((x) + S5PC1XX_VA_VIC(0)) -#define S5PC1XX_VIC1REG (x) ((x) + S5PC1XX_VA_VIC(1)) -#define S5PC1XX_VIC2REG (x) ((x) + S5PC1XX_VA_VIC(2)) -#endif /* __ASM_ARCH_REGS_IRQ_H */
arch/arm/mach-s5pc100/include/mach/system.h +3 -6
@@ -3,7 +3,7 @@* Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* S5PC1XX - system implementation +* S5PC100 - system implementation * * Based on mach-s3c6400/include/mach/system.h */
@@ -13,14 +13,11 @@#include <linux/io.h> #include <mach/map.h> -#include <plat/regs-clock.h> - -void (*s5pc1xx_idle)(void ); +#include <mach/regs-clock.h> static void arch_idle (void ) { -if (s5pc1xx_idle) -s5pc1xx_idle (); +/* nothing here yet */ }static void arch_reset (char mode,const char *cmd)
arch/arm/mach-s5pc100/include/mach/tick.h +2 -2
@@ -20,8 +20,8 @@*/ static inline u32 s3c24xx_ostimer_pending (void ) { -u32 pend =__raw_readl (S3C_VA_VIC0 +VIC_RAW_STATUS ); -return pend &1 << (IRQ_TIMER4_VIC -S5PC1XX_IRQ_VIC0 (0 )); +u32 pend =__raw_readl (VA_VIC0 +VIC_RAW_STATUS ); +return pend & (1 << (IRQ_TIMER4_VIC -S5P_IRQ_VIC0 (0 ))); }#define TICK_MAX (0xffffffff)
arch/arm/mach-s5pc100/init.c renamed from arch/arm/plat-s5pc1xx/s5pc100-init.c +2 -5
@@ -1,9 +1,8 @@ -/* linux/arch/arm/plat-s5pc1xx/s5pc100-init.c +/* linux/arch/arm/plat-s5pc100/s5pc100-init.c * * Copyright 2009 Samsung Electronics Co. * Byungho Min <[email protected]> * -* S5PC100 - CPU initialisation (common with other S5PC1XX chips) * * 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
@@ -19,9 +18,7 @@#include <plat/s5pc100.h> /* uart registration process */ -void __init s5pc100_common_init_uarts (struct s3c2410_uartcfg *cfg,int no) { -/* The driver name is s3c6400-uart to reuse s3c6400_serial_drv */ -s3c24xx_init_uartdevs ("s3c6400-uart" , s5pc1xx_uart_resources, cfg, no); +s3c24xx_init_uartdevs ("s3c6400-uart" , s5p_uart_resources, cfg, no); }
arch/arm/mach-s5pc100/mach-smdkc100.c +4 -7
@@ -140,8 +140,6 @@ static struct s3c_fb_platdata smdkc100_lcd_pdata __initdata = { .setup_gpio = s5pc100_fb_gpio_setup_24bpp, }; -static struct map_desc smdkc100_iodesc[] = {}; -static struct platform_device *smdkc100_devices[]__initdata = { &s3c_device_i2c0, &s3c_device_i2c1,
@@ -154,7 +152,7 @@ static struct platform_device *smdkc100_devices[] __initdata = {static void __init smdkc100_map_io (void ) { -s5pc1xx_init_io (smdkc100_iodesc,ARRAY_SIZE (smdkc100_iodesc)); +s5p_init_io (NULL ,0 ,S5P_VA_CHIPID );s3c24xx_init_clocks (12000000 );s3c24xx_init_uarts (smdkc100_uartcfgs,ARRAY_SIZE (smdkc100_uartcfgs)); }
@@ -178,10 +176,9 @@ static void __init smdkc100_machine_init(void)MACHINE_START (SMDKC100 ,"SMDKC100" )/* Maintainer: Byungho Min <[email protected]> */ - .phys_io = S5PC100_PA_UART & 0xfff00000, - .io_pg_offst = (((u32)S5PC1XX_VA_UART) >> 18) & 0xfffc, - .boot_params = S5PC100_PA_SDRAM + 0x100, - + .phys_io = S3C_PA_UART & 0xfff00000, + .io_pg_offst = (((u32)S3C_VA_UART) >> 18) & 0xfffc, + .boot_params = S5P_PA_SDRAM + 0x100, .init_irq = s5pc100_init_irq, .map_io = smdkc100_map_io, .init_machine = smdkc100_machine_init,
arch/arm/plat-s5p/Kconfig +1 -1
@@ -7,7 +7,7 @@ config PLAT_S5P bool - depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210) + depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PC100 || ARCH_S5PV210) default y select ARM_VIC select NO_IOPORT
arch/arm/plat-s5p/cpu.c +10 -0
@@ -19,12 +19,14 @@#include <plat/cpu.h> #include <plat/s5p6440.h> #include <plat/s5p6442.h> +#include <plat/s5pc100.h> #include <plat/s5pv210.h> /* table of supported CPUs */ static const char name_s5p6440[] ="S5P6440" ;static const char name_s5p6442[] ="S5P6442" ; +static const char name_s5pc100[] ="S5PC100" ;static const char name_s5pv210[] ="S5PV210/S5PC110" ;static struct cpu_table cpu_ids[]__initdata = {
@@ -45,6 +47,14 @@ static struct cpu_table cpu_ids[] __initdata = { .init = s5p6442_init, .name = name_s5p6442, }, { + .idcode = 0x43100000, + .idmask = 0xfffff000, + .map_io = s5pc100_map_io, + .init_clocks = s5pc100_init_clocks, + .init_uarts = s5pc100_init_uarts, + .init = s5pc100_init, + .name = name_s5pc100, + }, { .idcode = 0x43110000, .idmask = 0xfffff000, .map_io = s5pv210_map_io,
arch/arm/plat-s5p/include/plat/s5pc100.h new file +33 -0
@@ -0,0 +1,33 @@ +/* arch/arm/plat-s5p/include/plat/s5pc100.h +* +* Copyright (c) 2010 Samsung Electronics Co., Ltd. +* http://www.samsung.com/ +* +* Header file for s5pc100 cpu support +* +* 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. +*/ + +/* Common init code for S5PC100 related SoCs */ + +extern void s5pc100_common_init_uarts (struct s3c2410_uartcfg *cfg,int no); +extern void s5pc100_register_clocks (void ); +extern void s5pc100_setup_clocks (void ); + +#ifdef CONFIG_CPU_S5PC100 + +extern int s5pc100_init (void ); +extern void s5pc100_init_irq (void ); +extern void s5pc100_map_io (void ); +extern void s5pc100_init_clocks (int xtal); + +#define s5pc100_init_uarts s5pc100_common_init_uarts + +#else +#define s5pc100_init_clocks NULL +#define s5pc100_init_uarts NULL +#define s5pc100_map_io NULL +#define s5pc100_init NULL +#endif
arch/arm/plat-samsung/Kconfig +1 -1
@@ -6,7 +6,7 @@ config PLAT_SAMSUNG bool - depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX || ARCH_S5PC1XX + depends on ARCH_S3C2410 || ARCH_S3C24A0 || ARCH_S3C64XX select NO_IOPORT default y help
Signature · 1 line
1.6.4
PATCH 12/15 ARM: SMDKC100: fix frame buffer definitions
In reply to Marek SzyprowskiFix incorrectly defined pixel clock value for the default framebuffer window.
--- arch/arm/mach-s5pc100/mach-smdkc100.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)
arch/arm/mach-s5pc100/mach-smdkc100.c +1 -2
@@ -118,8 +118,7 @@ static struct platform_device smdkc100_lcd_powerdev = {static struct s3c_fb_pd_win smdkc100_fb_win0 = {/* this is to ensure we use win0 */ .win_mode = { - .refresh =70 , - .pixclock = (8 +13 +3 +800 )*(7 +5 +1 +480 ), + .pixclock =1000000000000ULL / ((8 +13 +3 +800 )*(7 +5 +1 +480 )*80 ), .left_margin =8 , .right_margin =13 , .upper_margin =7 ,
Signature · 1 line
1.6.4
PATCH 12/15 ARM: SMDKC100: fix frame buffer definitions
Quoted 3 lines · Marek Szyprowski
Fix incorrectly defined pixel clock value for the default framebuffer window.
It is better that separate this patch from c100 clean up patch set. As you know, this patch is unrelated to that.
Quoted 13 lines
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/mach-s5pc100/mach-smdkc100.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-)arch/arm/mach- renamed from arch/arm/mach-s5pc100/mach-smdkc100.c +0
-0
s5pc100/mach-smdkc100.c
index 9155564..7df8ed0 100644
arch/arm/mach-s5pc100/mach-smdkc100.c static struct platform_device smdkc100_lcd_powerdev = { · line 121
Quoted 6 lines
arch/arm/mach-s5pc100/mach-smdkc100.c +1
-2@@ -118,8 +118,7 @@ static struct platform_device smdkc100_lcd_powerdev = {static struct s3c_fb_pd_win smdkc100_fb_win0 = {/* this is to ensure we use win0 */ .win_mode = { - .refresh =70 , - .pixclock = (8 +13 +3 +800 )*(7 +5 +1 +480 ), + .pixclock =1000000000000ULL / ((8 +13 +3 +800 )*(7 +5 +1 +480 )*80 ),
As I've commented, how about moving to related LCD driver than hard coding here.
arch/arm/mach-s5pc100/mach-smdkc100.c static struct platform_device smdkc100_lcd_powerdev = {
Quoted 4 lines
arch/arm/mach-s5pc100/mach-smdkc100.c +0
-1.left_margin = 8, .right_margin = 13, .upper_margin = 7, --
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 13/15 ARM: Samsung: Move external interrupts support from plat-s5pc1xx to plat-s5p
In reply to Marek SzyprowskiThis patch moves external interrupts support code from plat-s5pc1xx to plat-s5p and enables support for it on ARCH_S5PC100. This code can be easily reused by S5PV210/S5PC110 and probably S5P6442.
---
arch/arm/mach-s5pc100/Kconfig | 1 +
arch/arm/mach-s5pc100/gpio.c | 8 ++--
arch/arm/mach-s5pc100/include/mach/gpio.h | 8 +++
arch/arm/plat-s5p/Kconfig | 5 ++
arch/arm/plat-s5p/Makefile | 1 +
arch/arm/plat-s5p/include/plat/gpio-ext.h | 44 ++++++++++++++++++
arch/arm/{plat-s5pc1xx => plat-s5p}/irq-eint.c | 57 ++++++++++++------------
arch/arm/plat-s5pc1xx/include/plat/gpio-ext.h | 44 ------------------
8 files changed, 92 insertions(+), 76 deletions(-)
create mode 100644 arch/arm/plat-s5p/include/plat/gpio-ext.h
rename arch/arm/{plat-s5pc1xx => plat-s5p}/irq-eint.c (80%)
delete mode 100644 arch/arm/plat-s5pc1xx/include/plat/gpio-ext.harch/arm/mach-s5pc100/Kconfig +1 -0
@@ -10,6 +10,7 @@ if ARCH_S5PC100 config CPU_S5PC100 bool select PLAT_S5P + select S5P_IRQ_EINT help Enable S5PC100 CPU support
arch/arm/mach-s5pc100/gpio.c +4 -4
@@ -61,7 +61,6 @@* L3 8 4Bit None */ -#if 0 static int s5pc100_gpiolib_to_irq (struct gpio_chip *chip,unsigned int offset) {return S3C_IRQ_GPIO (chip->base + offset);
@@ -85,7 +84,7 @@ static int s5pc100_gpiolib_to_eint(struct gpio_chip *chip, unsigned int offset)return IRQ_EINT (24 + offset);return -EINVAL ; } -#endif +static struct s3c_gpio_cfg gpio_cfg = { .set_config = s3c_gpio_setcfg_s3c64xx_4bit, .set_pull = s3c_gpio_setpull_updown,
@@ -401,9 +400,10 @@ static __init void s5pc100_gpiolib_link(struct s3c_gpio_chip *chip)set_irq_handler (irq, handle_level_irq); set_irq_flags(irq, IRQF_VALID); } - }else if (chip->config == &gpio_cfg_eint) - chip->chip.to_irq = s5pc100_gpiolib_to_eint; + } else#endif +if (chip->config == &gpio_cfg_eint) + chip->chip.to_irq = s5pc100_gpiolib_to_eint; }static __init int s5pc100_gpiolib_init (void )
arch/arm/mach-s5pc100/include/mach/gpio.h +8 -0
@@ -159,4 +159,12 @@ enum s3c_gpio_number {/* define the number of gpios we need to the one after the MP04() range */ #define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1) +/* Common compatibility defines */ +#define S5P_GPIO_EINT_SFN S3C_GPIO_SFN(0x2) +#define S5P_GPH0 (n) S5PC100_GPH0(n) +#define S5P_GPH1 (n) S5PC100_GPH1(n) +#define S5P_GPH2 (n) S5PC100_GPH2(n) +#define S5P_GPH3 (n) S5PC100_GPH3(n) +#define S5P_GPIO_INT_GROUP_END S5PC100_GPIO_INT_GROUP_END +#include <asm-generic/gpio.h>
arch/arm/plat-s5p/Kconfig +5 -0
@@ -24,3 +24,8 @@ config PLAT_S5P select SAMSUNG_IRQ_UART help Base platform code for Samsung's S5P series SoC. + +config S5P_IRQ_EINT + bool + help + Common initialisation code for the EINT support on S5P platform
arch/arm/plat-s5p/Makefile +1 -0
@@ -16,3 +16,4 @@ obj-y += dev-uart.o obj-y += cpu.o obj-y += clock.o obj-y += irq.o +obj-$(CONFIG_S5P_IRQ_EINT) += irq-eint.o
arch/arm/plat-s5p/include/plat/gpio-ext.h new file +44 -0
44 lines not on this page · raw message
arch/arm/plat-s5p/irq-eint.c renamed from arch/arm/plat-s5pc1xx/irq-eint.c +29 -28
168 lines not on this page · raw message
arch/arm/plat-s5pc1xx/include/plat/gpio-ext.h deleted +0 -44
44 lines not on this page · raw message
Signature · 1 line
1.6.4
PATCH 13/15 ARM: Samsung: Move external interrupts support from plat-s5pc1xx to plat-s5p
Quoted 3 lines · Marek Szyprowski
This patch moves external interrupts support code from plat-s5pc1xx to plat-s5p and enables support for it on
ARCH_S5PC100. This code can be
easily
Quoted 1 line
reused by S5PV210/S5PC110 and probably S5P6442.
Already merged EINT patch for S5P to Ben's for-2635/s5p-general. So please re-make based on it.
Quoted 11 lines
Signed-off-by Marek Szyprowski <[email protected]>Signed-off-by Kyungmin Park <[email protected]>--- arch/arm/mach-s5pc100/Kconfig | 1 + arch/arm/mach-s5pc100/gpio.c | 8 ++-- arch/arm/mach-s5pc100/include/mach/gpio.h | 8 +++ arch/arm/plat-s5p/Kconfig | 5 ++ arch/arm/plat-s5p/Makefile | 1 + arch/arm/plat-s5p/include/plat/gpio-ext.h | 44 ++++++++++++++++++ arch/arm/{plat-s5pc1xx => plat-s5p}/irq-eint.c | 57
++++++++++++------------
Quoted 6 lines
arch/arm/plat-s5pc1xx/include/plat/gpio-ext.h | 44 ------------------
8 files changed, 92 insertions(+), 76 deletions(-)
create mode 100644 arch/arm/plat-s5p/include/plat/gpio-ext.h
rename arch/arm/{plat-s5pc1xx => plat-s5p}/irq-eint.c (80%)
delete mode 100644 arch/arm/plat-s5pc1xx/include/plat/gpio-ext.h(snip)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.
PATCH 14/15 ARM: S5PC100: Add support for gpio interrupt
In reply to Marek SzyprowskiThis patch moves support for gpio interrupts from plat-s5pc1xx to mach-s5pc100 directory.
---
arch/arm/mach-s5pc100/Makefile | 2 +-
arch/arm/mach-s5pc100/gpio.c | 10 +--
arch/arm/{plat-s5pc1xx => mach-s5pc100}/irq-gpio.c | 78 ++++++++++----------
3 files changed, 44 insertions(+), 46 deletions(-)
rename arch/arm/{plat-s5pc1xx => mach-s5pc100}/irq-gpio.c (72%)arch/arm/mach-s5pc100/Makefile +1 -1
@@ -11,7 +11,7 @@ obj- := # Core support for S5PC100 system -obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o gpio.o +obj-$(CONFIG_CPU_S5PC100) += cpu.o init.o clock.o gpio.o irq-gpio.o obj-$(CONFIG_CPU_S5PC100) += setup-i2c0.o # Helper and device support
arch/arm/mach-s5pc100/gpio.c +4 -6
@@ -386,7 +386,6 @@ extern void s5pc100_irq_gpioint_handler(unsigned int irq, struct irq_desc *desc)static __init void s5pc100_gpiolib_link (struct s3c_gpio_chip *chip) { -#if 0 /* Interrupt */ if (chip->config == &gpio_cfg) {int i, irq;
@@ -400,10 +399,9 @@ static __init void s5pc100_gpiolib_link(struct s3c_gpio_chip *chip)set_irq_handler (irq, handle_level_irq);set_irq_flags (irq,IRQF_VALID ); } - } else -#endif -if (chip->config == &gpio_cfg_eint) + }else if (chip->config == &gpio_cfg_eint) { chip->chip.to_irq = s5pc100_gpiolib_to_eint; + } }static __init int s5pc100_gpiolib_init (void )
@@ -419,10 +417,10 @@ static __init int s5pc100_gpiolib_init(void)samsung_gpiolib_add_4bit_chips (s5pc100_gpio_chips,ARRAY_SIZE (s5pc100_gpio_chips)); -#if 0 +/* Interrupt */ set_irq_chained_handler (IRQ_GPIOINT , s5pc100_irq_gpioint_handler); -#endif +return 0 ; }core_initcall (s5pc100_gpiolib_init);
arch/arm/mach-s5pc100/irq-gpio.c renamed from arch/arm/plat-s5pc1xx/irq-gpio.c +39 -39
177 lines not on this page · raw message
Signature · 1 line
1.6.4
PATCH 15/15 ARM: remove obsolete plat-s5pc1xx directory
In reply to Marek SzyprowskiThis patch removes all obsolete files from plat-s5pc1xx. This directory is no longer needed. S5PC100 SoC is now completely supported in plat-s5p framework.
--- arch/arm/plat-s5pc1xx/Kconfig | 42 -- arch/arm/plat-s5pc1xx/Makefile | 25 - arch/arm/plat-s5pc1xx/clock.c | 709 ------------------ arch/arm/plat-s5pc1xx/cpu.c | 122 ---- arch/arm/plat-s5pc1xx/dev-uart.c | 145 ---- arch/arm/plat-s5pc1xx/include/plat/irqs.h | 198 ----- arch/arm/plat-s5pc1xx/include/plat/pll.h | 38 - arch/arm/plat-s5pc1xx/include/plat/regs-clock.h | 252 ------- arch/arm/plat-s5pc1xx/include/plat/regs-power.h | 84 --- arch/arm/plat-s5pc1xx/include/plat/s5pc100.h | 64 -- arch/arm/plat-s5pc1xx/irq.c | 75 -- arch/arm/plat-s5pc1xx/s5pc100-clock.c | 876 ----------------------- 12 files changed, 0 insertions(+), 2630 deletions(-) delete mode 100644 arch/arm/plat-s5pc1xx/Kconfig delete mode 100644 arch/arm/plat-s5pc1xx/Makefile delete mode 100644 arch/arm/plat-s5pc1xx/clock.c delete mode 100644 arch/arm/plat-s5pc1xx/cpu.c delete mode 100644 arch/arm/plat-s5pc1xx/dev-uart.c delete mode 100644 arch/arm/plat-s5pc1xx/include/plat/irqs.h delete mode 100644 arch/arm/plat-s5pc1xx/include/plat/pll.h delete mode 100644 arch/arm/plat-s5pc1xx/include/plat/regs-clock.h delete mode 100644 arch/arm/plat-s5pc1xx/include/plat/regs-power.h delete mode 100644 arch/arm/plat-s5pc1xx/include/plat/s5pc100.h delete mode 100644 arch/arm/plat-s5pc1xx/irq.c delete mode 100644 arch/arm/plat-s5pc1xx/s5pc100-clock.c
arch/arm/plat-s5pc1xx/Kconfig deleted +0 -42
@@ -1,42 +0,0 @@ -# Copyright 2009 Samsung Electronics Co. -# Byungho Min <[email protected]> -# -# Licensed under GPLv2 - -config PLAT_S5PC1XX - bool - depends on ARCH_S5PC1XX - default y - select PLAT_S3C - select ARM_VIC - select NO_IOPORT - select ARCH_REQUIRE_GPIOLIB - select SAMSUNG_CLKSRC - select SAMSUNG_IRQ_UART - select SAMSUNG_IRQ_VIC_TIMER - select S3C_GPIO_TRACK - select S3C_GPIO_PULL_UPDOWN - select S5P_GPIO_DRVSTR - select S3C_GPIO_CFG_S3C24XX - select S3C_GPIO_CFG_S3C64XX - select SAMSUNG_GPIOLIB_4BIT - help - Base platform code for any Samsung S5PC1XX device - -if PLAT_S5PC1XX - -# Configuration options shared by all S3C64XX implementations - -config CPU_S5PC100_INIT - bool - help - Common initialisation code for the S5PC1XX - -config CPU_S5PC100_CLOCK - bool - help - Common clock support code for the S5PC1XX - -# platform specific device setup - -endif
arch/arm/plat-s5pc1xx/Makefile deleted +0 -25
@@ -1,25 +0,0 @@ -# arch/arm/plat-s5pc1xx/Makefile -# -# Copyright 2009 Samsung Electronics Co. -# -# Licensed under GPLv2 - -obj-y := -obj-m := -obj-n := dummy.o -obj- := - -# Core files - -obj-y += dev-uart.o -obj-y += cpu.o -obj-y += irq.o -obj-y += clock.o - -# CPU support - -obj-$(CONFIG_CPU_S5PC100_INIT) += s5pc100-init.o -obj-$(CONFIG_CPU_S5PC100_CLOCK) += s5pc100-clock.o - -# Device setup -
arch/arm/plat-s5pc1xx/clock.c deleted +0 -709
709 lines not on this page · raw message
arch/arm/plat-s5pc1xx/cpu.c deleted +0 -122
122 lines not on this page · raw message
arch/arm/plat-s5pc1xx/dev-uart.c deleted +0 -145
145 lines not on this page · raw message
arch/arm/plat-s5pc1xx/include/plat/irqs.h deleted +0 -198
198 lines not on this page · raw message
arch/arm/plat-s5pc1xx/include/plat/pll.h deleted +0 -38
@@ -1,38 +0,0 @@ -/* arch/arm/plat-s5pc1xx/include/plat/pll.h -* -* Copyright 2009 Samsung Electronics Co. -* Byungho Min <[email protected]> -* -* S5PC1XX PLL code -* -* Based on plat-s3c64xx/include/plat/pll.h -* -* 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. -*/ - -#define S5P_PLL_MDIV_MASK ((1 << (25-16+1)) - 1) -#define S5P_PLL_PDIV_MASK ((1 << (13-8+1)) - 1) -#define S5P_PLL_SDIV_MASK ((1 << (2-0+1)) - 1) -#define S5P_PLL_MDIV_SHIFT (16) -#define S5P_PLL_PDIV_SHIFT (8) -#define S5P_PLL_SDIV_SHIFT (0) - -#include <asm/div64.h> - -static inline unsigned long s5pc1xx_get_pll (unsigned long baseclk, -u32 pllcon) -{ -u32 mdiv, pdiv, sdiv; -u64 fvco = baseclk; - - mdiv = (pllcon >>S5P_PLL_MDIV_SHIFT ) &S5P_PLL_MDIV_MASK ; - pdiv = (pllcon >>S5P_PLL_PDIV_SHIFT ) &S5P_PLL_PDIV_MASK ; - sdiv = (pllcon >>S5P_PLL_SDIV_SHIFT ) &S5P_PLL_SDIV_MASK ; - - fvco *= mdiv; -do_div (fvco, (pdiv << sdiv)); - -return (unsigned long )fvco; -}
arch/arm/plat-s5pc1xx/include/plat/regs-clock.h deleted +0 -252
252 lines not on this page · raw message
arch/arm/plat-s5pc1xx/include/plat/regs-power.h deleted +0 -84
84 lines not on this page · raw message
arch/arm/plat-s5pc1xx/include/plat/s5pc100.h deleted +0 -64
64 lines not on this page · raw message
arch/arm/plat-s5pc1xx/irq.c deleted +0 -75
75 lines not on this page · raw message
arch/arm/plat-s5pc1xx/s5pc100-clock.c deleted +0 -876
876 lines not on this page · raw message
Signature · 1 line
1.6.4