Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 14 October 2012 15:31, Jean-Christophe PLAGNIOL-VILLARD
wrote:
> On 19:40 Sat 13 Oct , Viresh Kumar wrote:
>> On 13 October 2012 19:38, Viresh Kumar wrote:
>> > On 13 October 2012 17:52, Jean-Christophe PLAGNIOL-VILLARD
>> > wrote:
>> >> On 14:18 Sat 13 Oct , Viresh Kumar wrote:
>> >>>On Oct 13, 2012 12:16 PM, "Jean-Christophe PLAGNIOL-VILLARD"
>> >>> wrote:
>> >>>>
>> >>>> On 22:42 Fri 12 Oct , Viresh Kumar wrote:
>> >>>> > On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD
>> >>>> > wrote:
>> >>>> > >> >> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE,
>> >>> NULL,
>> >>>"cf"),
>> >>>> > >> > ?/
>> >>>> > >>
>> >>>> > >> Sorry. can't get it :(
>> >>>> > > what is the "cf" as paltfrom data
>> >>>> >
>> >>>> > This is dma bus_id string, which matches with what is passed from
>> >>> dtb.
>> >>>> so pass if via dtb too
>> >>>
>> >>>Yes. Already passed in 13xx.dtsi.
>>
>> Probably some confusion here. What i meant to say here is, dmac's
>> DT slave info has a node for cf and cf driver expects this string to come
>> via platform data currently.
>
> so use a phandle to connect them
The purpose of this patchset wasn't to fix how CF driver sends its filter
routine and its parameter. CF driver would be fixed later by ST guys.
--
viresh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 19:40 Sat 13 Oct , Viresh Kumar wrote:
> On 13 October 2012 19:38, Viresh Kumar wrote:
> > On 13 October 2012 17:52, Jean-Christophe PLAGNIOL-VILLARD
> > wrote:
> >> On 14:18 Sat 13 Oct , Viresh Kumar wrote:
> >>>On Oct 13, 2012 12:16 PM, "Jean-Christophe PLAGNIOL-VILLARD"
> >>> wrote:
> >>>>
> >>>> On 22:42 Fri 12 Oct , Viresh Kumar wrote:
> >>>> > On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD
> >>>> > wrote:
> >>>> > >> >> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE,
> >>> NULL,
> >>>"cf"),
> >>>> > >> > ?/
> >>>> > >>
> >>>> > >> Sorry. can't get it :(
> >>>> > > what is the "cf" as paltfrom data
> >>>> >
> >>>> > This is dma bus_id string, which matches with what is passed from
> >>> dtb.
> >>>> so pass if via dtb too
> >>>
> >>>Yes. Already passed in 13xx.dtsi.
>
> Probably some confusion here. What i meant to say here is, dmac's
> DT slave info has a node for cf and cf driver expects this string to come
> via platform data currently.
so use a phandle to connect them
Best Regards,
J.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 19:40 Sat 13 Oct , Viresh Kumar wrote: On 13 October 2012 19:38, Viresh Kumar viresh.ku...@linaro.org wrote: On 13 October 2012 17:52, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 14:18 Sat 13 Oct , Viresh Kumar wrote: On Oct 13, 2012 12:16 PM, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 22:42 Fri 12 Oct , Viresh Kumar wrote: On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: + OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf), ?/ Sorry. can't get it :( what is the cf as paltfrom data This is dma bus_id string, which matches with what is passed from dtb. so pass if via dtb too Yes. Already passed in 13xx.dtsi. Probably some confusion here. What i meant to say here is, dmac's DT slave info has a node for cf and cf driver expects this string to come via platform data currently. so use a phandle to connect them Best Regards, J. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 14 October 2012 15:31, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 19:40 Sat 13 Oct , Viresh Kumar wrote: On 13 October 2012 19:38, Viresh Kumar viresh.ku...@linaro.org wrote: On 13 October 2012 17:52, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 14:18 Sat 13 Oct , Viresh Kumar wrote: On Oct 13, 2012 12:16 PM, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 22:42 Fri 12 Oct , Viresh Kumar wrote: On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: + OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf), ?/ Sorry. can't get it :( what is the cf as paltfrom data This is dma bus_id string, which matches with what is passed from dtb. so pass if via dtb too Yes. Already passed in 13xx.dtsi. Probably some confusion here. What i meant to say here is, dmac's DT slave info has a node for cf and cf driver expects this string to come via platform data currently. so use a phandle to connect them The purpose of this patchset wasn't to fix how CF driver sends its filter routine and its parameter. CF driver would be fixed later by ST guys. -- viresh -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 13 October 2012 19:38, Viresh Kumar wrote:
> On 13 October 2012 17:52, Jean-Christophe PLAGNIOL-VILLARD
> wrote:
>> On 14:18 Sat 13 Oct , Viresh Kumar wrote:
>>>On Oct 13, 2012 12:16 PM, "Jean-Christophe PLAGNIOL-VILLARD"
>>> wrote:
>>>>
>>>> On 22:42 Fri 12 Oct , Viresh Kumar wrote:
>>>> > On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD
>>>> > wrote:
>>>> > >> >> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL,
>>>"cf"),
>>>> > >> > ?/
>>>> > >>
>>>> > >> Sorry. can't get it :(
>>>> > > what is the "cf" as paltfrom data
>>>> >
>>>> > This is dma bus_id string, which matches with what is passed from
>>> dtb.
>>>> so pass if via dtb too
>>>
>>>Yes. Already passed in 13xx.dtsi.
Probably some confusion here. What i meant to say here is, dmac's
DT slave info has a node for cf and cf driver expects this string to come
via platform data currently.
>> so why do you keep the AUXDATA
>
> Because the compact flash driver expects it via platform data and not
> via DT. yes, it
> can be changed, but that wasn't the target of this patchset. If it has
> to be done, then
> it has to be done separately by ST guys.
--
viresh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 13 October 2012 17:52, Jean-Christophe PLAGNIOL-VILLARD
wrote:
> On 14:18 Sat 13 Oct , Viresh Kumar wrote:
>>On Oct 13, 2012 12:16 PM, "Jean-Christophe PLAGNIOL-VILLARD"
>> wrote:
>>>
>>> On 22:42 Fri 12 Oct , Viresh Kumar wrote:
>>> > On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD
>>> > wrote:
>>> > >> >> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL,
>>"cf"),
>>> > >> > ?/
>>> > >>
>>> > >> Sorry. can't get it :(
>>> > > what is the "cf" as paltfrom data
>>> >
>>> > This is dma bus_id string, which matches with what is passed from dtb.
>>> so pass if via dtb too
>>
>>Yes. Already passed in 13xx.dtsi.
> so why do you keep the AUXDATA
Because the compact flash driver expects it via platform data and not
via DT. yes, it
can be changed, but that wasn't the target of this patchset. If it has
to be done, then
it has to be done separately by ST guys.
--
viresh
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 14:18 Sat 13 Oct , Viresh Kumar wrote:
>On Oct 13, 2012 12:16 PM, "Jean-Christophe PLAGNIOL-VILLARD"
> wrote:
>>
>> On 22:42 Fri 12 Oct , Viresh Kumar wrote:
>> > On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD
>> > wrote:
>> > >> >> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL,
>"cf"),
>> > >> > ?/
>> > >>
>> > >> Sorry. can't get it :(
>> > > what is the "cf" as paltfrom data
>> >
>> > This is dma bus_id string, which matches with what is passed from dtb.
>> so pass if via dtb too
>
>Yes. Already passed in 13xx.dtsi.
so why do you keep the AUXDATA
Best Regards,
J.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 22:42 Fri 12 Oct , Viresh Kumar wrote:
> On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD
> wrote:
> >> >> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, "cf"),
> >> > ?/
> >>
> >> Sorry. can't get it :(
> > what is the "cf" as paltfrom data
>
> This is dma bus_id string, which matches with what is passed from dtb.
so pass if via dtb too
Best Regards,
J.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 22:42 Fri 12 Oct , Viresh Kumar wrote: On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: + OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf), ?/ Sorry. can't get it :( what is the cf as paltfrom data This is dma bus_id string, which matches with what is passed from dtb. so pass if via dtb too Best Regards, J. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 14:18 Sat 13 Oct , Viresh Kumar wrote: On Oct 13, 2012 12:16 PM, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 22:42 Fri 12 Oct , Viresh Kumar wrote: On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: + OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf), ?/ Sorry. can't get it :( what is the cf as paltfrom data This is dma bus_id string, which matches with what is passed from dtb. so pass if via dtb too Yes. Already passed in 13xx.dtsi. so why do you keep the AUXDATA Best Regards, J. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 13 October 2012 17:52, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 14:18 Sat 13 Oct , Viresh Kumar wrote: On Oct 13, 2012 12:16 PM, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 22:42 Fri 12 Oct , Viresh Kumar wrote: On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: + OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf), ?/ Sorry. can't get it :( what is the cf as paltfrom data This is dma bus_id string, which matches with what is passed from dtb. so pass if via dtb too Yes. Already passed in 13xx.dtsi. so why do you keep the AUXDATA Because the compact flash driver expects it via platform data and not via DT. yes, it can be changed, but that wasn't the target of this patchset. If it has to be done, then it has to be done separately by ST guys. -- viresh -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 13 October 2012 19:38, Viresh Kumar viresh.ku...@linaro.org wrote: On 13 October 2012 17:52, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 14:18 Sat 13 Oct , Viresh Kumar wrote: On Oct 13, 2012 12:16 PM, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: On 22:42 Fri 12 Oct , Viresh Kumar wrote: On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: + OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf), ?/ Sorry. can't get it :( what is the cf as paltfrom data This is dma bus_id string, which matches with what is passed from dtb. so pass if via dtb too Yes. Already passed in 13xx.dtsi. Probably some confusion here. What i meant to say here is, dmac's DT slave info has a node for cf and cf driver expects this string to come via platform data currently. so why do you keep the AUXDATA Because the compact flash driver expects it via platform data and not via DT. yes, it can be changed, but that wasn't the target of this patchset. If it has to be done, then it has to be done separately by ST guys. -- viresh -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD
wrote:
>> >> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, "cf"),
>> > ?/
>>
>> Sorry. can't get it :(
> what is the "cf" as paltfrom data
This is dma bus_id string, which matches with what is passed from dtb.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 20:22 Fri 12 Oct , Viresh Kumar wrote:
> On 12 October 2012 20:18, Jean-Christophe PLAGNIOL-VILLARD
> wrote:
> >> static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = {
> >> - OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL,
> >> _dma_priv),
> >> - OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL,
> >> _plat_data),
> >> - OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL,
> >> _plat_data),
> >> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, "cf"),
> > ?/
>
> Sorry. can't get it :(
what is the "cf" as paltfrom data
Best Regards,
J.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
>
> /* others */
> -#define DMAC0_BASE UL(0xEA80)
> -#define DMAC1_BASE UL(0xEB00)
> #define MCIF_CF_BASE UL(0xB280)
>
> /* Devices present in SPEAr1310 */
> diff --git a/arch/arm/mach-spear13xx/spear1310.c
> b/arch/arm/mach-spear13xx/spear1310.c
> index 9fbbfc5..0e60195 100644
> --- a/arch/arm/mach-spear13xx/spear1310.c
> +++ b/arch/arm/mach-spear13xx/spear1310.c
> @@ -36,9 +36,7 @@ static struct pl022_ssp_controller ssp1_plat_data = {
>
> /* Add SPEAr1310 auxdata to pass platform data */
> static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = {
> - OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, _dma_priv),
> - OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL, _plat_data),
> - OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL, _plat_data),
> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, "cf"),
?/
> OF_DEV_AUXDATA("arm,pl022", SSP_BASE, NULL, _plat_data),
>
> OF_DEV_AUXDATA("arm,pl022", SPEAR1310_SSP1_BASE, NULL, _plat_data),
> diff --git a/arch/arm/mach-spear13xx/spear1340.c
> b/arch/arm/mach-spear13xx/spear1340.c
> index 081014f..7301f14 100644
> --- a/arch/arm/mach-spear13xx/spear1340.c
> +++ b/arch/arm/mach-spear13xx/spear1340.c
> @@ -20,7 +20,6 @@
> #include
> #include
> #include
> -#include
> #include
> #include
>
> @@ -78,26 +77,10 @@
> (SPEAR1340_MIPHY_OSC_BYPASS_EXT | \
> SPEAR1340_MIPHY_PLL_RATIO_TOP(25))
>
Best Regards,
J.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 12 October 2012 20:18, Jean-Christophe PLAGNIOL-VILLARD
wrote:
>> static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = {
>> - OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL,
>> _dma_priv),
>> - OF_DEV_AUXDATA("snps,dma-spear1340", DMAC0_BASE, NULL,
>> _plat_data),
>> - OF_DEV_AUXDATA("snps,dma-spear1340", DMAC1_BASE, NULL,
>> _plat_data),
>> + OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, "cf"),
> ?/
Sorry. can't get it :(
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
[PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
This patch adds dw_dmac's platform data to DT node. It also creates slave info
node for SPEAr13xx, for the devices which were using dw_dmac.
Signed-off-by: Viresh Kumar
---
V1->V2:
--
- renamed filter function
arch/arm/boot/dts/spear1340.dtsi | 19 ++
arch/arm/boot/dts/spear13xx.dtsi | 38
arch/arm/mach-spear13xx/include/mach/spear.h | 2 --
arch/arm/mach-spear13xx/spear1310.c | 4 +--
arch/arm/mach-spear13xx/spear1340.c | 27 +++---
arch/arm/mach-spear13xx/spear13xx.c | 54 ++--
6 files changed, 65 insertions(+), 79 deletions(-)
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index d71fe2a..8ea3f66 100644
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -24,6 +24,25 @@
status = "disabled";
};
+ dma@ea80 {
+ slave_info {
+ uart1_tx {
+ bus_id = "uart1_tx";
+ cfg_hi = <0x6000>; /* 0xC << 11 */
+ cfg_lo = <0>;
+ src_master = <0>;
+ dst_master = <1>;
+ };
+ uart1_tx {
+ bus_id = "uart1_tx";
+ cfg_hi = <0x680>; /* 0xD << 7 */
+ cfg_lo = <0>;
+ src_master = <1>;
+ dst_master = <0>;
+ };
+ };
+ };
+
spi1: spi@5d40 {
compatible = "arm,pl022", "arm,primecell";
reg = <0x5d40 0x1000>;
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index f7b84ac..f06bb50 100644
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -91,6 +91,37 @@
reg = <0xea80 0x1000>;
interrupts = <0 19 0x4>;
status = "disabled";
+
+ nr_channels = <8>;
+ chan_allocation_order = <1>;
+ chan_priority = <1>;
+ block_size = <0xfff>;
+ nr_masters = <2>;
+ data_width = <3 3 0 0>;
+
+ slave_info {
+ ssp0_tx {
+ bus_id = "ssp0_tx";
+ cfg_hi = <0x2000>; /* 0x4 << 11 */
+ cfg_lo = <0>;
+ src_master = <0>;
+ dst_master = <0>;
+ };
+ ssp0_rx {
+ bus_id = "ssp0_rx";
+ cfg_hi = <0x280>; /* 0x5 << 7 */
+ cfg_lo = <0>;
+ src_master = <0>;
+ dst_master = <0>;
+ };
+ cf {
+ bus_id = "cf";
+ cfg_hi = <0>;
+ cfg_lo = <0>;
+ src_master = <0>;
+ dst_master = <0>;
+ };
+ };
};
dma@eb00 {
@@ -98,6 +129,13 @@
reg = <0xeb00 0x1000>;
interrupts = <0 59 0x4>;
status = "disabled";
+
+ nr_channels = <8>;
+ chan_allocation_order = <1>;
+ chan_priority = <1>;
+ block_size = <0xfff>;
+ nr_masters = <2>;
+ data_width = <3 3 0 0>;
};
fsmc: flash@b000 {
diff --git a/arch/arm/mach-spear13xx/include/mach/spear.h
b/arch/arm/mach-spear13xx/include/mach/spear.h
index 07d90ac..71bf5b6 100644
--- a/arch/arm/mach-spear13xx/include/mach/spear.h
+++ b/arch/arm/mach-spear13xx/include/mach/spear.h
@@ -43,8 +43,6 @@
#define VA_L2CC_BASE IOMEM(UL(0xFB00))
/* others */
-#define DMAC0_BASE UL(0xEA80)
-#define DMAC1_BASE UL(0xEB00)
#define MCIF_CF_BASE UL(0xB280)
/* Devices present in SPEAr1310 */
diff --git a/arch/arm/mach-spear13xx/spear1310.c
[PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
This patch adds dw_dmac's platform data to DT node. It also creates slave info
node for SPEAr13xx, for the devices which were using dw_dmac.
Signed-off-by: Viresh Kumar viresh.ku...@linaro.org
---
V1-V2:
--
- renamed filter function
arch/arm/boot/dts/spear1340.dtsi | 19 ++
arch/arm/boot/dts/spear13xx.dtsi | 38
arch/arm/mach-spear13xx/include/mach/spear.h | 2 --
arch/arm/mach-spear13xx/spear1310.c | 4 +--
arch/arm/mach-spear13xx/spear1340.c | 27 +++---
arch/arm/mach-spear13xx/spear13xx.c | 54 ++--
6 files changed, 65 insertions(+), 79 deletions(-)
diff --git a/arch/arm/boot/dts/spear1340.dtsi b/arch/arm/boot/dts/spear1340.dtsi
index d71fe2a..8ea3f66 100644
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@ -24,6 +24,25 @@
status = disabled;
};
+ dma@ea80 {
+ slave_info {
+ uart1_tx {
+ bus_id = uart1_tx;
+ cfg_hi = 0x6000; /* 0xC 11 */
+ cfg_lo = 0;
+ src_master = 0;
+ dst_master = 1;
+ };
+ uart1_tx {
+ bus_id = uart1_tx;
+ cfg_hi = 0x680; /* 0xD 7 */
+ cfg_lo = 0;
+ src_master = 1;
+ dst_master = 0;
+ };
+ };
+ };
+
spi1: spi@5d40 {
compatible = arm,pl022, arm,primecell;
reg = 0x5d40 0x1000;
diff --git a/arch/arm/boot/dts/spear13xx.dtsi b/arch/arm/boot/dts/spear13xx.dtsi
index f7b84ac..f06bb50 100644
--- a/arch/arm/boot/dts/spear13xx.dtsi
+++ b/arch/arm/boot/dts/spear13xx.dtsi
@@ -91,6 +91,37 @@
reg = 0xea80 0x1000;
interrupts = 0 19 0x4;
status = disabled;
+
+ nr_channels = 8;
+ chan_allocation_order = 1;
+ chan_priority = 1;
+ block_size = 0xfff;
+ nr_masters = 2;
+ data_width = 3 3 0 0;
+
+ slave_info {
+ ssp0_tx {
+ bus_id = ssp0_tx;
+ cfg_hi = 0x2000; /* 0x4 11 */
+ cfg_lo = 0;
+ src_master = 0;
+ dst_master = 0;
+ };
+ ssp0_rx {
+ bus_id = ssp0_rx;
+ cfg_hi = 0x280; /* 0x5 7 */
+ cfg_lo = 0;
+ src_master = 0;
+ dst_master = 0;
+ };
+ cf {
+ bus_id = cf;
+ cfg_hi = 0;
+ cfg_lo = 0;
+ src_master = 0;
+ dst_master = 0;
+ };
+ };
};
dma@eb00 {
@@ -98,6 +129,13 @@
reg = 0xeb00 0x1000;
interrupts = 0 59 0x4;
status = disabled;
+
+ nr_channels = 8;
+ chan_allocation_order = 1;
+ chan_priority = 1;
+ block_size = 0xfff;
+ nr_masters = 2;
+ data_width = 3 3 0 0;
};
fsmc: flash@b000 {
diff --git a/arch/arm/mach-spear13xx/include/mach/spear.h
b/arch/arm/mach-spear13xx/include/mach/spear.h
index 07d90ac..71bf5b6 100644
--- a/arch/arm/mach-spear13xx/include/mach/spear.h
+++ b/arch/arm/mach-spear13xx/include/mach/spear.h
@@ -43,8 +43,6 @@
#define VA_L2CC_BASE IOMEM(UL(0xFB00))
/* others */
-#define DMAC0_BASE UL(0xEA80)
-#define DMAC1_BASE UL(0xEB00)
#define MCIF_CF_BASE UL(0xB280)
/* Devices present in SPEAr1310 */
diff --git a/arch/arm/mach-spear13xx/spear1310.c
b/arch/arm/mach-spear13xx/spear1310.c
index 9fbbfc5..0e60195 100644
---
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 12 October 2012 20:18, Jean-Christophe PLAGNIOL-VILLARD
plagn...@jcrosoft.com wrote:
static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = {
- OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL,
cf_dma_priv),
- OF_DEV_AUXDATA(snps,dma-spear1340, DMAC0_BASE, NULL,
dmac_plat_data),
- OF_DEV_AUXDATA(snps,dma-spear1340, DMAC1_BASE, NULL,
dmac_plat_data),
+ OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf),
?/
Sorry. can't get it :(
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
/* others */
-#define DMAC0_BASE UL(0xEA80)
-#define DMAC1_BASE UL(0xEB00)
#define MCIF_CF_BASE UL(0xB280)
/* Devices present in SPEAr1310 */
diff --git a/arch/arm/mach-spear13xx/spear1310.c
b/arch/arm/mach-spear13xx/spear1310.c
index 9fbbfc5..0e60195 100644
--- a/arch/arm/mach-spear13xx/spear1310.c
+++ b/arch/arm/mach-spear13xx/spear1310.c
@@ -36,9 +36,7 @@ static struct pl022_ssp_controller ssp1_plat_data = {
/* Add SPEAr1310 auxdata to pass platform data */
static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = {
- OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf_dma_priv),
- OF_DEV_AUXDATA(snps,dma-spear1340, DMAC0_BASE, NULL, dmac_plat_data),
- OF_DEV_AUXDATA(snps,dma-spear1340, DMAC1_BASE, NULL, dmac_plat_data),
+ OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf),
?/
OF_DEV_AUXDATA(arm,pl022, SSP_BASE, NULL, pl022_plat_data),
OF_DEV_AUXDATA(arm,pl022, SPEAR1310_SSP1_BASE, NULL, ssp1_plat_data),
diff --git a/arch/arm/mach-spear13xx/spear1340.c
b/arch/arm/mach-spear13xx/spear1340.c
index 081014f..7301f14 100644
--- a/arch/arm/mach-spear13xx/spear1340.c
+++ b/arch/arm/mach-spear13xx/spear1340.c
@@ -20,7 +20,6 @@
#include linux/of_platform.h
#include asm/hardware/gic.h
#include asm/mach/arch.h
-#include mach/dma.h
#include mach/generic.h
#include mach/spear.h
@@ -78,26 +77,10 @@
(SPEAR1340_MIPHY_OSC_BYPASS_EXT | \
SPEAR1340_MIPHY_PLL_RATIO_TOP(25))
Best Regards,
J.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 20:22 Fri 12 Oct , Viresh Kumar wrote:
On 12 October 2012 20:18, Jean-Christophe PLAGNIOL-VILLARD
plagn...@jcrosoft.com wrote:
static struct of_dev_auxdata spear1310_auxdata_lookup[] __initdata = {
- OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL,
cf_dma_priv),
- OF_DEV_AUXDATA(snps,dma-spear1340, DMAC0_BASE, NULL,
dmac_plat_data),
- OF_DEV_AUXDATA(snps,dma-spear1340, DMAC1_BASE, NULL,
dmac_plat_data),
+ OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf),
?/
Sorry. can't get it :(
what is the cf as paltfrom data
Best Regards,
J.
--
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH V2 3/3] ARM: SPEAr13xx: Pass DW DMAC platform data from DT
On 12 October 2012 21:51, Jean-Christophe PLAGNIOL-VILLARD plagn...@jcrosoft.com wrote: + OF_DEV_AUXDATA(arasan,cf-spear1340, MCIF_CF_BASE, NULL, cf), ?/ Sorry. can't get it :( what is the cf as paltfrom data This is dma bus_id string, which matches with what is passed from dtb. -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
