Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-18 09:02:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

change pinmux pingroup and add some lost node/prop

Browse Source 
1. add resets properity for some nodes;
 2. change pinctrl groups for audio
 3. add PMU node
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJUdF8jAAoJEDIv4aC191RhpDgP/1b6j6BttTCtvxe26HOQIABD
 mbU8lgqthsAnn73qPdNaW5413chofJGBJm3ZgIzMydVXaZkAgp+137qD0/CmC/Oe
 +JIoPjO0zDEEMd2WanW6tW7taJWm5KCT5tv7dc5DmLaFVyNMWXAq25BH5aG0EKkc
 9Q8si229EB7yAiOJ5Jsg+aTvCwEmjcoj6OnKw1z27vL4XAb+9ihU738Yf4WXsJ+U
 z+b5/p3UdcY3VZlWKgYJB4iFjy8FuN/LsTtj9/61pbhf57duIph/oQgSwiCZsRiS
 g3b2Wj0jiVgSETZ9xdGzqdZdBSMU4nXIHteLzH8756r3SMpLXSEoQza+BPlPFLQB
 StmkbEuLKr7JkQA9eGNNwTL1WOiSxLFjCxJdtPzruhIA+0pxkrv58OfImxJGIUg5
 u5xIBmqA/gOvo3X1AcwFoLCAq7A/tNHzSAssYuyyYo+foQmSxnRABBkaluHqQDWH
 ZZ45uAG4TgmUpckgr9kldcfO+pGIjPCn2uSxDDtAwGPlUXk37KWfBp2+/XEQdjs4
 Dojm8d5HmEYRL0xCScawjE+HeGlCY92MmMVjfUjDHt534ZBjXvvDiXUTyynFP4n0
 fXfRyM1cl34EmIl3B25qMl17kNNNeCa8QZacSHKQ3qHsEfrQu+WJBWkfE0mUCPAl
 OqFZcZd3d6fPp5hq3eOO
 =wkho
 -----END PGP SIGNATURE-----

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

Pull "change pinmux pingroup and add some lost node/prop" from Barry Song:

1. add resets properity for some nodes;
2. change pinctrl groups for audio
3. add PMU node

* tag 'sirf-dts-for-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/baohua/linux:
  ARM: dts: atlas6: add resets property for SPI nodes
  ARM: dts: atlas6: add resets property for VPP nodes
  ARM: dts: prima2: add resets property for VPP nodes
  ARM: dts: prima2: add resets property for GPS nodes
  ARM: dts: prima2: add node for Performance Monitor Unit
  ARM: dts: atlas6: Add I2S external clock input pingroup
  ARM: dts: atlas6: add a separate pingroup for i2s mclk output
  ARM: dts: prima2: add I2S 2ch, 6ch, nodin, mclk groups

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2014-11-28 15:11:38 +01:00
commit ca7637585c
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,6 +131,7 @@
reg = <0x90020000 0x10000>; reg = <0x90020000 0x10000>;
interrupts = <31>; interrupts = <31>;
clocks = <&clks 35>; clocks = <&clks 35>;
resets = <&rstc 6>;
}; };
}; };
@ -312,6 +313,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&clks 19>; clocks = <&clks 19>;
resets = <&rstc 26>;
status = "disabled"; status = "disabled";
}; };
@ -327,6 +329,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
clocks = <&clks 20>; clocks = <&clks 20>;
resets = <&rstc 27>;
status = "disabled"; status = "disabled";
}; };
@ -522,6 +525,18 @@
sirf,function = "sdmmc5"; sirf,function = "sdmmc5";
}; };
}; };
i2s_mclk_pins_a: i2s_mclk@0 {
i2s_mclk {
sirf,pins = "i2smclkgrp";
sirf,function = "i2s_mclk";
};
};
i2s_ext_clk_input_pins_a: i2s_ext_clk_input@0 {
i2s_ext_clk_input {
sirf,pins = "i2s_ext_clk_inputgrp";
sirf,function = "i2s_ext_clk_input";
};
};
i2s_pins_a: i2s@0 { i2s_pins_a: i2s@0 {
i2s { i2s {
sirf,pins = "i2sgrp"; sirf,pins = "i2sgrp";

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

@ -41,6 +41,11 @@
}; };
}; };
arm-pmu {
compatible = "arm,cortex-a9-pmu";
interrupts = <29>;
};
axi { axi {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <1>; #address-cells = <1>;
@ -132,6 +137,7 @@
reg = <0x90020000 0x10000>; reg = <0x90020000 0x10000>;
interrupts = <31>; interrupts = <31>;
clocks = <&clks 35>; clocks = <&clks 35>;
resets = <&rstc 6>;
}; };
}; };
@ -173,6 +179,7 @@
compatible = "sirf,prima2-dspif"; compatible = "sirf,prima2-dspif";
reg = <0xa8000000 0x10000>; reg = <0xa8000000 0x10000>;
interrupts = <9>; interrupts = <9>;
resets = <&rstc 1>;
}; };
gps@a8010000 { gps@a8010000 {
@ -180,6 +187,7 @@
reg = <0xa8010000 0x10000>; reg = <0xa8010000 0x10000>;
interrupts = <7>; interrupts = <7>;
clocks = <&clks 9>; clocks = <&clks 9>;
resets = <&rstc 2>;
}; };
dsp@a9000000 { dsp@a9000000 {
@ -187,6 +195,7 @@
reg = <0xa9000000 0x1000000>; reg = <0xa9000000 0x1000000>;
interrupts = <8>; interrupts = <8>;
clocks = <&clks 8>; clocks = <&clks 8>;
resets = <&rstc 0>;
}; };
}; };
@ -524,12 +533,36 @@
sirf,function = "sdmmc5"; sirf,function = "sdmmc5";
}; };
}; };
i2s_mclk_pins_a: i2s_mclk@0 {
i2s_mclk {
sirf,pins = "i2smclkgrp";
sirf,function = "i2s_mclk";
};
};
i2s_ext_clk_input_pins_a: i2s_ext_clk_input@0 {
i2s_ext_clk_input {
sirf,pins = "i2s_ext_clk_inputgrp";
sirf,function = "i2s_ext_clk_input";
};
};
i2s_pins_a: i2s@0 { i2s_pins_a: i2s@0 {
i2s { i2s {
sirf,pins = "i2sgrp"; sirf,pins = "i2sgrp";
sirf,function = "i2s"; sirf,function = "i2s";
}; };
}; };
i2s_no_din_pins_a: i2s_no_din@0 {
i2s_no_din {
sirf,pins = "i2s_no_dingrp";
sirf,function = "i2s_no_din";
};
};
i2s_6chn_pins_a: i2s_6chn@0 {
i2s_6chn {
sirf,pins = "i2s_6chngrp";
sirf,function = "i2s_6chn";
};
};
ac97_pins_a: ac97@0 { ac97_pins_a: ac97@0 {
ac97 { ac97 {
sirf,pins = "ac97grp"; sirf,pins = "ac97grp";