SPI platform device consolidation

PATCH New Padmavathi Venna 2 participants 8 messages Dec 14, 2011

Subsystems (3)

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

lore

Share & tools

lore

Padmavathi Venna

author

2011-12-14 05:18 UTC #0 lore raw

v3 cover SPI platform device consolidation

SPI platform devices are defined in respective machine folder of Samsung S3C64XX and S5P series SoCs.This patchset moves S3C64XX and S5P series of SPI platform devices to a common place plat-samsung. This patchset also creates SPI setup files for GPIO configurations and platform data initialization.

V2 Changes:
Platform data initialized in a centralized setup file as suggested-by Mark Brown
SPI Controller number is added in SPI controller defining structure.

V3 Changes:
Reverted the SPI Controller number addition because device tree doesn't support enumeration using device instance number.

Padmavathi Venna (6):
ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung
ARM: S3C64XX: Modified files for SPI consolidation work
ARM: S5PC100: Modified files for SPI consolidation work
ARM: S5P64X0: Modified files for SPI consolidation work
ARM: S5PV210: Modified files for SPI consolidation work
ARM: S3C64XX: Modified according to SPI consolidation work.

 arch/arm/mach-s3c64xx/Kconfig                    |    8 +-
 arch/arm/mach-s3c64xx/Makefile                   |    2 +-
 arch/arm/mach-s3c64xx/dev-spi.c                  |  173 -----------------
 arch/arm/mach-s3c64xx/include/mach/map.h         |    2 +
 arch/arm/mach-s3c64xx/setup-spi.c                |   45 +++++
 arch/arm/mach-s5p64x0/Kconfig                    |    7 +-
 arch/arm/mach-s5p64x0/Makefile                   |    2 +-
 arch/arm/mach-s5p64x0/dev-spi.c                  |  218 ---------------------
 arch/arm/mach-s5p64x0/include/mach/map.h         |    3 +
 arch/arm/mach-s5p64x0/setup-spi.c                |   55 ++++++
 arch/arm/mach-s5pc100/Kconfig                    |    5 +
 arch/arm/mach-s5pc100/Makefile                   |    2 +-
 arch/arm/mach-s5pc100/dev-spi.c                  |  220 ----------------------
 arch/arm/mach-s5pc100/include/mach/map.h         |    3 +
 arch/arm/mach-s5pc100/setup-spi.c                |   65 +++++++
 arch/arm/mach-s5pv210/Kconfig                    |    5 +
 arch/arm/mach-s5pv210/Makefile                   |    2 +-
 arch/arm/mach-s5pv210/dev-spi.c                  |  169 -----------------
 arch/arm/mach-s5pv210/include/mach/map.h         |    2 +
 arch/arm/mach-s5pv210/setup-spi.c                |   51 +++++
 arch/arm/plat-samsung/Kconfig                    |   14 ++-
 arch/arm/plat-samsung/devs.c                     |  127 +++++++++++++
 arch/arm/plat-samsung/include/plat/devs.h        |    8 +-
 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h |   22 ++-
 24 files changed, 409 insertions(+), 801 deletions(-)
 delete mode 100644 arch/arm/mach-s3c64xx/dev-spi.c
 create mode 100644 arch/arm/mach-s3c64xx/setup-spi.c
 delete mode 100644 arch/arm/mach-s5p64x0/dev-spi.c
 create mode 100644 arch/arm/mach-s5p64x0/setup-spi.c
 delete mode 100644 arch/arm/mach-s5pc100/dev-spi.c
 create mode 100644 arch/arm/mach-s5pc100/setup-spi.c
 delete mode 100644 arch/arm/mach-s5pv210/dev-spi.c
 create mode 100644 arch/arm/mach-s5pv210/setup-spi.c

Padmavathi Venna

author

2011-12-14 05:18 UTC #1 lore raw

PATCH v3 1/6 ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung

