Skip to content

Commit 3ef2bc0

Browse files
committed
Merge tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull DeviceTree updates from Rob Herring: - fix sparse warnings in drivers/of/ - add more overlay unittests - update dtc to v1.4.4-8-g756ffc4f52f6. This adds more checks on dts files such as unit-address formatting and stricter character sets for node and property names - add a common DT modalias function - move trivial-devices.txt up and out of i2c dir - ARM NVIC interrupt controller binding - vendor prefixes for Sensirion, Dioo, Nordic, ROHM - correct some binding file locations * tag 'devicetree-for-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (24 commits) of: fix sparse warnings in fdt, irq, reserved mem, and resolver code of: fix sparse warning in of_pci_range_parser_one of: fix sparse warnings in of_find_next_cache_node of/unittest: Missing unlocks on error of: fix uninitialized variable warning for overlay test of: fix unittest build without CONFIG_OF_OVERLAY of: Add unit tests for applying overlays of: per-file dtc compiler flags fpga: region: add missing DT documentation for config complete timeout of: Add vendor prefix for ROHM Semiconductor of: fix "/cpus" reference leak in of_numa_parse_cpu_nodes() of: Add vendor prefix for Nordic Semiconductor dt-bindings: arm,nvic: Binding for ARM NVIC interrupt controller on Cortex-M dtc: update warning settings for new bus and node/property name checks scripts/dtc: Update to upstream version v1.4.4-8-g756ffc4f52f6 scripts/dtc: automate getting dtc version and log in update script of: Add function for generating a DT modalias with a newline of: fix of_device_get_modalias returned length when truncating buffers Documentation: devicetree: move trivial-devices out of I2C realm dt-bindings: add vendor prefix for Dioo ..
2 parents 2eecf3a + 17a7035 commit 3ef2bc0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1152
-233
lines changed

Documentation/devicetree/bindings/display/atmel/hlcdc-dc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Device-Tree bindings for Atmel's HLCDC (High LCD Controller) DRM driver
22

33
The Atmel HLCDC Display Controller is subdevice of the HLCDC MFD device.
4-
See ../mfd/atmel-hlcdc.txt for more details.
4+
See ../../mfd/atmel-hlcdc.txt for more details.
55

66
Required properties:
77
- compatible: value should be "atmel,hlcdc-display-controller"

Documentation/devicetree/bindings/fpga/fpga-region.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ Optional properties:
193193
- region-freeze-timeout-us : The maximum time in microseconds to wait for
194194
bridges to successfully become disabled before the region has been
195195
programmed.
196+
- config-complete-timeout-us : The maximum time in microseconds time for the
197+
FPGA to go to operating mode after the region has been programmed.
196198
- child nodes : devices in the FPGA after programming.
197199

198200
In the example below, when an overlay is applied targeting fpga-region0,
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
* ARM Nested Vector Interrupt Controller (NVIC)
2+
3+
The NVIC provides an interrupt controller that is tightly coupled to
4+
Cortex-M based processor cores. The NVIC implemented on different SoCs
5+
vary in the number of interrupts and priority bits per interrupt.
6+
7+
Main node required properties:
8+
9+
- compatible : should be one of:
10+
"arm,v6m-nvic"
11+
"arm,v7m-nvic"
12+
"arm,v8m-nvic"
13+
- interrupt-controller : Identifies the node as an interrupt controller
14+
- #interrupt-cells : Specifies the number of cells needed to encode an
15+
interrupt source. The type shall be a <u32> and the value shall be 2.
16+
17+
The 1st cell contains the interrupt number for the interrupt type.
18+
19+
The 2nd cell is the priority of the interrupt.
20+
21+
- reg : Specifies base physical address(s) and size of the NVIC registers.
22+
This is at a fixed address (0xe000e100) and size (0xc00).
23+
24+
- arm,num-irq-priority-bits: The number of priority bits implemented by the
25+
given SoC
26+
27+
Example:
28+
29+
intc: interrupt-controller@e000e100 {
30+
compatible = "arm,v7m-nvic";
31+
#interrupt-cells = <2>;
32+
#address-cells = <1>;
33+
interrupt-controller;
34+
reg = <0xe000e100 0xc00>;
35+
arm,num-irq-priority-bits = <4>;
36+
};

Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Required properties:
1515

