[PATCH 1/3 v5] v4l: Add V4L2_MBUS_FMT_JPEG_1X8 media bus format

2011-05-11 Thread Sylwester Nawrocki
Add V4L2_MBUS_FMT_JPEG_1X8 format and the corresponding Docbook
documentation.

Signed-off-by: Sylwester Nawrocki s.nawro...@samsung.com
Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com
Acked-by: Laurent Pinchart laurent.pinch...@ideasonboard.com
---
 Documentation/DocBook/v4l/subdev-formats.xml |   46 ++
 include/linux/v4l2-mediabus.h|3 ++
 2 files changed, 49 insertions(+), 0 deletions(-)

diff --git a/Documentation/DocBook/v4l/subdev-formats.xml 
b/Documentation/DocBook/v4l/subdev-formats.xml
index d7ccd25..a26b10c 100644
--- a/Documentation/DocBook/v4l/subdev-formats.xml
+++ b/Documentation/DocBook/v4l/subdev-formats.xml
@@ -2522,5 +2522,51 @@
/tgroup
   /table
 /section
+
+section
+  titleJPEG Compressed Formats/title
+
+  paraThose data formats consist of an ordered sequence of 8-bit bytes
+   obtained from JPEG compression process. Additionally to the
+   constant_JPEG/constant prefix the format code is made of
+   the following information.
+   itemizedlist
+ listitemThe number of bus samples per entropy encoded 
byte./listitem
+ listitemThe bus width./listitem
+   /itemizedlist
+
+   paraFor instance, for a JPEG baseline process and an 8-bit bus width
+ the format will be named constantV4L2_MBUS_FMT_JPEG_1X8/constant.
+   /para
+  /para
+
+  paraThe following table lists existing JPEG compressed formats./para
+
+  table pgwide=0 frame=none id=v4l2-mbus-pixelcode-jpeg
+   titleJPEG Formats/title
+   tgroup cols=3
+ colspec colname=id align=left /
+ colspec colname=code align=left/
+ colspec colname=remarks align=left/
+ thead
+   row
+ entryIdentifier/entry
+ entryCode/entry
+ entryRemarks/entry
+   /row
+ /thead
+ tbody valign=top
+   row id=V4L2-MBUS-FMT-JPEG-1X8
+ entryV4L2_MBUS_FMT_JPEG_1X8/entry
+ entry0x4001/entry
+ entryBesides of its usage for the parallel bus this format is
+   recommended for transmission of JPEG data over MIPI CSI bus
+   using the User Defined 8-bit Data types.
+ /entry
+   /row
+ /tbody
+   /tgroup
+  /table
+/section
   /section
 /section