SPI platform device definitions consolidated from respective machine folder to plat-samsung

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/mach-s3c64xx/Makefile                   |    1 -
 arch/arm/mach-s3c64xx/dev-spi.c                  |  173 -----------------
 arch/arm/mach-s5p64x0/Makefile                   |    1 -
 arch/arm/mach-s5p64x0/dev-spi.c                  |  218 ---------------------
 arch/arm/mach-s5pc100/Makefile                   |    1 -
 arch/arm/mach-s5pc100/dev-spi.c                  |  220 ----------------------
 arch/arm/mach-s5pv210/Makefile                   |    1 -
 arch/arm/mach-s5pv210/dev-spi.c                  |  169 -----------------
 arch/arm/plat-samsung/Kconfig                    |   14 ++-
 arch/arm/plat-samsung/devs.c                     |  118 ++++++++++++
 arch/arm/plat-samsung/include/plat/devs.h        |    8 +-
 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h |   15 +-
 12 files changed, 140 insertions(+), 799 deletions(-)
 delete mode 100644 arch/arm/mach-s3c64xx/dev-spi.c
 delete mode 100644 arch/arm/mach-s5p64x0/dev-spi.c
 delete mode 100644 arch/arm/mach-s5pc100/dev-spi.c
 delete mode 100644 arch/arm/mach-s5pv210/dev-spi.c

arch/arm/mach-s3c64xx/Makefile +0 -1

index e32093c..d1d0f09 100644
@@ -59,4 +59,3 @@ obj-$(CONFIG_MACH_WLF_CRAGG_6410) += mach-crag6410.o mach-crag6410-module.o
 
 obj-y				+= dev-uart.o
 obj-y				+= dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o

arch/arm/mach-s3c64xx/dev-spi.c deleted +0 ~~-173~~

173 lines not on this page · raw message

arch/arm/mach-s5p64x0/Makefile +0 -1

index a1324d8..e24d316 100644
@@ -26,7 +26,6 @@ obj-$(CONFIG_MACH_SMDK6450)	+= mach-smdk6450.o
 # device support
 
 obj-y				+= dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
 
 obj-$(CONFIG_S5P64X0_SETUP_I2C1)	+= setup-i2c1.o
 obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP)	+= setup-fb-24bpp.o

arch/arm/mach-s5p64x0/dev-spi.c deleted +0 ~~-218~~

218 lines not on this page · raw message

arch/arm/mach-s5pc100/Makefile +0 -1

index 2320e54..238a836 100644
@@ -25,7 +25,6 @@ obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
 
 # device support
 obj-y				+= dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
 
 # machine support

arch/arm/mach-s5pc100/dev-spi.c deleted +0 ~~-220~~

220 lines not on this page · raw message

arch/arm/mach-s5pv210/Makefile +0 -1

index 53c346a..7eb8677 100644
@@ -27,7 +27,6 @@ obj-$(CONFIG_MACH_TORBRECK)	+= mach-torbreck.o
 # device support
 
 obj-y				+= dev-audio.o
