Skip to content

Commit

Permalink
ARM: dts: keystone: Fix the mdio bindings by moving it to soc specifi…
Browse files Browse the repository at this point in the history
…c file

Currently mdio bindings are defined in keystone.dtsi and this results
in incorrect unit address for the node on K2E and K2L SoCs. Fix this
by moving them to SoC specific DTS file.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
  • Loading branch information
Murali Karicheri authored and Santosh Shilimkar committed Aug 13, 2015
1 parent e61eee7 commit 85ad3de
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 20 deletions.
15 changes: 11 additions & 4 deletions arch/arm/boot/dts/k2e.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -130,10 +130,17 @@
<GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;
};
};

mdio: mdio@24200f00 {
compatible = "ti,keystone_mdio", "ti,davinci_mdio";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x24200f00 0x100>;
status = "disabled";
clocks = <&clkcpgmac>;
clock-names = "fck";
bus_freq = <2500000>;
};
/include/ "k2e-netcp.dtsi"
};
};

&mdio {
reg = <0x24200f00 0x100>;
};
11 changes: 11 additions & 0 deletions arch/arm/boot/dts/k2hk.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,17 @@
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x25c>;
};

mdio: mdio@02090300 {
compatible = "ti,keystone_mdio", "ti,davinci_mdio";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x02090300 0x100>;
status = "disabled";
clocks = <&clkcpgmac>;
clock-names = "fck";
bus_freq = <2500000>;
};
/include/ "k2hk-netcp.dtsi"
};
};
16 changes: 11 additions & 5 deletions arch/arm/boot/dts/k2l.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
};

soc {

/include/ "k2l-clocks.dtsi"

uart2: serial@02348400 {
Expand Down Expand Up @@ -79,6 +78,17 @@
#gpio-cells = <2>;
gpio,syscon-dev = <&devctrl 0x24c>;
};

mdio: mdio@26200f00 {
compatible = "ti,keystone_mdio", "ti,davinci_mdio";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x26200f00 0x100>;
status = "disabled";
clocks = <&clkcpgmac>;
clock-names = "fck";
bus_freq = <2500000>;
};
/include/ "k2l-netcp.dtsi"
};
};
Expand All @@ -96,7 +106,3 @@
/* Pin muxed. Enabled and configured by Bootloader */
status = "disabled";
};

&mdio {
reg = <0x26200f00 0x100>;
};
11 changes: 0 additions & 11 deletions arch/arm/boot/dts/keystone.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -267,17 +267,6 @@
1 0 0x21000A00 0x00000100>;
};

mdio: mdio@02090300 {
compatible = "ti,keystone_mdio", "ti,davinci_mdio";
#address-cells = <1>;
#size-cells = <0>;
reg = <0x02090300 0x100>;
status = "disabled";
clocks = <&clkcpgmac>;
clock-names = "fck";
bus_freq = <2500000>;
};

kirq0: keystone_irq@26202a0 {
compatible = "ti,keystone-irq";
interrupts = <GIC_SPI 4 IRQ_TYPE_EDGE_RISING>;
Expand Down

0 comments on commit 85ad3de

Please sign in to comment.