diff options
| author | Michael J. Chudobiak <mjc@avtechpulse.com> | 2016-04-25 10:30:45 -0400 |
|---|---|---|
| committer | Michael J. Chudobiak <mjc@avtechpulse.com> | 2016-04-25 10:30:45 -0400 |
| commit | 5fb152d22b1e9d48ac6a2859407f0efe62a965c4 (patch) | |
| tree | 26935ff57ca03f2a914fc0fc6bdd98753fc2add5 | |
| parent | 482d7b3ce91e7a8e100f600fdcbff301e646249e (diff) | |
| -rw-r--r-- | linux/arch/arm/boot/dts/am335x-som-common.dtsi | 36 |
1 files changed, 8 insertions, 28 deletions
diff --git a/linux/arch/arm/boot/dts/am335x-som-common.dtsi b/linux/arch/arm/boot/dts/am335x-som-common.dtsi index 8081acab..389d3faf 100644 --- a/linux/arch/arm/boot/dts/am335x-som-common.dtsi +++ b/linux/arch/arm/boot/dts/am335x-som-common.dtsi @@ -26,17 +26,13 @@ status = "okay"; }; - uart1: serial@48022000 { - pinctrl-names = "default"; - pinctrl-0 = <&uart1_pins>; - status = "okay"; - }; uart4: serial@481a8000 { pinctrl-names = "default"; pinctrl-0 = <&uart4_pins>; status = "okay"; }; + epwmss0: epwmss@48300000 { status = "okay"; @@ -150,13 +146,6 @@ >; }; - uart1_pins: pinmux_uart1_pins { - pinctrl-single,pins = < - 0x168 (PIN_INPUT_PULLUP | MUX_MODE1) - 0x16c (PIN_OUTPUT_PULLDOWN | MUX_MODE1) - >; - }; - uart4_pins: pinmux_uart4_pins { pinctrl-single,pins = < 0x180 (PIN_INPUT_PULLUP | MUX_MODE0) @@ -336,26 +325,17 @@ dr_mode = "host"; }; - &cpsw_emac0 { - phy_id = <&davinci_mdio>, <0>; - phy-mode = "mii"; - dual_emac_res_vlan = <0>; -}; - -&cpsw_emac1 { - phy_id = <&davinci_mdio>, <1>; - phy-mode = "mii"; - dual_emac_res_vlan = <1>; + phy_id = <&davinci_mdio>, <0>; + phy-mode = "mii"; }; &mac { - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&cpsw_default>; - pinctrl-1 = <&cpsw_sleep>; - slaves = <2>; - dual_emac = <1>; - status = "okay"; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&cpsw_default>; + pinctrl-1 = <&cpsw_sleep>; + slaves = <1>; + status = "okay"; }; &davinci_mdio { |