hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This device-tree pxa update brings : 

- dma nodes after dmaengine pxa_dma driver merge
  - camera driver
  - usb host controller
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJVqXg0AAoJEAP2et0duMsS/b8QAJRkwGmJjnfYJmVCs2qdg7Pk
 2yFw8Dv+oqbuh7alwbKrUsTAiDdQpseJQ6h7aU2vd2WVWkidSgF4snRNJ1nnBd0F
 Y8mO55/ig4/wI+U4NY4pa/lNJCulG15PHsktE/rW4b1ZFUNRmzWT1eHnKO7oQOVZ
 8gCHsE8aM1/6E3kVg3hNDwexhQ0CbxNbVpfAnIv+D+e4CZ1joFfAnUWOs9DHyTAx
 1cp5Qqg5N/qmfrXxM1aDTs8EX1hArXka29wp/bi4/ewqngwQvf77MnH/k2NwVDyC
 PvG9NSTkR5tgZWGaIYkRt74ZsozOxw6DTUjpZmF/8quTrV1ITxPHfyIeltyT+EyC
 bIw2kp5528E3yX3DlzykBXl7NZ6AMD77/DSJsaLNxzH0lgKjm/dH+Mlhrz/OBELI
 tfNQuPzDE58h6Yv9e7Ru6rt02mPMVaBV3qoR8j7uK5Vlt5z1y5qVv1+kMlOdmrvb
 i1NHr5uJVS4IDzlFWZvl7Cl0Lcv9MYWAi0ADZrSOE2odtr8QDhkvmXnwX8j3a8Fl
 EvZQdD7a2rhq93cAQmo0RUOwh0JgIjCZH1kQqOMqhz1FHeQ2DSVRY9QwuIMXQbJR
 FATdsK/iaZ8CBDzQdnPQGro0ZPDi4Kv60pcAcH0o2theW9zO83Arz1L7JsxQYTPu
 OekZfvfqrOsKifipUkpO
 =2G18
 -----END PGP SIGNATURE-----

Merge tag 'tags/pxa-dt-4.3' of https://github.com/rjarzmik/linux into next/dt

Merge "pxa-dt for v4.3" from Robert Jarzmik:

This device-tree pxa update brings :
 - dma nodes after dmaengine pxa_dma driver merge
 - camera driver
 - usb host controller

* tag 'tags/pxa-dt-4.3' of https://github.com/rjarzmik/linux:
  ARM: dts: pxa: fix power i2c definition
  ARM: dts: pxa: add the usb host controller
  ARM: dts: pxa: add embedded pxa camera capture interface
  ARM: dts: pxa: add dma pxamci nodes to pxa3xx
  ARM: dts: pxa: add dma engine node to pxa3xx-nand
  ARM: dts: pxa: add dma controller

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2015-07-21 14:06:46 -07:00
parent af3761246c fb18539b3c
commit 7d132de8b0
3 changed files with 92 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
arch/arm/boot/dts/pxa27x.dtsi
View File

@ -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>;
@ -17,6 +26,14 @@
clocks = <&clks CLK_NONE>;
};
pxa27x_ohci: usb@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>;
@ -50,6 +67,8 @@
reg = <0x40f00180 0x24>;
interrupts = <6>;
clocks = <&clks CLK_PWRI2C>;
#address-cells = <0x1>;
#size-cells = <0>;
status = "disabled";
};
@ -68,6 +87,23 @@
clocks = <&clks CLK_KEYPAD>;
status = "disabled";
};
pxa_camera: imaging@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 {

4
arch/arm/boot/dts/pxa2xx.dtsi
View File

@ -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";
};

52
arch/arm/boot/dts/pxa3xx.dtsi
View File

@ -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>;
@ -21,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";
@ -42,6 +53,47 @@
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";
};
pxa3xx_ohci: usb@4c000000 {
compatible = "marvell,pxa-ohci";
reg = <0x4c000000 0x10000>;
interrupts = <3>;
clocks = <&clks CLK_USBHOST>;
status = "disabled";
};
};
clocks {