diff --git a/include/linux/v4l2-mediabus.h b/include/linux/v4l2-mediabus.h
index de5c159..5ea7f75 100644
--- a/include/linux/v4l2-mediabus.h
+++ b/include/linux/v4l2-mediabus.h
@@ -89,6 +89,9 @@ enum v4l2_mbus_pixelcode {
V4L2_MBUS_FMT_SGBRG12_1X12 = 0x3010,
V4L2_MBUS_FMT_SGRBG12_1X12 = 0x3011,
V4L2_MBUS_FMT_SRGGB12_1X12 = 0x3012,
+
+   /* JPEG compressed formats - next is 0x4002 */
+   V4L2_MBUS_FMT_JPEG_1X8 = 0x4001,
 };
 
 /**
-- 
1.7.5
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH v5] Add v4l2 subdev driver for Samsung S5P MIPI-CSI receivers

2011-05-11 Thread Sylwester Nawrocki
Hello,

this is fifth version of the subdev driver for MIPI-CSI2 receivers
available on S5PVx10 and EXYNOS4 SoCs. This version is mainly to address
Laurent's review comments, the full thread can be found here:
https://patchwork.kernel.org/patch/725081/

This patch set also adds a V4L2_MBUS_FMT_JPEG_1X8 media bus format
and moves the s5p-fimc driver to Video Capture Devices kconfig group.

Changes since v4:
 - reworked set_fmt/get_fmt pad level ops
 - replaced readl/writel with s5pcsis_read/write macros
 - added initialization to default pixel format in s5pcsis_probe()
 - removed empty media pad ops
 - added missing __init attribute for s5pcsis_probe()
 - edited Kconfig descriptions for s5p-fimc and s5p-csis modules
Patch 1/3 is unchanged since v4.

Changes since v3:
 - slighty reworked the power management part
 - removed a reference counting in s_stream op as this should be handled
   on a media device and the pipeline level
 - s5p_csis_ prefix renamed to s5pcsis_
 - updated the help text in Kconfig

Changes since v2:
 - added reference counting in s_stream op to allow the mipi-csi subdev
   to be shared by multiple FIMC instances
 - added support for TRY format in pad get_fmt op
 - added pm_runtime* calls in s_stream op to avoid a need for explicit
   s_power(1) call
 - corrected locking around the pad ops, minor bug fixes

Changes since v1:
 - added runtime PM support
 - conversion to the pad ops


[PATCH 1/3] v4l: Add V4L2_MBUS_FMT_JPEG_1X8 media bus format
[PATCH 2/3] v4l: Move s5p-fimc driver into Video capture devices
[PATCH 3/3] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI

 Documentation/DocBook/v4l/subdev-formats.xml |   46 ++
 drivers/media/video/Kconfig  |   28 +-
 drivers/media/video/s5p-fimc/Makefile|6 +-
 drivers/media/video/s5p-fimc/mipi-csis.c |  722 ++
 drivers/media/video/s5p-fimc/mipi-csis.h |   22 +
 include/linux/v4l2-mediabus.h|3 +
 6 files changed, 817 insertions(+), 10 deletions(-)

--
Sylwester Nawrocki
Samsung Poland RD Center
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 3/3 v5] v4l: Add v4l2 subdev driver for S5P/EXYNOS4 MIPI-CSI receivers

2011-05-11 Thread Sylwester Nawrocki
Add the subdev driver for the MIPI CSIS units available in S5P and
Exynos4 SoC series. This driver supports both CSIS0 and CSIS1
MIPI-CSI2 receivers.
The driver requires Runtime PM to be enabled for proper operation.

Signed-off-by: Sylwester Nawrocki s.nawro...@samsung.com
Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com
---
 drivers/media/video/Kconfig  |9 +
 drivers/media/video/s5p-fimc/Makefile|6 +-
 drivers/media/video/s5p-fimc/mipi-csis.c |  722 ++
 drivers/media/video/s5p-fimc/mipi-csis.h |   22 +
 4 files changed, 757 insertions(+), 2 deletions(-)
 create mode 100644 drivers/media/video/s5p-fimc/mipi-csis.c
 create mode 100644 drivers/media/video/s5p-fimc/mipi-csis.h

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index a705493..9c701dd 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -946,6 +946,15 @@ config  VIDEO_SAMSUNG_S5P_FIMC
  To compile this driver as a module, choose M here: the
  module will be called s5p-fimc.
 
+config VIDEO_S5P_MIPI_CSIS
+   tristate Samsung S5P and EXYNOS4 MIPI CSI receiver driver
+   depends on VIDEO_V4L2  PM_RUNTIME  VIDEO_V4L2_SUBDEV_API
+   ---help---
+ This is a v4l2 driver for Samsung S5P/EXYNOS4 MIPI-CSI receiver.
+
+ To compile this driver as a module, choose M here: the
+ module will be called s5p-csis.
+
 #
 # USB Multimedia device configuration
 #
diff --git a/drivers/media/video/s5p-fimc/Makefile 
b/drivers/media/video/s5p-fimc/Makefile
index 7ea1b14..df6954a 100644
--- a/drivers/media/video/s5p-fimc/Makefile
+++ b/drivers/media/video/s5p-fimc/Makefile
@@ -1,3 +1,5 @@
+s5p-fimc-objs := fimc-core.o fimc-reg.o fimc-capture.o
+s5p-csis-objs := mipi-csis.o
 
-obj-$(CONFIG_VIDEO_SAMSUNG_S5P_FIMC) := s5p-fimc.o
-s5p-fimc-y := fimc-core.o fimc-reg.o fimc-capture.o
+obj-$(CONFIG_VIDEO_S5P_MIPI_CSIS)  += s5p-csis.o
+obj-$(CONFIG_VIDEO_SAMSUNG_S5P_FIMC)   += s5p-fimc.o
diff --git a/drivers/media/video/s5p-fimc/mipi-csis.c 
b/drivers/media/video/s5p-fimc/mipi-csis.c
new file mode 100644
index 000..d50efcb
--- /dev/null
+++ b/drivers/media/video/s5p-fimc/mipi-csis.c
@@ -0,0 +1,722 @@
+/*
+ * Samsung S5P SoC series MIPI-CSI receiver driver
+ *
+ * Copyright (C) 2011 Samsung Electronics Co., Ltd.
+ * Contact: Sylwester Nawrocki, s.nawro...@samsung.com
+ *
+ * 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.
+ */
+
+#include linux/clk.h
+#include linux/delay.h
+#include linux/device.h
+#include linux/errno.h
+#include linux/interrupt.h
+#include linux/io.h
+#include linux/irq.h
+#include linux/kernel.h
+#include linux/memory.h
+#include linux/module.h
+#include linux/platform_device.h
+#include linux/pm_runtime.h
+#include linux/regulator/consumer.h
+#include linux/slab.h
+#include linux/spinlock.h
+#include linux/videodev2.h
+#include media/v4l2-subdev.h
+#include plat/mipi_csis.h
+#include mipi-csis.h
+
+static int debug;
+module_param(debug, int, 0644);
+MODULE_PARM_DESC(debug, Debug level (0-1));
+
+/* Register map definition */
+
+/* CSIS global control */
+#define S5PCSIS_CTRL   0x00
+#define S5PCSIS_CTRL_DPDN_DEFAULT  (0  31)
+#define S5PCSIS_CTRL_DPDN_SWAP (1  31)
+#define S5PCSIS_CTRL_ALIGN_32BIT   (1  20)
+#define S5PCSIS_CTRL_UPDATE_SHADOW (1  16)
+#define S5PCSIS_CTRL_WCLK_EXTCLK   (1  8)
+#define S5PCSIS_CTRL_RESET (1  4)
+#define S5PCSIS_CTRL_ENABLE(1  0)
+
+/* D-PHY control */
+#define S5PCSIS_DPHYCTRL   0x04
+#define S5PCSIS_DPHYCTRL_HSS_MASK  (0x1f  27)
+#define S5PCSIS_DPHYCTRL_ENABLE(0x1f  0)
+
+#define S5PCSIS_CONFIG 0x08
+#define S5PCSIS_CFG_FMT_YCBCR422_8BIT  (0x1e  2)
+#define S5PCSIS_CFG_FMT_RAW8   (0x2a  2)
+#define S5PCSIS_CFG_FMT_RAW10  (0x2b  2)
+#define S5PCSIS_CFG_FMT_RAW12  (0x2c  2)
+/* User defined formats, x = 1...4 */
+#define S5PCSIS_CFG_FMT_USER(x)((0x30 + x - 1)  2)
+#define S5PCSIS_CFG_FMT_MASK   (0x3f  2)
+#define S5PCSIS_CFG_NR_LANE_MASK   3
+
+/* Interrupt mask. */
+#define S5PCSIS_INTMSK 0x10
+#define S5PCSIS_INTMSK_EN_ALL  0xf03f
+#define S5PCSIS_INTSRC 0x14
+
+/* Pixel resolution */
+#define S5PCSIS_RESOL  0x2c
+#define CSIS_MAX_PIX_WIDTH 0x
+#define CSIS_MAX_PIX_HEIGHT0x
+
+enum {
+   CSIS_CLK_MUX,
+   CSIS_CLK_GATE,
+};
+
+static char *csi_clock_name[] = {
+   [CSIS_CLK_MUX]  = sclk_csis,
+   [CSIS_CLK_GATE] = csis,
+};
+#define NUM_CSIS_CLOCKSARRAY_SIZE(csi_clock_name)
+
+enum {
+   ST_POWERED  = 1,
+   ST_STREAMING= 2,
+   ST_SUSPENDED= 4,
+};
+
+/**
+ * struct csis_state - the driver's internal state data structure
+ * 

[PATCH 2/3 v5] v4l: Move s5p-fimc driver into Video capture devices

2011-05-11 Thread Sylwester Nawrocki
s5p-fimc now also implements a camera capture video node so move
it under the Video capture devices kernel config menu. Also
update the entry to reflect the driver's coverage of EXYNOS4 SoCs.

Signed-off-by: Sylwester Nawrocki s.nawro...@samsung.com
Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com
---
 drivers/media/video/Kconfig |   19 +++
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig
index d61414e..a705493 100644
--- a/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@ -934,6 +934,17 @@ config VIDEO_MX2
  This is a v4l2 driver for the i.MX27 and the i.MX25 Camera Sensor
  Interface
 
+config  VIDEO_SAMSUNG_S5P_FIMC
+   tristate Samsung S5P and EXYNOS4 camera host interface driver
+   depends on VIDEO_DEV  VIDEO_V4L2  PLAT_S5P
+   select VIDEOBUF2_DMA_CONTIG
+   select V4L2_MEM2MEM_DEV
+   ---help---
+ This is a v4l2 driver for Samsung S5P and EXYNOS4 camera
+ host interface and video postprocessor.
+
+ To compile this driver as a module, choose M here: the
+ module will be called s5p-fimc.
 
 #
 # USB Multimedia device configuration
@@ -1029,13 +1040,5 @@ config VIDEO_MEM2MEM_TESTDEV
  This is a virtual test device for the memory-to-memory driver
  framework.
 
-config  VIDEO_SAMSUNG_S5P_FIMC
-   tristate Samsung S5P FIMC (video postprocessor) driver
-   depends on VIDEO_DEV  VIDEO_V4L2  PLAT_S5P
-   select VIDEOBUF2_DMA_CONTIG
-   select V4L2_MEM2MEM_DEV
-   help
- This is a v4l2 driver for the S5P camera interface
- (video postprocessor)
 
 endif # V4L_MEM2MEM_DRIVERS
-- 
1.7.5
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 0/3] ARM: Removing ARCH_S5P6442

2011-05-11 Thread Kukjin Kim
This patch remvoes mach-s5p6442 directory for ARCH_S5P6442 in arch/arm.

If any problems, please let me know immediately.

[PATCH 1/3] ARM: S5P6442: Removing ARCH_S5P6442
[PATCH 2/3] ASoC: Remove to support sound for S5P6442
[PATCH 3/3] tty: Remove to support serial for S5P6442
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 2/3] ASoC: Remove to support sound for S5P6442

2011-05-11 Thread Kukjin Kim
According to removing ARCH_S5P6442, we don't need to support
sound for S5P6442.

Cc: Jassi Brar jassisinghb...@gmail.com
Cc: Mark Brown broo...@opensource.wolfsonmicro.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
 sound/soc/samsung/Kconfig   |4 ++--
 sound/soc/samsung/smdk_wm8580.c |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig
index a3fdfb6..4b96b18 100644
--- a/sound/soc/samsung/Kconfig
+++ b/sound/soc/samsung/Kconfig
@@ -1,6 +1,6 @@
 config SND_SOC_SAMSUNG
tristate ASoC support for Samsung
-   depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 
|| ARCH_S5P64X0 || ARCH_S5P6442 || ARCH_EXYNOS4
+   depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 
|| ARCH_S5P64X0 || ARCH_EXYNOS4
select S3C64XX_DMA if ARCH_S3C64XX
select S3C2410_DMA if ARCH_S3C2410
help
@@ -55,7 +55,7 @@ config SND_SOC_SAMSUNG_JIVE_WM8750
 
 config SND_SOC_SAMSUNG_SMDK_WM8580
tristate SoC I2S Audio support for WM8580 on SMDK
-   depends on SND_SOC_SAMSUNG  (MACH_SMDK6410 || MACH_SMDKC100 || 
MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDK6442 || MACH_SMDKV210 || 
MACH_SMDKC110)
+   depends on SND_SOC_SAMSUNG  (MACH_SMDK6410 || MACH_SMDKC100 || 
MACH_SMDK6440 || MACH_SMDK6450 || MACH_SMDKV210 || MACH_SMDKC110)
select SND_SOC_WM8580
select SND_SAMSUNG_I2S
help
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index 8aacf23..3d26f66 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -249,7 +249,7 @@ static int __init smdk_audio_init(void)
int ret;
char *str;
 
-   if (machine_is_smdkc100() || machine_is_smdk6442()
+   if (machine_is_smdkc100()
|| machine_is_smdkv210() || machine_is_smdkc110()) {
smdk.num_links = 3;
/* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */
-- 
1.7.1

