spi/omap: Adaptation to Device Tree
Subsystems (5)
cover spi/omap: Adaptation to Device Tree
Hi Grant,
You might think I'm harassing you with all these series, but it looks like you are the maintainer of all the stuff I care about for the moment :-)
Here are a couple of SPI patches + the addition of a SPI ethernet device needed for sdp4430 board.
This driver is still relying on a valid bus_number which is clearly bad. A cleanup is definitively needed, and will be done later.
This series is based on lo/master (a37cdd9) + for_3.4/dt_base branch to get the needed cleanup and fixes for OMAP.
Please note that due to the changes in the various OMAP DTS files, I have to base this series on top of my other DT series (gpio for example), otherwise the merge of the two series will generate some merge conflict in the DTS since they are both adding some new nodes at the exact same location.
I'm not sure how this should be handled.
This series is available here for reference:
git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt.git for_3.4/dt_spi_eth
Regards,
Benoit
Benoit Cousson (4):
spi/omap: Add DT support to McSPI driver arm/dts: OMAP4: Add SPI controller nodes arm/dts: OMAP3: Add SPI controller nodes arm/dts: omap4-sdp: Add ks8851 ethernet SPI device
Documentation/devicetree/bindings/spi/omap-spi.txt | 20 +++++++ arch/arm/boot/dts/omap3.dtsi | 32 +++++++++++ arch/arm/boot/dts/omap4-sdp.dts | 21 +++++++ arch/arm/boot/dts/omap4.dtsi | 32 +++++++++++ arch/arm/mach-omap2/devices.c | 4 +- drivers/spi/spi-omap2-mcspi.c | 56 +++++++++++++++++--- 6 files changed, 156 insertions(+), 9 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/omap-spi.txt
PATCH 1/4 spi/omap: Add DT support to McSPI driver
Add device tree support to the OMAP2+ McSPI driver. Add the bindings documentation.
Based on original code from Rajendra.
--- Documentation/devicetree/bindings/spi/omap-spi.txt | 20 +++++++ drivers/spi/spi-omap2-mcspi.c | 56 +++++++++++++++++--- 2 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/omap-spi.txt
Documentation/devicetree/bindings/spi/omap-spi.txt new file +20 -0
@@ -0,0 +1,20 @@ +OMAP2+ McSPI device + +Required properties: +- compatible : + - "ti,omap2-spi" for OMAP2 & OMAP3. + - "ti,omap4-spi" for OMAP4+. +- ti,spi-num-cs : Number of chipselect supported by the instance. +- ti,hwmods: Name of the hwmod associated to the McSPI + + +Example: + +mcspi1: mcspi at 1 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "ti,omap4-mcspi"; + ti,hwmods = "mcspi1"; + ti,spi-num-cs = <4>; +}; +
drivers/spi/spi-omap2-mcspi.c +48 -8
97 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 1/4 spi/omap: Add DT support to McSPI driver
Quoted 23 lines · Benoit Cousson
Add device tree support to the OMAP2+ McSPI driver. Add the bindings documentation.
Based on original code from Rajendra.
Signed-off-by Benoit Cousson <[email protected]>Cc Grant Likely <[email protected]>Cc Rajendra Nayak <[email protected]>--- Documentation/devicetree/bindings/spi/omap-spi.txt | 20 +++++++ drivers/spi/spi-omap2-mcspi.c | 56 +++++++++++++++++--- 2 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/omap-spi.txtDocumentation/devicetree/bindings/spi/omap-spi.txt new file +3
-0@@ -0,0 +1,20 @@ +OMAP2+ McSPI device + +Required properties:
Documentation/devicetree/bindings/spi/omap-spi.txt line 13
Quoted 10 lines
Documentation/devicetree/bindings/spi/omap-spi.txt new file +10
-0+- compatible : + - "ti,omap2-spi" for OMAP2 & OMAP3. + - "ti,omap4-spi" for OMAP4+. +- ti,spi-num-cs : Number of chipselect supported by the instance. +- ti,hwmods: Name of the hwmod associated to the McSPI + + +Example: + +mcspi1: mcspi at 1 {
I don't recall if there's a generic name defined but just "spi" would probably be better. Also, shouldn't this be the base address?
Otherwise, for the series:
Quoted 113 lines
Documentation/devicetree/bindings/spi/omap-spi.txt new file +7
-0+ #address-cells = <1>; + #size-cells = <0>; + compatible = "ti,omap4-mcspi"; + ti,hwmods = "mcspi1"; + ti,spi-num-cs = <4>; +}; +drivers/spi/spi-omap2-mcspi.c +48
-8@@ -34,6 +34,8 @@#include <linux/io.h> #include <linux/slab.h> #include <linux/pm_runtime.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/spi/spi.h> @@ -1079,15 +1081,39 @@ static int omap_mcspi_runtime_resume(struct device *dev)return 0 ; } +static struct omap2_mcspi_platform_config omap2_pdata = { + .regs_offset =0 , +}; + +static struct omap2_mcspi_platform_config omap4_pdata = { + .regs_offset =OMAP4_MCSPI_REG_OFFSET , +}; + +static const struct of_device_id omap_mcspi_of_match[] = { + { + .compatible ="ti,omap2-mcspi" , + .data = &omap2_pdata, + }, + { + .compatible ="ti,omap4-mcspi" , + .data = &omap4_pdata, + }, + { }, +}; +MODULE_DEVICE_TABLE (of, omap_mcspi_of_match);static int __init omap2_mcspi_probe (struct platform_device *pdev) {struct spi_master *master; -struct omap2_mcspi_platform_config *pdata = pdev->dev.platform_data; +struct omap2_mcspi_platform_config *pdata;struct omap2_mcspi *mcspi;struct resource *r;int status =0 , i;char wq_name[20 ]; +u32 regs_offset =0 ; +static int bus_num =1 ; +struct device_node *node = pdev->dev.of_node; +const struct of_device_id *match; master =spi_alloc_master (&pdev->dev,sizeof *mcspi);if (master ==NULL ) {@@ -1098,13 +1124,26 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)/* the spi->mode bits understood by this driver: */ master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ; -if (pdev->id !=-1 ) - master->bus_num = pdev->id; - master->setup = omap2_mcspi_setup; master->transfer = omap2_mcspi_transfer; master->cleanup = omap2_mcspi_cleanup; - master->num_chipselect = pdata->num_cs; + master->dev.of_node = node; + + match =of_match_device (omap_mcspi_of_match, &pdev->dev); +if (match) { +u32 num_cs =1 ;/* default number of chipselect */ + pdata = match->data; + +of_property_read_u32 (node,"ti,spi-num-cs" , &num_cs); + master->num_chipselect = num_cs; + master->bus_num = bus_num++; + }else { + pdata = pdev->dev.platform_data; + master->num_chipselect = pdata->num_cs; +if (pdev->id !=-1 ) + master->bus_num = pdev->id; + } + regs_offset = pdata->regs_offset;dev_set_drvdata (&pdev->dev, master);@@ -1124,8 +1163,8 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) goto free_master; } - r->start += pdata->regs_offset; - r->end += pdata->regs_offset; + r->start += regs_offset; + r->end += regs_offset; mcspi->phys = r->start;if (!request_mem_region (r->start,resource_size (r),dev_name (&pdev->dev))) {@@ -1285,7 +1324,8 @@ static struct platform_driver omap2_mcspi_driver = { .driver = { .name = "omap2_mcspi", .owner = THIS_MODULE, - .pm = &omap2_mcspi_pm_ops + .pm = &omap2_mcspi_pm_ops, + .of_match_table = omap_mcspi_of_match, }, .remove = __exit_p(omap2_mcspi_remove), };
PATCH 1/4 spi/omap: Add DT support to McSPI driver
Quoted 38 lines · Rob Herring
Quoted 23 lines · Benoit Cousson
Add device tree support to the OMAP2+ McSPI driver. Add the bindings documentation.
Based on original code from Rajendra.
Signed-off-by Benoit Cousson <[email protected]>Cc Grant Likely <[email protected]>Cc Rajendra Nayak <[email protected]>--- Documentation/devicetree/bindings/spi/omap-spi.txt | 20 +++++++ drivers/spi/spi-omap2-mcspi.c | 56 +++++++++++++++++--- 2 files changed, 68 insertions(+), 8 deletions(-) create mode 100644 Documentation/devicetree/bindings/spi/omap-spi.txtDocumentation/devicetree/bindings/spi/omap-spi.txt new file +3
-0@@ -0,0 +1,20 @@ +OMAP2+ McSPI device + +Required properties:Documentation/devicetree/bindings/spi/omap-spi.txt line 13
Quoted 10 lines
Documentation/devicetree/bindings/spi/omap-spi.txt new file +10
-0+- compatible : + - "ti,omap2-spi" for OMAP2 & OMAP3. + - "ti,omap4-spi" for OMAP4+. +- ti,spi-num-cs : Number of chipselect supported by the instance. +- ti,hwmods: Name of the hwmod associated to the McSPI + + +Example: + +mcspi1: mcspi at 1 {I don't recall if there's a generic name defined but just "spi" would probably be better. Also, shouldn't this be the base address?
Quoted 3 lines
Otherwise, for the series:
Acked-by Rob Herring <[email protected]>
Yes, use the generic names recommended practice and name the node spi@<address>.
g.
Quoted 116 lines
Quoted 115 lines
Documentation/devicetree/bindings/spi/omap-spi.txt new file +7
-0+ #address-cells = <1>; + #size-cells = <0>; + compatible = "ti,omap4-mcspi"; + ti,hwmods = "mcspi1"; + ti,spi-num-cs = <4>; +}; +drivers/spi/spi-omap2-mcspi.c +48
-8@@ -34,6 +34,8 @@#include <linux/io.h> #include <linux/slab.h> #include <linux/pm_runtime.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/spi/spi.h> @@ -1079,15 +1081,39 @@ static int omap_mcspi_runtime_resume(struct device *dev)return 0 ; } +static struct omap2_mcspi_platform_config omap2_pdata = { + .regs_offset =0 , +}; + +static struct omap2_mcspi_platform_config omap4_pdata = { + .regs_offset =OMAP4_MCSPI_REG_OFFSET , +}; + +static const struct of_device_id omap_mcspi_of_match[] = { + { + .compatible ="ti,omap2-mcspi" , + .data = &omap2_pdata, + }, + { + .compatible ="ti,omap4-mcspi" , + .data = &omap4_pdata, + }, + { }, +}; +MODULE_DEVICE_TABLE (of, omap_mcspi_of_match);static int __init omap2_mcspi_probe (struct platform_device *pdev) {struct spi_master *master; -struct omap2_mcspi_platform_config *pdata = pdev->dev.platform_data; +struct omap2_mcspi_platform_config *pdata;struct omap2_mcspi *mcspi;struct resource *r;int status =0 , i;char wq_name[20 ]; +u32 regs_offset =0 ; +static int bus_num =1 ; +struct device_node *node = pdev->dev.of_node; +const struct of_device_id *match; master =spi_alloc_master (&pdev->dev,sizeof *mcspi);if (master ==NULL ) {@@ -1098,13 +1124,26 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)/* the spi->mode bits understood by this driver: */ master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ; -if (pdev->id !=-1 ) - master->bus_num = pdev->id; - master->setup = omap2_mcspi_setup; master->transfer = omap2_mcspi_transfer; master->cleanup = omap2_mcspi_cleanup; - master->num_chipselect = pdata->num_cs; + master->dev.of_node = node; + + match =of_match_device (omap_mcspi_of_match, &pdev->dev); +if (match) { +u32 num_cs =1 ;/* default number of chipselect */ + pdata = match->data; + +of_property_read_u32 (node,"ti,spi-num-cs" , &num_cs); + master->num_chipselect = num_cs; + master->bus_num = bus_num++; + }else { + pdata = pdev->dev.platform_data; + master->num_chipselect = pdata->num_cs; +if (pdev->id !=-1 ) + master->bus_num = pdev->id; + } + regs_offset = pdata->regs_offset;dev_set_drvdata (&pdev->dev, master);@@ -1124,8 +1163,8 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) goto free_master; } - r->start += pdata->regs_offset; - r->end += pdata->regs_offset; + r->start += regs_offset; + r->end += regs_offset; mcspi->phys = r->start;if (!request_mem_region (r->start,resource_size (r),dev_name (&pdev->dev))) {@@ -1285,7 +1324,8 @@ static struct platform_driver omap2_mcspi_driver = { .driver = { .name = "omap2_mcspi", .owner = THIS_MODULE, - .pm = &omap2_mcspi_pm_ops + .pm = &omap2_mcspi_pm_ops, + .of_match_table = omap_mcspi_of_match, }, .remove = __exit_p(omap2_mcspi_remove), };
PATCH 1/4 spi/omap: Add DT support to McSPI driver
In reply to Rob HerringQuoted 29 lines · Rob Herring
Quoted 28 lines · Benoit Cousson
Add device tree support to the OMAP2+ McSPI driver. Add the bindings documentation.
Based on original code from Rajendra.
Signed-off-by Benoit Cousson<[email protected]>Cc Grant Likely<[email protected]>Cc Rajendra Nayak<[email protected]>--- Documentation/devicetree/bindings/spi/omap-spi.txt | 20 +++++++ drivers/spi/spi-omap2-mcspi.c | 56 +++++++++++++++++--- 2 files changed, 68 insertions(+), 8 deletions(-)create mode 100644
Documentation/devicetree/bindings/spi/omap-spi.txtDocumentation/devicetree/bindings/spi/omap-spi.txt new file +8
-0@@ -0,0 +1,20 @@ +OMAP2+ McSPI device + +Required properties: +- compatible : + - "ti,omap2-spi" for OMAP2& OMAP3. + - "ti,omap4-spi" for OMAP4+. +- ti,spi-num-cs : Number of chipselect supported by the instance. +- ti,hwmods: Name of the hwmod associated to the McSPI
Quoted 8 lines
Documentation/devicetree/bindings/spi/omap-spi.txt line 13
Quoted 5 lines
Documentation/devicetree/bindings/spi/omap-spi.txt new file +5
-0+ + +Example: + +mcspi1: mcspi at 1 {I don't recall if there's a generic name defined but just "spi" would probably be better.
I was wondering as well, but based on Grant further comment it looks it is the case.
I couldn't find any list of generic name in the bindings documentation. Is there some place we can get that?
Quoted 1 line
Also, shouldn't this be the base address?
Yeah, it should, I've just explained the reason of this OMAP irregularity in my answer to Grant. Let see if he'll be convinced or not :-)
Quoted 3 lines
Otherwise, for the series:
Acked-by Rob Herring<[email protected]>
Thanks,
Benoit
Quoted 116 lines
Quoted 115 lines
Documentation/devicetree/bindings/spi/omap-spi.txt new file +7
-0+ #address-cells =<1>; + #size-cells =<0>; + compatible = "ti,omap4-mcspi"; + ti,hwmods = "mcspi1"; + ti,spi-num-cs =<4>; +}; +drivers/spi/spi-omap2-mcspi.c +48
-8@@ -34,6 +34,8 @@#include <linux/io.h> #include <linux/slab.h> #include <linux/pm_runtime.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <linux/spi/spi.h> @@ -1079,15 +1081,39 @@ static int omap_mcspi_runtime_resume(struct device *dev)return 0 ; } +static struct omap2_mcspi_platform_config omap2_pdata = { + .regs_offset =0 , +}; + +static struct omap2_mcspi_platform_config omap4_pdata = { + .regs_offset =OMAP4_MCSPI_REG_OFFSET , +}; + +static const struct of_device_id omap_mcspi_of_match[] = { + { + .compatible ="ti,omap2-mcspi" , + .data =&omap2_pdata, + }, + { + .compatible ="ti,omap4-mcspi" , + .data =&omap4_pdata, + }, + { }, +}; +MODULE_DEVICE_TABLE (of, omap_mcspi_of_match);static int __init omap2_mcspi_probe (struct platform_device *pdev) {struct spi_master *master; -struct omap2_mcspi_platform_config *pdata = pdev->dev.platform_data; +struct omap2_mcspi_platform_config *pdata;struct omap2_mcspi *mcspi;struct resource *r;int status =0 , i;char wq_name[20 ]; +u32 regs_offset =0 ; +static int bus_num =1 ; +struct device_node *node = pdev->dev.of_node; +const struct of_device_id *match; master =spi_alloc_master (&pdev->dev,sizeof *mcspi);if (master ==NULL ) {@@ -1098,13 +1124,26 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev)/* the spi->mode bits understood by this driver: */ master->mode_bits =SPI_CPOL |SPI_CPHA |SPI_CS_HIGH ; -if (pdev->id !=-1 ) - master->bus_num = pdev->id; - master->setup = omap2_mcspi_setup; master->transfer = omap2_mcspi_transfer; master->cleanup = omap2_mcspi_cleanup; - master->num_chipselect = pdata->num_cs; + master->dev.of_node = node; + + match =of_match_device (omap_mcspi_of_match,&pdev->dev); +if (match) { +u32 num_cs =1 ;/* default number of chipselect */ + pdata = match->data; + +of_property_read_u32 (node,"ti,spi-num-cs" ,&num_cs); + master->num_chipselect = num_cs; + master->bus_num = bus_num++; + }else { + pdata = pdev->dev.platform_data; + master->num_chipselect = pdata->num_cs; +if (pdev->id !=-1 ) + master->bus_num = pdev->id; + } + regs_offset = pdata->regs_offset;dev_set_drvdata (&pdev->dev, master);@@ -1124,8 +1163,8 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) goto free_master; } - r->start += pdata->regs_offset; - r->end += pdata->regs_offset; + r->start += regs_offset; + r->end += regs_offset; mcspi->phys = r->start;if (!request_mem_region (r->start,resource_size (r),dev_name (&pdev->dev))) {@@ -1285,7 +1324,8 @@ static struct platform_driver omap2_mcspi_driver = { .driver = { .name = "omap2_mcspi", .owner = THIS_MODULE, - .pm = &omap2_mcspi_pm_ops + .pm = &omap2_mcspi_pm_ops, + .of_match_table = omap_mcspi_of_match, }, .remove = __exit_p(omap2_mcspi_remove), };
PATCH 2/4 arm/dts: OMAP4: Add SPI controller nodes
In reply to Benoit CoussonAdd the 4 McSPI controller nodes present in an OMAP4 device.
Remove SPI static device initialisation if DT is populated.
--- arch/arm/boot/dts/omap4.dtsi | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/devices.c | 4 +++- 2 files changed, 35 insertions(+), 1 deletions(-)
arch/arm/boot/dts/omap4.dtsi +32 -0
@@ -209,5 +209,37 @@ #size-cells = <0>; ti,hwmods = "i2c4"; }; + + mcspi1: mcspi at 1 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi1"; + ti,spi-num-cs = <4>; + }; + + mcspi2: mcspi at 2 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi2"; + ti,spi-num-cs = <2>; + }; + + mcspi3: mcspi at 3 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi3"; + ti,spi-num-cs = <2>; + }; + + mcspi4: mcspi at 4 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi4"; + ti,spi-num-cs = <1>; + }; }; };
arch/arm/mach-omap2/devices.c +3 -1
@@ -725,7 +725,9 @@ static int __init omap2_init_devices(void)omap_init_dmic ();omap_init_camera ();omap_init_mbox (); -omap_init_mcspi (); +/* If dtb is there, the devices will be created dynamically */ +if (!of_have_populated_dt ()) +omap_init_mcspi ();omap_init_pmu ();omap_hdq_init ();omap_init_sti ();
Signature · 1 line
1.7.0.4
PATCH 2/4 arm/dts: OMAP4: Add SPI controller nodes
Quoted 16 lines · Benoit Cousson
Add the 4 McSPI controller nodes present in an OMAP4 device.
Remove SPI static device initialisation if DT is populated.
Signed-off-by Benoit Cousson <[email protected]>Cc Grant Likely <[email protected]>--- arch/arm/boot/dts/omap4.dtsi | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/devices.c | 4 +++- 2 files changed, 35 insertions(+), 1 deletions(-)arch/arm/boot/dts/omap4.dtsi +0
-0
arch/arm/boot/dts/omap4.dtsi line 218
Quoted 10 lines
arch/arm/boot/dts/omap4.dtsi +7
-0@@ -209,5 +209,37 @@ #size-cells = <0>; ti,hwmods = "i2c4"; }; + + mcspi1: mcspi at 1 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi1"; + ti,spi-num-cs = <4>;
No reg or interrupts properties? And the @<num> in the name must match the first entry in a reg property. This looks wrong.
Quoted 50 lines
arch/arm/boot/dts/omap4.dtsi +25
-0+ }; + + mcspi2: mcspi at 2 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi2"; + ti,spi-num-cs = <2>; + }; + + mcspi3: mcspi at 3 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi3"; + ti,spi-num-cs = <2>; + }; + + mcspi4: mcspi at 4 { + compatible = "ti,omap4-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi4"; + ti,spi-num-cs = <1>; + }; }; };arch/arm/mach-omap2/devices.c +3
-1@@ -725,7 +725,9 @@ static int __init omap2_init_devices(void)omap_init_dmic ();omap_init_camera ();omap_init_mbox (); -omap_init_mcspi (); +/* If dtb is there, the devices will be created dynamically */ +if (!of_have_populated_dt ()) +omap_init_mcspi ();omap_init_pmu ();omap_hdq_init ();omap_init_sti ();Signature · 7 lines
1.7.0.4 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel at lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH 2/4 arm/dts: OMAP4: Add SPI controller nodes
Quoted 22 lines · Grant Likely
Quoted 21 lines · Benoit Cousson
Add the 4 McSPI controller nodes present in an OMAP4 device.
Remove SPI static device initialisation if DT is populated.
Signed-off-by Benoit Cousson<[email protected]>Cc Grant Likely<[email protected]>--- arch/arm/boot/dts/omap4.dtsi | 32 ++++++++++++++++++++++++++++++++ arch/arm/mach-omap2/devices.c | 4 +++- 2 files changed, 35 insertions(+), 1 deletions(-)arch/arm/boot/dts/omap4.dtsi +2
-0@@ -209,5 +209,37 @@ #size-cells =<0>; ti,hwmods = "i2c4"; }; + + mcspi1: mcspi at 1 {
Quoted 8 lines
arch/arm/boot/dts/omap4.dtsi line 218
Quoted 5 lines
arch/arm/boot/dts/omap4.dtsi +5
-0+ compatible = "ti,omap4-mcspi"; + #address-cells =<1>; + #size-cells =<0>; + ti,hwmods = "mcspi1"; + ti,spi-num-cs =<4>;No reg or interrupts properties? And the @<num> in the name must match the first entry in a reg property. This looks wrong.
Well, it is done on purpose :-)
The idea being that since reg, irq and dma are still provided by hwmod data, I'd rather not populate this information here at all and thus not confuse people that will then think that these entries are valid and useful.
At some point, when I'll be able to migrate some of the hwmod data to DT, I will use the hwmod Python generator to generate the OMAP DTS and then populate the proper reg, interrupts and dma-requests.
It does not match with the DT convention yet, but this is to emphasis the temporary situation due to hwmod data still in use to build a device.
@<num> might be populated, but again the point was to be *consistent* in the overall inconsistency with regards to DT convention.
Does that make sense or not at all?
Regards,
Benoit
PATCH 3/4 arm/dts: OMAP3: Add SPI controller nodes
In reply to Benoit CoussonAdd the 4 McSPI controller nodes present in an OMAP3 device.
--- arch/arm/boot/dts/omap3.dtsi | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap3.dtsi +32 -0
@@ -167,5 +167,37 @@ #size-cells = <0>; ti,hwmods = "i2c3"; }; + + mcspi1: mcspi at 1 { + compatible = "ti,omap2-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi1"; + ti,spi-num-cs = <4>; + }; + + mcspi2: mcspi at 2 { + compatible = "ti,omap2-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi2"; + ti,spi-num-cs = <2>; + }; + + mcspi3: mcspi at 3 { + compatible = "ti,omap2-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi3"; + ti,spi-num-cs = <2>; + }; + + mcspi4: mcspi at 4 { + compatible = "ti,omap2-mcspi"; + #address-cells = <1>; + #size-cells = <0>; + ti,hwmods = "mcspi4"; + ti,spi-num-cs = <1>; + }; }; };
Signature · 1 line
1.7.0.4
PATCH 4/4 arm/dts: omap4-sdp: Add ks8851 ethernet SPI device
In reply to Benoit CoussonAdd an ethernet SPI chip in the OMAP4 SDP/Blaze board DTS file.
Add a fixed regulator node controlled by a GPIO line to supply the ethernet chip.
Based on original code from Rajendra.
--- arch/arm/boot/dts/omap4-sdp.dts | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-)
arch/arm/boot/dts/omap4-sdp.dts +21 -0
@@ -17,6 +17,16 @@ device_type = "memory"; reg = <0x80000000 0x40000000>; /* 1 GB */ }; + + vdd_eth: fixedregulator at 0 { + compatible = "regulator-fixed"; + regulator-name = "VDD_ETH"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + gpio = <&gpio2 16 0>; /* gpio line 48 */ + enable-active-high; + regulator-boot-on; + }; }; &i2c1 {
@@ -70,3 +80,14 @@ reg = <0x1e>; }; }; + +&mcspi1 { + eth at 0 { + compatible = "ks8851"; + spi-max-frequency = <24000000>; + reg = <0>; + interrupt-parent = <&gpio2>; + interrupts = <2>; /* gpio line 34 */ + vdd-supply = <&vdd_eth>; + }; +};
Signature · 1 line
1.7.0.4
cover spi/omap: Adaptation to Device Tree
In reply to Benoit CoussonQuoted 11 lines · Benoit Cousson
Hi Grant,
You might think I'm harassing you with all these series, but it looks like you are the maintainer of all the stuff I care about for the moment :-)
Here are a couple of SPI patches + the addition of a SPI ethernet device needed for sdp4430 board.
This driver is still relying on a valid
bus_numberwhich is clearly bad. A cleanup is definitively needed, and will be done later.
Quoted 7 lines
This series is based on lo/master (a37cdd9) + for_3.4/dt_base branch to get the needed cleanup and fixes for OMAP.
Please note that due to the changes in the various OMAP DTS files, I have to base this series on top of my other DT series (gpio for example), otherwise the merge of the two series will generate some merge conflict in the DTS since they are both adding some new nodes at the exact same location.
Merge conflicts of this type are just fine when they are both adding new stuff. The resolution of such conflicts are easy.
g.