Merge tag 'dt-fixes-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux (345ef87b) · Commits · 戴 / test

Documentation/devicetree/bindings/arm/marvell,kirkwood.txt

0 → 100644

+97 −0

Original line number	Diff line number	Diff line
		Marvell Kirkwood SoC Family Device Tree Bindings
		------------------------------------------------

		Boards with a SoC of the Marvell Kirkwook family, eg 88f6281

		* Required root node properties:
		compatible: must contain "marvell,kirkwood"

		In addition, the above compatible shall be extended with the specific
		SoC. Currently known SoC compatibles are:

		"marvell,kirkwood-88f6192"
		"marvell,kirkwood-88f6281"
		"marvell,kirkwood-88f6282"
		"marvell,kirkwood-88f6283"
		"marvell,kirkwood-88f6702"
		"marvell,kirkwood-98DX4122"

		And in addition, the compatible shall be extended with the specific
		board. Currently known boards are:

		"buffalo,lschlv2"
		"buffalo,lsxhl"
		"buffalo,lsxl"
		"dlink,dns-320"
		"dlink,dns-320-a1"
		"dlink,dns-325"
		"dlink,dns-325-a1"
		"dlink,dns-kirkwood"
		"excito,b3"
		"globalscale,dreamplug-003-ds2001"
		"globalscale,guruplug"
		"globalscale,guruplug-server-plus"
		"globalscale,sheevaplug"
		"globalscale,sheevaplug"
		"globalscale,sheevaplug-esata"
		"globalscale,sheevaplug-esata-rev13"
		"iom,iconnect"
		"iom,iconnect-1.1"
		"iom,ix2-200"
		"keymile,km_kirkwood"
		"lacie,cloudbox"
		"lacie,inetspace_v2"
		"lacie,laplug"
		"lacie,netspace_lite_v2"
		"lacie,netspace_max_v2"
		"lacie,netspace_mini_v2"
		"lacie,netspace_v2"
		"marvell,db-88f6281-bp"
		"marvell,db-88f6282-bp"
		"marvell,mv88f6281gtw-ge"
		"marvell,rd88f6281"
		"marvell,rd88f6281"
		"marvell,rd88f6281-a0"
		"marvell,rd88f6281-a1"
		"mpl,cec4"
		"mpl,cec4-10"
		"netgear,readynas"
		"netgear,readynas"
		"netgear,readynas-duo-v2"
		"netgear,readynas-nv+-v2"
		"plathome,openblocks-a6"
		"plathome,openblocks-a7"
		"raidsonic,ib-nas6210"
		"raidsonic,ib-nas6210-b"
		"raidsonic,ib-nas6220"
		"raidsonic,ib-nas6220-b"
		"raidsonic,ib-nas62x0"
		"seagate,dockstar"
		"seagate,goflexnet"
		"synology,ds109"
		"synology,ds110jv10"
		"synology,ds110jv20"
		"synology,ds110jv30"
		"synology,ds111"
		"synology,ds209"
		"synology,ds210jv10"
		"synology,ds210jv20"
		"synology,ds212"
		"synology,ds212jv10"
		"synology,ds212jv20"
		"synology,ds212pv10"
		"synology,ds409"
		"synology,ds409slim"
		"synology,ds410j"
		"synology,ds411"
		"synology,ds411j"
		"synology,ds411slim"
		"synology,ds413jv10"
		"synology,rs212"
		"synology,rs409"
		"synology,rs411"
		"synology,rs812"
		"usi,topkick"
		"usi,topkick-1281P2"
		"zyxel,nsa310"
		"zyxel,nsa310a"

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

+16 −0

Original line number	Diff line number	Diff line
		@@ -13,8 +13,22 @@ ad,ad7414 SMBus/I2C Digital Temperature Sensor in 6-Pin SOT with SMBus Alert an
		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
		adi,adt7473 +/-1C TDM Extended Temp Range I.C
		adi,adt7475 +/-1C TDM Extended Temp Range I.C
		adi,adt7476 +/-1C TDM Extended Temp Range I.C
		adi,adt7490 +/-1C TDM Extended Temp Range I.C
		at,24c08 i2c serial eeprom (24cxx)
		atmel,24c00 i2c serial eeprom (24cxx)
		atmel,24c01 i2c serial eeprom (24cxx)
		atmel,24c02 i2c serial eeprom (24cxx)
		atmel,24c04 i2c serial eeprom (24cxx)
		atmel,24c16 i2c serial eeprom (24cxx)
		atmel,24c32 i2c serial eeprom (24cxx)
		atmel,24c64 i2c serial eeprom (24cxx)
		atmel,24c128 i2c serial eeprom (24cxx)
		atmel,24c256 i2c serial eeprom (24cxx)
		atmel,24c512 i2c serial eeprom (24cxx)
		atmel,24c1024 i2c serial eeprom (24cxx)
		atmel,at97sc3204t i2c trusted platform module (TPM)
		capella,cm32181 CM32181: Ambient Light Sensor
		catalyst,24c32 i2c serial eeprom
		@@ -46,8 +60,10 @@ 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,lm63 Temperature sensor with integrated fan control
		national,lm75 I2C TEMP SENSOR
		national,lm80 Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor
		national,lm85 Temperature sensor with integrated fan control
		national,lm92 ±0.33°C Accurate, 12-Bit + Sign Temperature Sensor and Thermal Window Comparator with Two-Wire Interface
		nuvoton,npct501 i2c trusted platform module (TPM)
		nxp,pca9556 Octal SMBus and I2C registered interface

