Merge remote-tracking branch 'powerpc/next'

Conflicts:
	arch/powerpc/configs/40x/hcu4_defconfig
	arch/powerpc/include/asm/udbg.h
	arch/powerpc/kernel/udbg.c
	drivers/tty/serial/8250.c

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/configs/ppc40x_defconfig
Simple merge

diff --cc arch/powerpc/include/asm/udbg.h
index 5354ae91bdde8f2d168c68552a50f5f97f5520e9,6587ec7bc6ec8e081b99341323380082b9efee0f..7efc08eccfa191f4d4e0bbdb7226fd6b3eec9489
--- 1/arch/powerpc/include/asm/udbg.h
--- 2/arch/powerpc/include/asm/udbg.h
+++ b/arch/powerpc/include/asm/udbg.h
@@@ -54,7 -54,9 +54,10 @@@ extern void __init udbg_init_40x_realmo
  extern void __init udbg_init_cpm(void);
  extern void __init udbg_init_usbgecko(void);
  extern void __init udbg_init_wsp(void);
+ extern void __init udbg_init_ps3gelic(void);
+ extern void __init udbg_init_debug_opal_raw(void);
+ extern void __init udbg_init_debug_opal_hvsi(void);
 +extern void __init udbg_init_ehv_bc(void);
  
  #endif /* __KERNEL__ */
  #endif /* _ASM_POWERPC_UDBG_H */

diff --cc arch/powerpc/kernel/asm-offsets.c
Simple merge

diff --cc arch/powerpc/kernel/exceptions-64s.S
Simple merge

diff --cc arch/powerpc/kernel/udbg.c
index b4607a91d1f44563d2dcf8851118de567aa88dc7,35f948203ec59fc698129057ff544db1d57632a1..7de6d3747619afa4a59a54dd981e855b46454cb5
--- 1/arch/powerpc/kernel/udbg.c
--- 2/arch/powerpc/kernel/udbg.c
+++ b/arch/powerpc/kernel/udbg.c
@@@ -67,8 -67,12 +67,14 @@@ void __init udbg_early_init(void
        udbg_init_usbgecko();
  #elif defined(CONFIG_PPC_EARLY_DEBUG_WSP)
        udbg_init_wsp();
+ #elif defined(CONFIG_PPC_EARLY_DEBUG_PS3GELIC)
+       udbg_init_ps3gelic();
+ #elif defined(CONFIG_PPC_EARLY_DEBUG_OPAL_RAW)
+       udbg_init_debug_opal_raw();
+ #elif defined(CONFIG_PPC_EARLY_DEBUG_OPAL_HVSI)
+       udbg_init_debug_opal_hvsi();
 +#elif defined(CONFIG_PPC_EARLY_DEBUG_EHV_BC)
 +      udbg_init_ehv_bc();
  #endif
  
  #ifdef CONFIG_PPC_EARLY_DEBUG

diff --cc arch/powerpc/mm/hugetlbpage.c
Simple merge

diff --cc arch/powerpc/platforms/40x/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/85xx/Kconfig
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

diff --cc drivers/net/ethernet/toshiba/ps3_gelic_net.c
Simple merge

diff --cc drivers/net/ethernet/toshiba/ps3_gelic_net.h
Simple merge

diff --cc drivers/of/fdt.c
Simple merge

diff --cc drivers/tty/hvc/hvcs.c
Simple merge

diff --cc drivers/tty/serial/8250.c
index a87a56cb5417b0f0804e532c5a260ab81b2329ea,610b8e63710d53c67bfa83d35fed8ec01771a018..eeadf1b8e093202234b30c688490da2de10a3c04
--- 1/drivers/tty/serial/8250.c
--- 2/drivers/tty/serial/8250.c
+++ b/drivers/tty/serial/8250.c
@@@ -450,24 -443,42 +450,6 @@@ static void au_serial_out(struct uart_p
        __raw_writel(value, p->membase + offset);
  }
  
- static unsigned int tsi_serial_in(struct uart_port *p, int offset)
 -/* Save the LCR value so it can be re-written when a Busy Detect IRQ occurs. */
 -static inline void dwapb_save_out_value(struct uart_port *p, int offset,
 -                                      int value)
--{
-       unsigned int tmp;
-       offset = map_8250_in_reg(p, offset) << p->regshift;
-       if (offset == UART_IIR) {
-               tmp = readl(p->membase + (UART_IIR & ~3));
-               return (tmp >> 16) & 0xff; /* UART_IIR % 4 == 2 */
-       } else
-               return readb(p->membase + offset);
 -      struct uart_8250_port *up =
 -              container_of(p, struct uart_8250_port, port);
 -
 -      if (offset == UART_LCR)
 -              up->lcr = value;
--}
--
- static void tsi_serial_out(struct uart_port *p, int offset, int value)
 -/* Read the IER to ensure any interrupt is cleared before returning from ISR. */
 -static inline void dwapb_check_clear_ier(struct uart_port *p, int offset)
 -{
 -      if (offset == UART_TX || offset == UART_IER)
 -              p->serial_in(p, UART_IER);
 -}
 -
 -static void dwapb_serial_out(struct uart_port *p, int offset, int value)
--{
 -      int save_offset = offset;
--      offset = map_8250_out_reg(p, offset) << p->regshift;
-       if (!((offset == UART_IER) && (value & UART_IER_UUE)))
-               writeb(value, p->membase + offset);
 -      dwapb_save_out_value(p, save_offset, value);
 -      writeb(value, p->membase + offset);
 -      dwapb_check_clear_ier(p, save_offset);
 -}
 -
 -static void dwapb32_serial_out(struct uart_port *p, int offset, int value)
 -{
 -      int save_offset = offset;
 -      offset = map_8250_out_reg(p, offset) << p->regshift;
 -      dwapb_save_out_value(p, save_offset, value);
 -      writel(value, p->membase + offset);
 -      dwapb_check_clear_ier(p, save_offset);
--}
--
  static unsigned int io_serial_in(struct uart_port *p, int offset)
  {
        offset = map_8250_in_reg(p, offset) << p->regshift;
@@@ -508,11 -517,16 +490,6 @@@ static void set_io_from_upio(struct uar
                p->serial_out = au_serial_out;
                break;
  
-       case UPIO_TSI:
-               p->serial_in = tsi_serial_in;
-               p->serial_out = tsi_serial_out;
 -      case UPIO_DWAPB:
 -              p->serial_in = mem_serial_in;
 -              p->serial_out = dwapb_serial_out;
 -              break;
 -
 -      case UPIO_DWAPB32:
 -              p->serial_in = mem32_serial_in;
 -              p->serial_out = dwapb32_serial_out;
--              break;
--
        default:
                p->serial_in = io_serial_in;
                p->serial_out = io_serial_out;

diff --cc include/linux/dma-mapping.h
Simple merge

diff --cc kernel/sched.c
Simple merge