Commit 02550d61 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux-2.6 

devicetree/next changes queued for v3.3 merge window

* tag 'devicetree-for-linus-20120104' of git://git.secretlab.ca/git/linux-2.6:
  ARM: prom.h: Fix build error by removing unneeded header file
  irq: check domain hwirq range for DT translate
  dt: add empty of_get_node/of_put_node functions
  of/pdt: fix section mismatch warning
  i2c-designware: add OF binding support
  dt/i2c: Enumerate some of the known trivial i2c devices
  dt: reform for_each_property to for_each_property_of_node
  ARM/of: allow *machine_desc.dt_compat to be const
  of/base: Take NULL string into account for property with multiple strings
  OF/device-tree: Add some entries to vendor-prefixes.txt

Fix up trivial add-add conflicts in include/linux/of.h
parents 2d51daaa c89810ac

Documentation/devicetree/bindings/i2c/i2c-designware.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
* Synopsys DesignWare I2C



Required properties :



 - compatible : should be "snps,designware-i2c"

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

 - interrupts : <IRQ> where IRQ is the interrupt number.



Recommended properties :



 - clock-frequency : desired I2C bus clock frequency in Hz.



Example :



	i2c@f0000 {

		#address-cells = <1>;

		#size-cells = <0>;

		compatible = "snps,designware-i2c";

		reg = <0xf0000 0x1000>;

		interrupts = <11>;

		clock-frequency = <400000>;

	};

Documentation/devicetree/bindings/i2c/trivial-devices.txt

0 → 100644
+58 −0
Original line number Diff line number Diff line 
This is a list of trivial i2c devices that have simple device tree

bindings, consisting only of a compatible field, an address and

possibly an interrupt line.



If a device needs more specific bindings, such as properties to

describe some aspect of it, there needs to be a specific binding

document for it just like any other devices.





Compatible		Vendor / Chip

==========		=============

ad,ad7414		SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert and Over Temperature Pin

ad,adm9240		ADM9240:  Complete System Hardware Monitor for uProcessor-Based Systems

adi,adt7461		+/-1C TDM Extended Temp Range I.C

adt7461			+/-1C TDM Extended Temp Range I.C

at,24c08		i2c serial eeprom  (24cxx)

atmel,24c02		i2c serial eeprom  (24cxx)

catalyst,24c32		i2c serial eeprom

dallas,ds1307		64 x 8, Serial, I2C Real-Time Clock

dallas,ds1338		I2C RTC with 56-Byte NV RAM

dallas,ds1339		I2C Serial Real-Time Clock

dallas,ds1340		I2C RTC with Trickle Charger

dallas,ds1374		I2C, 32-Bit Binary Counter Watchdog RTC with Trickle Charger and Reset Input/Output

dallas,ds1631		High-Precision Digital Thermometer

dallas,ds1682		Total-Elapsed-Time Recorder with Alarm

dallas,ds1775		Tiny Digital Thermometer and Thermostat

dallas,ds3232		Extremely Accurate I²C RTC with Integrated Crystal and SRAM

dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O

dallas,ds75		Digital Thermometer and Thermostat

dialog,da9053		DA9053: flexible system level PMIC with multicore support

epson,rx8025		High-Stability. I2C-Bus INTERFACE REAL TIME CLOCK MODULE

epson,rx8581		I2C-BUS INTERFACE REAL TIME CLOCK MODULE

fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer

fsl,mc13892		MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51

fsl,mma8450		MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer

fsl,mpr121		MPR121: Proximity Capacitive Touch Sensor Controller

fsl,sgtl5000		SGTL5000: Ultra Low-Power Audio Codec

maxim,ds1050		5 Bit Programmable, Pulse-Width Modulator

maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs

maxim,max6625		9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface

mc,rv3029c2		Real Time Clock Module with I2C-Bus

national,lm75		I2C TEMP SENSOR

national,lm80		Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor

national,lm92		±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface

nxp,pca9556		Octal SMBus and I2C registered interface

nxp,pca9557		8-bit I2C-bus and SMBus I/O port with reset

nxp,pcf8563		Real-time clock/calendar

ovti,ov5642		OV5642: Color CMOS QSXGA (5-megapixel) Image Sensor with OmniBSI and Embedded TrueFocus

pericom,pt7c4338	Real-time Clock Module

plx,pex8648		48-Lane, 12-Port PCI Express Gen 2 (5.0 GT/s) Switch

ramtron,24c64		i2c serial eeprom  (24cxx)

ricoh,rs5c372a		I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC

samsung,24ad0xd1	S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)

st-micro,24c256		i2c serial eeprom  (24cxx)

stm,m41t00		Serial Access TIMEKEEPER

stm,m41t62		Serial real-time clock (RTC) with alarm

stm,m41t80		M41T80 - SERIAL ACCESS RTC WITH ALARMS

ti,tsc2003		I2C Touch-Screen Controller

Documentation/devicetree/bindings/vendor-prefixes.txt

+3 −0
Original line number Diff line number Diff line
@@ -8,7 +8,9 @@ amcc Applied Micro Circuits Corporation (APM, formally AMCC) 
apm	Applied Micro Circuits Corporation (APM)

arm	ARM Ltd.

atmel	Atmel Corporation

cavium	Cavium, Inc.

chrp	Common Hardware Reference Platform

cortina	Cortina Systems, Inc.

dallas	Maxim Integrated Products (formerly Dallas Semiconductor)

denx	Denx Software Engineering

epson	Seiko Epson Corp.
@@ -36,6 +38,7 @@ schindler Schindler 
sil	Silicon Image

simtek

sirf	SiRF Technology, Inc.

st	STMicroelectronics

stericsson	ST-Ericsson

ti	Texas Instruments

xlnx	Xilinx

arch/arm/include/asm/mach/arch.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ struct machine_desc { 
	unsigned int		nr;		/* architecture number	*/

	const char		*name;		/* architecture name	*/

	unsigned long		atag_offset;	/* tagged list (relative) */

	const char		**dt_compat;	/* array of device tree

	const char *const 	*dt_compat;	/* array of device tree

						 * 'compatible' strings	*/



	unsigned int		nr_irqs;	/* number of IRQs */

arch/arm/include/asm/prom.h

+0 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#ifdef CONFIG_OF



#include <asm/setup.h>

#include <asm/irq.h>



extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);

CRA Git | Maintained and supported by SUSTech CRA and CCSE