56c56
< bootargs = "console=ttyS0,115200 earlyprintk";
---
> stdout-path = "serial0:115200n8";
66c66,68
< MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
---
> MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
> MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
> MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
91,95d92
< /* Two rear eSATA ports */
< sata@a0000 {
< nr-ports = <2>;
< status = "okay";
< };
97,98c94,96
< serial@12000 {
< status = "okay";
---
> /* RTC is provided by Intersil ISL12057 I2C RTC chip */
> rtc@10300 {
> status = "disabled";
101,127d98
< mdio {
< phy0: ethernet-phy@0 { /* Marvell 88E1318 */
< reg = <0>;
< };
<
< phy1: ethernet-phy@1 { /* Marvell 88E1318 */
< reg = <1>;
< };
< };
<
< ethernet@70000 {
< status = "okay";
< phy = <&phy0>;
< phy-mode = "rgmii-id";
< };
<
< ethernet@74000 {
< status = "okay";
< phy = <&phy1>;
< phy-mode = "rgmii-id";
< };
<
< /* Front USB 2.0 port */
< usb@50000 {
< status = "okay";
< };
<
133,138d103
< isl12057: isl12057@68 {
< compatible = "isil,isl12057";
< reg = <0x68>;
< isil,irq2-can-wakeup-machine;
< };
<
174a140,145
>
> isl12057: isl12057@68 {
> compatible = "isil,isl12057";
> reg = <0x68>;
> wakeup-source;
> };
176a148,184
> serial@12000 {
> status = "okay";
> };
>
> /* Front USB 2.0 port */
> usb@50000 {
> status = "okay";
> };
>
> mdio {
> phy0: ethernet-phy@0 { /* Marvell 88E1318 */
> reg = <0>;
> };
>
> phy1: ethernet-phy@1 { /* Marvell 88E1318 */
> reg = <1>;
> };
> };
>
> ethernet@70000 {
> status = "okay";
> phy = <&phy0>;
> phy-mode = "rgmii-id";
> };
>
> ethernet@74000 {
> status = "okay";
> phy = <&phy1>;
> phy-mode = "rgmii-id";
> };
>
> /* Two rear eSATA ports */
> sata@a0000 {
> nr-ports = <2>;
> status = "okay";
> };
>
< bootargs = "console=ttyS0,115200 earlyprintk";
---
> stdout-path = "serial0:115200n8";
66c66,68
< MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
---
> MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
> MBUS_ID(0x09, 0x09) 0 0 0xf8100000 0x10000
> MBUS_ID(0x09, 0x05) 0 0 0xf8110000 0x10000>;
91,95d92
< /* Two rear eSATA ports */
< sata@a0000 {
< nr-ports = <2>;
< status = "okay";
< };
97,98c94,96
< serial@12000 {
< status = "okay";
---
> /* RTC is provided by Intersil ISL12057 I2C RTC chip */
> rtc@10300 {
> status = "disabled";
101,127d98
< mdio {
< phy0: ethernet-phy@0 { /* Marvell 88E1318 */
< reg = <0>;
< };
<
< phy1: ethernet-phy@1 { /* Marvell 88E1318 */
< reg = <1>;
< };
< };
<
< ethernet@70000 {
< status = "okay";
< phy = <&phy0>;
< phy-mode = "rgmii-id";
< };
<
< ethernet@74000 {
< status = "okay";
< phy = <&phy1>;
< phy-mode = "rgmii-id";
< };
<
< /* Front USB 2.0 port */
< usb@50000 {
< status = "okay";
< };
<
133,138d103
< isl12057: isl12057@68 {
< compatible = "isil,isl12057";
< reg = <0x68>;
< isil,irq2-can-wakeup-machine;
< };
<
174a140,145
>
> isl12057: isl12057@68 {
> compatible = "isil,isl12057";
> reg = <0x68>;
> wakeup-source;
> };
176a148,184
> serial@12000 {
> status = "okay";
> };
>
> /* Front USB 2.0 port */
> usb@50000 {
> status = "okay";
> };
>
> mdio {
> phy0: ethernet-phy@0 { /* Marvell 88E1318 */
> reg = <0>;
> };
>
> phy1: ethernet-phy@1 { /* Marvell 88E1318 */
> reg = <1>;
> };
> };
>
> ethernet@70000 {
> status = "okay";
> phy = <&phy0>;
> phy-mode = "rgmii-id";
> };
>
> ethernet@74000 {
> status = "okay";
> phy = <&phy1>;
> phy-mode = "rgmii-id";
> };
>
> /* Two rear eSATA ports */
> sata@a0000 {
> nr-ports = <2>;
> status = "okay";
> };
>