-obj-$(CONFIG_S3C64XX_DEV_SPI)	+= dev-spi.o
 
 obj-$(CONFIG_S5PV210_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
 obj-$(CONFIG_S5PV210_SETUP_FIMC)	+= setup-fimc.o

arch/arm/mach-s5pv210/dev-spi.c deleted +0 ~~-169~~

169 lines not on this page · raw message

arch/arm/plat-samsung/Kconfig +13 -1

index bb0af66..34a55fa 100644
@@ -234,7 +234,19 @@ config SAMSUNG_DEV_IDE
 	help
 	  Compile in platform device definitions for IDE
 
-config S3C64XX_DEV_SPI
+config S3C64XX_DEV_SPI0
+	bool
+	help
+	  Compile in platform device definitions for S3C64XX's type
+	  SPI controllers.
+
+config S3C64XX_DEV_SPI1
+	bool
+	help
+	  Compile in platform device definitions for S3C64XX's type
+	  SPI controllers.
+
+config S3C64XX_DEV_SPI2
 	bool
 	help
 	  Compile in platform device definitions for S3C64XX's type

arch/arm/plat-samsung/devs.c +118 -0

127 lines not on this page · raw message

arch/arm/plat-samsung/include/plat/devs.h +1 -7

index ab633c9..83b1e31 100644
@@ -39,6 +39,7 @@ extern struct platform_device s3c64xx_device_pcm0;
 extern struct platform_device s3c64xx_device_pcm1;
 extern struct platform_device s3c64xx_device_spi0;
 extern struct platform_device s3c64xx_device_spi1;
+extern struct platform_device s3c64xx_device_spi2;
 
 extern struct platform_device s3c_device_adc;
 extern struct platform_device s3c_device_cfcon;

@@ -98,8 +99,6 @@ extern struct platform_device s5p6450_device_iis1;
 extern struct platform_device s5p6450_device_iis2;
 extern struct platform_device s5p6450_device_pcm0;
 
-extern struct platform_device s5p64x0_device_spi0;
-extern struct platform_device s5p64x0_device_spi1;
 
 extern struct platform_device s5pc100_device_ac97;
 extern struct platform_device s5pc100_device_iis0;

@@ -108,9 +107,6 @@ extern struct platform_device s5pc100_device_iis2;
 extern struct platform_device s5pc100_device_pcm0;
 extern struct platform_device s5pc100_device_pcm1;
 extern struct platform_device s5pc100_device_spdif;
-extern struct platform_device s5pc100_device_spi0;
-extern struct platform_device s5pc100_device_spi1;
-extern struct platform_device s5pc100_device_spi2;
 
 extern struct platform_device s5pv210_device_ac97;
 extern struct platform_device s5pv210_device_iis0;

@@ -120,8 +116,6 @@ extern struct platform_device s5pv210_device_pcm0;
 extern struct platform_device s5pv210_device_pcm1;
 extern struct platform_device s5pv210_device_pcm2;
 extern struct platform_device s5pv210_device_spdif;
-extern struct platform_device s5pv210_device_spi0;
-extern struct platform_device s5pv210_device_spi1;
 
 extern struct platform_device exynos4_device_ac97;
 extern struct platform_device exynos4_device_ahci;

arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +8 -7

index c3d82a5..effca53 100644
@@ -56,18 +56,19 @@ struct s3c64xx_spi_info {
 };
 
 /**
- * s3c64xx_spi_set_info - SPI Controller configure callback by the board
+ * s3c64xx_spi_set_platdata - SPI Controller configure callback by the board
  *				initialization code.
- * @cntrlr: SPI controller number the configuration is for.
+ * @pd: SPI platform data to set.
  * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks.
  * @num_cs: Number of elements in the 'cs' array.
  *
  * Call this from machine init code for each SPI Controller that
  * has some chips attached to it.
  */
-extern void s3c64xx_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
-extern void s5pc100_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
-extern void s5pv210_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
-extern void s5p64x0_spi_set_info(int cntrlr, int src_clk_nr, int num_cs);
-
+extern void s3c64xx_spi0_set_platdata(struct s3c64xx_spi_info *pd,
+				      int src_clk_nr, int num_cs);
+extern void s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd,
+				      int src_clk_nr, int num_cs);
+extern void s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd,
+				      int src_clk_nr, int num_cs);
 #endif /* __S3C64XX_PLAT_SPI_H */

Signature · 1 line

1.7.0.4

Padmavathi Venna

author

2011-12-14 05:18 UTC #2 lore raw

PATCH v3 2/6 ARM: S3C64XX: Modified files for SPI consolidation work

In reply to Padmavathi Venna

As SPI platform devices are consolidated to plat-samsung, some corresponding changes are required in the respective machine folder. Setup files are added for SPI GPIO configurations and platform data initialization.

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/mach-s3c64xx/Kconfig                    |    5 ++
 arch/arm/mach-s3c64xx/Makefile                   |    1 +
 arch/arm/mach-s3c64xx/include/mach/map.h         |    2 +
 arch/arm/mach-s3c64xx/setup-spi.c                |   45 ++++++++++++++++++++++
 arch/arm/plat-samsung/devs.c                     |    6 +++
 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h |    7 +++
 6 files changed, 66 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-s3c64xx/setup-spi.c

arch/arm/mach-s3c64xx/Kconfig +5 -0

index 4d8c489..dea62bf 100644
@@ -77,6 +77,11 @@ config S3C64XX_SETUP_SDHCI_GPIO
 	help
 	  Common setup code for S3C64XX SDHCI GPIO configurations
 
+config S3C64XX_SETUP_SPI
+	bool
+	help
+	 Common setup code for SPI GPIO configurations
+
 # S36400 Macchine support
 
 config MACH_SMDK6400

