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

Commit d6c662d4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 21b4da78 00adbf62

Documentation/powerpc/booting-without-of.txt

+59 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ 
                           compiler and the textural representation of

                           the tree that can be "compiled" by dtc.





   November 21, 2005: Rev 0.5

			 - Additions/generalizations for 32-bit

			 - Changed to reflect the new arch/powerpc
@@ -1307,6 +1306,65 @@ platforms are moved over to use the flattened-device-tree model. 
	};





   f) Freescale SOC USB controllers



   The device node for a USB controller that is part of a Freescale

   SOC is as described in the document "Open Firmware Recommended

   Practice : Universal Serial Bus" with the following modifications

   and additions :  



   Required properties :

    - compatible : Should be "fsl-usb2-mph" for multi port host usb

      controllers, or "fsl-usb2-dr" for dual role usb controllers

    - phy_type : For multi port host usb controllers, should be one of

      "ulpi", or "serial". For dual role usb controllers, should be

      one of "ulpi", "utmi", "utmi_wide", or "serial".

    - reg : Offset and length of the register set for the device

    - port0 : boolean; if defined, indicates port0 is connected for

      fsl-usb2-mph compatible controllers.  Either this property or

      "port1" (or both) must be defined for "fsl-usb2-mph" compatible 

      controllers.

    - port1 : boolean; if defined, indicates port1 is connected for

      fsl-usb2-mph compatible controllers.  Either this property or

      "port0" (or both) must be defined for "fsl-usb2-mph" compatible 

      controllers.



   Recommended properties :

    - interrupts : <a b> where a is the interrupt number and b is a

      field that represents an encoding of the sense and level

      information for the interrupt.  This should be encoded based on

      the information in section 2) depending on the type of interrupt

      controller you have.

    - interrupt-parent : the phandle for the interrupt controller that

      services interrupts for this device.



   Example multi port host usb controller device node : 

	usb@22000 {

	        device_type = "usb";

		compatible = "fsl-usb2-mph";

		reg = <22000 1000>;

		#address-cells = <1>;

		#size-cells = <0>;

		interrupt-parent = <700>;

		interrupts = <27 1>;

		phy_type = "ulpi";

		port0;

		port1;

	};



   Example dual role usb controller device node : 

	usb@23000 {

		device_type = "usb";

		compatible = "fsl-usb2-dr";

		reg = <23000 1000>;

		#address-cells = <1>;

		#size-cells = <0>;

		interrupt-parent = <700>;

		interrupts = <26 1>;

		phy = "ulpi";

	};





   More devices will be defined as this spec matures.

arch/powerpc/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -83,6 +83,12 @@ config GENERIC_TBSYNC 
	default y if PPC32 && SMP

	default n



config DEFAULT_UIMAGE

	bool

	help

	  Used to allow a board to specify it wants a uImage built by default

	default n



menu "Processor support"

choice

	prompt "Processor Type"

arch/powerpc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -142,6 +142,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ 
# Default to zImage, override when needed

defaultimage-y			:= zImage

defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux

defaultimage-$(CONFIG_DEFAULT_UIMAGE) := uImage

KBUILD_IMAGE := $(defaultimage-y)

all: $(KBUILD_IMAGE)

arch/powerpc/kernel/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ endif 


obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \

				   irq.o align.o signal_32.o pmc.o vdso.o \

				   init_task.o process.o

				   init_task.o process.o systbl.o

obj-y				+= vdso32/

obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \

				   signal_64.o ptrace32.o systbl.o \

				   signal_64.o ptrace32.o \

				   paca.o cpu_setup_power4.o \

				   firmware.o sysfs.o idle_64.o

obj-$(CONFIG_PPC64)		+= vdso64/
@@ -46,7 +46,7 @@ extra-$(CONFIG_8xx) := head_8xx.o 
extra-y				+= vmlinux.lds



obj-y				+= time.o prom.o traps.o setup-common.o udbg.o

obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o systbl.o

obj-$(CONFIG_PPC32)		+= entry_32.o setup_32.o misc_32.o

obj-$(CONFIG_PPC64)		+= misc_64.o dma_64.o iommu.o

obj-$(CONFIG_PPC_MULTIPLATFORM)	+= prom_init.o

obj-$(CONFIG_MODULES)		+= ppc_ksyms.o

arch/powerpc/kernel/systbl.S

+1 −2
Original line number Diff line number Diff line
@@ -36,8 +36,6 @@ 
#ifdef CONFIG_PPC64

#define sys_sigpending	sys_ni_syscall

#define sys_old_getrlimit sys_ni_syscall

#else

#define ppc_rtas	sys_ni_syscall

#endif



_GLOBAL(sys_call_table)
@@ -323,3 +321,4 @@ SYSCALL(spu_run) 
SYSCALL(spu_create)

COMPAT_SYS(pselect6)

COMPAT_SYS(ppoll)

SYSCALL(unshare)