Merge branch 'master' (cbefa325) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/powerpc/booting-without-of.txt

+59 −1

Original line number	Original line	Diff line number	Diff line
	@@ -44,7 +44,6 @@
	compiler and the textural representation of		compiler and the textural representation of
	the tree that can be "compiled" by dtc.		the tree that can be "compiled" by dtc.


	November 21, 2005: Rev 0.5		November 21, 2005: Rev 0.5
	- Additions/generalizations for 32-bit		- Additions/generalizations for 32-bit
	- Changed to reflect the new arch/powerpc		- 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.		More devices will be defined as this spec matures.

arch/arm/mach-s3c2410/mach-h1940.c

+27 −2

Original line number	Original line	Diff line number	Diff line
	@@ -46,10 +46,11 @@
	#include <asm/irq.h>		#include <asm/irq.h>
	#include <asm/mach-types.h>		#include <asm/mach-types.h>

	//#include <asm/debug-ll.h>
	#include <asm/arch/regs-serial.h>		#include <asm/arch/regs-serial.h>
	#include <asm/arch/regs-lcd.h>		#include <asm/arch/regs-lcd.h>

			#include <asm/arch/h1940-latch.h>
	#include <asm/arch/fb.h>		#include <asm/arch/fb.h>

	#include <linux/serial_core.h>		#include <linux/serial_core.h>
	@@ -59,7 +60,12 @@
	#include "cpu.h"		#include "cpu.h"

	static struct map_desc h1940_iodesc[] __initdata = {		static struct map_desc h1940_iodesc[] __initdata = {
	/* nothing here yet */		[0] = {
			.virtual = (unsigned long)H1940_LATCH,
			.pfn = __phys_to_pfn(H1940_PA_LATCH),
			.length = SZ_16K,
			.type = MT_DEVICE
			},
	};		};

	#define UCON S3C2410_UCON_DEFAULT \| S3C2410_UCON_UCLK		#define UCON S3C2410_UCON_DEFAULT \| S3C2410_UCON_UCLK
	@@ -92,6 +98,25 @@ static struct s3c2410_uartcfg h1940_uartcfgs[] = {
	}		}
	};		};

			/* Board control latch control */

			static unsigned int latch_state = H1940_LATCH_DEFAULT;

			void h1940_latch_control(unsigned int clear, unsigned int set)
			{
			unsigned long flags;

			local_irq_save(flags);

			latch_state &= ~clear;
			latch_state \|= set;

			__raw_writel(latch_state, H1940_LATCH);

			local_irq_restore(flags);
			}

			EXPORT_SYMBOL_GPL(h1940_latch_control);


	/**		/**

arch/arm/mach-s3c2410/s3c2400.h

0 → 100644

+31 −0

Original line number	Original line	Diff line number	Diff line
			/* arch/arm/mach-s3c2410/s3c2400.h
			*
			* Copyright (c) 2004 Simtec Electronics
			* Ben Dooks <ben@simtec.co.uk>
			*
			* Header file for S3C2400 cpu support
			*
			* This program is free software; you can redistribute it and/or modify
			* it under the terms of the GNU General Public License version 2 as
			* published by the Free Software Foundation.
			*
			* Modifications:
			* 09-Fev-2006 LCVR First version, based on s3c2410.h
			*/

			#ifdef CONFIG_CPU_S3C2400

			extern int s3c2400_init(void);

			extern void s3c2400_map_io(struct map_desc *mach_desc, int size);

			extern void s3c2400_init_uarts(struct s3c2410_uartcfg *cfg, int no);

			extern void s3c2400_init_clocks(int xtal);

			#else
			#define s3c2400_init_clocks NULL
			#define s3c2400_init_uarts NULL
			#define s3c2400_map_io NULL
			#define s3c2400_init NULL
			#endif

arch/i386/kernel/smpboot.c

+0 −4

Original line number	Original line	Diff line number	Diff line
	@@ -87,11 +87,7 @@ EXPORT_SYMBOL(cpu_online_map);
	cpumask_t cpu_callin_map;		cpumask_t cpu_callin_map;
	cpumask_t cpu_callout_map;		cpumask_t cpu_callout_map;
	EXPORT_SYMBOL(cpu_callout_map);		EXPORT_SYMBOL(cpu_callout_map);
	#ifdef CONFIG_HOTPLUG_CPU
	cpumask_t cpu_possible_map = CPU_MASK_ALL;
	#else
	cpumask_t cpu_possible_map;		cpumask_t cpu_possible_map;
	#endif
	EXPORT_SYMBOL(cpu_possible_map);		EXPORT_SYMBOL(cpu_possible_map);
	static cpumask_t smp_commenced_mask;		static cpumask_t smp_commenced_mask;

arch/i386/mach-voyager/voyager_smp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -240,7 +240,7 @@ static cpumask_t smp_commenced_mask = CPU_MASK_NONE;
	cpumask_t cpu_callin_map = CPU_MASK_NONE;		cpumask_t cpu_callin_map = CPU_MASK_NONE;
	cpumask_t cpu_callout_map = CPU_MASK_NONE;		cpumask_t cpu_callout_map = CPU_MASK_NONE;
	EXPORT_SYMBOL(cpu_callout_map);		EXPORT_SYMBOL(cpu_callout_map);
	cpumask_t cpu_possible_map = CPU_MASK_ALL;		cpumask_t cpu_possible_map = CPU_MASK_NONE;
	EXPORT_SYMBOL(cpu_possible_map);		EXPORT_SYMBOL(cpu_possible_map);

	/* The per processor IRQ masks (these are usually kept in sync) */		/* The per processor IRQ masks (these are usually kept in sync) */