--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 3/3] tty: Remove to support serial for S5P6442

2011-05-11 Thread Kukjin Kim
According to removing ARCH_S5P6442, we don't need to support
serial for S5P6442.

Cc: Alan Cox a...@lxorguk.ukuu.org.uk
Cc: Greg Kroah-Hartman gre...@suse.de
Signed-off-by: Kukjin Kim kgene@samsung.com
---
 drivers/tty/serial/Kconfig |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 80484af..2892f22 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -537,7 +537,7 @@ config SERIAL_S3C6400
 
 config SERIAL_S5PV210
tristate Samsung S5PV210 Serial port support
-   depends on SERIAL_SAMSUNG  (CPU_S5PV210 || CPU_S5P6442 || 
CPU_EXYNOS4210)
+   depends on SERIAL_SAMSUNG  (CPU_S5PV210 || CPU_EXYNOS4210)
select SERIAL_SAMSUNG_UARTS_4 if (CPU_S5PV210 || CPU_EXYNOS4210)
default y
help
-- 
1.7.1

--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 0/7] ARM: Removing ARCH_S5PC100

2011-05-11 Thread Kukjin Kim
This patch remvoes mach-s5pc100 directory for ARCH_S5PC100 in arch/arm.

If any problems, please let me know immediately.

[PATCH 1/7] ARM: S5PC100: Removing ARCH_S5PC100
[PATCH 2/7] ASoC: Remove to support sound for S5PC100
[PATCH 3/7] [media] s5p-fimc: Remove to support fimc for S5PC100
[PATCH 4/7] mtd: OneNAND: Remove to support onenand for S5PC100
[PATCH 5/7] tty: Remove to support serial for S5PC100
[PATCH 6/7] video: s3c-fb: Remove to support fb for S5PC100
[PATCH 7/7] libata: Remove to support pata for S5PC100
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 6/7] video: s3c-fb: Remove to support fb for S5PC100

