Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (35 commits)
  powerpc/5121: make clock debug output more readable
  powerpc/5xxx: Add common mpc5xxx_get_bus_frequency() function
  powerpc/5200: Update pcm030.dts to add i2c eeprom and delete cruft
  powerpc/5200: convert mpc52xx_psc_spi to use cs_control callback
  fbdev/xilinxfb: Fix improper casting and tighen up probe path
  usb/ps3: Add missing annotations
  powerpc: Add memory clobber to mtspr()
  powerpc: Fix invalid construct in our CPU selection Kconfig
  ps3rom: Use ps3_system_bus_[gs]et_drvdata() instead of direct access
  powerpc: Add configurable -Werror for arch/powerpc
  of_serial: Add UPF_FIXED_TYPE flag
  drivers/hvc: Add missing __devexit_p()
  net/ps3: gelic - Add missing annotations
  powerpc: Introduce macro spin_event_timeout()
  powerpc/warp: Fix ISA_DMA_THRESHOLD default
  powerpc/bootwrapper: Custom build options for XPedite52xx targets
  powerpc/85xx: Add defconfig for X-ES MPC85xx boards
  powerpc/85xx: Add dts files for X-ES MPC85xx boards
  powerpc/85xx: Add platform support for X-ES MPC85xx boards
  83xx: add support for the kmeter1 board.
  ...

1 files changed, 13 insertions, 6 deletions

diff --git a/arch/powerpc/boot/dts/mpc8272ads.dts b/arch/powerpc/boot/dts/mpc8272ads.dts
index 2a1929acaabd..60f332778e41 100644
--- a/arch/powerpc/boot/dts/mpc8272ads.dts
+++ b/arch/powerpc/boot/dts/mpc8272ads.dts
@@ -17,6 +17,13 @@
         #address-cells = <1>;
         #size-cells = <1>;
 
+        aliases {
+                ethernet0 = &eth0;
+                ethernet1 = &eth1;
+                serial0 = &scc1;
+                serial1 = &scc4;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -46,13 +53,13 @@
                 #size-cells = <1>;
                 reg = <0xf0010100 0x40>;
 
-                ranges = <0x0 0x0 0xfe000000 0x2000000
+                ranges = <0x0 0x0 0xff800000 0x00800000
                           0x1 0x0 0xf4500000 0x8000
                           0x3 0x0 0xf8200000 0x8000>;
 
                 flash@0,0 {
                         compatible = "jedec-flash";
-                        reg = <0x0 0x0 0x2000000>;
+                        reg = <0x0 0x0 0x00800000>;
                         bank-width = <4>;
                         device-width = <1>;
                 };
@@ -144,7 +151,7 @@
                                 reg = <0x119f0 0x10 0x115f0 0x10>;
                         };
 
-                        serial@11a00 {
+                        scc1: serial@11a00 {
                                 device_type = "serial";
                                 compatible = "fsl,mpc8272-scc-uart",
                                              "fsl,cpm2-scc-uart";
@@ -155,7 +162,7 @@
                                 fsl,cpm-command = <0x800000>;
                         };
 
-                        serial@11a60 {
+                        scc4: serial@11a60 {
                                 device_type = "serial";
                                 compatible = "fsl,mpc8272-scc-uart",
                                              "fsl,cpm2-scc-uart";
@@ -192,7 +199,7 @@
                                 };
                         };
 
-                        ethernet@11300 {
+                        eth0: ethernet@11300 {
                                 device_type = "network";
                                 compatible = "fsl,mpc8272-fcc-enet",
                                              "fsl,cpm2-fcc-enet";
@@ -205,7 +212,7 @@
                                 fsl,cpm-command = <0x12000300>;
                         };
 
-                        ethernet@11320 {
+                        eth1: ethernet@11320 {
                                 device_type = "network";
                                 compatible = "fsl,mpc8272-fcc-enet",
                                              "fsl,cpm2-fcc-enet";