openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

some minor cleanup and add some missed nodes: 

1. move dma channel descriptions to generic dma properity;
 2. add resets properity for some nodes;
 3. add missed pinctrl groups.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJTayTBAAoJEDIv4aC191RhUQEQALavrvNQqB6Psk6iMXi9ZS3H
 j4O5HErQ4EeKk2i9om6wTHi8KCeEqaRPJZQ9CeaIq80AGkNH6SZWqG3G7vMrXJcF
 fhC206sPIXc6PRS57Ji9rcPyLS3yLxAz5c4DnbYCaqPbBzbqsdTgBEG0lHZ5N24r
 EKZe1003AMg7XEhp48nQeDotGv+6HWFSqI+vEa37wytFehVW0TnijZ5KBJDzkjxW
 P0+xiY89tcYI/joB9h5ABp0W3gRmx46P/T38BGXvB8x5oEQrgHi3INhWeb5oH68d
 ZRWd1UDSwjcKHgRzM+F0n0gU+MEj049vFdunYQX/lcLfBO0xC8NeLiXKR1JAD5ss
 fzNJihgMLq50pOMnT3I3jyyQohFbammue6fPeQgPSa9djcF/5ATbHO4eWV9NXYzn
 apGaZBhjAsdgJBrRvnNCDN2NWkxBroWxYS1MFpLr1j7//Rwd4+b7LmJHcKDyJXvu
 IWX3CYnCT1TdfI86orGZF9R/U+enl/D7LhXveExnCiehQPTmWYnxhcmSmz2lVxBY
 AIcDBRI3MU7EnSQKVxpCDbJZ2HETX/+nC6Qfq/+MCNbfea0uvabOLvIN7Mg+FLV3
 5U8LQqU8DBBFw4tK5zpiXz1cbT9fMrV7NgcaRmcz4v8lOztCy2DJutk7JOeMxq7k
 YFGa4oygjl+dseNr1Ncj
 =mw3T
 -----END PGP SIGNATURE-----

Merge tag 'sirf-dts-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux into next/dt

Merge "ARM: sirf: dts update for 3.16" from Barry Son:

some minor cleanup and add some missed nodes:
1. move dma channel descriptions to generic dma properity
2. add resets properity for some nodes;
3. add missed pinctrl groups.

* tag 'sirf-dts-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: dts: sirf: add resets for dspif, gps and dsp nodes
  ARM: dts: atlas6: add cortex-a9-pmu compatible PMU node
  ARM: dts: sirf: move to use generic dma dt-binding for spi
  ARM: dts: sirf: add pin group for USP0 with only RX or TX frame sync for atlas6

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-05-26 15:01:07 -07:00
parent 70bc6bb3f2 b01c5905c2
commit 7f7bb3179d
2 changed files with 32 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/arm/boot/dts/atlas6.dtsi
View File

@ -39,6 +39,11 @@ cpu@0 {
};
};
arm-pmu {
compatible = "arm,cortex-a9-pmu";
interrupts = <29>;
};
axi {
compatible = "simple-bus";
#address-cells = <1>;
@ -167,6 +172,7 @@ dspif@a8000000 {
compatible = "sirf,prima2-dspif";
reg = <0xa8000000 0x10000>;
interrupts = <9>;
resets = <&rstc 1>;
};
gps@a8010000 {
@ -174,6 +180,7 @@ gps@a8010000 {
reg = <0xa8010000 0x10000>;
interrupts = <7>;
clocks = <&clks 9>;
resets = <&rstc 2>;
};
dsp@a9000000 {
@ -181,6 +188,7 @@ dsp@a9000000 {
reg = <0xa9000000 0x1000000>;
interrupts = <8>;
clocks = <&clks 8>;
resets = <&rstc 0>;
};
};
@ -297,9 +305,9 @@ spi0: spi@b00d0000 {
reg = <0xb00d0000 0x10000>;
interrupts = <15>;
sirf,spi-num-chipselects = <1>;
cs-gpios = <&gpio 0 0>;
sirf,spi-dma-rx-channel = <25>;
sirf,spi-dma-tx-channel = <20>;
dmas = <&dmac1 9>,
<&dmac1 4>;
dma-names = "rx", "tx";
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clks 19>;
@ -312,8 +320,9 @@ spi1: spi@b0170000 {
reg = <0xb0170000 0x10000>;
interrupts = <16>;
sirf,spi-num-chipselects = <1>;
sirf,spi-dma-rx-channel = <12>;
sirf,spi-dma-tx-channel = <13>;
dmas = <&dmac0 12>,
<&dmac0 13>;
dma-names = "rx", "tx";
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clks 20>;
@ -554,6 +563,18 @@ usp0 {
sirf,function = "usp0_uart_nostreamctrl";
};
};
usp0_only_utfs_pins_a: usp0@2 {
usp0 {
sirf,pins = "usp0_only_utfs_grp";
sirf,function = "usp0_only_utfs";
};
};
usp0_only_urfs_pins_a: usp0@3 {
usp0 {
sirf,pins = "usp0_only_urfs_grp";
sirf,function = "usp0_only_urfs";
};
};
usp1_pins_a: usp1@0 {
usp1 {
sirf,pins = "usp1grp";

10
arch/arm/boot/dts/prima2.dtsi
View File

@ -313,8 +313,9 @@ spi0: spi@b00d0000 {
reg = <0xb00d0000 0x10000>;
interrupts = <15>;
sirf,spi-num-chipselects = <1>;
sirf,spi-dma-rx-channel = <25>;
sirf,spi-dma-tx-channel = <20>;
dmas = <&dmac1 9>,
<&dmac1 4>;
dma-names = "rx", "tx";
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clks 19>;
@ -327,8 +328,9 @@ spi1: spi@b0170000 {
reg = <0xb0170000 0x10000>;
interrupts = <16>;
sirf,spi-num-chipselects = <1>;
sirf,spi-dma-rx-channel = <12>;
sirf,spi-dma-tx-channel = <13>;
dmas = <&dmac0 12>,
<&dmac0 13>;
dma-names = "rx", "tx";
#address-cells = <1>;
#size-cells = <0>;
clocks = <&clks 20>;