RE: [PATCH 1/3 v5] spi: s3c64xx: fix broken cs_gpios usage in the driver
Doug Anderson wrote:
Mark or Kukjin,
Hi,
On Thu, Jun 12, 2014 at 8:59 PM, Naveen Krishna Chatradhi
ch.nav...@samsung.com wrote:
Since, (3146bee spi: s3c64xx: Added provision for dedicated cs pin)
spi-s3c64xx.c driver expects
1. chip select gpios from cs-gpio(singular) under the
controller-data node of the client/slave device of the SPI.
2. cs-gpio(singular) entry to be present in the SPI device node.
Eg of current broken usage:
spi_1 {
cs-gpio ; /* this entry is checked during probe */
...
slave_node {
controller-data {
cs-gpio gpioa2 5 0;
/* This field is parsed during .setup() */
}
};
};
The following dts files which were using this driver. But,
din't have the cs-gpio entry under SPI node.
-- arch/arm/boot/dts/exynos4210-smdkv310.dts
-- arch/arm/boot/dts/exynos4412-trats2.dts
-- arch/arm/boot/dts/exynos5250-smdk5250.dts
Also, the SPI core and many drivers moved on to using cs-gpios
from SPI node and removed the gpio handling code from drivers
(including spi-s3c64xx.c).
Hence, spi-s3c64xx.c is broken since Jun 21 11:26:12 2013 and
considering the time with no compliants about the breakage.
We are assuming it is safe to remove the cs-gpio(singular) usage
from device tree binding of spi-samsung.txt and makes appropriate
changes in the driver to use cs-gpios(plural) from
SPI device node.
Signed-off-by: Naveen Krishna Chatradhi ch.nav...@samsung.com
Acked-by: Rob Herring r...@kernel.org
Reviewed-by: Javier Martinez Canillas javier.marti...@collabora.co.uk
Tested-by: Doug Anderson diand...@chromium.org
Cc: Tomasz Figa t.f...@samsung.com
---
Changes since v4:
1. Added reviewed by from Javier and Tested by from Doug
Changes since v3:
1. Remove the sdd-cs_gpio and use gpio_is_valid(spi-cs_gpio) instead
2. Keep cs-line only for Non-DT platforms and use spi-cs_gpio
for DT platforms
.../devicetree/bindings/spi/spi-samsung.txt|8 ++--
drivers/spi/spi-s3c64xx.c | 41
2 files changed, 20 insertions(+), 29 deletions(-)
Is one of you two planning to apply (parts 1 and 2)? I know that
Kukjin needs to handle the part 3 (the .dts files)...
Once Mark takes spi driver related patches, I will pick DT related patches into
samsung tree.
Ideally it seems like it could go to 3.16 since it is a bugfix...
I think so but it depends on Mark's comments ;-)
Thanks,
Kukjin
--
Open source business process management suite built on Java and Eclipse
Turn processes into business applications with Bonita BPM Community Edition
Quickly connect people, data, and systems into organized workflows
Winner of BOSSIE, CODIE, OW2 and Gartner awards
http://p.sf.net/sfu/Bonitasoft
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH] spi/s3c64xx: Complain if we fail to set a transfer speed
Mark Brown wrote:
Signed-off-by: Mark Brown broo...@opensource.wolfsonmicro.com
Acked-by: Kukjin Kim kgene@samsung.com
---
drivers/spi/spi-s3c64xx.c |2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index
ad93231..6495352 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -957,6 +957,8 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
if (spi-max_speed_hz = speed) {
spi-max_speed_hz = speed;
} else {
+ dev_err(spi-dev, Can't set %dHz transfer
speed\n,
+ spi-max_speed_hz);
err = -EINVAL;
goto setup_exit;
}
--
1.7.10.4
--
Master Visual Studio, SharePoint, SQL, ASP.NET, C# 2012, HTML5, CSS,
MVC, Windows 8 Apps, JavaScript and much more. Keep your skills current
with LearnDevNow - 3,200 step-by-step video tutorials by Microsoft
MVPs and experts. ON SALE this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122712
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH v2 v2 v2 8/8] spi/s3c64xx: use correct dma_transfer_direction type
Arnd Bergmann wrote:
There is a subtle difference between dma_transfer_direction and
dma_data_direction: the former is used by the dmaengine framework,
while the latter is used by the dma-mapping API. Although the
purpose is comparable, the actual values are different and must
not be mixed. In this case, the driver just wants to use
dma_transfer_direction.
Without this patch, building s3c6400_defconfig results in:
drivers/spi/spi-s3c64xx.c: In function 's3c64xx_spi_dmacb':
drivers/spi/spi-s3c64xx.c:239:21: warning: comparison between
'enum dma_data_direction' and 'enum dma_transfer_direction' [-
Wenum-compare]
Signed-off-by: Arnd Bergmann a...@arndb.de
Cc: Ben Dooks ben-li...@fluff.org
Cc: Kukjin Kim kgene@samsung.com
Acked-by: Kukjin Kim kgene@samsung.com
BTW, don't we need following accordingly?
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 1a81c90..a0bb55e 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1067,11 +1067,11 @@ static int __devinit s3c64xx_spi_get_dmares(
if (tx) {
dma_data = sdd-tx_dma;
- dma_data-direction = DMA_TO_DEVICE;
+ dma_data-direction = DMA_MEM_TO_DEV;
chan_str = tx;
} else {
dma_data = sdd-rx_dma;
- dma_data-direction = DMA_FROM_DEVICE;
+ dma_data-direction = DMA_DEV_TO_MEM;
chan_str = rx;
}
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
Cc: Grant Likely grant.lik...@secretlab.ca
Cc: linux-arm-ker...@lists.infradead.org
Cc: linux-samsung-...@vger.kernel.org
Cc: spi-devel-general@lists.sourceforge.net
---
drivers/spi/spi-s3c64xx.c |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index d1c8441f..2e44dd6 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -132,7 +132,7 @@
struct s3c64xx_spi_dma_data {
unsignedch;
- enum dma_data_direction direction;
+ enum dma_transfer_direction direction;
enum dma_ch dmach;
struct property *dma_prop;
};
--
1.7.10
--
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_sfd2d_oct
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH] spi: s3c64xx: Don't free controller_data on non-dt platforms
Sylwester Nawrocki wrote: When s3c64xx-spi is instantiated from device tree an instance of struct s3c64xx_spi_csinfo is dynamically allocated in the driver. For non-dt platform it is passed from board code through spi_register_board_info(). On error path in s3c64xx_spi_setup() function there is an attempt to free this data struct s3c64xx_spi_csinfo object as it would have been allocated in the driver for both, dt and non-dt based platforms. This leads to following bug when gpio request fails: spi spi1.0: Failed to get /CS gpio [21]: -16 kernel BUG at mm/slub.c:3478! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP ARM Modules linked in: CPU: 0Not tainted (3.6.0-rc5-00092-g9b0b493-dirty #6111) PC is at kfree+0x148/0x158 LR is at s3c64xx_spi_setup+0xac/0x290 pc : [c00a513c]lr : [c0227014]psr: 4013 sp : ee043e10 ip : c032883c fp : c0481f7c r10: ee0abd80 r9 : 0063 r8 : r7 : ee129e78 r6 : ee104a00 r5 : fff0 r4 : c047bc64 r3 : 4400 r2 : c047bc64 r1 : c04def60 r0 : 0004047b Flags: nZcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment kernel Control: 10c5387d Table: 4000404a DAC: 0015 Process swapper/0 (pid: 1, stack limit = 0xee0422f0) Stack: (0xee043e10 to 0xee044000) ... [c00a513c] (kfree+0x148/0x158) from [c0227014] (s3c64xx_spi_setup+0xac/0x290) [c0227014] (s3c64xx_spi_setup+0xac/0x290) from [c02251a4] (spi_setup+0x34/0x4c) [c02251a4] (spi_setup+0x34/0x4c) from [c02258d0] (spi_add_device+0x98/0x128) [c02258d0] (spi_add_device+0x98/0x128) from [c02259d4] (spi_new_device+0x74/0xa8) [c02259d4] (spi_new_device+0x74/0xa8) from [c0225a2c] (spi_match_master_to_boardinfo+0x24/0x44) [c0225a2c] (spi_match_master_to_boardinfo+0x24/0x44) from [c0225b40] (spi_register_master+0xf4/0x2a8) [c0225b40] (spi_register_master+0xf4/0x2a8) from [c043fe0c] (s3c64xx_spi_probe+0x34c/0x42c) [c043fe0c] (s3c64xx_spi_probe+0x34c/0x42c) from [c01fc198] (platform_drv_probe+0x18/0x1c) There should be no attempt to kfree controller_data when it was externally provided through the board code. Fix this by freeing controller_data only when dev-of_node is not null. Signed-off-by: Sylwester Nawrocki s.nawro...@samsung.com Signed-off-by: Kyungmin Park kyungmin.p...@samsung.com Yes, correct. Need to check it. Acked-by: Kukjin Kim kgene@samsung.com Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Got visibility? Most devs has no idea what their production app looks like. Find out how fast your code is with AppDynamics Lite. http://ad.doubleclick.net/clk;262219671;13503038;y? http://info.appdynamics.com/FreeJavaPerformanceDownload.html ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 14/14] drivers/spi/spi-s3c24xx.c: fix error return code
Julia Lawall wrote:
From: Julia Lawall julia.law...@lip6.fr
Initialize return variable before exiting on an error path.
A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)
// smpl
(
if@p1 (\(ret 0\|ret != 0\))
{ ... return ret; }
|
ret@p1 = 0
)
... when != ret = e1
when != ret
*if(...)
{
... when != ret = e2
when forall
return ret;
}
// /smpl
Signed-off-by: Julia Lawall julia.law...@lip6.fr
Acked-by: Kukjin Kim kgene@samsung.com
(Cc'ed Mark Brown who is handling spi for a moment)
---
Perhaps -EINVAL is not the right value in this case.
Well, if (pin_cs 0) is true, it is really invalid value. So I think, it
makes sense :-)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
drivers/spi/spi-s3c24xx.c |1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index 8ee7d79..a2a080b 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -611,6 +611,7 @@ static int __devinit s3c24xx_spi_probe(struct
platform_device *pdev)
if (!pdata-set_cs) {
if (pdata-pin_cs 0) {
dev_err(pdev-dev, No chipselect pin\n);
+ err = -EINVAL;
goto err_register;
}
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH] spi/s3c64xx: Drop extra calls to spi_master_get in suspend/remove functions
Guenter Roeck wrote:
Suspend and resume functions call spi_master_get() without matching
spi_master_put(). The extra references are unnecessary and cause
subsequent
module unload attempts to fail. Drop the calls.
Signed-off-by: Guenter Roeck li...@roeck-us.net
Acked-by: Kukjin Kim kgene@samsung.com
(Cc'ed Mark Brown who is handling spi now)
Guenter, maybe you need to re-send this patch to Mark so that he can apply
;-)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
---
drivers/spi/spi-s3c64xx.c |8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 646a765..d7a87df 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -1409,7 +1409,7 @@ static int s3c64xx_spi_remove(struct platform_device
*pdev)
#ifdef CONFIG_PM
static int s3c64xx_spi_suspend(struct device *dev)
{
- struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+ struct spi_master *master = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd =
spi_master_get_devdata(master);
spi_master_suspend(master);
@@ -1428,7 +1428,7 @@ static int s3c64xx_spi_suspend(struct device *dev)
static int s3c64xx_spi_resume(struct device *dev)
{
- struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+ struct spi_master *master = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd =
spi_master_get_devdata(master);
struct s3c64xx_spi_info *sci = sdd-cntrlr_info;
@@ -1452,7 +1452,7 @@ static int s3c64xx_spi_resume(struct device *dev)
#ifdef CONFIG_PM_RUNTIME
static int s3c64xx_spi_runtime_suspend(struct device *dev)
{
- struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+ struct spi_master *master = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd =
spi_master_get_devdata(master);
clk_disable(sdd-clk);
@@ -1463,7 +1463,7 @@ static int s3c64xx_spi_runtime_suspend(struct device
*dev)
static int s3c64xx_spi_runtime_resume(struct device *dev)
{
- struct spi_master *master = spi_master_get(dev_get_drvdata(dev));
+ struct spi_master *master = dev_get_drvdata(dev);
struct s3c64xx_spi_driver_data *sdd =
spi_master_get_devdata(master);
clk_enable(sdd-src_clk);
--
1.7.9.7
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 1/4] spi/s3c64xx: Fix handling of errors in gpio_request()
Mark Brown wrote:
When gpio_request() fails the driver logged the failure but while it'd
try to print an error code in the non-DT case it didn't pass the error
code in so garbage would be logged and in the DT case the error wasn't
logged.
Further, in the non-DT case the error code was then overwritten with -
EBUSY
depriving the caller of information and breaking automatic probe deferral
pushing back from the GPIO level. Also reformat the non-DT log message
so it's not word wrapped and we can grep for it.
Signed-off-by: Mark Brown broo...@opensource.wolfsonmicro.com
---
drivers/spi/spi-s3c64xx.c |9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 999154a0..7258b18 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -894,9 +894,9 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
if (!spi_get_ctldata(spi)) {
err = gpio_request(cs-line, dev_name(spi-dev));
if (err) {
- dev_err(spi-dev, request for slave select gpio
- line [%d] failed\n, cs-line);
- err = -EBUSY;
+ dev_err(spi-dev,
+ Failed to get /CS gpio [%d]: %d\n,
+ cs-line, err);
goto err_gpio_req;
}
spi_set_ctldata(spi, cs);
@@ -1114,7 +1114,8 @@ static int s3c64xx_spi_parse_dt_gpio(struct
s3c64xx_spi_driver_data *sdd)
ret = gpio_request(gpio, spi-bus);
if (ret) {
- dev_err(dev, gpio [%d] request failed\n, gpio);
+ dev_err(dev, gpio [%d] request failed: %d\n,
+ gpio, ret);
goto free_gpio;
}
}
--
1.7.10.4
Mark, thanks for your re-work 3th and 4th patches in this series :-)
Looks good to me, applied this series.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 2/2] spi/s3c64xx: Expand S3C64XX_SPI_{DE,}ACT macros at call sites
Linus Walleij wrote: On Thu, Jun 28, 2012 at 3:23 PM, Mark Brown broo...@opensource.wolfsonmicro.com wrote: They have very few users and they're both just doing a single register write so the advantage of having the macro is a bit limited. An inline function might make sense but it's as easy to just do the writes directly. Signed-off-by: Mark Brown broo...@opensource.wolfsonmicro.com Much clearer. Acked-by: Linus Walleij linus.wall...@linaro.org Yeah, I agree, looks good to me. But I think, nobody takes this series...? So may I take then send this series via samsung tree? Because for samsung spi dt, the file has been touched in samsung tree so it helps to avoid bad conflicts. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH v5 6/6] spi: s3c64xx: add device tree support
Thomas Abraham wrote: On 13 July 2012 19:12, Kukjin Kim kgene@samsung.com wrote: Thomas Abraham wrote: On 13 July 2012 16:58, Kukjin Kim kgene@samsung.com wrote: Thomas Abraham wrote: On 13 July 2012 04:08, Kukjin Kim kgene@samsung.com wrote: Thomas, the DMACH_DT_PROP is available only on pl330 now. So seems occur following build error with s3c6400_defconfig. drivers/spi/spi-s3c64xx.c: In function 's3c64xx_spi_get_dmares': drivers/spi/spi-s3c64xx.c:1098: error: 'DMACH_DT_PROP' undeclared (first use in this function) drivers/spi/spi-s3c64xx.c:1098: error: (Each undeclared identifier is reported only once drivers/spi/spi-s3c64xx.c:1098: error: for each function it appears in.) make[3]: *** [drivers/spi/spi-s3c64xx.o] Error 1 make[2]: *** [drivers/spi] Error 2 Dear Mr. Kim, Thanks for considering these patches to be merged via your tree. For the build break you mentioned above, there was a patch submitted some time back to handle this. The link to that patch is: http://lists.infradead.org/pipermail/linux-arm-kernel/2012- June/102627.html. Could you please apply this patch also to your tree. Sure, it looks good to me, will apply that then this series will be rebased on top of that. There are six more patches that enable spi device tree support for Exynos4 and Exynos5 platforms. Could you consider to apply those patches as well. The link to those patches is: http://www.mail-archive.com/linux-samsung- s...@vger.kernel.org/msg10851.html. Yeah, I remember, but I think some patches is needed to re-work as per comments...? I checked again for any pending comments on v2 version. There are no pending comments for the v2 version of this patch series. Thanks. OK, I checked v2 series you mentioned. Looks OK to me and applied into next/dt-samsung because it is related in supporting dt. Note, I applied all of them into same dt branch, the fist one 'fix the incorrect hierarchy of spi controller bus clock for exynos4' can be sent to upstream via fixes now though. And I changed the clock name for exynos4_clk_mdout_spix to 'mdout_spi' for consensus when I applied. If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH v5 6/6] spi: s3c64xx: add device tree support
Thomas Abraham wrote: On 13 July 2012 04:08, Kukjin Kim kgene@samsung.com wrote: Thomas, the DMACH_DT_PROP is available only on pl330 now. So seems occur following build error with s3c6400_defconfig. drivers/spi/spi-s3c64xx.c: In function 's3c64xx_spi_get_dmares': drivers/spi/spi-s3c64xx.c:1098: error: 'DMACH_DT_PROP' undeclared (first use in this function) drivers/spi/spi-s3c64xx.c:1098: error: (Each undeclared identifier is reported only once drivers/spi/spi-s3c64xx.c:1098: error: for each function it appears in.) make[3]: *** [drivers/spi/spi-s3c64xx.o] Error 1 make[2]: *** [drivers/spi] Error 2 Dear Mr. Kim, Thanks for considering these patches to be merged via your tree. For the build break you mentioned above, there was a patch submitted some time back to handle this. The link to that patch is: http://lists.infradead.org/pipermail/linux-arm-kernel/2012- June/102627.html. Could you please apply this patch also to your tree. Sure, it looks good to me, will apply that then this series will be rebased on top of that. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH v5 6/6] spi: s3c64xx: add device tree support
Thomas Abraham wrote: On 13 July 2012 16:58, Kukjin Kim kgene@samsung.com wrote: Thomas Abraham wrote: On 13 July 2012 04:08, Kukjin Kim kgene@samsung.com wrote: Thomas, the DMACH_DT_PROP is available only on pl330 now. So seems occur following build error with s3c6400_defconfig. drivers/spi/spi-s3c64xx.c: In function 's3c64xx_spi_get_dmares': drivers/spi/spi-s3c64xx.c:1098: error: 'DMACH_DT_PROP' undeclared (first use in this function) drivers/spi/spi-s3c64xx.c:1098: error: (Each undeclared identifier is reported only once drivers/spi/spi-s3c64xx.c:1098: error: for each function it appears in.) make[3]: *** [drivers/spi/spi-s3c64xx.o] Error 1 make[2]: *** [drivers/spi] Error 2 Dear Mr. Kim, Thanks for considering these patches to be merged via your tree. For the build break you mentioned above, there was a patch submitted some time back to handle this. The link to that patch is: http://lists.infradead.org/pipermail/linux-arm-kernel/2012- June/102627.html. Could you please apply this patch also to your tree. Sure, it looks good to me, will apply that then this series will be rebased on top of that. There are six more patches that enable spi device tree support for Exynos4 and Exynos5 platforms. Could you consider to apply those patches as well. The link to those patches is: http://www.mail-archive.com/linux-samsung- s...@vger.kernel.org/msg10851.html. Yeah, I remember, but I think some patches is needed to re-work as per comments...? Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH v5 0/6] spi: s3c64xx: add support for device tree
Thomas Abraham wrote: On 11 July 2012 23:19, Mark Brown broo...@opensource.wolfsonmicro.com wrote: On Wed, Jul 11, 2012 at 09:10:59PM +0530, Thomas Abraham wrote: Changes since v4: - Includes the missing gpio request for slave select line gpio as suggested by Mark Brown. These looked OK (and have had quite a bit of review already so we're probably at the stage where incremental fixes are better anyway) so I tried to apply them but git am was really unhappy. I tried applying on git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git spi- next and -next. Can you check what's going on here please? Firstly, this patches look ok to me. And Mark, this touches various samsung stuff in arch/arm/ so if you're ok, I'd like to pick this up in samsung tree. We don't want to see conflicts... These patches were based on Samsung maintainer's for-next branch with Grant's spi/next branch merged. I will check with your spi-next branch. Thanks. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
Re: [PATCH v5 0/6] spi: s3c64xx: add support for device tree
On 07/13/12 01:16, Mark Brown wrote: On Thu, Jul 12, 2012 at 07:13:37PM +0530, Thomas Abraham wrote: On 12 July 2012 18:32, Mark Brownbroo...@opensource.wolfsonmicro.com wrote: Well, simple conflicts aren't that big a deal... However, Thomas mentioned that in order to test this he merged the SPI tree into your tree so perhaps there is also a dependency on the SPI tree? If that was just for good practice testing then I agree that the best thing is to merge via your tree, otherwise we might need to think harder. There were no dependency on Grant's spi/next branch. It was merged just to ensure that nothing is broken. OK, great - then the Samsung tree it is. Thanks, will apply. Mark, if you want to add your ack or review on them, let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
Re: [PATCH v5 6/6] spi: s3c64xx: add device tree support
On 07/12/12 00:41, Thomas Abraham wrote:
Add support for device based discovery.
Signed-off-by: Thomas Abrahamthomas.abra...@linaro.org
Acked-by: Jaswinder Singhjaswinder.si...@linaro.org
Acked-by: Grant Likelygrant.lik...@secretlab.ca
---
.../devicetree/bindings/spi/spi-samsung.txt| 113
drivers/spi/spi-s3c64xx.c | 305
+---
2 files changed, 378 insertions(+), 40 deletions(-)
create mode 100644 Documentation/devicetree/bindings/spi/spi-samsung.txt
[snip]
@@ -989,49 +1057,166 @@ static void s3c64xx_spi_hwinit(struct
s3c64xx_spi_driver_data *sdd, int channel)
flush_fifo(sdd);
}
+static int __devinit s3c64xx_spi_get_dmares(
+ struct s3c64xx_spi_driver_data *sdd, bool tx)
+{
+ struct platform_device *pdev = sdd-pdev;
+ struct s3c64xx_spi_dma_data *dma_data;
+ struct property *prop;
+ struct resource *res;
+ char prop_name[15], *chan_str;
+
+ if (tx) {
+ dma_data =sdd-tx_dma;
+ dma_data-direction = DMA_TO_DEVICE;
+ chan_str = tx;
+ } else {
+ dma_data =sdd-rx_dma;
+ dma_data-direction = DMA_FROM_DEVICE;
+ chan_str = rx;
+ }
+
+ if (!sdd-pdev-dev.of_node) {
+ res = platform_get_resource(pdev, IORESOURCE_DMA, tx ? 0 : 1);
+ if (!res) {
+ dev_err(pdev-dev, Unable to get SPI-%s dma
+ resource\n, chan_str);
+ return -ENXIO;
+ }
+ dma_data-dmach = res-start;
+ return 0;
+ }
+
+ sprintf(prop_name, %s-dma-channel, chan_str);
+ prop = of_find_property(pdev-dev.of_node, prop_name, NULL);
+ if (!prop) {
+ dev_err(pdev-dev, %s dma channel property not specified\n,
+ chan_str);
+ return -ENXIO;
+ }
+
+ dma_data-dmach = DMACH_DT_PROP;
Thomas, the DMACH_DT_PROP is available only on pl330 now. So seems occur
following build error with s3c6400_defconfig.
drivers/spi/spi-s3c64xx.c: In function 's3c64xx_spi_get_dmares':
drivers/spi/spi-s3c64xx.c:1098: error: 'DMACH_DT_PROP' undeclared (first
use in this function)
drivers/spi/spi-s3c64xx.c:1098: error: (Each undeclared identifier is
reported only once
drivers/spi/spi-s3c64xx.c:1098: error: for each function it appears in.)
make[3]: *** [drivers/spi/spi-s3c64xx.o] Error 1
make[2]: *** [drivers/spi] Error 2
+ dma_data-dma_prop = prop;
+ return 0;
+}
[snip]
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 2/3] spi: Add the use of DMA config operation
Boojin Kim wrote:
Config operation is separated from request operation in DMA common
operation.
Because spi driver can change the DMA config for every transfer.
So this patch is using the separated DMA config operation.
Signed-off-by: Boojin Kim boojin@samsung.com
Signed-off-by: Kyoungil Kim ki0351@samsung.com
---
drivers/spi/spi-s3c64xx.c | 33 +++--
1 files changed, 19 insertions(+), 14 deletions(-)
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index 15f864d..f4e2341 100644
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -262,14 +262,24 @@ static void prepare_dma(struct s3c64xx_spi_dma_data
*dma,
unsigned len, dma_addr_t buf)
{
struct s3c64xx_spi_driver_data *sdd;
- struct samsung_dma_prep_info info;
+ struct samsung_dma_prep info;
+ struct samsung_dma_config config;
- if (dma-direction == DMA_DEV_TO_MEM)
+ if (dma-direction == DMA_DEV_TO_MEM) {
sdd = container_of((void *)dma,
struct s3c64xx_spi_driver_data, rx_dma);
- else
+ config.direction = sdd-rx_dma.direction;
+ config.fifo = sdd-sfr_start + S3C64XX_SPI_RX_DATA;
+ config.width = sdd-cur_bpw / 8;
+ sdd-ops-config(sdd-rx_dma.ch, config);
+ } else {
sdd = container_of((void *)dma,
struct s3c64xx_spi_driver_data, tx_dma);
+ config.direction = sdd-tx_dma.direction;
+ config.fifo = sdd-sfr_start + S3C64XX_SPI_TX_DATA;
+ config.width = sdd-cur_bpw / 8;
+ sdd-ops-config(sdd-tx_dma.ch, config);
+ }
info.cap = DMA_SLAVE;
info.len = len;
@@ -284,20 +294,15 @@ static void prepare_dma(struct s3c64xx_spi_dma_data
*dma,
static int acquire_dma(struct s3c64xx_spi_driver_data *sdd)
{
- struct samsung_dma_info info;
+ struct samsung_dma_req req;
sdd-ops = samsung_dma_get_ops();
- info.cap = DMA_SLAVE;
- info.client = s3c64xx_spi_dma_client;
- info.width = sdd-cur_bpw / 8;
-
- info.direction = sdd-rx_dma.direction;
- info.fifo = sdd-sfr_start + S3C64XX_SPI_RX_DATA;
- sdd-rx_dma.ch = sdd-ops-request(sdd-rx_dma.dmach, info);
- info.direction = sdd-tx_dma.direction;
- info.fifo = sdd-sfr_start + S3C64XX_SPI_TX_DATA;
- sdd-tx_dma.ch = sdd-ops-request(sdd-tx_dma.dmach, info);
+ req.cap = DMA_SLAVE;
+ req.client = s3c64xx_spi_dma_client;
+
+ sdd-rx_dma.ch = sdd-ops-request(sdd-rx_dma.dmach, req);
+ sdd-tx_dma.ch = sdd-ops-request(sdd-tx_dma.dmach, req);
return 1;
}
--
1.7.1
Hi Grant,
I think, this is needed to support Samsung SPI with DMA and this has
dependency with other patches in this series.
If you're ok on this, please reply with your ack :) so that I can take this
series together.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 1/3] ARM: SAMSUNG: Add config() function in DMA common operations
samsung_dma_prep_info *info)
if (!data-fp) {
s3c2410_dma_set_buffdone_fn(ch, s3c_dma_cb);
- data-fp = info-fp;
- data-fp_param = info-fp_param;
+ data-fp = param-fp;
+ data-fp_param = param-fp_param;
}
- s3c2410_dma_enqueue(ch, (void *)data, info-buf, len);
+ s3c2410_dma_enqueue(ch, (void *)data, param-buf, len);
return 0;
}
@@ -117,6 +121,7 @@ static inline int s3c_dma_stop(unsigned ch)
static struct samsung_dma_ops s3c_dma_ops = {
.request= s3c_dma_request,
.release= s3c_dma_release,
+ .config = s3c_dma_config,
.prepare= s3c_dma_prepare,
.trigger= s3c_dma_trigger,
.started= s3c_dma_started,
--
1.7.1
Looks good to me but need to ack on spi patch in this series. I think, this
series should be picked up together.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 3/3] ASoC: follow the updated samsung DMA common operations
Boojin Kim wrote: Mark Brown wrote This patch uses config() function to configure DMA transmit options. Acked-by: Mark Brown broo...@opensource.wolfsonmicro.com Thanks for your ack and let me pick this up in Samsung tree. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. It'd be good if we could get all the older Samsung platforms moved over to dmaengine... Thanks for your ack :) And, Our engineer's preparing to move the older Samsung dma driver into dmaengine. -- Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH v2 2/6] spi: s3c64xx: move controller information into driver data
are specified to the driver using this
structure
+ * which is provided as driver data to the driver.
+ */
+struct s3c64xx_spi_port_config {
+ int fifo_lvl_mask[MAX_SPI_PORTS];
+ int rx_lvl_offset;
+ int tx_st_done;
+ boolhigh_speed;
+ boolclk_from_cmu;
+};
When I saw this, I thought this will be used for each SPI port. But I know,
above structure is used for each SoC not each SPI port. So I think, how
about to change the structure name to avoid confusion?
[...]
@@ -1000,6 +1029,7 @@ static int __init s3c64xx_spi_probe(struct
platform_device *pdev)
platform_set_drvdata(pdev, master);
sdd = spi_master_get_devdata(master);
+ sdd-port_conf = s3c64xx_spi_get_port_config(pdev);
sdd-master = master;
sdd-cntrlr_info = sci;
sdd-pdev = pdev;
@@ -1008,10 +1038,11 @@ static int __init s3c64xx_spi_probe(struct
platform_device *pdev)
sdd-tx_dma.direction = DMA_MEM_TO_DEV;
sdd-rx_dma.dmach = dmarx_res-start;
sdd-rx_dma.direction = DMA_DEV_TO_MEM;
+ sdd-port_id = pdev-id;
sdd-cur_bpw = 8;
- master-bus_num = pdev-id;
+ master-bus_num = sdd-port_id;
[...]
@@ -1071,7 +1102,7 @@ static int __init s3c64xx_spi_probe(struct
platform_device *pdev)
}
/* Setup Deufult Mode */
- s3c64xx_spi_hwinit(sdd, pdev-id);
+ s3c64xx_spi_hwinit(sdd, sdd-port_id);
Do we need this change?
spin_lock_init(sdd-lock);
init_completion(sdd-xfer_completion);
@@ -1096,7 +1127,7 @@ static int __init s3c64xx_spi_probe(struct
platform_device *pdev)
dev_dbg(pdev-dev, Samsung SoC SPI Driver loaded for Bus SPI-%d
with %d Slaves attached\n,
- pdev-id, master-num_chipselect);
+ sdd-port_id,
master-num_chipselect);
Same as above.
dev_dbg(pdev-dev, \tIOmem=[0x%x-0x%x]\tDMA=[Rx-%d, Tx-%d]\n,
mem_res-end, mem_res-start,
sdd-rx_dma.dmach,
sdd-tx_dma.dmach);
@@ -1189,7 +1220,7 @@ static int s3c64xx_spi_resume(struct device *dev)
clk_enable(sdd-src_clk);
clk_enable(sdd-clk);
- s3c64xx_spi_hwinit(sdd, pdev-id);
+ s3c64xx_spi_hwinit(sdd, sdd-port_id);
Same as above.
[...]
+#ifdef CONFIG_ARCH_EXYNOS4
+struct s3c64xx_spi_port_config exynos4_spi_port_config = {
Is this available on exynos4212/exynos4412? If not, this should be
'exynos4210_spi_port_config' and ifdef CONFIG_CPU_EXYNOS4210.
+ .fifo_lvl_mask = { 0x1ff, 0x7F, 0x7F },
+ .rx_lvl_offset = 15,
+ .tx_st_done = 25,
+ .high_speed = 1,
+ .clk_from_cmu = true,
+};
+#define EXYNOS4_SPI_PORT_CONFIG
((kernel_ulong_t)exynos4_spi_port_config)
+#else
+#define EXYNOS4_SPI_PORT_CONFIG ((kernel_ulong_t)NULL)
+#endif /* CONFIG_ARCH_EXYNOS4 */
And let's think the name of ..._SPI_PORT_CONFIG again. How about just
..._SPI_CONFIG?
+
+static struct platform_device_id s3c64xx_spi_driver_ids[] = {
+ {
+ .name = s3c2443-spi,
+ .driver_data= S3C2443_SPI_PORT_CONFIG,
+ }, {
+ .name = s3c6410-spi,
+ .driver_data= S3C6410_SPI_PORT_CONFIG,
+ }, {
+ .name = s5p64x0-spi,
+ .driver_data= S5P64X0_SPI_PORT_CONFIG,
+ }, {
+ .name = s5pc100-spi,
+ .driver_data= S5PC100_SPI_PORT_CONFIG,
+ }, {
+ .name = s5pv210-spi,
+ .driver_data= S5PV210_SPI_PORT_CONFIG,
+ }, {
+ .name = exynos4210-spi,
+ .driver_data= EXYNOS4_SPI_PORT_CONFIG,
As I commented, if this is only for exynos4210, EXYNOS4210_SPI_CONFIG should
be used here not EXYNOS4_SPI_.
[...]
And I think, it's time to change the name of spi driver to spi-samsung.c and
samsung_spi as a prefix even though we have another s3c24xx spi driver now.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
--
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
___
spi-devel-general mailing list
spi-devel-general@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH v2 2/2] S3C24XX: move spi-s3c24xx platdata out of mach
Heiko Stübner wrote:
spi.h now only contains the definition of the platform data structure
for the driver in spi-s3c24xx.c . Therefore it does not need to stay
in include/mach but can instead live in linux/spi/s3c24xx.h .
Signed-off-by: Heiko Stuebner he...@sntech.de
---
Sorry for messing up, but it seems I forgot to readd the moved spi header
in the original submission of the second patch, which I noticed just now.
As your cleanup-s3c24xx branch is not pushed out yet, could you please
replace it with this one, which adds the forgotten file.
OK, I replaced with this. And I'm not sure Grant is ok on this.
Grant, this looks ok to me and I'd like to apply this in samsung tree.
So if any problem to send this via samsung tree, please let me know.
Thanks.
Best regards,
Kgene.
--
Kukjin Kim kgene@samsung.com, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
arch/arm/mach-s3c2410/include/mach/spi.h | 27
--
-
arch/arm/mach-s3c2440/mach-gta02.c |2 +-
drivers/spi/spi-s3c24xx.c|2 +-
include/linux/spi/s3c24xx.h | 26
++
4 files changed, 28 insertions(+), 29 deletions(-)
delete mode 100644 arch/arm/mach-s3c2410/include/mach/spi.h
create mode 100644 include/linux/spi/s3c24xx.h
diff --git a/arch/arm/mach-s3c2410/include/mach/spi.h b/arch/arm/mach-
s3c2410/include/mach/spi.h
deleted file mode 100644
index 2a686c0..000
--- a/arch/arm/mach-s3c2410/include/mach/spi.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/spi.h
- *
- * Copyright (c) 2006 Simtec Electronics
- * Ben Dooks b...@simtec.co.uk
- *
- * S3C2410 - SPI Controller platform_device info
- *
- * 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.
-*/
-
-#ifndef __ASM_ARCH_SPI_H
-#define __ASM_ARCH_SPI_H __FILE__
-
-struct s3c2410_spi_info {
- int pin_cs;/* simple gpio cs */
- unsigned int num_cs;/* total chipselects */
- int bus_num; /* bus number to use. */
-
- unsigned int use_fiq:1; /* use fiq */
-
- void (*gpio_setup)(struct s3c2410_spi_info *spi, int enable);
- void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
-};
-
-#endif /* __ASM_ARCH_SPI_H */
diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-
s3c2440/mach-gta02.c
index 5859e60..cf270f5 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -38,6 +38,7 @@
#include linux/platform_device.h
#include linux/serial_core.h
#include linux/spi/spi.h
+#include linux/spi/s3c24xx.h
#include linux/mmc/host.h
@@ -73,7 +74,6 @@
#include mach/regs-gpioj.h
#include mach/fb.h
-#include mach/spi.h
#include plat/usb-control.h
#include mach/regs-mem.h
#include mach/hardware.h
diff --git a/drivers/spi/spi-s3c24xx.c b/drivers/spi/spi-s3c24xx.c
index fc06453..8ee7d79 100644
--- a/drivers/spi/spi-s3c24xx.c
+++ b/drivers/spi/spi-s3c24xx.c
@@ -24,10 +24,10 @@
#include linux/spi/spi.h
#include linux/spi/spi_bitbang.h
+#include linux/spi/s3c24xx.h
#include linux/module.h
#include plat/regs-spi.h
-#include mach/spi.h
#include plat/fiq.h
#include asm/fiq.h
diff --git a/include/linux/spi/s3c24xx.h b/include/linux/spi/s3c24xx.h
new file mode 100644
index 000..c23b923
--- /dev/null
+++ b/include/linux/spi/s3c24xx.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2006 Simtec Electronics
+ * Ben Dooks b...@simtec.co.uk
+ *
+ * S3C2410 - SPI Controller platform_device info
+ *
+ * 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.
+*/
+
+#ifndef __LINUX_SPI_S3C24XX_H
+#define __LINUX_SPI_S3C24XX_H __FILE__
+
+struct s3c2410_spi_info {
+ int pin_cs;/* simple gpio cs */
+ unsigned int num_cs;/* total chipselects */
+ int bus_num; /* bus number to use. */
+
+ unsigned int use_fiq:1; /* use fiq */
+
+ void (*gpio_setup)(struct s3c2410_spi_info *spi, int enable);
+ void (*set_cs)(struct s3c2410_spi_info *spi, int cs, int pol);
+};
+
+#endif /* __LINUX_SPI_S3C24XX_H */
--
1.7.5.4
--
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
RE: [PATCH 0/2] S3C24XX: remove some spi left overs
Heiko Stübner wrote: This series removes unused setup-code of the s3c24xx spi driver. It has no current in kernel users and also no development activity trying to change this. I also checked the upstream git of the only board including the spi.h file (the gta02 at http://git.openmoko.org). The setup calls are also not used there. I recall a thread some time back talking about removing the spi-s3c24xx driver altogether, but as current linux-next still carries the driver I'm not sure what became of it. So this series does the next smaller thing. Heiko Stuebner (2): S3C24XX: remove unused spi gpio setup functions S3C24XX: move spi-s3c24xx platdata out of mach arch/arm/mach-s3c2410/include/mach/spi.h | 38 -- arch/arm/mach-s3c2440/mach-gta02.c |2 +- arch/arm/plat-s3c24xx/Kconfig| 20 - arch/arm/plat-s3c24xx/Makefile |6 arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c | 36 arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c | 38 -- arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c| 36 drivers/spi/spi-s3c24xx.c|2 +- 8 files changed, 2 insertions(+), 176 deletions(-) delete mode 100644 arch/arm/mach-s3c2410/include/mach/spi.h delete mode 100644 arch/arm/plat-s3c24xx/spi-bus0-gpe11_12_13.c delete mode 100644 arch/arm/plat-s3c24xx/spi-bus1-gpd8_9_10.c delete mode 100644 arch/arm/plat-s3c24xx/spi-bus1-gpg5_6_7.c -- 1.7.2.3 Looks good :) Applied in my cleanup-s3c24xx, thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Try before you buy = See our experts in action! The most comprehensive online learning library for Microsoft developers is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3, Metro Style Apps, more. Free future releases when you subscribe now! http://p.sf.net/sfu/learndevnow-dev2 ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 2/2] SPI: SAMSUNG: Bug fix for SPI with different FIFO level
Kukjin Kim wrote: Grant Likely wrote: On Mon, Jul 04, 2011 at 07:08:55PM +0900, Kukjin Kim wrote: Kukjin Kim wrote: Thanks Grant, Jassi and all, I will apply these 1 and 2 in my -fix tree for 3.0 with your acks. Oops, this needs previous 'cleanup spi platform specific code' so can't apply -fix tree now. There may also be conflicts with the heavy rework in the spi tree. Kgene, when you pick up this series, can you put it into a separate topic branch and merge that into your main tree? That way if there are difficult conflicts, then I can also merge that same topic branch into spi/next to resolve them. Hi Grant, Sure, no problem. I'm waiting for Padmavathi's new patch which is based on old code not new SPI code. When I merge topic branch for this into my tree, let you know immediately. Then if any problems, let's talk again :) Hi, I made topic branch for this based on 3.0-rc6. git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git #for-spi If any problems, please let me know :) Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 2/2] SPI: SAMSUNG: Bug fix for SPI with different FIFO level
Grant Likely wrote: On Wed, Jul 06, 2011 at 03:22:08PM +0900, Kukjin Kim wrote: Kukjin Kim wrote: Grant Likely wrote: On Mon, Jul 04, 2011 at 07:08:55PM +0900, Kukjin Kim wrote: Kukjin Kim wrote: Thanks Grant, Jassi and all, I will apply these 1 and 2 in my -fix tree for 3.0 with your acks. Oops, this needs previous 'cleanup spi platform specific code' so can't apply -fix tree now. There may also be conflicts with the heavy rework in the spi tree. Kgene, when you pick up this series, can you put it into a separate topic branch and merge that into your main tree? That way if there are difficult conflicts, then I can also merge that same topic branch into spi/next to resolve them. Hi Grant, Sure, no problem. I'm waiting for Padmavathi's new patch which is based on old code not new SPI code. When I merge topic branch for this into my tree, let you know immediately. Then if any problems, let's talk again :) Hi, I made topic branch for this based on 3.0-rc6. git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git #for-spi Okay. If there are problems, then I'll merge it. Thanks. Maybe 'If there are not problems'? Anyway, where do you want to merge this -next or -fix? I think, this is required for 3.0. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 2/2] SPI: SAMSUNG: Bug fix for SPI with different FIFO level
Grant Likely wrote: On Mon, Jul 4, 2011 at 12:55 AM, Grant Likely grant.lik...@secretlab.ca wrote: On Fri, Jul 01, 2011 at 11:43:08AM +0530, Jassi Brar wrote: On Fri, Jul 1, 2011 at 11:29 AM, padma venkat padma@gmail.com wrote: Hi Jassi, On Fri, Jul 1, 2011 at 11:22 AM, Jassi Brar jassisinghb...@gmail.com wrote: On Fri, Jul 1, 2011 at 11:16 AM, padma venkat padma@gmail.com wrote: Hi Tony, On Thu, Jun 30, 2011 at 4:30 PM, Tony Nadackal ton...@gmail.com wrote: Hi Padma, With regards to your patch, even though one can check the tx done status using the TX_DONE bit, the present macro itself would work perfectly fine if the 'fifo_lvl_mask' is set properly. For example in 6450 channel 1, the fifo_lvl_mask should be 0x1ff (for 9bits, 15:23), while even in your patch, it is wrongly set as 0x7f(only 7bits). Thus, if this fifo_lvl_mask was defined correctly, the existing macro would itself have worked. Thanks for your comment. I considered changing to the fifo_lvl_mask to 1ff as you mentioned. But I think that the fifo_lvl_mask reflects the actual FIFO capacity in the SPI driver. For the failing channels the FIFO trigger level is 64 bytes and so i retained that value. In the driver it polls till the FIFO capacity level otherwise it goes for DMA.So if we keep the FIFO level as 1ff when the actual capacity is 7f then it fails. Jassi what do you think about this? 'fifo_lvl_mask' is h/w specific and can't be set for convenience. I don't have access to post-s3c64xx datasheets. Please check and reply if TX_DONE bit is at same offset for all channels of an SoC, because I suspect it's otherwise. Yes. The TX_DONE bit is at the same offset for all the channels of an SoC. in S5P64X0,S5PV210 and S5PV310 it is at offset 25. Then, Patches-1,2 Acked-by: Jassi Brar jassisinghb...@gmail.com Are these bug fixes that should be in v3.0, or do I queue them up for v3.1? Regardless, this one touches a lot of arch/arm files, so I'd rather see both patches go through the samsung tree: Acked-by: Grant Likely grant.lik...@secretlab.ca Thanks Grant, Jassi and all, I will apply these 1 and 2 in my -fix tree for 3.0 with your acks. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 2/2] SPI: SAMSUNG: Bug fix for SPI with different FIFO level
Kukjin Kim wrote: Grant Likely wrote: On Mon, Jul 4, 2011 at 12:55 AM, Grant Likely grant.lik...@secretlab.ca wrote: On Fri, Jul 01, 2011 at 11:43:08AM +0530, Jassi Brar wrote: On Fri, Jul 1, 2011 at 11:29 AM, padma venkat padma@gmail.com wrote: Hi Jassi, On Fri, Jul 1, 2011 at 11:22 AM, Jassi Brar jassisinghb...@gmail.com wrote: On Fri, Jul 1, 2011 at 11:16 AM, padma venkat padma@gmail.com wrote: Hi Tony, On Thu, Jun 30, 2011 at 4:30 PM, Tony Nadackal ton...@gmail.com wrote: Hi Padma, With regards to your patch, even though one can check the tx done status using the TX_DONE bit, the present macro itself would work perfectly fine if the 'fifo_lvl_mask' is set properly. For example in 6450 channel 1, the fifo_lvl_mask should be 0x1ff (for 9bits, 15:23), while even in your patch, it is wrongly set as 0x7f(only 7bits). Thus, if this fifo_lvl_mask was defined correctly, the existing macro would itself have worked. Thanks for your comment. I considered changing to the fifo_lvl_mask to 1ff as you mentioned. But I think that the fifo_lvl_mask reflects the actual FIFO capacity in the SPI driver. For the failing channels the FIFO trigger level is 64 bytes and so i retained that value. In the driver it polls till the FIFO capacity level otherwise it goes for DMA.So if we keep the FIFO level as 1ff when the actual capacity is 7f then it fails. Jassi what do you think about this? 'fifo_lvl_mask' is h/w specific and can't be set for convenience. I don't have access to post-s3c64xx datasheets. Please check and reply if TX_DONE bit is at same offset for all channels of an SoC, because I suspect it's otherwise. Yes. The TX_DONE bit is at the same offset for all the channels of an SoC. in S5P64X0,S5PV210 and S5PV310 it is at offset 25. Then, Patches-1,2 Acked-by: Jassi Brar jassisinghb...@gmail.com Are these bug fixes that should be in v3.0, or do I queue them up for v3.1? Regardless, this one touches a lot of arch/arm files, so I'd rather see both patches go through the samsung tree: Acked-by: Grant Likely grant.lik...@secretlab.ca Thanks Grant, Jassi and all, I will apply these 1 and 2 in my -fix tree for 3.0 with your acks. Oops, this needs previous 'cleanup spi platform specific code' so can't apply -fix tree now. Padmavathi, I will apply these 1 and 2 on -next for 3.1 after your updated 'cleanup spi' patches... If any problems, please let me know. Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 0/5] remove spi-s3c24xx-gpio driver
Grant Likely wrote: On Wed, Jun 29, 2011 at 07:51:10PM +0200, Peter Korsgaard wrote: Grant == Grant Likely grant.lik...@secretlab.ca writes: Great, will you handle the series or should it go through the spi tree? Grant With the big spi driver rename, it should probably either go via the Grant spi tree, or be put into a topic branch that can be merged by both the Grant spi and samsung trees. Both is fine by me. Let me know if you want me to do something. It's pretty minimal arch/arm impact, and it depends on the big rename patch, so why don't I just merge it directly into spi/next without a topic branch. Hi Grant, I agree with you, it is not expected this makes some conflicts between spi and samsung tree. I think Ben's ack is enough on this, if required, Acked-by: Kukjin Kim kgene@samsung.com Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH 2/2] SPI: SAMSUNG: Bug fix for SPI with different FIFO level
Grant Likely wrote: On Mon, Jul 04, 2011 at 07:08:55PM +0900, Kukjin Kim wrote: Kukjin Kim wrote: Thanks Grant, Jassi and all, I will apply these 1 and 2 in my -fix tree for 3.0 with your acks. Oops, this needs previous 'cleanup spi platform specific code' so can't apply -fix tree now. There may also be conflicts with the heavy rework in the spi tree. Kgene, when you pick up this series, can you put it into a separate topic branch and merge that into your main tree? That way if there are difficult conflicts, then I can also merge that same topic branch into spi/next to resolve them. Hi Grant, Sure, no problem. I'm waiting for Padmavathi's new patch which is based on old code not new SPI code. When I merge topic branch for this into my tree, let you know immediately. Then if any problems, let's talk again :) Thanks. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2 ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
RE: [PATCH V3] spi: Enable SPI driver for S5P6440 and S5P6450
Grant Likely wrote: On Wed, Jan 12, 2011 at 03:00:23PM +0900, Kukjin Kim wrote: From: Abhilash Kesavan a.kesa...@samsung.com This patch enables the existing S3C64XX series SPI driver for S5P64X0 and removed dependency on EXPERIMENTAL because we don't need it now. Signed-off-by: Abhilash Kesavan a.kesa...@samsung.com Signed-off-by: Sangbeom Kim sbki...@samsung.com Cc: Jassi Brar jassi.b...@samsung.com Signed-off-by: Kukjin Kim kgene@samsung.com Merged, thanks. Hi Grant, thanks. As a note, I mis-used David's e-mail :-( David, sorry and will use your right e-mail address from now on. Thanks again. Best regards, Kgene. -- Kukjin Kim kgene@samsung.com, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
[PATCH V2] spi: Enable SPI driver for S5P6440 and S5P6450
From: Abhilash Kesavan a.kesa...@samsung.com This patch enables the existing S3C64XX series SPI driver for S5P64X0 and removed dependency on EXPERIMENTAL because we don't need it now. Signed-off-by: Abhilash Kesavan a.kesa...@samsung.com Signed-off-by: Sangbeom Kim sbki...@samsung.com Cc: Jassi Brar jassi.b...@samsung.com Signed-off-by: Kukjin Kim kgene@samsung.com --- Changes since v1: - Removed dependency on EXPERIMENTAL Hi David and Grant, I missed that send to you when I have got this via Linux Samsung SoC mailing list. Hmm...I know, it's 38 merge winodw...so I'm not sure can be handled now. Anyway if any problems, please let me know. Thanks and Happy New year :) Best regards, Kgene. drivers/spi/Kconfig |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 1906840..37aec5e 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -310,8 +310,8 @@ config SPI_S3C24XX_GPIO config SPI_S3C64XX tristate Samsung S3C64XX series type SPI - depends on ARCH_S3C64XX EXPERIMENTAL - select S3C64XX_DMA + depends on (ARCH_S3C64XX || ARCH_S5P64X0) + select S3C64XX_DMA if !ARCH_S5P64X0 help SPI driver for Samsung S3C64XX and newer SoCs. -- 1.6.2.5 -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
[PATCH V3] spi: Enable SPI driver for S5P6440 and S5P6450
From: Abhilash Kesavan a.kesa...@samsung.com This patch enables the existing S3C64XX series SPI driver for S5P64X0 and removed dependency on EXPERIMENTAL because we don't need it now. Signed-off-by: Abhilash Kesavan a.kesa...@samsung.com Signed-off-by: Sangbeom Kim sbki...@samsung.com Cc: Jassi Brar jassi.b...@samsung.com Signed-off-by: Kukjin Kim kgene@samsung.com --- Changes since v2: - Changed dependency of S3C64XX_DMA Changes since v1: - Removed dependency on EXPERIMENTAL (Following is same with previous patch v2) Hi David and Grant, I missed that send to you when I have got this via Linux Samsung SoC mailing list. Hmm...I know, it's 38 merge winodw...so I'm not sure can be handled now. Anyway if any problems, please let me know. Thanks and Happy New year :) Best regards, Kgene. drivers/spi/Kconfig |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 1906840..37aec5e 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -310,8 +310,8 @@ config SPI_S3C24XX_GPIO config SPI_S3C64XX tristate Samsung S3C64XX series type SPI - depends on ARCH_S3C64XX EXPERIMENTAL - select S3C64XX_DMA + depends on (ARCH_S3C64XX || ARCH_S5P64X0) + select S3C64XX_DMA if ARCH_S3C64XX help SPI driver for Samsung S3C64XX and newer SoCs. -- 1.6.2.5 -- Protect Your Site and Customers from Malware Attacks Learn about various malware tactics and how to avoid them. Understand malware threats, the impact they can have on your business, and how you can protect your company and customers by using code signing. http://p.sf.net/sfu/oracle-sfdevnl ___ spi-devel-general mailing list spi-devel-general@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/spi-devel-general