arch/arm/mach-s3c64xx/Makefile +1 -0

index d1d0f09..d7d9bb5 100644
@@ -34,6 +34,7 @@ obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o
 obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o
 obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o
 obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
+obj-$(CONFIG_S3C64XX_SETUP_SPI) += setup-spi.o
 
 # PM

arch/arm/mach-s3c64xx/include/mach/map.h +2 -0

index 23a1d71..8e2097b 100644
@@ -115,6 +115,8 @@
 #define S3C_PA_USB_HSOTG	S3C64XX_PA_USB_HSOTG
 #define S3C_PA_RTC		S3C64XX_PA_RTC
 #define S3C_PA_WDT		S3C64XX_PA_WATCHDOG
+#define S3C_PA_SPI0		S3C64XX_PA_SPI0
+#define S3C_PA_SPI1		S3C64XX_PA_SPI1
 
 #define SAMSUNG_PA_ADC		S3C64XX_PA_ADC
 #define SAMSUNG_PA_CFCON	S3C64XX_PA_CFCON

arch/arm/mach-s3c64xx/setup-spi.c new file +45 -0

45 lines not on this page · raw message

arch/arm/plat-samsung/devs.c +6 -0

index c943b46..2652dd9 100644
@@ -1498,6 +1498,9 @@ void __init s3c64xx_spi0_set_platdata(struct s3c64xx_spi_info *pd,
 
 	pd->num_cs = num_cs;
 	pd->src_clk_nr = src_clk_nr;
+	if (!pd->cfg_gpio)
+		pd->cfg_gpio = s3c64xx_spi0_cfg_gpio;
+
 	s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi0);
 }
 #endif /* CONFIG_S3C64XX_DEV_SPI0 */

@@ -1537,6 +1540,9 @@ void __init s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd,
 
 	pd->num_cs = num_cs;
 	pd->src_clk_nr = src_clk_nr;
+	if (!pd->cfg_gpio)
+		pd->cfg_gpio = s3c64xx_spi1_cfg_gpio;
+
 	s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi1);
 }
 #endif /* CONFIG_S3C64XX_DEV_SPI1 */

arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +7 -0

index effca53..d3e2209 100644
@@ -71,4 +71,11 @@ extern void s3c64xx_spi1_set_platdata(struct s3c64xx_spi_info *pd,
 				      int src_clk_nr, int num_cs);
 extern void s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd,
 				      int src_clk_nr, int num_cs);
+
+/* defined by architecture to configure gpio */
+extern int s3c64xx_spi0_cfg_gpio(struct platform_device *dev);
+extern int s3c64xx_spi1_cfg_gpio(struct platform_device *dev);
+
+extern struct s3c64xx_spi_info s3c64xx_spi0_pdata;
+extern struct s3c64xx_spi_info s3c64xx_spi1_pdata;
 #endif /* __S3C64XX_PLAT_SPI_H */

Signature · 1 line

1.7.0.4

Padmavathi Venna

author

2011-12-14 05:18 UTC #3 lore raw

PATCH v3 3/6 ARM: S5PC100: Modified files for SPI consolidation work

In reply to Padmavathi Venna

As SPI platform devices are consolidated to plat-samsung, some corresponding changes are required in the respective machine folder. Added SPI Setup file for GPIO configurations and platform data initialization.

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/mach-s5pc100/Kconfig                    |    5 ++
 arch/arm/mach-s5pc100/Makefile                   |    1 +
 arch/arm/mach-s5pc100/include/mach/map.h         |    3 +
 arch/arm/mach-s5pc100/setup-spi.c                |   65 ++++++++++++++++++++++
 arch/arm/plat-samsung/devs.c                     |    3 +
 arch/arm/plat-samsung/include/plat/s3c64xx-spi.h |    2 +
 6 files changed, 79 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-s5pc100/setup-spi.c

arch/arm/mach-s5pc100/Kconfig +5 -0

index e538a4c..75a26ea 100644
@@ -45,6 +45,11 @@ config S5PC100_SETUP_SDHCI_GPIO
 	help
 	  Common setup code for SDHCI gpio.
 
