UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: dts: AM33XX: fix ethernet and mdio default state 

Make sure ethernet and mdio nodes are disabled by default and enable
them explicitly only on boards that actually use them.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Johan Hovold 2014-05-08 10:57:36 +02:00 committed by Tony Lindgren
parent 741cac5f00
commit 16c75a13e3
6 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/am335x-bone-common.dtsi
View File

@ -280,13 +280,14 @@
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&mmc1 { &mmc1 {

2
arch/arm/boot/dts/am335x-evm.dts
View File

@ -614,12 +614,14 @@
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {

2
arch/arm/boot/dts/am335x-evmsk.dts
View File

@ -495,12 +495,14 @@
pinctrl-0 = <&cpsw_default>; pinctrl-0 = <&cpsw_default>;
pinctrl-1 = <&cpsw_sleep>; pinctrl-1 = <&cpsw_sleep>;
dual_emac = <1>; dual_emac = <1>;
status = "okay";
}; };
&davinci_mdio { &davinci_mdio {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>; pinctrl-0 = <&davinci_mdio_default>;
pinctrl-1 = <&davinci_mdio_sleep>; pinctrl-1 = <&davinci_mdio_sleep>;
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {

8
arch/arm/boot/dts/am335x-igep0033.dtsi
View File

@ -95,6 +95,14 @@
}; };
}; };
&mac {
status = "okay";
};
&davinci_mdio {
status = "okay";
};
&cpsw_emac0 { &cpsw_emac0 {
phy_id = <&davinci_mdio>, <0>; phy_id = <&davinci_mdio>, <0>;
}; };

5
arch/arm/boot/dts/am335x-nano.dts
View File

@ -344,6 +344,11 @@
&mac { &mac {
dual_emac = <1>; dual_emac = <1>;
status = "okay";
};
&davinci_mdio {
status = "okay";
}; };
&cpsw_emac0 { &cpsw_emac0 {

2
arch/arm/boot/dts/am33xx.dtsi
View File

@ -688,6 +688,7 @@
*/ */
interrupts = <40 41 42 43>; interrupts = <40 41 42 43>;
ranges; ranges;
status = "disabled";
davinci_mdio: mdio@4a101000 { davinci_mdio: mdio@4a101000 {
compatible = "ti,davinci_mdio"; compatible = "ti,davinci_mdio";
@ -696,6 +697,7 @@
ti,hwmods = "davinci_mdio"; ti,hwmods = "davinci_mdio";
bus_freq = <1000000>; bus_freq = <1000000>;
reg = <0x4a101000 0x100>; reg = <0x4a101000 0x100>;
status = "disabled";
}; };
cpsw_emac0: slave@4a100200 { cpsw_emac0: slave@4a100200 {