Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 912b2539 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  powerpc: add defconfig for Freescale MPC8349E-mITX board
  powerpc: Add base support for the Freescale MPC8349E-mITX eval board
  Documentation: correct values in MPC8548E SEC example node
  [POWERPC] Actually copy over i8259.c to arch/ppc/syslib this time
  [POWERPC] Add new interrupt mapping core and change platforms to use it
  [POWERPC] Copy i8259 code back to arch/ppc
  [POWERPC] New device-tree interrupt parsing code
  [POWERPC] Use the genirq framework
  [PATCH] genirq: Allow fasteoi handler to retrigger disabled interrupts
  [POWERPC] Update the SWIM3 (powermac) floppy driver
  [POWERPC] Fix error handling in detecting legacy serial ports
  [POWERPC] Fix booting on Momentum "Apache" board (a Maple derivative)
  [POWERPC] Fix various offb and BootX-related issues
  [POWERPC] Add a default config for 32-bit CHRP machines
  [POWERPC] fix implicit declaration on cell.
  [POWERPC] change get_property to return void *
parents 70b97a7f 39ab9c21

Documentation/powerpc/booting-without-of.txt

+2 −2
Original line number Diff line number Diff line
@@ -1436,9 +1436,9 @@ platforms are moved over to use the flattened-device-tree model. 
               interrupts = <1d 3>;

               interrupt-parent = <40000>;

               num-channels = <4>;

               channel-fifo-len = <24>;

               channel-fifo-len = <18>;

               exec-units-mask = <000000fe>;

               descriptor-types-mask = <073f1127>;

               descriptor-types-mask = <012b0ebf>;

       };

arch/powerpc/configs/chrp32_defconfig

0 → 100644
+1378 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/powerpc/configs/mpc834x_itx_defconfig

0 → 100644
+1336 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/powerpc/kernel/btext.c

+14 −6
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ void __init btext_setup_display(int width, int height, int depth, int pitch, 
	logicalDisplayBase = (unsigned char *)address;

	dispDeviceBase = (unsigned char *)address;

	dispDeviceRowBytes = pitch;

	dispDeviceDepth = depth;

	dispDeviceDepth = depth == 15 ? 16 : depth;

	dispDeviceRect[0] = dispDeviceRect[1] = 0;

	dispDeviceRect[2] = width;

	dispDeviceRect[3] = height;
@@ -160,19 +160,27 @@ int btext_initialize(struct device_node *np) 
	unsigned long address = 0;

	u32 *prop;



	prop = (u32 *)get_property(np, "linux,bootx-width", NULL);

	if (prop == NULL)

		prop = (u32 *)get_property(np, "width", NULL);

	if (prop == NULL)

		return -EINVAL;

	width = *prop;

	prop = (u32 *)get_property(np, "linux,bootx-height", NULL);

	if (prop == NULL)

		prop = (u32 *)get_property(np, "height", NULL);

	if (prop == NULL)

		return -EINVAL;

	height = *prop;

	prop = (u32 *)get_property(np, "linux,bootx-depth", NULL);

	if (prop == NULL)

		prop = (u32 *)get_property(np, "depth", NULL);

	if (prop == NULL)

		return -EINVAL;

	depth = *prop;

	pitch = width * ((depth + 7) / 8);

	prop = (u32 *)get_property(np, "linux,bootx-linebytes", NULL);

	if (prop == NULL)

		prop = (u32 *)get_property(np, "linebytes", NULL);

	if (prop)

		pitch = *prop;
@@ -194,7 +202,7 @@ int btext_initialize(struct device_node *np) 
	g_max_loc_Y = height / 16;

	dispDeviceBase = (unsigned char *)address;

	dispDeviceRowBytes = pitch;

	dispDeviceDepth = depth;

	dispDeviceDepth = depth == 15 ? 16 : depth;

	dispDeviceRect[0] = dispDeviceRect[1] = 0;

	dispDeviceRect[2] = width;

	dispDeviceRect[3] = height;

arch/powerpc/kernel/ibmebus.c

+2 −7
Original line number Diff line number Diff line
@@ -323,13 +323,11 @@ int ibmebus_request_irq(struct ibmebus_dev *dev, 
			unsigned long irq_flags, const char * devname,

			void *dev_id)

{

	unsigned int irq = virt_irq_create_mapping(ist);

	unsigned int irq = irq_create_mapping(NULL, ist, 0);

	

	if (irq == NO_IRQ)

		return -EINVAL;

	

	irq = irq_offset_up(irq);

	

	return request_irq(irq, handler,

			   irq_flags, devname, dev_id);

}
@@ -337,12 +335,9 @@ EXPORT_SYMBOL(ibmebus_request_irq); 


void ibmebus_free_irq(struct ibmebus_dev *dev, u32 ist, void *dev_id)

{

	unsigned int irq = virt_irq_create_mapping(ist);

	unsigned int irq = irq_find_mapping(NULL, ist);

	

	irq = irq_offset_up(irq);

	free_irq(irq, dev_id);

	

	return;

}

EXPORT_SYMBOL(ibmebus_free_irq);