1616
The HLCDC IP exposes two subdevices:
1717
- a PWM chip: see ../pwm/atmel-hlcdc-pwm.txt
18-
- a Display Controller: see ../display/atmel-hlcdc-dc.txt
18+
- a Display Controller: see ../display/atmel/hlcdc-dc.txt
1919

2020
Example:
2121

Documentation/devicetree/bindings/net/moxa,moxart-mac.txt renamed to Documentation/devicetree/bindings/net/faraday,ftmac.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
MOXA ART Ethernet Controller
1+
Faraday Ethernet Controller
22

33
Required properties:
44

5-
- compatible : Must be "moxa,moxart-mac"
5+
- compatible : Must contain "faraday,ftmac", as well as one of
6+
the SoC specific identifiers:
7+
"andestech,atmac100"
8+
"moxa,moxart-mac"
69
- reg : Should contain register location and length
710
- interrupts : Should contain the mac interrupt number
811

Documentation/devicetree/bindings/vendor-prefixes.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ denx Denx Software Engineering
8080
devantech Devantech, Ltd.
8181
digi Digi International Inc.
8282
digilent Diglent, Inc.
83+
dioo Dioo Microcircuit Co., Ltd
8384
dlg Dialog Semiconductor
8485
dlink D-Link Corporation
8586
dmo Data Modul AG
@@ -215,6 +216,7 @@ newhaven Newhaven Display International
215216
ni National Instruments
216217
nintendo Nintendo
217218
nokia Nokia
219+
nordic Nordic Semiconductor
218220
nuvoton Nuvoton Technology Corporation
219221
nvd New Vision Display
220222
nvidia NVIDIA
@@ -261,6 +263,7 @@ richtek Richtek Technology Corporation
261263
ricoh Ricoh Co. Ltd.
262264
rikomagic Rikomagic Tech Corp. Ltd
263265
rockchip Fuzhou Rockchip Electronics Co., Ltd
266+
rohm ROHM Semiconductor Co., Ltd
264267
samsung Samsung Semiconductor
265268
samtec Samtec/Softing company
266269
sandisk Sandisk Corporation

arch/powerpc/platforms/pseries/ibmebus.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -410,10 +410,7 @@ static ssize_t name_show(struct device *dev,
410410
static ssize_t modalias_show(struct device *dev,
411411
struct device_attribute *attr, char *buf)
412412
{
413-
ssize_t len = of_device_get_modalias(dev, buf, PAGE_SIZE - 2);
414-
buf[len] = '\n';
415-
buf[len+1] = 0;
416-
return len+1;
413+
return of_device_modalias(dev, buf, PAGE_SIZE);
417414
}
418415

419416
static struct device_attribute ibmebus_bus_device_attrs[] = {

drivers/base/platform.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -847,7 +847,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
847847
struct platform_device *pdev = to_platform_device(dev);
848848
int len;
849849

850-
len = of_device_get_modalias(dev, buf, PAGE_SIZE -1);
850+
len = of_device_modalias(dev, buf, PAGE_SIZE);
851851
if (len != -ENODEV)
852852
return len;
853853

drivers/macintosh/macio_sysfs.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
4141
static ssize_t modalias_show (struct device *dev, struct device_attribute *attr,
4242
char *buf)
4343
{
44-
int len = of_device_get_modalias(dev, buf, PAGE_SIZE - 2);
45-
46-
buf[len] = '\n';
47-
buf[len+1] = 0;
48-
49-
return len+1;
44+
return of_device_modalias(dev, buf, PAGE_SIZE);
5045
}
5146

5247
static ssize_t devspec_show(struct device *dev,

0 commit comments

Comments
 (0)