Documentation/devicetree/bindings/vendor-prefixes.txt

+17 −1

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ auo AU Optronics Corporation
		avago Avago Technologies
		bosch Bosch Sensortec GmbH
		brcm Broadcom Corporation
		buffalo Buffalo, Inc.
		calxeda Calxeda
		capella Capella Microsystems, Inc
		cavium Cavium, Inc.
		@@ -33,15 +34,18 @@ cortina Cortina Systems, Inc.
		crystalfontz Crystalfontz America, Inc.
		dallas Maxim Integrated Products (formerly Dallas Semiconductor)
		davicom DAVICOM Semiconductor, Inc.
		dlink D-Link Systems, Inc.
		denx Denx Software Engineering
		digi Digi International Inc.
		dlink D-Link Corporation
		dmo Data Modul AG
		ebv EBV Elektronik
		edt Emerging Display Technologies
		emmicro EM Microelectronic
		epfl Ecole Polytechnique Fédérale de Lausanne
		epson Seiko Epson Corp.
		est ESTeem Wireless Modems
		eukrea Eukréa Electromatique
		excito Excito
		fsl Freescale Semiconductor
		GEFanuc GE Fanuc Intelligent Platforms Embedded Systems, Inc.
		gef GE Fanuc Intelligent Platforms Embedded Systems, Inc.
		@@ -53,13 +57,17 @@ haoyu Haoyu Microelectronic Co. Ltd.
		hisilicon Hisilicon Limited.
		honeywell Honeywell
		hp Hewlett Packard
		i2se I2SE GmbH
		ibm International Business Machines (IBM)
		idt Integrated Device Technologies, Inc.
		iom Iomega Corporation
		img Imagination Technologies Ltd.
		intel Intel Corporation
		intercontrol Inter Control Group
		isee ISEE 2007 S.L.
		isl Intersil
		karo Ka-Ro electronics GmbH
		keymile Keymile GmbH
		lacie LaCie
		lantiq Lantiq Semiconductor
		lg LG Corporation
		@@ -70,9 +78,12 @@ maxim Maxim Integrated Products
		microchip Microchip Technology Inc.
		mosaixtech Mosaix Technologies, Inc.
		moxa Moxa
		mpl MPL AG
		mxicy Macronix International Co., Ltd.
		national National Semiconductor
		neonode Neonode Inc.
		netgear NETGEAR
		newhaven Newhaven Display International
		nintendo Nintendo
		nokia Nokia
		nvidia NVIDIA
		@@ -82,10 +93,12 @@ opencores OpenCores.org
		panasonic Panasonic Corporation
		phytec PHYTEC Messtechnik GmbH
		picochip Picochip Ltd
		plathome Plat'Home Co., Ltd.
		powervr PowerVR (deprecated, use img)
		qca Qualcomm Atheros, Inc.
		qcom Qualcomm Technologies, Inc
		qnap QNAP Systems, Inc.
		raidsonic RaidSonic Technology GmbH
		ralink Mediatek/Ralink Technology Corp.
		ramtron Ramtron International
		realtek Realtek Semiconductor Corp.
		@@ -95,6 +108,7 @@ rockchip Fuzhou Rockchip Electronics Co., Ltd
		samsung Samsung Semiconductor
		sbs Smart Battery System
		schindler Schindler
		seagate Seagate Technology PLC
		sil Silicon Image
		silabs Silicon Laboratories
		simtek
		@@ -111,6 +125,7 @@ ti Texas Instruments
		tlm Trusted Logic Mobility
		toshiba Toshiba Corporation
		toumaz Toumaz
		usi Universal Scientifc Industrial Co., Ltd.
		v3 V3 Semiconductor
		via VIA Technologies, Inc.
		voipac Voipac Technologies s.r.o.
		@@ -119,3 +134,4 @@ wlf Wolfson Microelectronics
		wm Wondermedia Technologies, Inc.
		xes Extreme Engineering Solutions (X-ES)
		xlnx Xilinx
		zyxel ZyXEL Communications Corp.

drivers/of/base.c

+3 −7

Original line number	Diff line number	Diff line
		@@ -1828,17 +1828,13 @@ int of_update_property(struct device_node np, struct property newprop)
		next = &(*next)->next;
		}
		raw_spin_unlock_irqrestore(&devtree_lock, flags);
		if (rc)
		return rc;
		if (!found)
		return -ENODEV;

		/* Update the sysfs attribute */
		if (oldprop)
		sysfs_remove_bin_file(&np->kobj, &oldprop->attr);
		__of_add_property_sysfs(np, newprop);

		if (!found)
		return -ENODEV;

		return 0;
		}

drivers/of/fdt.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -491,7 +491,7 @@ static int __init __reserved_mem_reserve_reg(unsigned long node,
		* in /reserved-memory matches the values supported by the current implementation,
		* also check if ranges property has been provided
		*/
		static int __reserved_mem_check_root(unsigned long node)
		static int __init __reserved_mem_check_root(unsigned long node)
		{
		__be32 *prop;

Admin message