From: Jason Cooper <jason@lakedaemon.net>
Date: Mon, 19 Aug 2013 21:28:24 +0000 (+0000)
Subject: Merge branch 'mvebu/boards' into for-next
X-Git-Tag: next-20130822~13^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=faa7403b6bba3a2ef8114f60340b60cdc7c0b84e;p=karo-tx-linux.git

Merge branch 'mvebu/boards' into for-next

Conflicts:
	arch/arm/boot/dts/kirkwood.dtsi
---

faa7403b6bba3a2ef8114f60340b60cdc7c0b84e
diff --cc arch/arm/boot/dts/kirkwood-db.dtsi
index 45c1bf74ac00,ca8bf362748a..c0e2a5879174
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@@ -77,5 -77,29 +77,21 @@@
  			cd-gpios = <&gpio1 6 0>;
  			status = "okay";
  		};
 -
 -		pcie-controller {
 -			status = "okay";
 -
 -			pcie@1,0 {
 -				status = "okay";
 -			};
 -		};
  	};
  };
+ 
+ &mdio {
+ 	status = "okay";
+ 
+ 	ethphy0: ethernet-phy@8 {
+ 		device_type = "ethernet-phy";
+ 		reg = <8>;
+ 	};
+ };
+ 
+ &eth0 {
+ 	status = "okay";
+ 	ethernet0-port@0 {
+ 		phy-handle = <&ethphy0>;
+ 	};
+ };
diff --cc arch/arm/boot/dts/kirkwood-ts219.dtsi
index 7019cf675df2,102eaeb426aa..39158cf16258
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@@ -97,5 -87,28 +97,21 @@@
  			status = "okay";
  			nr-ports = <2>;
  		};
 -		pcie-controller {
 -			status = "okay";
 -
 -			pcie@1,0 {
 -				status = "okay";
 -			};
 -		};
  	};
  };
+ 
+ &mdio {
+ 	status = "okay";
+ 
+ 	ethphy0: ethernet-phy {
+ 		device_type = "ethernet-phy";
+                 /* overwrite reg property in board file */
+ 	};
+ };
+ 
+ &eth0 {
+ 	status = "okay";
+ 	ethernet0-port@0 {
+ 		phy-handle = <&ethphy0>;
+ 	};
+ };
diff --cc arch/arm/boot/dts/kirkwood.dtsi
index 70f414d9bd9a,1d6921d2d170..6489b982563a
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@@ -22,23 -20,7 +22,16 @@@
  	       gpio0 = &gpio0;
  	       gpio1 = &gpio1;
  	};
- 	intc: interrupt-controller {
- 		compatible = "marvell,orion-intc", "marvell,intc";
- 		interrupt-controller;
- 		#interrupt-cells = <1>;
- 		reg = <0xf1020204 0x04>,
- 		      <0xf1020214 0x04>;
- 	};
  
 +	mbus {
 +		compatible = "marvell,kirkwood-mbus", "simple-bus";
 +		#address-cells = <2>;
 +		#size-cells = <1>;
 +		controller = <&mbusc>;
 +		pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
 +		pcie-io-aperture  = <0xf2000000 0x100000>;   /*   1 MiB    I/O space */
 +	};
 +
  	ocp@f1000000 {
  		compatible = "simple-bus";
  		ranges = <0x00000000 0xf1000000 0x0100000
@@@ -47,11 -30,30 +40,35 @@@
  		#address-cells = <1>;
  		#size-cells = <1>;
  
+ 		timer: timer@20300 {
+ 			compatible = "marvell,orion-timer";
+ 			reg = <0x20300 0x20>;
+ 			interrupt-parent = <&bridge_intc>;
+ 			interrupts = <1>, <2>;
+ 			clocks = <&core_clk 0>;
+ 		};
+ 
+ 		intc: main-interrupt-ctrl@20200 {
+ 			compatible = "marvell,orion-intc";
+ 			interrupt-controller;
+ 			#interrupt-cells = <1>;
+ 			reg = <0x20200 0x10>, <0x20210 0x10>;
+ 		};
+ 
+ 		bridge_intc: bridge-interrupt-ctrl@20110 {
+ 			compatible = "marvell,orion-bridge-intc";
+ 			interrupt-controller;
+ 			#interrupt-cells = <1>;
+ 			reg = <0x20110 0x8>;
+ 			interrupts = <1>;
+ 			marvell,#interrupts = <6>;
+ 		};
+ 
 +		mbusc: mbus-controller@20000 {
 +			compatible = "marvell,mbus-controller";
 +			reg = <0x20000 0x80>, <0x1500 0x20>;
 +		};
 +
  		core_clk: core-clocks@10030 {
  			compatible = "marvell,kirkwood-core-clock";
  			reg = <0x10030 0x4>;
diff --cc arch/arm/mach-orion5x/edmini_v2-setup.c
index 0fc33c56cbb7,7d316ede10ae..f66c1b2ee8c1
--- a/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@@ -152,12 -144,9 +144,11 @@@ void __init edmini_v2_init(void
  	 * Configure peripherals.
  	 */
  	orion5x_ehci0_init();
- 	orion5x_eth_init(&edmini_v2_eth_data);
  
 -	mvebu_mbus_add_window("devbus-boot", EDMINI_V2_NOR_BOOT_BASE,
 -			      EDMINI_V2_NOR_BOOT_SIZE);
 +	mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
 +				    ORION_MBUS_DEVBUS_BOOT_ATTR,
 +				    EDMINI_V2_NOR_BOOT_BASE,
 +				    EDMINI_V2_NOR_BOOT_SIZE);
  	platform_device_register(&edmini_v2_nor_flash);
  
  	pr_notice("edmini_v2: USB device port, flash write and power-off "