mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 16:49:22 +00:00
Code Issues Releases Wiki Activity

Merge tag 'dt-3.11-4' of git://git.infradead.org/users/jcooper/linux into next/dt

Browse source 
From Jason Cooper:
mvebu dt changes for v3.11 (round 4)

 - kirkwood
    - reshuffle nodes from kirkwood.dtsi to -6281.dtsi, etc
    - add i2c-gpio for km_kirkwood
    - add cpu node so pending cpufreq driver will init

* tag 'dt-3.11-4' of git://git.infradead.org/users/jcooper/linux:
  ARM: Kirkwood add cpus definition needed by cpufreq driver to dtsi
  ARM: kirkwood: add i2c-gpio controller for km_kirkwood
  ARM: kirkwood: refactor dtsi to largest common nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-06-10 21:39:37 -07:00
commit b131eaa310
5 changed files with 76 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
arch/arm/boot/dts/kirkwood-6281.dtsi
View file

@ -40,5 +40,33 @@ pmx_sdio: pmx-sdio {
marvell,function = "sdio";
};
};
rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};
sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
clocks = <&gate_clk 14>, <&gate_clk 15>;
clock-names = "0", "1";
status = "disabled";
};
mvsdio@90000 {
compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>;
interrupts = <28>;
clocks = <&gate_clk 4>;
bus-width = <4>;
cap-sdio-irq;
cap-sd-highspeed;
cap-mmc-highspeed;
status = "disabled";
};
};
};

28
arch/arm/boot/dts/kirkwood-6282.dtsi
View file

@ -49,6 +49,34 @@ pmx_sdio: pmx-sdio {
};
};
rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};
sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
clocks = <&gate_clk 14>, <&gate_clk 15>;
clock-names = "0", "1";
status = "disabled";
};
mvsdio@90000 {
compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>;
interrupts = <28>;
clocks = <&gate_clk 4>;
bus-width = <4>;
cap-sdio-irq;
cap-sd-highspeed;
cap-mmc-highspeed;
status = "disabled";
};
thermal@10078 {
compatible = "marvell,kirkwood-thermal";
reg = <0x10078 0x4>;

7
arch/arm/boot/dts/kirkwood-km_kirkwood.dts
View file

@ -42,4 +42,11 @@ nand@3000000 {
chip-delay = <25>;
};
};
i2c@0 {
compatible = "i2c-gpio";
gpios = < &gpio0 8 0 /* sda */
&gpio0 9 0 >; /* scl */
i2c-gpio,delay-us = <2>; /* ~100 kHz */
};
};

1
arch/arm/boot/dts/kirkwood-nsa310.dts
View file

@ -1,6 +1,7 @@
/dts-v1/;
/include/ "kirkwood.dtsi"
/include/ "kirkwood-6281.dtsi"
/ {
model = "ZyXEL NSA310";

40
arch/arm/boot/dts/kirkwood.dtsi
View file

@ -4,6 +4,18 @@ / {
compatible = "marvell,kirkwood";
interrupt-parent = <&intc>;
cpus {
#address-cells = <1>;
#size-cells = <0>;
cpu@0 {
device_type = "cpu";
compatible = "marvell,feroceon";
clocks = <&core_clk 1>, <&core_clk 3>, <&gate_clk 11>;
clock-names = "cpu_clk", "ddrclk", "powersave";
};
};
aliases {
gpio0 = &gpio0;
gpio1 = &gpio1;
@ -71,13 +83,6 @@ serial@12100 {
status = "disabled";
};
rtc@10300 {
compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
reg = <0x10300 0x20>;
interrupts = <53>;
clocks = <&gate_clk 7>;
};
spi@10600 {
compatible = "marvell,orion-spi";
#address-cells = <1>;
@ -151,15 +156,6 @@ ehci@50000 {
status = "okay";
};
sata@80000 {
compatible = "marvell,orion-sata";
reg = <0x80000 0x5000>;
interrupts = <21>;
clocks = <&gate_clk 14>, <&gate_clk 15>;
clock-names = "0", "1";
status = "disabled";
};
nand@3000000 {
#address-cells = <1>;
#size-cells = <1>;
@ -194,17 +190,5 @@ crypto@30000 {
clocks = <&gate_clk 17>;
status = "okay";
};
mvsdio@90000 {
compatible = "marvell,orion-sdio";
reg = <0x90000 0x200>;
interrupts = <28>;
clocks = <&gate_clk 4>;
bus-width = <4>;
cap-sdio-irq;
cap-sd-highspeed;
cap-mmc-highspeed;
status = "disabled";
};
};
};