2011-05-11 Thread Kukjin Kim
According to removing ARCH_S5PC100, we don't need to support
fb for S5PC100.

Cc: Ben Dooks ben-li...@fluff.org
Cc: Paul Mundt let...@linux-sh.org
Signed-off-by: Kukjin Kim kgene@samsung.com
---
 drivers/video/s3c-fb.c |   33 -
 1 files changed, 0 insertions(+), 33 deletions(-)

diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 3b6cdca..9928c7e 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1696,36 +1696,6 @@ static struct s3c_fb_driverdata s3c_fb_data_64xx = {
.win[4] = s3c_fb_data_64xx_wins[4],
 };
 
-static struct s3c_fb_driverdata s3c_fb_data_s5pc100 = {
-   .variant = {
-   .nr_windows = 5,
-   .vidtcon= VIDTCON0,
-   .wincon = WINCON(0),
-   .winmap = WINxMAP(0),
-   .keycon = WKEYCON,
-   .osd= VIDOSD_BASE,
-   .osd_stride = 16,
-   .buf_start  = VIDW_BUF_START(0),
-   .buf_size   = VIDW_BUF_SIZE(0),
-   .buf_end= VIDW_BUF_END(0),
-
-   .palette = {
-   [0] = 0x2400,
-   [1] = 0x2800,
-   [2] = 0x2c00,
-   [3] = 0x3000,
-   [4] = 0x3400,
-   },
-
-   .has_prtcon = 1,
-   },
-   .win[0] = s3c_fb_data_64xx_wins[0],
-   .win[1] = s3c_fb_data_64xx_wins[1],
-   .win[2] = s3c_fb_data_64xx_wins[2],
-   .win[3] = s3c_fb_data_64xx_wins[3],
-   .win[4] = s3c_fb_data_64xx_wins[4],
-};
-
 static struct s3c_fb_driverdata s3c_fb_data_s5pv210 = {
.variant = {
.nr_windows = 5,
@@ -1797,9 +1767,6 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
.name   = s3c-fb,
.driver_data= (unsigned long)s3c_fb_data_64xx,
}, {
-   .name   = s5pc100-fb,
-   .driver_data= (unsigned long)s3c_fb_data_s5pc100,
-   }, {
.name   = s5pv210-fb,
.driver_data= (unsigned long)s3c_fb_data_s5pv210,
}, {
-- 
1.7.1

--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[PATCH 7/7] libata: Remove to support pata for S5PC100

2011-05-11 Thread Kukjin Kim
According to removing ARCH_S5PC100, we don't need to support
pata for S5PC100.

Cc: Jeff Garzik jgar...@pobox.com
Signed-off-by: Kukjin Kim kgene@samsung.com
---
 drivers/ata/pata_samsung_cf.c |   13 -
 1 files changed, 0 insertions(+), 13 deletions(-)

diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
index c446ae6..5c35f21 100644
--- a/drivers/ata/pata_samsung_cf.c
+++ b/drivers/ata/pata_samsung_cf.c
@@ -31,7 +31,6 @@
 
 enum s3c_cpu_type {
TYPE_S3C64XX,
-   TYPE_S5PC100,
TYPE_S5PV210,
 };
 
@@ -453,10 +452,6 @@ static void pata_s3c_hwinit(struct s3c_ide_info *info,
writel(0x1b, info-ide_addr + S3C_ATA_IRQ_MSK);
break;
 
-   case TYPE_S5PC100:
-   pata_s3c_cfg_mode(info-sfr_addr);
-   /* FALLTHROUGH */
-
case TYPE_S5PV210:
/* Configure as little endian */
pata_s3c_set_endian(info-ide_addr, 0);
@@ -538,11 +533,6 @@ static int __init pata_s3c_probe(struct platform_device 
*pdev)
info-sfr_addr = info-ide_addr + 0x1800;
info-ide_addr += 0x1900;
info-fifo_status_reg = 0x94;
-   } else if (cpu_type == TYPE_S5PC100) {
-   ap-ops = pata_s5p_port_ops;
-   info-sfr_addr = info-ide_addr + 0x1800;
-   info-ide_addr += 0x1900;
-   info-fifo_status_reg = 0x84;
} else {
ap-ops = pata_s5p_port_ops;
info-fifo_status_reg = 0x84;
@@ -640,9 +630,6 @@ static struct platform_device_id pata_s3c_driver_ids[] = {
.name   = s3c64xx-pata,
.driver_data= TYPE_S3C64XX,
}, {
-   .name   = s5pc100-pata,
-   .driver_data= TYPE_S5PC100,
-   }, {
.name   = s5pv210-pata,
.driver_data= TYPE_S5PV210,
},
-- 
1.7.1

--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 7/7] libata: Remove to support pata for S5PC100

2011-05-11 Thread Jeff Garzik

On 05/11/2011 09:11 PM, Kukjin Kim wrote:

According to removing ARCH_S5PC100, we don't need to support
pata for S5PC100.

Cc: Jeff Garzikjgar...@pobox.com
Signed-off-by: Kukjin Kimkgene@samsung.com


Acked-by: Jeff Garzik jgar...@redhat.com


--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html