+config S5PC100_SETUP_SPI
+	bool
+	help
+	  Common setup code for SPI GPIO configurations.
+
 config MACH_SMDKC100
 	bool "SMDKC100"
 	select CPU_S5PC100

arch/arm/mach-s5pc100/Makefile +1 -0

index 238a836..291e246 100644
@@ -22,6 +22,7 @@ obj-$(CONFIG_S5PC100_SETUP_I2C1)	+= setup-i2c1.o
 obj-$(CONFIG_S5PC100_SETUP_IDE)		+= setup-ide.o
 obj-$(CONFIG_S5PC100_SETUP_KEYPAD)	+= setup-keypad.o
 obj-$(CONFIG_S5PC100_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
+obj-$(CONFIG_S5PC100_SETUP_SPI)	+= setup-spi.o
 
 # device support
 obj-y				+= dev-audio.o

arch/arm/mach-s5pc100/include/mach/map.h +3 -0

index ccbe6b7..54bc4f8 100644
@@ -100,6 +100,9 @@
 #define S3C_PA_USB_HSOTG		S5PC100_PA_USB_HSOTG
 #define S3C_PA_USB_HSPHY		S5PC100_PA_USB_HSPHY
 #define S3C_PA_WDT			S5PC100_PA_WATCHDOG
+#define S3C_PA_SPI0			S5PC100_PA_SPI0
+#define S3C_PA_SPI1			S5PC100_PA_SPI1
+#define S3C_PA_SPI2			S5PC100_PA_SPI2
 
 #define S5P_PA_CHIPID			S5PC100_PA_CHIPID
 #define S5P_PA_FIMC0			S5PC100_PA_FIMC0

arch/arm/mach-s5pc100/setup-spi.c new file +65 -0

65 lines not on this page · raw message

arch/arm/plat-samsung/devs.c +3 -0

index 2652dd9..7aa3bec 100644
@@ -1582,6 +1582,9 @@ void __init s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd,
 
 	pd->num_cs = num_cs;
 	pd->src_clk_nr = src_clk_nr;
+	if (!pd->cfg_gpio)
+		pd->cfg_gpio = s3c64xx_spi2_cfg_gpio;
+
 	s3c_set_platdata(pd, sizeof(*pd), &s3c64xx_device_spi2);
 }
 #endif /* CONFIG_S3C64XX_DEV_SPI2 */

arch/arm/plat-samsung/include/plat/s3c64xx-spi.h +2 -0

