Update

Documentation/devicetree/bindings/net/cpsw.txt

@@ -24,16 +24,18 @@ Optional properties:
 - ti,hwmods		: Must be "cpgmac0"
 - no_bd_ram		: Must be 0 or 1
 - dual_emac		: Specifies Switch to act as Dual EMAC
+- syscon		: Phandle to the system control device node, which is
+			  the control module device of the am33x
 
 Slave Properties:
 Required properties:
 - phy_id		: Specifies slave phy id
 - phy-mode		: The interface between the SoC and the PHY (a string
 			  that of_get_phy_mode() can understand)
-- mac-address		: Specifies slave MAC address
 
 Optional properties:
 - dual_emac_res_vlan	: Specifies VID to be used to segregate the ports
+- mac-address		: See ethernet.txt file in the same directory
 
 Note: "ti,hwmods" field is used to fetch the base address and irq
 resources from TI, omap hwmod data base during device registration.
@@ -58,6 +60,7 @@ Examples:
 		active_slave = <0>;
 		cpts_clock_mult = <0x80000000>;
 		cpts_clock_shift = <29>;
+		syscon = <&cm>;
 		cpsw_emac0: slave@0 {
 			phy_id = <&davinci_mdio>, <0>;
 			phy-mode = "rgmii-txid";
@@ -86,6 +89,7 @@ Examples:
 		active_slave = <0>;
 		cpts_clock_mult = <0x80000000>;
 		cpts_clock_shift = <29>;
+		syscon = <&cm>;
 		cpsw_emac0: slave@0 {
 			phy_id = <&davinci_mdio>, <0>;
 			phy-mode = "rgmii-txid";

arch/arm/boot/dts/Makefile

@@ -229,6 +229,46 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
 	am335x-evmsk.dtb \
 	am335x-bone.dtb \
 	am335x-boneblack.dtb \
+	am335x-boneblack-ttyO5.dtb \
+	am335x-boneblack-ttyO4.dtb \
+	am335x-boneblack-ttyO2.dtb \
+	am335x-boneblack-ttyO1.dtb \
+	am335x-boneblack-rtc-01-00a1.dtb \
+	am335x-boneblack-lcd7-01-00a3.dtb \
+	am335x-boneblack-lcd7-01-00a2.dtb \
+	am335x-boneblack-lcd4-01-00a1.dtb \
+	am335x-boneblack-lcd3-01-00a2.dtb \
+	am335x-boneblack-bbb-exp-c.dtb \
+	am335x-boneblack-4dcape-70t.dtb \
+	am335x-boneblack-4dcape-70.dtb \
+	am335x-boneblack-4dcape-43t.dtb \
+	am335x-boneblack-4dcape-43.dtb \
+	am335x-boneblack-crypto-00a0.dtb \
+	am335x-boneblack-cape-bone-argus.dtb \
+	am335x-boneblack-can1.dtb \
+	am335x-boneblack-bb-view-43.dtb \
+	am335x-boneblack-audio-revb.dtb \
+	am335x-boneblack-audio-reva.dtb \
+	am335x-bone-ttyO5.dtb \
+	am335x-bone-ttyO4.dtb \
+	am335x-bone-ttyO2.dtb \
+	am335x-bone-ttyO1.dtb \
+	am335x-bone-rtc-01-00a1.dtb \
+	am335x-bone-lcd7-01-00a3.dtb \
+	am335x-bone-lcd7-01-00a2.dtb \
+	am335x-bone-lcd4-01-00a1.dtb \
+	am335x-bone-lcd3-01-00a2.dtb \
+	am335x-bone-bbb-exp-c.dtb \
+	am335x-bone-4dcape-70t.dtb \
+	am335x-bone-4dcape-70.dtb \
+	am335x-bone-4dcape-43t.dtb \
+	am335x-bone-4dcape-43.dtb \
+	am335x-bone-crypto-00a0.dtb \
+	am335x-bone-cape-bone-argus.dtb \
+	am335x-bone-can1.dtb \
+	am335x-bone-bb-view-43.dtb \
+	am335x-bone-audio-revb.dtb \
+	am335x-bone-audio-reva.dtb \
 	am335x-nano.dtb \
 	am335x-base0033.dtb \
 	am3517-craneboard.dtb \

arch/arm/boot/dts/am335x-bone-4dcape-43.dts

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+#include "am335x-bone-common-pinmux.dtsi"
+
+/ {
+	model = "TI AM335x BeagleBone";
+	compatible = "ti,am335x-bone", "ti,am33xx";
+};
+
+&ldo3_reg {
+	regulator-min-microvolt = <1800000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-always-on;
+};
+
+&ocp {
+	/* clkout2 */
+	P9_41_pinmux {
+		status = "disabled";
+	};
+	/* mmc1 */
+	P9_92_pinmux {
+		status = "disabled";
+	};
+};
+
+&mmc1 {
+	vmmc-supply = <&ldo3_reg>;
+};
+
+&am33xx_pinmux {
+	pinctrl-names = "default";
+	pinctrl-0 = <&clkout2_pin>;
+};
+
+#include "am335x-bone-i2c2-cape-eeprom.dtsi"
+
+#include "am335x-bone-4dcape-43.dtsi"

arch/arm/boot/dts/am335x-bone-4dcape-43.dtsi

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* Led */
+/* #include "am335x-bone-led-gpio1-18.dtsi" */
+#include "am335x-bone-led-gpio1-28.dtsi"
+/* #include "am335x-bone-led-gpio3-19.dtsi" */
+/* #include "am335x-bone-led-gpio2-4-gpio2-5.dtsi" */
+
+/* Keypad */
+/* #include "am335x-bone-keymap0.dtsi" */
+#include "am335x-bone-keymap1.dtsi"
+/* #include "am335x-bone-keymap2.dtsi" */
+/* #include "am335x-bone-keymap3.dtsi" */
+
+/* Backlight */
+#include "am335x-bone-bl-gpio1-18.dtsi"
+
+/* Touchscreen */
+/* #include "am335x-bone-ti-tscadc-4-wire.dtsi" */
+
+/* Panel */
+/* #include "am335x-bone-panel-320x240.dtsi" */
+#include "am335x-bone-panel-480x272.dtsi"
+/* #include "am335x-bone-panel-800x480.dtsi" */
+/* #include "am335x-bone-panel-1024x600-24bit.dtsi" */

arch/arm/boot/dts/am335x-bone-4dcape-43t.dts

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+#include "am335x-bone-common-pinmux.dtsi"
+
+/ {
+	model = "TI AM335x BeagleBone";
+	compatible = "ti,am335x-bone", "ti,am33xx";
+};
+
+&ldo3_reg {
+	regulator-min-microvolt = <1800000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-always-on;
+};
+
+&ocp {
+	/* clkout2 */
+	P9_41_pinmux {
+		status = "disabled";
+	};
+	/* mmc1 */
+	P9_92_pinmux {
+		status = "disabled";
+	};
+};
+
+&mmc1 {
+	vmmc-supply = <&ldo3_reg>;
+};
+
+&am33xx_pinmux {
+	pinctrl-names = "default";
+	pinctrl-0 = <&clkout2_pin>;
+};
+
+#include "am335x-bone-i2c2-cape-eeprom.dtsi"
+
+#include "am335x-bone-4dcape-43t.dtsi"

arch/arm/boot/dts/am335x-bone-4dcape-43t.dtsi

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* Led */
+/* #include "am335x-bone-led-gpio1-18.dtsi" */
+#include "am335x-bone-led-gpio1-28.dtsi"
+/* #include "am335x-bone-led-gpio3-19.dtsi" */
+/* #include "am335x-bone-led-gpio2-4-gpio2-5.dtsi" */
+
+/* Keypad */
+/* #include "am335x-bone-keymap0.dtsi" */
+#include "am335x-bone-keymap1.dtsi"
+/* #include "am335x-bone-keymap2.dtsi" */
+/* #include "am335x-bone-keymap3.dtsi" */
+
+/* Backlight */
+#include "am335x-bone-bl-gpio1-18.dtsi"
+
+/* Touchscreen */
+#include "am335x-bone-ti-tscadc-4-wire.dtsi"
+
+/* Panel */
+/* #include "am335x-bone-panel-320x240.dtsi" */
+#include "am335x-bone-panel-480x272.dtsi"
+/* #include "am335x-bone-panel-800x480.dtsi" */
+/* #include "am335x-bone-panel-1024x600-24bit.dtsi" */

arch/arm/boot/dts/am335x-bone-4dcape-70.dts

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+#include "am335x-bone-common-pinmux.dtsi"
+
+/ {
+	model = "TI AM335x BeagleBone";
+	compatible = "ti,am335x-bone", "ti,am33xx";
+};
+
+&ldo3_reg {
+	regulator-min-microvolt = <1800000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-always-on;
+};
+
+&ocp {
+	/* clkout2 */
+	P9_41_pinmux {
+		status = "disabled";
+	};
+	/* mmc1 */
+	P9_92_pinmux {
+		status = "disabled";
+	};
+};
+
+&mmc1 {
+	vmmc-supply = <&ldo3_reg>;
+};
+
+&am33xx_pinmux {
+	pinctrl-names = "default";
+	pinctrl-0 = <&clkout2_pin>;
+};
+
+#include "am335x-bone-i2c2-cape-eeprom.dtsi"
+
+#include "am335x-bone-4dcape-70.dtsi"

arch/arm/boot/dts/am335x-bone-4dcape-70.dtsi

@@ -0,0 +1,31 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/* Led */
+/* #include "am335x-bone-led-gpio1-18.dtsi" */
+#include "am335x-bone-led-gpio1-28.dtsi"
+/* #include "am335x-bone-led-gpio3-19.dtsi" */
+/* #include "am335x-bone-led-gpio2-4-gpio2-5.dtsi" */
+
+/* Keypad */
+#include "am335x-bone-keymap0.dtsi"
+/* #include "am335x-bone-keymap1.dtsi" */
+/* #include "am335x-bone-keymap2.dtsi" */
+/* #include "am335x-bone-keymap3.dtsi" */
+
+/* Backlight */
+#include "am335x-bone-bl-gpio1-18.dtsi"
+
+/* Touchscreen */
+/* #include "am335x-bone-ti-tscadc-4-wire.dtsi" */
+
+/* Panel */
+/* #include "am335x-bone-panel-320x240.dtsi" */
+/* #include "am335x-bone-panel-480x272.dtsi" */
+#include "am335x-bone-panel-800x480.dtsi"
+/* #include "am335x-bone-panel-1024x600-24bit.dtsi" */

arch/arm/boot/dts/am335x-bone-4dcape-70t.dts

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+#include "am335x-bone-common-pinmux.dtsi"
+
+/ {
+	model = "TI AM335x BeagleBone";
+	compatible = "ti,am335x-bone", "ti,am33xx";
+};
+
+&ldo3_reg {
+	regulator-min-microvolt = <1800000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-always-on;
+};
+
+&ocp {
+	/* clkout2 */
+	P9_41_pinmux {
+		status = "disabled";
+	};
+	/* mmc1 */
+	P9_92_pinmux {
+		status = "disabled";
+	};
+};
+
+&mmc1 {
+	vmmc-supply = <&ldo3_reg>;
+};
+
+&am33xx_pinmux {
+	pinctrl-names = "default";
+	pinctrl-0 = <&clkout2_pin>;
+};
+
+#include "am335x-bone-i2c2-cape-eeprom.dtsi"
+
+#include "am335x-bone-4dcape-70t.dtsi"