* [PATCH 1/6] ARM: dts: pxa: add dma controller
@ 2015-06-06 21:09 Robert Jarzmik
2015-06-06 21:09 ` [PATCH 2/6] ARM: dts: pxa: add dma engine node to pxa3xx-nand Robert Jarzmik
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Robert Jarzmik @ 2015-06-06 21:09 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala
Cc: devicetree, linux-arm-kernel, linux-kernel, Robert Jarzmik
Add the SoC embedded DMA controller, shared with the mmp architecture.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
arch/arm/boot/dts/pxa27x.dtsi | 9 +++++++++
arch/arm/boot/dts/pxa3xx.dtsi | 9 +++++++++
2 files changed, 18 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 90b9971..506db86 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -7,6 +7,15 @@
compatible = "marvell,pxa27x";
pxabus {
+ pdma: dma-controller@40000000 {
+ compatible = "marvell,pdma-1.0";
+ reg = <0x40000000 0x10000>;
+ interrupts = <25>;
+ #dma-channels = <32>;
+ #dma-cells = <2>;
+ status = "okay";
+ };
+
pxairq: interrupt-controller@40d00000 {
marvell,intc-priority;
marvell,intc-nr-irqs = <34>;
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 7ad0b17..4eb1563 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -6,6 +6,15 @@
compatible = "marvell,pxa3xx";
pxabus {
+ pdma: dma-controller@40000000 {
+ compatible = "marvell,pdma-1.0";
+ reg = <0x40000000 0x10000>;
+ interrupts = <25>;
+ #dma-channels = <32>;
+ #dma-cells = <2>;
+ status = "okay";
+ };
+
pwri2c: i2c@40f500c0 {
compatible = "mrvl,pwri2c";
reg = <0x40f500c0 0x30>;
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/6] ARM: dts: pxa: add dma engine node to pxa3xx-nand
2015-06-06 21:09 [PATCH 1/6] ARM: dts: pxa: add dma controller Robert Jarzmik
@ 2015-06-06 21:09 ` Robert Jarzmik
2015-06-06 21:09 ` [PATCH 3/6] ARM: dts: pxa: add dma pxamci nodes to pxa3xx Robert Jarzmik
` (3 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Robert Jarzmik @ 2015-06-06 21:09 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala
Cc: devicetree, linux-arm-kernel, linux-kernel, Robert Jarzmik
Add the dma client description for pxa3xx-nand to use its dma through
device-tree.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
arch/arm/boot/dts/pxa3xx.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 4eb1563..d90489b 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -30,6 +30,8 @@
reg = <0x43100000 90>;
interrupts = <45>;
clocks = <&clks CLK_NAND>;
+ dmas = <&pdma 97>;
+ dma-names = "data";
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 3/6] ARM: dts: pxa: add dma pxamci nodes to pxa3xx
2015-06-06 21:09 [PATCH 1/6] ARM: dts: pxa: add dma controller Robert Jarzmik
2015-06-06 21:09 ` [PATCH 2/6] ARM: dts: pxa: add dma engine node to pxa3xx-nand Robert Jarzmik
@ 2015-06-06 21:09 ` Robert Jarzmik
2015-06-06 21:09 ` [PATCH 4/6] ARM: dts; pxa: add embedded pxa camera capture interface Robert Jarzmik
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Robert Jarzmik @ 2015-06-06 21:09 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala
Cc: devicetree, linux-arm-kernel, linux-kernel, Robert Jarzmik
Add the 3 possible mmc controllers on pxa3xx SoCs to the devicetree
description. Add the dma and clocks to the device-tree description of
pxa27x and pxa3xx at the same time.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
arch/arm/boot/dts/pxa2xx.dtsi | 4 ++++
arch/arm/boot/dts/pxa3xx.dtsi | 33 +++++++++++++++++++++++++++++++++
2 files changed, 37 insertions(+)
diff --git a/arch/arm/boot/dts/pxa2xx.dtsi b/arch/arm/boot/dts/pxa2xx.dtsi
index 71a0cd7..5e5af07 100644
--- a/arch/arm/boot/dts/pxa2xx.dtsi
+++ b/arch/arm/boot/dts/pxa2xx.dtsi
@@ -128,6 +128,10 @@
compatible = "marvell,pxa-mmc";
reg = <0x41100000 0x1000>;
interrupts = <23>;
+ clocks = <&clks CLK_MMC>;
+ dmas = <&pdma 21 3
+ &pdma 22 3>;
+ dma-names = "rx", "tx";
status = "disabled";
};
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index d90489b..29aeac5 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -53,6 +53,39 @@
interrupt-controller;
#interrupt-cells = <0x2>;
};
+
+ mmc0: mmc@41100000 {
+ compatible = "marvell,pxa-mmc";
+ reg = <0x41100000 0x1000>;
+ interrupts = <23>;
+ clocks = <&clks CLK_MMC>;
+ dmas = <&pdma 21 3
+ &pdma 22 3>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ mmc1: mmc@42000000 {
+ compatible = "marvell,pxa-mmc";
+ reg = <0x42000000 0x1000>;
+ interrupts = <41>;
+ clocks = <&clks CLK_MMC1>;
+ dmas = <&pdma 93 3
+ &pdma 94 3>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
+
+ mmc2: mmc@42500000 {
+ compatible = "marvell,pxa-mmc";
+ reg = <0x42500000 0x1000>;
+ interrupts = <55>;
+ clocks = <&clks CLK_MMC2>;
+ dmas = <&pdma 46 3
+ &pdma 47 3>;
+ dma-names = "rx", "tx";
+ status = "disabled";
+ };
};
clocks {
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/6] ARM: dts; pxa: add embedded pxa camera capture interface
2015-06-06 21:09 [PATCH 1/6] ARM: dts: pxa: add dma controller Robert Jarzmik
2015-06-06 21:09 ` [PATCH 2/6] ARM: dts: pxa: add dma engine node to pxa3xx-nand Robert Jarzmik
2015-06-06 21:09 ` [PATCH 3/6] ARM: dts: pxa: add dma pxamci nodes to pxa3xx Robert Jarzmik
@ 2015-06-06 21:09 ` Robert Jarzmik
2015-06-06 22:07 ` Sergei Shtylyov
2015-06-06 21:09 ` [PATCH 5/6] ARM: dts: pxa: fix power i2c definition Robert Jarzmik
2015-06-06 21:09 ` [PATCH 6/6] ARM: dts: pxa: add the usb host controller Robert Jarzmik
4 siblings, 1 reply; 8+ messages in thread
From: Robert Jarzmik @ 2015-06-06 21:09 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala
Cc: devicetree, linux-arm-kernel, linux-kernel, Robert Jarzmik
The pxa27x SoCs have an embedded camera host controller. Add the
description to the family description.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
arch/arm/boot/dts/pxa27x.dtsi | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 506db86..9ebfd7f 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -77,6 +77,23 @@
clocks = <&clks CLK_KEYPAD>;
status = "disabled";
};
+
+ pxa_camera: pxa_camera@50000000 {
+ compatible = "marvell,pxa270-qci";
+ reg = <0x50000000 0x1000>;
+ interrupts = <33>;
+ dmas = <&pdma 68 0 /* Y channel */
+ &pdma 69 0 /* U channel */
+ &pdma 70 0>; /* V channel */
+ dma-names = "CI_Y", "CI_U", "CI_V";
+
+ clocks = <&clks CLK_CAMERA>;
+ clock-names = "ciclk";
+ clock-frequency = <5000000>;
+ clock-output-names = "qci_mclk";
+
+ status = "disabled";
+ };
};
clocks {
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 5/6] ARM: dts: pxa: fix power i2c definition
2015-06-06 21:09 [PATCH 1/6] ARM: dts: pxa: add dma controller Robert Jarzmik
` (2 preceding siblings ...)
2015-06-06 21:09 ` [PATCH 4/6] ARM: dts; pxa: add embedded pxa camera capture interface Robert Jarzmik
@ 2015-06-06 21:09 ` Robert Jarzmik
2015-06-06 21:09 ` [PATCH 6/6] ARM: dts: pxa: add the usb host controller Robert Jarzmik
4 siblings, 0 replies; 8+ messages in thread
From: Robert Jarzmik @ 2015-06-06 21:09 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala
Cc: devicetree, linux-arm-kernel, linux-kernel, Robert Jarzmik
Add the correct address and size to the device-tree description.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
arch/arm/boot/dts/pxa27x.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 9ebfd7f..94cf80f 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -59,6 +59,8 @@
reg = <0x40f00180 0x24>;
interrupts = <6>;
clocks = <&clks CLK_PWRI2C>;
+ #address-cells = <0x1>;
+ #size-cells = <0>;
status = "disabled";
};
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 6/6] ARM: dts: pxa: add the usb host controller
2015-06-06 21:09 [PATCH 1/6] ARM: dts: pxa: add dma controller Robert Jarzmik
` (3 preceding siblings ...)
2015-06-06 21:09 ` [PATCH 5/6] ARM: dts: pxa: fix power i2c definition Robert Jarzmik
@ 2015-06-06 21:09 ` Robert Jarzmik
4 siblings, 0 replies; 8+ messages in thread
From: Robert Jarzmik @ 2015-06-06 21:09 UTC (permalink / raw)
To: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala
Cc: devicetree, linux-arm-kernel, linux-kernel, Robert Jarzmik
Add the usb host controller to pxa27x and pxa3xx.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
---
arch/arm/boot/dts/pxa27x.dtsi | 8 ++++++++
arch/arm/boot/dts/pxa3xx.dtsi | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
index 94cf80f..7f75272 100644
--- a/arch/arm/boot/dts/pxa27x.dtsi
+++ b/arch/arm/boot/dts/pxa27x.dtsi
@@ -26,6 +26,14 @@
clocks = <&clks CLK_NONE>;
};
+ pxa27x_ohci: ohci@4c000000 {
+ compatible = "marvell,pxa-ohci";
+ reg = <0x4c000000 0x10000>;
+ interrupts = <3>;
+ clocks = <&clks CLK_USBHOST>;
+ status = "disabled";
+ };
+
pwm0: pwm@40b00000 {
compatible = "marvell,pxa270-pwm", "marvell,pxa250-pwm";
reg = <0x40b00000 0x10>;
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index 29aeac5..67bd4fe 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -86,6 +86,14 @@
dma-names = "rx", "tx";
status = "disabled";
};
+
+ pxa3xx_ohci: ohci@4c000000 {
+ compatible = "marvell,pxa-ohci";
+ reg = <0x4c000000 0x10000>;
+ interrupts = <3>;
+ clocks = <&clks CLK_USBHOST>;
+ status = "disabled";
+ };
};
clocks {
--
2.1.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 4/6] ARM: dts; pxa: add embedded pxa camera capture interface
2015-06-06 21:09 ` [PATCH 4/6] ARM: dts; pxa: add embedded pxa camera capture interface Robert Jarzmik
@ 2015-06-06 22:07 ` Sergei Shtylyov
2015-06-08 17:23 ` Robert Jarzmik
0 siblings, 1 reply; 8+ messages in thread
From: Sergei Shtylyov @ 2015-06-06 22:07 UTC (permalink / raw)
To: Robert Jarzmik, Rob Herring, Pawel Moll, Mark Rutland,
Ian Campbell, Kumar Gala
Cc: devicetree, linux-kernel, linux-arm-kernel
Hello.
On 06/07/2015 12:09 AM, Robert Jarzmik wrote:
> The pxa27x SoCs have an embedded camera host controller. Add the
> description to the family description.
> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
> ---
> arch/arm/boot/dts/pxa27x.dtsi | 17 +++++++++++++++++
> 1 file changed, 17 insertions(+)
> diff --git a/arch/arm/boot/dts/pxa27x.dtsi b/arch/arm/boot/dts/pxa27x.dtsi
> index 506db86..9ebfd7f 100644
> --- a/arch/arm/boot/dts/pxa27x.dtsi
> +++ b/arch/arm/boot/dts/pxa27x.dtsi
> @@ -77,6 +77,23 @@
> clocks = <&clks CLK_KEYPAD>;
> status = "disabled";
> };
> +
> + pxa_camera: pxa_camera@50000000 {
The ePAPR standard has something to say about the node naming:
"The name of a node should be somewhat generic, reflecting the function of the
device and not its precise programming model." So I'd suggest "video@50000000"
instead...
[...]
WBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 4/6] ARM: dts; pxa: add embedded pxa camera capture interface
2015-06-06 22:07 ` Sergei Shtylyov
@ 2015-06-08 17:23 ` Robert Jarzmik
0 siblings, 0 replies; 8+ messages in thread
From: Robert Jarzmik @ 2015-06-08 17:23 UTC (permalink / raw)
To: Sergei Shtylyov
Cc: Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala,
devicetree, linux-kernel, linux-arm-kernel
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> writes:
>> + pxa_camera: pxa_camera@50000000 {
>
> The ePAPR standard has something to say about the node naming:
> "The name of a node should be somewhat generic, reflecting the function of the
> device and not its precise programming model." So I'd suggest "video@50000000"
> instead...
Okay, I understand. As "video" could stand for a video decoder/encoder, or the
display device, I'd rather go for "imaging" or "camera-host", or something like
that if I find an already used named in other dts files.
Cheers.
--
Robert
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-06-08 17:25 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-06 21:09 [PATCH 1/6] ARM: dts: pxa: add dma controller Robert Jarzmik
2015-06-06 21:09 ` [PATCH 2/6] ARM: dts: pxa: add dma engine node to pxa3xx-nand Robert Jarzmik
2015-06-06 21:09 ` [PATCH 3/6] ARM: dts: pxa: add dma pxamci nodes to pxa3xx Robert Jarzmik
2015-06-06 21:09 ` [PATCH 4/6] ARM: dts; pxa: add embedded pxa camera capture interface Robert Jarzmik
2015-06-06 22:07 ` Sergei Shtylyov
2015-06-08 17:23 ` Robert Jarzmik
2015-06-06 21:09 ` [PATCH 5/6] ARM: dts: pxa: fix power i2c definition Robert Jarzmik
2015-06-06 21:09 ` [PATCH 6/6] ARM: dts: pxa: add the usb host controller Robert Jarzmik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).