index d3e2209..aea68b6 100644
@@ -75,7 +75,9 @@ extern void s3c64xx_spi2_set_platdata(struct s3c64xx_spi_info *pd,
 /* defined by architecture to configure gpio */
 extern int s3c64xx_spi0_cfg_gpio(struct platform_device *dev);
 extern int s3c64xx_spi1_cfg_gpio(struct platform_device *dev);
+extern int s3c64xx_spi2_cfg_gpio(struct platform_device *dev);
 
 extern struct s3c64xx_spi_info s3c64xx_spi0_pdata;
 extern struct s3c64xx_spi_info s3c64xx_spi1_pdata;
+extern struct s3c64xx_spi_info s3c64xx_spi2_pdata;
 #endif /* __S3C64XX_PLAT_SPI_H */

Signature · 1 line

1.7.0.4

Padmavathi Venna

author

2011-12-14 05:18 UTC #4 lore raw

PATCH v3 4/6 ARM: S5P64X0: Modified files for SPI consolidation work

In reply to Padmavathi Venna

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/mach-s5p64x0/Kconfig            |    7 +++-
 arch/arm/mach-s5p64x0/Makefile           |    1 +
 arch/arm/mach-s5p64x0/include/mach/map.h |    3 ++
 arch/arm/mach-s5p64x0/setup-spi.c        |   55 ++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 arch/arm/mach-s5p64x0/setup-spi.c

arch/arm/mach-s5p64x0/Kconfig +5 -2

index 18690c5..dd8c85e 100644
@@ -36,6 +36,11 @@ config S5P64X0_SETUP_I2C1
 	help
 	  Common setup code for i2c bus 1.
 
+config S5P64X0_SETUP_SPI
+	bool
+	help
+	  Common setup code for SPI GPIO configurations
+
 # machine support
 
 config MACH_SMDK6440

@@ -45,7 +50,6 @@ config MACH_SMDK6440
 	select S3C_DEV_I2C1
 	select S3C_DEV_RTC
 	select S3C_DEV_WDT
-	select S3C64XX_DEV_SPI
 	select SAMSUNG_DEV_ADC
 	select SAMSUNG_DEV_BACKLIGHT
 	select SAMSUNG_DEV_PWM

@@ -62,7 +66,6 @@ config MACH_SMDK6450
 	select S3C_DEV_I2C1
 	select S3C_DEV_RTC
 	select S3C_DEV_WDT
-	select S3C64XX_DEV_SPI
 	select SAMSUNG_DEV_ADC
 	select SAMSUNG_DEV_BACKLIGHT
 	select SAMSUNG_DEV_PWM

arch/arm/mach-s5p64x0/Makefile +1 -0

index e24d316..a7d7a49 100644
@@ -29,3 +29,4 @@ obj-y				+= dev-audio.o
 
 obj-$(CONFIG_S5P64X0_SETUP_I2C1)	+= setup-i2c1.o
 obj-$(CONFIG_S5P64X0_SETUP_FB_24BPP)	+= setup-fb-24bpp.o
+obj-$(CONFIG_S5P64X0_SETUP_SPI)		+= setup-spi.o

arch/arm/mach-s5p64x0/include/mach/map.h +3 -0

index 4d3ac8a..c6af0fc 100644
@@ -67,6 +67,8 @@
 #define S3C_PA_RTC		S5P64X0_PA_RTC
 #define S3C_PA_WDT		S5P64X0_PA_WDT
 #define S3C_PA_FB		S5P64X0_PA_FB
+#define S3C_PA_SPI0		S5P64X0_PA_SPI0
+#define S3C_PA_SPI1		S5P64X0_PA_SPI1
 
 #define S5P_PA_CHIPID		S5P64X0_PA_CHIPID
 #define S5P_PA_SROMC		S5P64X0_PA_SROMC

@@ -75,6 +77,7 @@
 
 #define SAMSUNG_PA_ADC		S5P64X0_PA_ADC
 
+
 /* UART */
 
 #define S5P6440_PA_UART(x)	(0xEC000000 + ((x) * S3C_UART_OFFSET))

arch/arm/mach-s5p64x0/setup-spi.c new file +55 -0

55 lines not on this page · raw message

Signature · 1 line

1.7.0.4

Tushar Behera

2011-12-14 06:33 UTC #5 lore raw

PATCH v3 4/6 ARM: S5P64X0: Modified files for SPI consolidation work

Quoted 14 lines · Padmavathi Venna

As SPI platform devices are consolidated to plat-samsung, some corresponding changes are required in the respective machine folder. Added SPI Setup file for GPIO configurations and platform data initialization.
Signed-off-by Padmavathi Venna<[email protected]>
---
  arch/arm/mach-s5p64x0/Kconfig            |    7 +++-
  arch/arm/mach-s5p64x0/Makefile           |    1 +
  arch/arm/mach-s5p64x0/include/mach/map.h |    3 ++
  arch/arm/mach-s5p64x0/setup-spi.c        |   55 ++++++++++++++++++++++++++++++
  4 files changed, 64 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/mach-s5p64x0/setup-spi.c

[snip]

Quoted 14 lines

arch/arm/mach-s5p64x0/include/mach/map.h +2 -0

index 4d3ac8a..c6af0fc 100644
@@ -67,6 +67,8 @@
  #define S3C_PA_RTC		S5P64X0_PA_RTC
  #define S3C_PA_WDT		S5P64X0_PA_WDT
  #define S3C_PA_FB		S5P64X0_PA_FB
+#define S3C_PA_SPI0		S5P64X0_PA_SPI0
+#define S3C_PA_SPI1		S5P64X0_PA_SPI1
 
  #define S5P_PA_CHIPID		S5P64X0_PA_CHIPID
  #define S5P_PA_SROMC		S5P64X0_PA_SROMC

arch/arm/mach-s5p64x0/include/mach/map.h line 80

Quoted 4 lines

arch/arm/mach-s5p64x0/include/mach/map.h +1 -0
@@ -75,6 +77,7 @@
 
  #define SAMSUNG_PA_ADC		S5P64X0_PA_ADC
 
+

Unncessary insertion of line.

Signature · 1 line

Tushar Behera

Padmavathi Venna

author

2011-12-14 05:18 UTC #6 lore raw

PATCH v3 5/6 ARM: S5PV210: Modified files for SPI consolidation work

In reply to Padmavathi Venna

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/mach-s5pv210/Kconfig            |    5 +++
 arch/arm/mach-s5pv210/Makefile           |    1 +
 arch/arm/mach-s5pv210/include/mach/map.h |    2 +
 arch/arm/mach-s5pv210/setup-spi.c        |   51 ++++++++++++++++++++++++++++++
 4 files changed, 59 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/mach-s5pv210/setup-spi.c

arch/arm/mach-s5pv210/Kconfig +5 -0

index 646057a..2cdc42e 100644
@@ -60,6 +60,11 @@ config S5PV210_SETUP_FIMC
 	help
 	  Common setup code for the camera interfaces.
 
+config S5PV210_SETUP_SPI
+	bool
+	help
+	  Common setup code for SPI GPIO configurations.
+
 menu "S5PC110 Machines"
 
 config MACH_AQUILA

arch/arm/mach-s5pv210/Makefile +1 -0

index 7eb8677..471df5d 100644
@@ -35,3 +35,4 @@ obj-$(CONFIG_S5PV210_SETUP_I2C2) 	+= setup-i2c2.o
 obj-$(CONFIG_S5PV210_SETUP_IDE)		+= setup-ide.o
 obj-$(CONFIG_S5PV210_SETUP_KEYPAD)	+= setup-keypad.o
 obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO)	+= setup-sdhci-gpio.o
