Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (408 commits)
  [POWERPC] Add memchr() to the bootwrapper
  [POWERPC] Implement logging of unhandled signals
  [POWERPC] Add legacy serial support for OPB with flattened device tree
  [POWERPC] Use 1TB segments
  [POWERPC] XilinxFB: Allow fixed framebuffer base address
  [POWERPC] XilinxFB: Add support for custom screen resolution
  [POWERPC] XilinxFB: Use pdata to pass around framebuffer parameters
  [POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
  [POWERPC] 4xx: Kilauea defconfig file
  [POWERPC] 4xx: Kilauea DTS
  [POWERPC] 4xx: Add AMCC Kilauea eval board support to platforms/40x
  [POWERPC] 4xx: Add AMCC 405EX support to cputable.c
  [POWERPC] Adjust TASK_SIZE on ppc32 systems to 3GB that are capable
  [POWERPC] Use PAGE_OFFSET to tell if an address is user/kernel in SW TLB handlers
  [POWERPC] 85xx: Enable FP emulation in MPC8560 ADS defconfig
  [POWERPC] 85xx: Killed <asm/mpc85xx.h>
  [POWERPC] 85xx: Add cpm nodes for 8541/8555 CDS
  [POWERPC] 85xx: Convert mpc8560ads to the new CPM binding.
  [POWERPC] mpc8272ads: Remove muram from the CPM reg property.
  [POWERPC] Make clockevents work on PPC601 processors
  ...

Fixed up conflict in Documentation/powerpc/booting-without-of.txt manually.

1 files changed, 41 insertions, 4 deletions

diff --git a/arch/powerpc/boot/ebony.c b/arch/powerpc/boot/ebony.c
index 75daedafd0a4..86c0f5df0a86 100644
--- a/arch/powerpc/boot/ebony.c
+++ b/arch/powerpc/boot/ebony.c
@@ -24,12 +24,11 @@
 #include "page.h"
 #include "ops.h"
 #include "reg.h"
+#include "io.h"
 #include "dcr.h"
+#include "4xx.h"
 #include "44x.h"
 
-extern char _dtb_start[];
-extern char _dtb_end[];
-
 static u8 *ebony_mac0, *ebony_mac1;
 
 /* Calculate 440GP clocks */
@@ -92,15 +91,53 @@ void ibm440gp_fixup_clocks(unsigned int sysclk, unsigned int ser_clk)
         dt_fixup_clock("/plb/opb/serial@40000300", uart1);
 }
 
+#define EBONY_FPGA_PATH         "/plb/opb/ebc/fpga"
+#define EBONY_FPGA_FLASH_SEL    0x01
+#define EBONY_SMALL_FLASH_PATH  "/plb/opb/ebc/small-flash"
+
+static void ebony_flashsel_fixup(void)
+{
+        void *devp;
+        u32 reg[3] = {0x0, 0x0, 0x80000};
+        u8 *fpga;
+        u8 fpga_reg0 = 0x0;
+
+        devp = finddevice(EBONY_FPGA_PATH);
+        if (!devp)
+                fatal("Couldn't locate FPGA node %s\n\r", EBONY_FPGA_PATH);
+
+        if (getprop(devp, "virtual-reg", &fpga, sizeof(fpga)) != sizeof(fpga))
+                fatal("%s has missing or invalid virtual-reg property\n\r",
+                      EBONY_FPGA_PATH);
+
+        fpga_reg0 = in_8(fpga);
+
+        devp = finddevice(EBONY_SMALL_FLASH_PATH);
+        if (!devp)
+                fatal("Couldn't locate small flash node %s\n\r",
+                      EBONY_SMALL_FLASH_PATH);
+
+        if (getprop(devp, "reg", reg, sizeof(reg)) != sizeof(reg))
+                fatal("%s has reg property of unexpected size\n\r",
+                      EBONY_SMALL_FLASH_PATH);
+
+        /* Invert address bit 14 (IBM-endian) if FLASH_SEL fpga bit is set */
+        if (fpga_reg0 & EBONY_FPGA_FLASH_SEL)
+                reg[1] ^= 0x80000;
+
+        setprop(devp, "reg", reg, sizeof(reg));
+}
+
 static void ebony_fixups(void)
 {
         // FIXME: sysclk should be derived by reading the FPGA registers
         unsigned long sysclk = 33000000;
 
         ibm440gp_fixup_clocks(sysclk, 6 * 1843200);
-        ibm44x_fixup_memsize();
+        ibm4xx_fixup_memsize();
         dt_fixup_mac_addresses(ebony_mac0, ebony_mac1);
         ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");
+        ebony_flashsel_fixup();
 }
 
 void ebony_init(void *mac0, void *mac1)