+obj-$(CONFIG_S5PV210_SETUP_SPI)		+= setup-spi.o

arch/arm/mach-s5pv210/include/mach/map.h +2 -0

index 7ff609f..89c34b8 100644
@@ -109,6 +109,8 @@
 #define S3C_PA_RTC			S5PV210_PA_RTC
 #define S3C_PA_USB_HSOTG		S5PV210_PA_HSOTG
 #define S3C_PA_WDT			S5PV210_PA_WATCHDOG
+#define S3C_PA_SPI0			S5PV210_PA_SPI0
+#define S3C_PA_SPI1			S5PV210_PA_SPI1
 
 #define S5P_PA_CHIPID			S5PV210_PA_CHIPID
 #define S5P_PA_FIMC0			S5PV210_PA_FIMC0

arch/arm/mach-s5pv210/setup-spi.c new file +51 -0

51 lines not on this page · raw message

Signature · 1 line

1.7.0.4

Padmavathi Venna

author

2011-12-14 05:18 UTC #7 lore raw

PATCH v3 6/6 ARM: S3C64XX: Modified according to SPI consolidation work.

In reply to Padmavathi Venna

As SPI platform devices are consolidated to plat-samsung, some corresponding changes are required in the s3c6410 varient SoCs.

Signed-off-by Padmavathi Venna <[email protected]>

---
 arch/arm/mach-s3c64xx/Kconfig |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

arch/arm/mach-s3c64xx/Kconfig +2 -1

index dea62bf..e9dae91 100644
@@ -281,6 +281,7 @@ config MACH_WLF_CRAGG_6410
 	select S3C64XX_SETUP_IDE
 	select S3C64XX_SETUP_FB_24BPP
 	select S3C64XX_SETUP_KEYPAD
+	select S3C64XX_SETUP_SPI
 	select SAMSUNG_DEV_ADC
 	select SAMSUNG_DEV_KEYPAD
 	select S3C_DEV_USB_HOST

@@ -291,7 +292,7 @@ config MACH_WLF_CRAGG_6410
 	select S3C_DEV_I2C1
 	select S3C_DEV_WDT
 	select S3C_DEV_RTC
-	select S3C64XX_DEV_SPI
+	select S3C64XX_DEV_SPI0
 	select SAMSUNG_GPIO_EXTRA128
 	select I2C
 	help

Signature · 1 line

1.7.0.4