From 4f59d7119c7cb5f32ca91662a74c217ea7c4ddca Mon Sep 17 00:00:00 2001 From: Zhen Lei Date: Tue, 25 Aug 2015 12:08:22 +0800 Subject: [PATCH 01/45] of: to support binding numa node to specified device in devicetree For now, in function device_add, the new device will be forced to inherit the numa node of its parent. But this will override the device's numa node which configured in devicetree. Signed-off-by: Zhen Lei Signed-off-by: Rob Herring --- drivers/base/core.c | 2 +- drivers/of/device.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/base/core.c b/drivers/base/core.c index 334ec7ef1960..b7d56c5ea3c6 100644 --- a/drivers/base/core.c +++ b/drivers/base/core.c @@ -1066,7 +1066,7 @@ int device_add(struct device *dev) dev->kobj.parent = kobj; /* use parent numa_node */ - if (parent) + if (parent && (dev_to_node(dev) == NUMA_NO_NODE)) set_dev_node(dev, dev_to_node(parent)); /* first, register with generic layer. */ diff --git a/drivers/of/device.c b/drivers/of/device.c index 8b91ea241b10..e5f47cec75f3 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -60,11 +60,12 @@ int of_device_add(struct platform_device *ofdev) ofdev->name = dev_name(&ofdev->dev); ofdev->id = -1; - /* device_add will assume that this device is on the same node as - * the parent. If there is no parent defined, set the node - * explicitly */ - if (!ofdev->dev.parent) - set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); + /* + * If this device has not binding numa node in devicetree, that is + * of_node_to_nid returns NUMA_NO_NODE. device_add will assume that this + * device is on the same node as the parent. + */ + set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node)); return device_add(&ofdev->dev); } From ae1add247bf8c22facacbd818142f1f66e735802 Mon Sep 17 00:00:00 2001 From: Mitchel Humpherys Date: Tue, 15 Sep 2015 18:30:36 -0700 Subject: [PATCH 02/45] of: Check for overlap in reserved memory regions Any overlap in the reserved memory regions (those specified in the reserved-memory DT node) is a bug. These bugs might go undetected as long as the contested region isn't used simultaneously by multiple software agents, which makes such bugs hard to debug. Fix this by printing a scary warning during boot if overlap is detected. Signed-off-by: Mitchel Humpherys Signed-off-by: Rob Herring --- drivers/of/of_reserved_mem.c | 43 +++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/drivers/of/of_reserved_mem.c b/drivers/of/of_reserved_mem.c index 726ebe792813..62f467b8ccae 100644 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@ -1,7 +1,7 @@ /* * Device tree based initialization code for reserved memory. * - * Copyright (c) 2013, The Linux Foundation. All Rights Reserved. + * Copyright (c) 2013, 2015 The Linux Foundation. All Rights Reserved. * Copyright (c) 2013,2014 Samsung Electronics Co., Ltd. * http://www.samsung.com * Author: Marek Szyprowski @@ -20,6 +20,7 @@ #include #include #include +#include #define MAX_RESERVED_REGIONS 16 static struct reserved_mem reserved_mem[MAX_RESERVED_REGIONS]; @@ -197,12 +198,52 @@ static int __init __reserved_mem_init_node(struct reserved_mem *rmem) return -ENOENT; } +static int __init __rmem_cmp(const void *a, const void *b) +{ + const struct reserved_mem *ra = a, *rb = b; + + return ra->base - rb->base; +} + +static void __init __rmem_check_for_overlap(void) +{ + int i; + + if (reserved_mem_count < 2) + return; + + sort(reserved_mem, reserved_mem_count, sizeof(reserved_mem[0]), + __rmem_cmp, NULL); + for (i = 0; i < reserved_mem_count - 1; i++) { + struct reserved_mem *this, *next; + + this = &reserved_mem[i]; + next = &reserved_mem[i + 1]; + if (!(this->base && next->base)) + continue; + if (this->base + this->size > next->base) { + phys_addr_t this_end, next_end; + + this_end = this->base + this->size; + next_end = next->base + next->size; + WARN(1, + "Reserved memory: OVERLAP DETECTED!\n%s (%pa--%pa) overlaps with %s (%pa--%pa)\n", + this->name, &this->base, &this_end, + next->name, &next->base, &next_end); + } + } +} + /** * fdt_init_reserved_mem - allocate and init all saved reserved memory regions */ void __init fdt_init_reserved_mem(void) { int i; + + /* check for overlapping reserved regions */ + __rmem_check_for_overlap(); + for (i = 0; i < reserved_mem_count; i++) { struct reserved_mem *rmem = &reserved_mem[i]; unsigned long node = rmem->fdt_node; From 4af971064977b00a437c1ed8ead8876db4e3b58a Mon Sep 17 00:00:00 2001 From: Pavel Fedin Date: Thu, 8 Oct 2015 10:24:25 +0300 Subject: [PATCH 03/45] PCI: of: Add 64-bit address recognition without LPAE support If non-LPAE kernel is booted up on a machine with 64-bit PCI resources, PCI controller probe fails with: PCI host bridge /pcie@10000000 ranges: IO 0x3eff0000..0x3effffff -> 0x00000000 MEM 0x10000000..0x3efeffff -> 0x10000000 MEM 0x8000000000..0xffffffffff -> 0x8000000000 pci-host-generic 3f000000.pcie: resource collision: [mem 0x00000000-0xffffffff] conflicts with /pl011@9000000 [mem 0x09000000-0x09000fff] pci-host-generic: probe of 3f000000.pcie failed with error -16 This happens because res->start assignment in of_pci_range_to_resource() truncates the upper part of the address, because res->start is of phys_addr_t type, which is 32-bit on non-LPAE kernels. This patch adds explicit recognition of 64-bit resources, preventing from potential problems when e. g. 0x8000001234 would be converted to 0x00001234. Signed-off-by: Pavel Fedin Signed-off-by: Rob Herring --- drivers/of/address.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/of/address.c b/drivers/of/address.c index 384574c3987c..cd53fe4a0c86 100644 --- a/drivers/of/address.c +++ b/drivers/of/address.c @@ -330,6 +330,12 @@ int of_pci_range_to_resource(struct of_pci_range *range, } res->start = port; } else { + if ((sizeof(resource_size_t) < 8) && + upper_32_bits(range->cpu_addr)) { + err = -EINVAL; + goto invalid_range; + } + res->start = range->cpu_addr; } res->end = res->start + range->size - 1; From f134f25162e7174ebe63f8aa16810192606eb826 Mon Sep 17 00:00:00 2001 From: Pavel Fedin Date: Thu, 8 Oct 2015 10:24:26 +0300 Subject: [PATCH 04/45] PCI: of: Ignore resources with failed translation This patch allows PCI host controller to function even if part of resources is unusable for some reason. An example is non-LPAE kernel on a machine which has some 64-bit resources. Unusable resources will be just skipped instead of a complete failure. Signed-off-by: Pavel Fedin Signed-off-by: Rob Herring --- drivers/of/of_pci.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/of/of_pci.c b/drivers/of/of_pci.c index 5751dc5b6494..ea7c2b6dfc56 100644 --- a/drivers/of/of_pci.c +++ b/drivers/of/of_pci.c @@ -223,8 +223,10 @@ int of_pci_get_host_bridge_resources(struct device_node *dev, } err = of_pci_range_to_resource(&range, dev, res); - if (err) - goto conversion_failed; + if (err) { + kfree(res); + continue; + } if (resource_type(res) == IORESOURCE_IO) { if (!io_base) { From 88d5ec1656910102676c2907c40cc2c34a97e977 Mon Sep 17 00:00:00 2001 From: Michael Opdenacker Date: Tue, 13 Oct 2015 13:51:39 +0200 Subject: [PATCH 05/45] drm: sti: fix typos in stih4xx binding Fix typos in the st,stih4xx binding, in particular replacing "pinctrl-name" by "pinctrl-names". Fix minor typos in the descriptions too. Signed-off-by: Michael Opdenacker Signed-off-by: Rob Herring --- Documentation/devicetree/bindings/gpu/st,stih4xx.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt b/Documentation/devicetree/bindings/gpu/st,stih4xx.txt index a36dfce0032e..a352ed30cd70 100644 --- a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt +++ b/Documentation/devicetree/bindings/gpu/st,stih4xx.txt @@ -61,7 +61,7 @@ STMicroelectronics stih4xx platforms - reg-names: names of the mapped memory regions listed in regs property in the same order. - interrupts : HDMI interrupt number to the CPU. - - interrupt-names: name of the interrupts listed in interrupts property in + - interrupt-names: names of the interrupts listed in interrupts property in the same order - clocks: from common clock binding: handle hardware IP needed clocks, the number of clocks may depend of the SoC type. @@ -95,7 +95,7 @@ sti-dvo: - clock-names: names of the clocks listed in clocks property in the same order. - pinctrl-0: pin control handle - - pinctrl-name: names of the pin control to use + - pinctrl-names: names of the pin control states to use - sti,panel: phandle of the panel connected to the DVO output sti-hqvdp: From 191b77c3615b77cf77bdbca95fd98f71c0f191ff Mon Sep 17 00:00:00 2001 From: Jarkko Nikula Date: Tue, 13 Oct 2015 16:44:06 +0300 Subject: [PATCH 06/45] DT: ARM: pxa: Remove incorrect binding from documentation Remove "mrvl,lpss-ssp" property from documentation because LPSS SSP type is for certain Intel platforms. I believe commit a6e56c28a178 ("ARM: pxa: ssp: add DT bindings") added it by accident by copying all enum pxa_ssp_type types from include/linux/pxa2xx_ssp.h. Please note this was removed from arch/arm/plat-pxa/ssp.c by the commit b692cb83b14d ("ARM: pxa: ssp: Fix build error by removing originally incorrect DT binding"). Signed-off-by: Jarkko Nikula Signed-off-by: Rob Herring --- Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt b/Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt index 669b8140dd79..d10cc06c0c37 100644 --- a/Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt +++ b/Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt @@ -10,7 +10,6 @@ Required properties: mvrl,pxa168-ssp mrvl,pxa910-ssp mrvl,ce4100-ssp - mrvl,lpss-ssp - reg: The memory base - dmas: Two dma phandles, one for rx, one for tx From 6296ad9e3375c6c1ddbb371f589ba6a145bb31df Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Sat, 10 Oct 2015 01:29:30 -0700 Subject: [PATCH 07/45] of/fdt: fix aliases with baudrate in earlycon Many boards use an alias in the stdout-path specification along with console options after a colon (e.g. serial0:115200n8). When using earlycon, this specification currently does not work. While fdt_path_offset supports alias resolution, it does not remove the console options by itself. Use the fdt_path_offset_namelen variant and provide the length of the alias to enable aliases with console options in the stdout-path. Signed-off-by: Stefan Agner Signed-off-by: Rob Herring --- drivers/of/fdt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 6e82bc42373b..9fc356830226 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -813,8 +813,11 @@ static int __init early_init_dt_scan_chosen_serial(void) if (!p || !l) return -ENOENT; + /* Remove console options if present */ + l = strchrnul(p, ':') - p; + /* Get the node specified by stdout-path */ - offset = fdt_path_offset(fdt, p); + offset = fdt_path_offset_namelen(fdt, p, l); if (offset < 0) return -ENODEV; From f9f9f11dcf0f3b757b282ce7cefea8696212a422 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 12 Oct 2015 14:43:22 +0200 Subject: [PATCH 08/45] of/irq: move of_msi_configure to the right guard and add a dummy of_msi_configure is part of of_irq.c, which is compiled in when OF_IRQ is enabled, not just OF. Also It is unconditionally called from of_platform_device_create_pdata, which does not depend on OF_IRQ, just OF_ADDRESS, so we need a dummy implementation in case of OF_ADDRESS=y but OF_IRQ=n. Fixes: c706c239 ("of/platform: Assign MSI domain to platform device") Signed-off-by: Jonas Gorski Signed-off-by: Rob Herring --- include/linux/of_irq.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 4bcbd586a672..0088038d5ccd 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -46,6 +46,7 @@ extern int of_irq_get(struct device_node *dev, int index); extern int of_irq_get_byname(struct device_node *dev, const char *name); extern int of_irq_to_resource_table(struct device_node *dev, struct resource *res, int nr_irqs); +extern void of_msi_configure(struct device *dev, struct device_node *np); #else static inline int of_irq_count(struct device_node *dev) { @@ -64,6 +65,9 @@ static inline int of_irq_to_resource_table(struct device_node *dev, { return 0; } +static inline void of_msi_configure(struct device *dev, struct device_node *np) +{ +} #endif #if defined(CONFIG_OF) @@ -74,7 +78,6 @@ static inline int of_irq_to_resource_table(struct device_node *dev, */ extern unsigned int irq_of_parse_and_map(struct device_node *node, int index); extern struct device_node *of_irq_find_parent(struct device_node *child); -extern void of_msi_configure(struct device *dev, struct device_node *np); #else /* !CONFIG_OF */ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, From 52493d446141b07c8ba28dd6a529513f8b2342bd Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 12 Oct 2015 14:43:23 +0200 Subject: [PATCH 09/45] of/irq: make of_irq_find_parent static of_irq_find_parent has no users outside of of_irq.c, so it does not make sense to expose it in of_irq.h. Therefore remove the prototype and dummy implmeentation and make the function static instead. Signed-off-by: Jonas Gorski Signed-off-by: Rob Herring --- drivers/of/irq.c | 2 +- include/linux/of_irq.h | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 55317fa9c9dc..0c7f4cbe3434 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(irq_of_parse_and_map); * Returns a pointer to the interrupt parent node, or NULL if the interrupt * parent could not be determined. */ -struct device_node *of_irq_find_parent(struct device_node *child) +static struct device_node *of_irq_find_parent(struct device_node *child) { struct device_node *p; const __be32 *parp; diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index 0088038d5ccd..a58e2e51eeb2 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -77,7 +77,6 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np) * so declare it here regardless of the CONFIG_OF_IRQ setting. */ extern unsigned int irq_of_parse_and_map(struct device_node *node, int index); -extern struct device_node *of_irq_find_parent(struct device_node *child); #else /* !CONFIG_OF */ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, @@ -85,11 +84,6 @@ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, { return 0; } - -static inline void *of_irq_find_parent(struct device_node *child) -{ - return NULL; -} #endif /* !CONFIG_OF */ #endif /* __OF_IRQ_H */ From 62ebf931935964230d6fe39026bc5fbcfac330d3 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 12 Oct 2015 14:43:24 +0200 Subject: [PATCH 10/45] of/irq: fix guards for irq_of_parse_and_map prototype Since OF is now a userselectable config symbol, having OF=y but OF_IRQ=n is a valid combination for non-OF platforms, and OF=y does not guarantee anymore that OF_IRQ is enabled (or we are building for SPARC). Fixes the following build error with OF=y, IRQ_DOMAIN=n and SPI=y: drivers/built-in.o: In function `spi_register_master': (.text+0xc3ae): undefined reference to `irq_of_parse_and_map' Makefile:935: recipe for target 'vmlinux' failed make: *** [vmlinux] Error 1 Signed-off-by: Jonas Gorski Signed-off-by: Rob Herring --- include/linux/of_irq.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index a58e2e51eeb2..580818d90475 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -70,7 +70,7 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np) } #endif -#if defined(CONFIG_OF) +#if defined(CONFIG_OF_IRQ) || defined(CONFIG_SPARC) /* * irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC * implements it differently. However, the prototype is the same for all, @@ -78,7 +78,7 @@ static inline void of_msi_configure(struct device *dev, struct device_node *np) */ extern unsigned int irq_of_parse_and_map(struct device_node *node, int index); -#else /* !CONFIG_OF */ +#else /* !CONFIG_OF && !CONFIG_SPARC */ static inline unsigned int irq_of_parse_and_map(struct device_node *dev, int index) { From 307751ee3212df0d047b0e1a93ce21f2e511d1a1 Mon Sep 17 00:00:00 2001 From: Robert Jarzmik Date: Mon, 12 Oct 2015 13:30:23 +0200 Subject: [PATCH 11/45] video: fbdev: add Marvell PXA LCD controller binding Add documentation for the PXA LCD controller devicetree binding. Signed-off-by: Robert Jarzmik Reviewed-by: Philipp Zabel Signed-off-by: Rob Herring --- .../bindings/display/marvell,pxa2xx-lcdc.txt | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt diff --git a/Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt b/Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt new file mode 100644 index 000000000000..309c47f25b87 --- /dev/null +++ b/Documentation/devicetree/bindings/display/marvell,pxa2xx-lcdc.txt @@ -0,0 +1,34 @@ +PXA LCD Controller +------------------ + +Required properties: + - compatible : one of these + "marvell,pxa2xx-lcdc", + "marvell,pxa270-lcdc", + "marvell,pxa300-lcdc" + - reg : should contain 1 register range (address and length). + - interrupts : framebuffer controller interrupt. + - clocks: phandle to input clocks + +Required nodes: + - port: connection to the LCD panel (see video-interfaces.txt) + This node must have its properties bus-width and remote-endpoint set. + If the panel is not a TFT color panel, then a "lcd-type" property in + the panel should specify the panel type. + This panel node should be in the board dts. + +Example: + lcd-controller@40500000 { + compatible = "marvell,pxa2xx-lcdc"; + reg = <0x44000000 0x10000>; + interrupts = <17>; + clocks = <&clks CLK_LCD>; + status = "okay"; + + port { + lcdc_out: endpoint { + remote-endpoint = <&panel_in>; + bus-width = <16>; + }; + }; + }; From efdbd7345f8836f7495f3ac6ee237d86cb3bb6b0 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 21 Sep 2015 10:51:09 -0500 Subject: [PATCH 12/45] dt-bindings: consolidate display related bindings This is a quite large renaming to consolidate display related bindings into a single "display" directory from various scattered locations of video, drm, gpu, fb, mipi, and panel. The prior location was somewhat based on the Linux driver location, but bindings should be independent of that. Signed-off-by: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- .../devicetree/bindings/{video => display}/arm,pl11x.txt | 0 .../bindings/{drm => display}/armada/marvell,dove-lcd.txt | 0 .../devicetree/bindings/{video => display}/atmel,lcdc.txt | 0 .../devicetree/bindings/{drm => display}/atmel/hlcdc-dc.txt | 0 .../bindings/{video => display/bridge}/adi,adv7123.txt | 0 .../bindings/{video => display/bridge}/adi,adv7511.txt | 0 .../devicetree/bindings/{drm => display}/bridge/dw_hdmi.txt | 4 ++-- .../devicetree/bindings/{video => display}/bridge/ps8622.txt | 0 .../devicetree/bindings/{video => display}/bridge/ptn3460.txt | 0 .../bindings/{drm/i2c => display/bridge}/tda998x.txt | 0 .../bridge/thine,thc63lvdm83d.txt} | 0 .../bindings/{video => display}/cirrus,clps711x-fb.txt | 2 +- .../{video => display/connector}/analog-tv-connector.txt | 0 .../bindings/{video => display/connector}/dvi-connector.txt | 0 .../bindings/{video => display/connector}/hdmi-connector.txt | 0 .../bindings/{video => display/connector}/vga-connector.txt | 0 .../bindings/{video => display/exynos}/exynos-mic.txt | 0 .../bindings/{video => display/exynos}/exynos5433-decon.txt | 0 .../bindings/{video => display/exynos}/exynos7-decon.txt | 2 +- .../bindings/{video => display/exynos}/exynos_dp.txt | 2 +- .../bindings/{video => display/exynos}/exynos_dsim.txt | 2 +- .../bindings/{video => display/exynos}/exynos_hdmi.txt | 0 .../bindings/{video => display/exynos}/exynos_hdmiddc.txt | 0 .../bindings/{video => display/exynos}/exynos_hdmiphy.txt | 0 .../bindings/{video => display/exynos}/exynos_mixer.txt | 0 .../bindings/{video => display/exynos}/samsung-fimd.txt | 2 +- .../devicetree/bindings/{video => display}/fsl,dcu.txt | 0 .../devicetree/bindings/{video => display/imx}/fsl,imx-fb.txt | 2 +- .../devicetree/bindings/{drm => display}/imx/fsl-imx-drm.txt | 0 .../devicetree/bindings/{drm => display}/imx/hdmi.txt | 0 .../devicetree/bindings/{drm => display}/imx/ldb.txt | 2 +- .../bindings/{mipi/dsi => display}/mipi-dsi-bus.txt | 0 .../devicetree/bindings/{drm => display}/msm/dsi.txt | 2 +- .../devicetree/bindings/{drm => display}/msm/edp.txt | 0 .../devicetree/bindings/{drm => display}/msm/gpu.txt | 0 .../devicetree/bindings/{drm => display}/msm/hdmi.txt | 0 .../devicetree/bindings/{drm => display}/msm/mdp.txt | 0 Documentation/devicetree/bindings/{fb => display}/mxsfb.txt | 0 .../bindings/{ => display}/panel/ampire,am800480r3tmqwa1h.txt | 0 .../devicetree/bindings/{ => display}/panel/auo,b080uan01.txt | 0 .../devicetree/bindings/{ => display}/panel/auo,b101aw03.txt | 0 .../devicetree/bindings/{ => display}/panel/auo,b101ean01.txt | 0 .../devicetree/bindings/{ => display}/panel/auo,b101xtn01.txt | 0 .../devicetree/bindings/{ => display}/panel/auo,b116xw03.txt | 0 .../devicetree/bindings/{ => display}/panel/auo,b133htn01.txt | 0 .../devicetree/bindings/{ => display}/panel/auo,b133xtn01.txt | 0 .../bindings/{ => display}/panel/avic,tm070ddh03.txt | 0 .../bindings/{ => display}/panel/chunghwa,claa101wa01a.txt | 0 .../bindings/{ => display}/panel/chunghwa,claa101wb03.txt | 0 .../bindings/{video => display/panel}/display-timing.txt | 0 .../bindings/{ => display}/panel/edt,et057090dhu.txt | 0 .../bindings/{ => display}/panel/edt,et070080dh6.txt | 0 .../bindings/{ => display}/panel/edt,etm0700g0dh6.txt | 0 .../bindings/{ => display}/panel/foxlink,fl500wvr00-a0t.txt | 0 .../bindings/{ => display}/panel/giantplus,gpg482739qs5.txt | 0 .../bindings/{ => display}/panel/hannstar,hsd070pww1.txt | 0 .../bindings/{ => display}/panel/hannstar,hsd100pxn1.txt | 0 .../bindings/{ => display}/panel/hit,tx23d38vm0caa.txt | 0 .../bindings/{ => display}/panel/innolux,at043tn24.txt | 0 .../bindings/{ => display}/panel/innolux,g121i1-l01.txt | 0 .../bindings/{ => display}/panel/innolux,n116bge.txt | 0 .../bindings/{ => display}/panel/innolux,n156bge-l21.txt | 0 .../bindings/{ => display}/panel/innolux,zj070na-01p.txt | 0 .../devicetree/bindings/{ => display}/panel/lg,lb070wv8.txt | 0 .../bindings/{ => display}/panel/lg,ld070wx3-sl01.txt | 0 .../devicetree/bindings/{ => display}/panel/lg,lg4573.txt | 0 .../bindings/{ => display}/panel/lg,lh500wx1-sd03.txt | 0 .../devicetree/bindings/{ => display}/panel/lg,lp129qe.txt | 0 .../bindings/{video => display/panel}/lgphilips,lb035q02.txt | 0 .../bindings/{ => display}/panel/nec,nl4827hc19-05b.txt | 0 .../bindings/{ => display}/panel/okaya,rs800480t-7x0gp.txt | 0 .../bindings/{ => display}/panel/ortustech,com43h4m85ulc.txt | 0 .../bindings/{ => display}/panel/panasonic,vvx10f004b00.txt | 0 .../bindings/{video => display/panel}/panel-dpi.txt | 2 +- .../bindings/{video => display/panel}/panel-dsi-cm.txt | 0 .../bindings/{ => display}/panel/samsung,ld9040.txt | 2 +- .../bindings/{ => display}/panel/samsung,ltn101nt05.txt | 0 .../bindings/{ => display}/panel/samsung,ltn140at29-301.txt | 0 .../bindings/{ => display}/panel/samsung,s6e8aa0.txt | 2 +- .../bindings/{ => display}/panel/sharp,lq101r1sx01.txt | 0 .../bindings/{video => display/panel}/sharp,ls037v7dw01.txt | 0 .../bindings/{ => display}/panel/shelly,sca07010-bfn-lnn.txt | 0 .../devicetree/bindings/{ => display}/panel/simple-panel.txt | 0 .../bindings/{video => display/panel}/sony,acx565akm.txt | 0 .../bindings/{video => display/panel}/toppoly,td028ttec1.txt | 0 .../bindings/{video => display/panel}/tpo,td043mtea1.txt | 0 .../devicetree/bindings/{video => display}/renesas,du.txt | 0 .../bindings/{video => display/rockchip}/dw_hdmi-rockchip.txt | 0 .../bindings/{video => display/rockchip}/rockchip-drm.txt | 2 +- .../bindings/{video => display/rockchip}/rockchip-vop.txt | 0 .../bindings/{video => display}/simple-framebuffer-sunxi.txt | 0 .../bindings/{video => display}/simple-framebuffer.txt | 0 Documentation/devicetree/bindings/{fb => display}/sm501fb.txt | 0 .../devicetree/bindings/{video => display}/ssd1289fb.txt | 0 .../devicetree/bindings/{video => display}/ssd1307fb.txt | 0 .../devicetree/bindings/{gpu => display}/st,stih4xx.txt | 0 .../bindings/{mipi => display/tegra}/nvidia,tegra114-mipi.txt | 0 .../bindings/{gpu => display/tegra}/nvidia,tegra20-host1x.txt | 2 +- .../devicetree/bindings/{video => display/ti}/ti,dra7-dss.txt | 2 +- .../devicetree/bindings/{video => display/ti}/ti,omap-dss.txt | 0 .../bindings/{video => display/ti}/ti,omap2-dss.txt | 2 +- .../bindings/{video => display/ti}/ti,omap3-dss.txt | 2 +- .../bindings/{video => display/ti}/ti,omap4-dss.txt | 2 +- .../bindings/{video => display/ti}/ti,omap5-dss.txt | 2 +- .../devicetree/bindings/{video => display/ti}/ti,opa362.txt | 0 .../devicetree/bindings/{video => display/ti}/ti,tfp410.txt | 0 .../bindings/{video => display/ti}/ti,tpd12s015.txt | 0 .../devicetree/bindings/{drm => display}/tilcdc/panel.txt | 2 +- .../devicetree/bindings/{drm => display}/tilcdc/tfp410.txt | 0 .../devicetree/bindings/{drm => display}/tilcdc/tilcdc.txt | 0 .../devicetree/bindings/{video => display}/via,vt8500-fb.txt | 0 .../bindings/{video => display}/wm,prizm-ge-rops.txt | 0 .../devicetree/bindings/{video => display}/wm,wm8505-fb.txt | 0 Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt | 2 +- 114 files changed, 22 insertions(+), 22 deletions(-) rename Documentation/devicetree/bindings/{video => display}/arm,pl11x.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/armada/marvell,dove-lcd.txt (100%) rename Documentation/devicetree/bindings/{video => display}/atmel,lcdc.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/atmel/hlcdc-dc.txt (100%) rename Documentation/devicetree/bindings/{video => display/bridge}/adi,adv7123.txt (100%) rename Documentation/devicetree/bindings/{video => display/bridge}/adi,adv7511.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/bridge/dw_hdmi.txt (91%) rename Documentation/devicetree/bindings/{video => display}/bridge/ps8622.txt (100%) rename Documentation/devicetree/bindings/{video => display}/bridge/ptn3460.txt (100%) rename Documentation/devicetree/bindings/{drm/i2c => display/bridge}/tda998x.txt (100%) rename Documentation/devicetree/bindings/{video/thine,thc63lvdm83d => display/bridge/thine,thc63lvdm83d.txt} (100%) rename Documentation/devicetree/bindings/{video => display}/cirrus,clps711x-fb.txt (94%) rename Documentation/devicetree/bindings/{video => display/connector}/analog-tv-connector.txt (100%) rename Documentation/devicetree/bindings/{video => display/connector}/dvi-connector.txt (100%) rename Documentation/devicetree/bindings/{video => display/connector}/hdmi-connector.txt (100%) rename Documentation/devicetree/bindings/{video => display/connector}/vga-connector.txt (100%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos-mic.txt (100%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos5433-decon.txt (100%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos7-decon.txt (97%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_dp.txt (98%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_dsim.txt (98%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmi.txt (100%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmiddc.txt (100%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_hdmiphy.txt (100%) rename Documentation/devicetree/bindings/{video => display/exynos}/exynos_mixer.txt (100%) rename Documentation/devicetree/bindings/{video => display/exynos}/samsung-fimd.txt (98%) rename Documentation/devicetree/bindings/{video => display}/fsl,dcu.txt (100%) rename Documentation/devicetree/bindings/{video => display/imx}/fsl,imx-fb.txt (96%) rename Documentation/devicetree/bindings/{drm => display}/imx/fsl-imx-drm.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/imx/hdmi.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/imx/ldb.txt (98%) rename Documentation/devicetree/bindings/{mipi/dsi => display}/mipi-dsi-bus.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/msm/dsi.txt (98%) rename Documentation/devicetree/bindings/{drm => display}/msm/edp.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/msm/gpu.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/msm/hdmi.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/msm/mdp.txt (100%) rename Documentation/devicetree/bindings/{fb => display}/mxsfb.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/ampire,am800480r3tmqwa1h.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/auo,b080uan01.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101aw03.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101ean01.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/auo,b101xtn01.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/auo,b116xw03.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/auo,b133htn01.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/auo,b133xtn01.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/avic,tm070ddh03.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/chunghwa,claa101wa01a.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/chunghwa,claa101wb03.txt (100%) rename Documentation/devicetree/bindings/{video => display/panel}/display-timing.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/edt,et057090dhu.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/edt,et070080dh6.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/edt,etm0700g0dh6.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/foxlink,fl500wvr00-a0t.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/giantplus,gpg482739qs5.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/hannstar,hsd070pww1.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/hannstar,hsd100pxn1.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/hit,tx23d38vm0caa.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/innolux,at043tn24.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/innolux,g121i1-l01.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/innolux,n116bge.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/innolux,n156bge-l21.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/innolux,zj070na-01p.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/lg,lb070wv8.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/lg,ld070wx3-sl01.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/lg,lg4573.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/lg,lh500wx1-sd03.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/lg,lp129qe.txt (100%) rename Documentation/devicetree/bindings/{video => display/panel}/lgphilips,lb035q02.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/nec,nl4827hc19-05b.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/okaya,rs800480t-7x0gp.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/ortustech,com43h4m85ulc.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/panasonic,vvx10f004b00.txt (100%) rename Documentation/devicetree/bindings/{video => display/panel}/panel-dpi.txt (94%) rename Documentation/devicetree/bindings/{video => display/panel}/panel-dsi-cm.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ld9040.txt (96%) rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ltn101nt05.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/samsung,ltn140at29-301.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/samsung,s6e8aa0.txt (95%) rename Documentation/devicetree/bindings/{ => display}/panel/sharp,lq101r1sx01.txt (100%) rename Documentation/devicetree/bindings/{video => display/panel}/sharp,ls037v7dw01.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/shelly,sca07010-bfn-lnn.txt (100%) rename Documentation/devicetree/bindings/{ => display}/panel/simple-panel.txt (100%) rename Documentation/devicetree/bindings/{video => display/panel}/sony,acx565akm.txt (100%) rename Documentation/devicetree/bindings/{video => display/panel}/toppoly,td028ttec1.txt (100%) rename Documentation/devicetree/bindings/{video => display/panel}/tpo,td043mtea1.txt (100%) rename Documentation/devicetree/bindings/{video => display}/renesas,du.txt (100%) rename Documentation/devicetree/bindings/{video => display/rockchip}/dw_hdmi-rockchip.txt (100%) rename Documentation/devicetree/bindings/{video => display/rockchip}/rockchip-drm.txt (88%) rename Documentation/devicetree/bindings/{video => display/rockchip}/rockchip-vop.txt (100%) rename Documentation/devicetree/bindings/{video => display}/simple-framebuffer-sunxi.txt (100%) rename Documentation/devicetree/bindings/{video => display}/simple-framebuffer.txt (100%) rename Documentation/devicetree/bindings/{fb => display}/sm501fb.txt (100%) rename Documentation/devicetree/bindings/{video => display}/ssd1289fb.txt (100%) rename Documentation/devicetree/bindings/{video => display}/ssd1307fb.txt (100%) rename Documentation/devicetree/bindings/{gpu => display}/st,stih4xx.txt (100%) rename Documentation/devicetree/bindings/{mipi => display/tegra}/nvidia,tegra114-mipi.txt (100%) rename Documentation/devicetree/bindings/{gpu => display/tegra}/nvidia,tegra20-host1x.txt (99%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,dra7-dss.txt (95%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap-dss.txt (100%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap2-dss.txt (93%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap3-dss.txt (95%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap4-dss.txt (97%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,omap5-dss.txt (96%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,opa362.txt (100%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,tfp410.txt (100%) rename Documentation/devicetree/bindings/{video => display/ti}/ti,tpd12s015.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/tilcdc/panel.txt (96%) rename Documentation/devicetree/bindings/{drm => display}/tilcdc/tfp410.txt (100%) rename Documentation/devicetree/bindings/{drm => display}/tilcdc/tilcdc.txt (100%) rename Documentation/devicetree/bindings/{video => display}/via,vt8500-fb.txt (100%) rename Documentation/devicetree/bindings/{video => display}/wm,prizm-ge-rops.txt (100%) rename Documentation/devicetree/bindings/{video => display}/wm,wm8505-fb.txt (100%) diff --git a/Documentation/devicetree/bindings/video/arm,pl11x.txt b/Documentation/devicetree/bindings/display/arm,pl11x.txt similarity index 100% rename from Documentation/devicetree/bindings/video/arm,pl11x.txt rename to Documentation/devicetree/bindings/display/arm,pl11x.txt diff --git a/Documentation/devicetree/bindings/drm/armada/marvell,dove-lcd.txt b/Documentation/devicetree/bindings/display/armada/marvell,dove-lcd.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/armada/marvell,dove-lcd.txt rename to Documentation/devicetree/bindings/display/armada/marvell,dove-lcd.txt diff --git a/Documentation/devicetree/bindings/video/atmel,lcdc.txt b/Documentation/devicetree/bindings/display/atmel,lcdc.txt similarity index 100% rename from Documentation/devicetree/bindings/video/atmel,lcdc.txt rename to Documentation/devicetree/bindings/display/atmel,lcdc.txt diff --git a/Documentation/devicetree/bindings/drm/atmel/hlcdc-dc.txt b/Documentation/devicetree/bindings/display/atmel/hlcdc-dc.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/atmel/hlcdc-dc.txt rename to Documentation/devicetree/bindings/display/atmel/hlcdc-dc.txt diff --git a/Documentation/devicetree/bindings/video/adi,adv7123.txt b/Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt similarity index 100% rename from Documentation/devicetree/bindings/video/adi,adv7123.txt rename to Documentation/devicetree/bindings/display/bridge/adi,adv7123.txt diff --git a/Documentation/devicetree/bindings/video/adi,adv7511.txt b/Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt similarity index 100% rename from Documentation/devicetree/bindings/video/adi,adv7511.txt rename to Documentation/devicetree/bindings/display/bridge/adi,adv7511.txt diff --git a/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt b/Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt similarity index 91% rename from Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt rename to Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt index a905c1413558..dc1452f0d5d8 100644 --- a/Documentation/devicetree/bindings/drm/bridge/dw_hdmi.txt +++ b/Documentation/devicetree/bindings/display/bridge/dw_hdmi.txt @@ -14,8 +14,8 @@ Required properties: -port@[X]: SoC specific port nodes with endpoint definitions as defined in Documentation/devicetree/bindings/media/video-interfaces.txt, please refer to the SoC specific binding document: - * Documentation/devicetree/bindings/drm/imx/hdmi.txt - * Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt + * Documentation/devicetree/bindings/display/imx/hdmi.txt + * Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt Optional properties - reg-io-width: the width of the reg:1,4, default set to 1 if not present diff --git a/Documentation/devicetree/bindings/video/bridge/ps8622.txt b/Documentation/devicetree/bindings/display/bridge/ps8622.txt similarity index 100% rename from Documentation/devicetree/bindings/video/bridge/ps8622.txt rename to Documentation/devicetree/bindings/display/bridge/ps8622.txt diff --git a/Documentation/devicetree/bindings/video/bridge/ptn3460.txt b/Documentation/devicetree/bindings/display/bridge/ptn3460.txt similarity index 100% rename from Documentation/devicetree/bindings/video/bridge/ptn3460.txt rename to Documentation/devicetree/bindings/display/bridge/ptn3460.txt diff --git a/Documentation/devicetree/bindings/drm/i2c/tda998x.txt b/Documentation/devicetree/bindings/display/bridge/tda998x.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/i2c/tda998x.txt rename to Documentation/devicetree/bindings/display/bridge/tda998x.txt diff --git a/Documentation/devicetree/bindings/video/thine,thc63lvdm83d b/Documentation/devicetree/bindings/display/bridge/thine,thc63lvdm83d.txt similarity index 100% rename from Documentation/devicetree/bindings/video/thine,thc63lvdm83d rename to Documentation/devicetree/bindings/display/bridge/thine,thc63lvdm83d.txt diff --git a/Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt b/Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt similarity index 94% rename from Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt rename to Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt index 6fc3c6adeefa..d685be898d0c 100644 --- a/Documentation/devicetree/bindings/video/cirrus,clps711x-fb.txt +++ b/Documentation/devicetree/bindings/display/cirrus,clps711x-fb.txt @@ -6,7 +6,7 @@ Required properties: location and size of the framebuffer memory. - clocks : phandle + clock specifier pair of the FB reference clock. - display : phandle to a display node as described in - Documentation/devicetree/bindings/video/display-timing.txt. + Documentation/devicetree/bindings/display/display-timing.txt. Additionally, the display node has to define properties: - bits-per-pixel: Bits per pixel. - ac-prescale : LCD AC bias frequency. This frequency is the required diff --git a/Documentation/devicetree/bindings/video/analog-tv-connector.txt b/Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt similarity index 100% rename from Documentation/devicetree/bindings/video/analog-tv-connector.txt rename to Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt diff --git a/Documentation/devicetree/bindings/video/dvi-connector.txt b/Documentation/devicetree/bindings/display/connector/dvi-connector.txt similarity index 100% rename from Documentation/devicetree/bindings/video/dvi-connector.txt rename to Documentation/devicetree/bindings/display/connector/dvi-connector.txt diff --git a/Documentation/devicetree/bindings/video/hdmi-connector.txt b/Documentation/devicetree/bindings/display/connector/hdmi-connector.txt similarity index 100% rename from Documentation/devicetree/bindings/video/hdmi-connector.txt rename to Documentation/devicetree/bindings/display/connector/hdmi-connector.txt diff --git a/Documentation/devicetree/bindings/video/vga-connector.txt b/Documentation/devicetree/bindings/display/connector/vga-connector.txt similarity index 100% rename from Documentation/devicetree/bindings/video/vga-connector.txt rename to Documentation/devicetree/bindings/display/connector/vga-connector.txt diff --git a/Documentation/devicetree/bindings/video/exynos-mic.txt b/Documentation/devicetree/bindings/display/exynos/exynos-mic.txt similarity index 100% rename from Documentation/devicetree/bindings/video/exynos-mic.txt rename to Documentation/devicetree/bindings/display/exynos/exynos-mic.txt diff --git a/Documentation/devicetree/bindings/video/exynos5433-decon.txt b/Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt similarity index 100% rename from Documentation/devicetree/bindings/video/exynos5433-decon.txt rename to Documentation/devicetree/bindings/display/exynos/exynos5433-decon.txt diff --git a/Documentation/devicetree/bindings/video/exynos7-decon.txt b/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt similarity index 97% rename from Documentation/devicetree/bindings/video/exynos7-decon.txt rename to Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt index f5f9c8d4a55a..3938caacf11c 100644 --- a/Documentation/devicetree/bindings/video/exynos7-decon.txt +++ b/Documentation/devicetree/bindings/display/exynos/exynos7-decon.txt @@ -38,7 +38,7 @@ Optional Properties: Can be used in case timings cannot be provided otherwise or to override timings provided by the panel. -[1]: Documentation/devicetree/bindings/video/display-timing.txt +[1]: Documentation/devicetree/bindings/display/display-timing.txt Example: diff --git a/Documentation/devicetree/bindings/video/exynos_dp.txt b/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt similarity index 98% rename from Documentation/devicetree/bindings/video/exynos_dp.txt rename to Documentation/devicetree/bindings/display/exynos/exynos_dp.txt index 7a3a9cdb86ab..64693f2ebc51 100644 --- a/Documentation/devicetree/bindings/video/exynos_dp.txt +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dp.txt @@ -50,7 +50,7 @@ Required properties for dp-controller: number of lanes supported by the panel. LANE_COUNT1 = 1, LANE_COUNT2 = 2, LANE_COUNT4 = 4 - display-timings: timings for the connected panel as described by - Documentation/devicetree/bindings/video/display-timing.txt + Documentation/devicetree/bindings/display/display-timing.txt Optional properties for dp-controller: -interlaced: diff --git a/Documentation/devicetree/bindings/video/exynos_dsim.txt b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt similarity index 98% rename from Documentation/devicetree/bindings/video/exynos_dsim.txt rename to Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt index 0be036270661..0e6f0c024858 100644 --- a/Documentation/devicetree/bindings/video/exynos_dsim.txt +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt @@ -49,7 +49,7 @@ Video interfaces: mode - samsung,esc-clock-frequency: specifies DSI frequency in escape mode -[1]: Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt +[1]: Documentation/devicetree/bindings/display/mipi-dsi-bus.txt [2]: Documentation/devicetree/bindings/media/video-interfaces.txt Example: diff --git a/Documentation/devicetree/bindings/video/exynos_hdmi.txt b/Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt similarity index 100% rename from Documentation/devicetree/bindings/video/exynos_hdmi.txt rename to Documentation/devicetree/bindings/display/exynos/exynos_hdmi.txt diff --git a/Documentation/devicetree/bindings/video/exynos_hdmiddc.txt b/Documentation/devicetree/bindings/display/exynos/exynos_hdmiddc.txt similarity index 100% rename from Documentation/devicetree/bindings/video/exynos_hdmiddc.txt rename to Documentation/devicetree/bindings/display/exynos/exynos_hdmiddc.txt diff --git a/Documentation/devicetree/bindings/video/exynos_hdmiphy.txt b/Documentation/devicetree/bindings/display/exynos/exynos_hdmiphy.txt similarity index 100% rename from Documentation/devicetree/bindings/video/exynos_hdmiphy.txt rename to Documentation/devicetree/bindings/display/exynos/exynos_hdmiphy.txt diff --git a/Documentation/devicetree/bindings/video/exynos_mixer.txt b/Documentation/devicetree/bindings/display/exynos/exynos_mixer.txt similarity index 100% rename from Documentation/devicetree/bindings/video/exynos_mixer.txt rename to Documentation/devicetree/bindings/display/exynos/exynos_mixer.txt diff --git a/Documentation/devicetree/bindings/video/samsung-fimd.txt b/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt similarity index 98% rename from Documentation/devicetree/bindings/video/samsung-fimd.txt rename to Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt index a8bbbde03e79..27c3ce0db16a 100644 --- a/Documentation/devicetree/bindings/video/samsung-fimd.txt +++ b/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt @@ -82,7 +82,7 @@ in [2]. The following are properties specific to those nodes: 3 - for parallel output, 4 - for write-back interface -[1]: Documentation/devicetree/bindings/video/display-timing.txt +[1]: Documentation/devicetree/bindings/display/display-timing.txt [2]: Documentation/devicetree/bindings/media/video-interfaces.txt Example: diff --git a/Documentation/devicetree/bindings/video/fsl,dcu.txt b/Documentation/devicetree/bindings/display/fsl,dcu.txt similarity index 100% rename from Documentation/devicetree/bindings/video/fsl,dcu.txt rename to Documentation/devicetree/bindings/display/fsl,dcu.txt diff --git a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt b/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt similarity index 96% rename from Documentation/devicetree/bindings/video/fsl,imx-fb.txt rename to Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt index 8c8c2f4e4c3f..00d5f8ea7ec6 100644 --- a/Documentation/devicetree/bindings/video/fsl,imx-fb.txt +++ b/Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt @@ -9,7 +9,7 @@ Required properties: Required nodes: - display: Phandle to a display node as described in - Documentation/devicetree/bindings/video/display-timing.txt + Documentation/devicetree/bindings/display/display-timing.txt Additional, the display node has to define properties: - bits-per-pixel: Bits per pixel - fsl,pcr: LCDC PCR value diff --git a/Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt b/Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/imx/fsl-imx-drm.txt rename to Documentation/devicetree/bindings/display/imx/fsl-imx-drm.txt diff --git a/Documentation/devicetree/bindings/drm/imx/hdmi.txt b/Documentation/devicetree/bindings/display/imx/hdmi.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/imx/hdmi.txt rename to Documentation/devicetree/bindings/display/imx/hdmi.txt diff --git a/Documentation/devicetree/bindings/drm/imx/ldb.txt b/Documentation/devicetree/bindings/display/imx/ldb.txt similarity index 98% rename from Documentation/devicetree/bindings/drm/imx/ldb.txt rename to Documentation/devicetree/bindings/display/imx/ldb.txt index 9a21366436f6..0a175d991b52 100644 --- a/Documentation/devicetree/bindings/drm/imx/ldb.txt +++ b/Documentation/devicetree/bindings/display/imx/ldb.txt @@ -63,7 +63,7 @@ Required properties: Optional properties (required if display-timings are used): - display-timings : A node that describes the display timings as defined in - Documentation/devicetree/bindings/video/display-timing.txt. + Documentation/devicetree/bindings/display/display-timing.txt. - fsl,data-mapping : should be "spwg" or "jeida" This describes how the color bits are laid out in the serialized LVDS signal. diff --git a/Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt b/Documentation/devicetree/bindings/display/mipi-dsi-bus.txt similarity index 100% rename from Documentation/devicetree/bindings/mipi/dsi/mipi-dsi-bus.txt rename to Documentation/devicetree/bindings/display/mipi-dsi-bus.txt diff --git a/Documentation/devicetree/bindings/drm/msm/dsi.txt b/Documentation/devicetree/bindings/display/msm/dsi.txt similarity index 98% rename from Documentation/devicetree/bindings/drm/msm/dsi.txt rename to Documentation/devicetree/bindings/display/msm/dsi.txt index d56923cd5590..f344b9e49198 100644 --- a/Documentation/devicetree/bindings/drm/msm/dsi.txt +++ b/Documentation/devicetree/bindings/display/msm/dsi.txt @@ -28,7 +28,7 @@ Required properties: Optional properties: - panel@0: Node of panel connected to this DSI controller. - See files in Documentation/devicetree/bindings/panel/ for each supported + See files in Documentation/devicetree/bindings/display/panel/ for each supported panel. - qcom,dual-dsi-mode: Boolean value indicating if the DSI controller is driving a panel which needs 2 DSI links. diff --git a/Documentation/devicetree/bindings/drm/msm/edp.txt b/Documentation/devicetree/bindings/display/msm/edp.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/msm/edp.txt rename to Documentation/devicetree/bindings/display/msm/edp.txt diff --git a/Documentation/devicetree/bindings/drm/msm/gpu.txt b/Documentation/devicetree/bindings/display/msm/gpu.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/msm/gpu.txt rename to Documentation/devicetree/bindings/display/msm/gpu.txt diff --git a/Documentation/devicetree/bindings/drm/msm/hdmi.txt b/Documentation/devicetree/bindings/display/msm/hdmi.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/msm/hdmi.txt rename to Documentation/devicetree/bindings/display/msm/hdmi.txt diff --git a/Documentation/devicetree/bindings/drm/msm/mdp.txt b/Documentation/devicetree/bindings/display/msm/mdp.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/msm/mdp.txt rename to Documentation/devicetree/bindings/display/msm/mdp.txt diff --git a/Documentation/devicetree/bindings/fb/mxsfb.txt b/Documentation/devicetree/bindings/display/mxsfb.txt similarity index 100% rename from Documentation/devicetree/bindings/fb/mxsfb.txt rename to Documentation/devicetree/bindings/display/mxsfb.txt diff --git a/Documentation/devicetree/bindings/panel/ampire,am800480r3tmqwa1h.txt b/Documentation/devicetree/bindings/display/panel/ampire,am800480r3tmqwa1h.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/ampire,am800480r3tmqwa1h.txt rename to Documentation/devicetree/bindings/display/panel/ampire,am800480r3tmqwa1h.txt diff --git a/Documentation/devicetree/bindings/panel/auo,b080uan01.txt b/Documentation/devicetree/bindings/display/panel/auo,b080uan01.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/auo,b080uan01.txt rename to Documentation/devicetree/bindings/display/panel/auo,b080uan01.txt diff --git a/Documentation/devicetree/bindings/panel/auo,b101aw03.txt b/Documentation/devicetree/bindings/display/panel/auo,b101aw03.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/auo,b101aw03.txt rename to Documentation/devicetree/bindings/display/panel/auo,b101aw03.txt diff --git a/Documentation/devicetree/bindings/panel/auo,b101ean01.txt b/Documentation/devicetree/bindings/display/panel/auo,b101ean01.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/auo,b101ean01.txt rename to Documentation/devicetree/bindings/display/panel/auo,b101ean01.txt diff --git a/Documentation/devicetree/bindings/panel/auo,b101xtn01.txt b/Documentation/devicetree/bindings/display/panel/auo,b101xtn01.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/auo,b101xtn01.txt rename to Documentation/devicetree/bindings/display/panel/auo,b101xtn01.txt diff --git a/Documentation/devicetree/bindings/panel/auo,b116xw03.txt b/Documentation/devicetree/bindings/display/panel/auo,b116xw03.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/auo,b116xw03.txt rename to Documentation/devicetree/bindings/display/panel/auo,b116xw03.txt diff --git a/Documentation/devicetree/bindings/panel/auo,b133htn01.txt b/Documentation/devicetree/bindings/display/panel/auo,b133htn01.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/auo,b133htn01.txt rename to Documentation/devicetree/bindings/display/panel/auo,b133htn01.txt diff --git a/Documentation/devicetree/bindings/panel/auo,b133xtn01.txt b/Documentation/devicetree/bindings/display/panel/auo,b133xtn01.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/auo,b133xtn01.txt rename to Documentation/devicetree/bindings/display/panel/auo,b133xtn01.txt diff --git a/Documentation/devicetree/bindings/panel/avic,tm070ddh03.txt b/Documentation/devicetree/bindings/display/panel/avic,tm070ddh03.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/avic,tm070ddh03.txt rename to Documentation/devicetree/bindings/display/panel/avic,tm070ddh03.txt diff --git a/Documentation/devicetree/bindings/panel/chunghwa,claa101wa01a.txt b/Documentation/devicetree/bindings/display/panel/chunghwa,claa101wa01a.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/chunghwa,claa101wa01a.txt rename to Documentation/devicetree/bindings/display/panel/chunghwa,claa101wa01a.txt diff --git a/Documentation/devicetree/bindings/panel/chunghwa,claa101wb03.txt b/Documentation/devicetree/bindings/display/panel/chunghwa,claa101wb03.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/chunghwa,claa101wb03.txt rename to Documentation/devicetree/bindings/display/panel/chunghwa,claa101wb03.txt diff --git a/Documentation/devicetree/bindings/video/display-timing.txt b/Documentation/devicetree/bindings/display/panel/display-timing.txt similarity index 100% rename from Documentation/devicetree/bindings/video/display-timing.txt rename to Documentation/devicetree/bindings/display/panel/display-timing.txt diff --git a/Documentation/devicetree/bindings/panel/edt,et057090dhu.txt b/Documentation/devicetree/bindings/display/panel/edt,et057090dhu.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/edt,et057090dhu.txt rename to Documentation/devicetree/bindings/display/panel/edt,et057090dhu.txt diff --git a/Documentation/devicetree/bindings/panel/edt,et070080dh6.txt b/Documentation/devicetree/bindings/display/panel/edt,et070080dh6.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/edt,et070080dh6.txt rename to Documentation/devicetree/bindings/display/panel/edt,et070080dh6.txt diff --git a/Documentation/devicetree/bindings/panel/edt,etm0700g0dh6.txt b/Documentation/devicetree/bindings/display/panel/edt,etm0700g0dh6.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/edt,etm0700g0dh6.txt rename to Documentation/devicetree/bindings/display/panel/edt,etm0700g0dh6.txt diff --git a/Documentation/devicetree/bindings/panel/foxlink,fl500wvr00-a0t.txt b/Documentation/devicetree/bindings/display/panel/foxlink,fl500wvr00-a0t.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/foxlink,fl500wvr00-a0t.txt rename to Documentation/devicetree/bindings/display/panel/foxlink,fl500wvr00-a0t.txt diff --git a/Documentation/devicetree/bindings/panel/giantplus,gpg482739qs5.txt b/Documentation/devicetree/bindings/display/panel/giantplus,gpg482739qs5.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/giantplus,gpg482739qs5.txt rename to Documentation/devicetree/bindings/display/panel/giantplus,gpg482739qs5.txt diff --git a/Documentation/devicetree/bindings/panel/hannstar,hsd070pww1.txt b/Documentation/devicetree/bindings/display/panel/hannstar,hsd070pww1.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/hannstar,hsd070pww1.txt rename to Documentation/devicetree/bindings/display/panel/hannstar,hsd070pww1.txt diff --git a/Documentation/devicetree/bindings/panel/hannstar,hsd100pxn1.txt b/Documentation/devicetree/bindings/display/panel/hannstar,hsd100pxn1.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/hannstar,hsd100pxn1.txt rename to Documentation/devicetree/bindings/display/panel/hannstar,hsd100pxn1.txt diff --git a/Documentation/devicetree/bindings/panel/hit,tx23d38vm0caa.txt b/Documentation/devicetree/bindings/display/panel/hit,tx23d38vm0caa.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/hit,tx23d38vm0caa.txt rename to Documentation/devicetree/bindings/display/panel/hit,tx23d38vm0caa.txt diff --git a/Documentation/devicetree/bindings/panel/innolux,at043tn24.txt b/Documentation/devicetree/bindings/display/panel/innolux,at043tn24.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/innolux,at043tn24.txt rename to Documentation/devicetree/bindings/display/panel/innolux,at043tn24.txt diff --git a/Documentation/devicetree/bindings/panel/innolux,g121i1-l01.txt b/Documentation/devicetree/bindings/display/panel/innolux,g121i1-l01.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/innolux,g121i1-l01.txt rename to Documentation/devicetree/bindings/display/panel/innolux,g121i1-l01.txt diff --git a/Documentation/devicetree/bindings/panel/innolux,n116bge.txt b/Documentation/devicetree/bindings/display/panel/innolux,n116bge.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/innolux,n116bge.txt rename to Documentation/devicetree/bindings/display/panel/innolux,n116bge.txt diff --git a/Documentation/devicetree/bindings/panel/innolux,n156bge-l21.txt b/Documentation/devicetree/bindings/display/panel/innolux,n156bge-l21.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/innolux,n156bge-l21.txt rename to Documentation/devicetree/bindings/display/panel/innolux,n156bge-l21.txt diff --git a/Documentation/devicetree/bindings/panel/innolux,zj070na-01p.txt b/Documentation/devicetree/bindings/display/panel/innolux,zj070na-01p.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/innolux,zj070na-01p.txt rename to Documentation/devicetree/bindings/display/panel/innolux,zj070na-01p.txt diff --git a/Documentation/devicetree/bindings/panel/lg,lb070wv8.txt b/Documentation/devicetree/bindings/display/panel/lg,lb070wv8.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/lg,lb070wv8.txt rename to Documentation/devicetree/bindings/display/panel/lg,lb070wv8.txt diff --git a/Documentation/devicetree/bindings/panel/lg,ld070wx3-sl01.txt b/Documentation/devicetree/bindings/display/panel/lg,ld070wx3-sl01.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/lg,ld070wx3-sl01.txt rename to Documentation/devicetree/bindings/display/panel/lg,ld070wx3-sl01.txt diff --git a/Documentation/devicetree/bindings/panel/lg,lg4573.txt b/Documentation/devicetree/bindings/display/panel/lg,lg4573.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/lg,lg4573.txt rename to Documentation/devicetree/bindings/display/panel/lg,lg4573.txt diff --git a/Documentation/devicetree/bindings/panel/lg,lh500wx1-sd03.txt b/Documentation/devicetree/bindings/display/panel/lg,lh500wx1-sd03.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/lg,lh500wx1-sd03.txt rename to Documentation/devicetree/bindings/display/panel/lg,lh500wx1-sd03.txt diff --git a/Documentation/devicetree/bindings/panel/lg,lp129qe.txt b/Documentation/devicetree/bindings/display/panel/lg,lp129qe.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/lg,lp129qe.txt rename to Documentation/devicetree/bindings/display/panel/lg,lp129qe.txt diff --git a/Documentation/devicetree/bindings/video/lgphilips,lb035q02.txt b/Documentation/devicetree/bindings/display/panel/lgphilips,lb035q02.txt similarity index 100% rename from Documentation/devicetree/bindings/video/lgphilips,lb035q02.txt rename to Documentation/devicetree/bindings/display/panel/lgphilips,lb035q02.txt diff --git a/Documentation/devicetree/bindings/panel/nec,nl4827hc19-05b.txt b/Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/nec,nl4827hc19-05b.txt rename to Documentation/devicetree/bindings/display/panel/nec,nl4827hc19-05b.txt diff --git a/Documentation/devicetree/bindings/panel/okaya,rs800480t-7x0gp.txt b/Documentation/devicetree/bindings/display/panel/okaya,rs800480t-7x0gp.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/okaya,rs800480t-7x0gp.txt rename to Documentation/devicetree/bindings/display/panel/okaya,rs800480t-7x0gp.txt diff --git a/Documentation/devicetree/bindings/panel/ortustech,com43h4m85ulc.txt b/Documentation/devicetree/bindings/display/panel/ortustech,com43h4m85ulc.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/ortustech,com43h4m85ulc.txt rename to Documentation/devicetree/bindings/display/panel/ortustech,com43h4m85ulc.txt diff --git a/Documentation/devicetree/bindings/panel/panasonic,vvx10f004b00.txt b/Documentation/devicetree/bindings/display/panel/panasonic,vvx10f004b00.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/panasonic,vvx10f004b00.txt rename to Documentation/devicetree/bindings/display/panel/panasonic,vvx10f004b00.txt diff --git a/Documentation/devicetree/bindings/video/panel-dpi.txt b/Documentation/devicetree/bindings/display/panel/panel-dpi.txt similarity index 94% rename from Documentation/devicetree/bindings/video/panel-dpi.txt rename to Documentation/devicetree/bindings/display/panel/panel-dpi.txt index a40180b05bab..216c894d4f99 100644 --- a/Documentation/devicetree/bindings/video/panel-dpi.txt +++ b/Documentation/devicetree/bindings/display/panel/panel-dpi.txt @@ -10,7 +10,7 @@ Optional properties: Required nodes: - "panel-timing" containing video timings - (Documentation/devicetree/bindings/video/display-timing.txt) + (Documentation/devicetree/bindings/display/display-timing.txt) - Video port for DPI input Example diff --git a/Documentation/devicetree/bindings/video/panel-dsi-cm.txt b/Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt similarity index 100% rename from Documentation/devicetree/bindings/video/panel-dsi-cm.txt rename to Documentation/devicetree/bindings/display/panel/panel-dsi-cm.txt diff --git a/Documentation/devicetree/bindings/panel/samsung,ld9040.txt b/Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt similarity index 96% rename from Documentation/devicetree/bindings/panel/samsung,ld9040.txt rename to Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt index 07c36c3f7b52..fc595d9b985b 100644 --- a/Documentation/devicetree/bindings/panel/samsung,ld9040.txt +++ b/Documentation/devicetree/bindings/display/panel/samsung,ld9040.txt @@ -20,7 +20,7 @@ The device node can contain one 'port' child node with one child 'endpoint' node, according to the bindings defined in [3]. This node should describe panel's video bus. -[1]: Documentation/devicetree/bindings/video/display-timing.txt +[1]: Documentation/devicetree/bindings/display/display-timing.txt [2]: Documentation/devicetree/bindings/spi/spi-bus.txt [3]: Documentation/devicetree/bindings/media/video-interfaces.txt diff --git a/Documentation/devicetree/bindings/panel/samsung,ltn101nt05.txt b/Documentation/devicetree/bindings/display/panel/samsung,ltn101nt05.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/samsung,ltn101nt05.txt rename to Documentation/devicetree/bindings/display/panel/samsung,ltn101nt05.txt diff --git a/Documentation/devicetree/bindings/panel/samsung,ltn140at29-301.txt b/Documentation/devicetree/bindings/display/panel/samsung,ltn140at29-301.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/samsung,ltn140at29-301.txt rename to Documentation/devicetree/bindings/display/panel/samsung,ltn140at29-301.txt diff --git a/Documentation/devicetree/bindings/panel/samsung,s6e8aa0.txt b/Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt similarity index 95% rename from Documentation/devicetree/bindings/panel/samsung,s6e8aa0.txt rename to Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt index e7ee988e3156..25701c81b5e0 100644 --- a/Documentation/devicetree/bindings/panel/samsung,s6e8aa0.txt +++ b/Documentation/devicetree/bindings/display/panel/samsung,s6e8aa0.txt @@ -21,7 +21,7 @@ The device node can contain one 'port' child node with one child 'endpoint' node, according to the bindings defined in [2]. This node should describe panel's video bus. -[1]: Documentation/devicetree/bindings/video/display-timing.txt +[1]: Documentation/devicetree/bindings/display/display-timing.txt [2]: Documentation/devicetree/bindings/media/video-interfaces.txt Example: diff --git a/Documentation/devicetree/bindings/panel/sharp,lq101r1sx01.txt b/Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/sharp,lq101r1sx01.txt rename to Documentation/devicetree/bindings/display/panel/sharp,lq101r1sx01.txt diff --git a/Documentation/devicetree/bindings/video/sharp,ls037v7dw01.txt b/Documentation/devicetree/bindings/display/panel/sharp,ls037v7dw01.txt similarity index 100% rename from Documentation/devicetree/bindings/video/sharp,ls037v7dw01.txt rename to Documentation/devicetree/bindings/display/panel/sharp,ls037v7dw01.txt diff --git a/Documentation/devicetree/bindings/panel/shelly,sca07010-bfn-lnn.txt b/Documentation/devicetree/bindings/display/panel/shelly,sca07010-bfn-lnn.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/shelly,sca07010-bfn-lnn.txt rename to Documentation/devicetree/bindings/display/panel/shelly,sca07010-bfn-lnn.txt diff --git a/Documentation/devicetree/bindings/panel/simple-panel.txt b/Documentation/devicetree/bindings/display/panel/simple-panel.txt similarity index 100% rename from Documentation/devicetree/bindings/panel/simple-panel.txt rename to Documentation/devicetree/bindings/display/panel/simple-panel.txt diff --git a/Documentation/devicetree/bindings/video/sony,acx565akm.txt b/Documentation/devicetree/bindings/display/panel/sony,acx565akm.txt similarity index 100% rename from Documentation/devicetree/bindings/video/sony,acx565akm.txt rename to Documentation/devicetree/bindings/display/panel/sony,acx565akm.txt diff --git a/Documentation/devicetree/bindings/video/toppoly,td028ttec1.txt b/Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt similarity index 100% rename from Documentation/devicetree/bindings/video/toppoly,td028ttec1.txt rename to Documentation/devicetree/bindings/display/panel/toppoly,td028ttec1.txt diff --git a/Documentation/devicetree/bindings/video/tpo,td043mtea1.txt b/Documentation/devicetree/bindings/display/panel/tpo,td043mtea1.txt similarity index 100% rename from Documentation/devicetree/bindings/video/tpo,td043mtea1.txt rename to Documentation/devicetree/bindings/display/panel/tpo,td043mtea1.txt diff --git a/Documentation/devicetree/bindings/video/renesas,du.txt b/Documentation/devicetree/bindings/display/renesas,du.txt similarity index 100% rename from Documentation/devicetree/bindings/video/renesas,du.txt rename to Documentation/devicetree/bindings/display/renesas,du.txt diff --git a/Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt b/Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt similarity index 100% rename from Documentation/devicetree/bindings/video/dw_hdmi-rockchip.txt rename to Documentation/devicetree/bindings/display/rockchip/dw_hdmi-rockchip.txt diff --git a/Documentation/devicetree/bindings/video/rockchip-drm.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt similarity index 88% rename from Documentation/devicetree/bindings/video/rockchip-drm.txt rename to Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt index 7fff582495a2..5707af89319d 100644 --- a/Documentation/devicetree/bindings/video/rockchip-drm.txt +++ b/Documentation/devicetree/bindings/display/rockchip/rockchip-drm.txt @@ -9,7 +9,7 @@ Required properties: - compatible: Should be "rockchip,display-subsystem" - ports: Should contain a list of phandles pointing to display interface port of vop devices. vop definitions as defined in - Documentation/devicetree/bindings/video/rockchip-vop.txt + Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt example: diff --git a/Documentation/devicetree/bindings/video/rockchip-vop.txt b/Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt similarity index 100% rename from Documentation/devicetree/bindings/video/rockchip-vop.txt rename to Documentation/devicetree/bindings/display/rockchip/rockchip-vop.txt diff --git a/Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt b/Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt similarity index 100% rename from Documentation/devicetree/bindings/video/simple-framebuffer-sunxi.txt rename to Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt diff --git a/Documentation/devicetree/bindings/video/simple-framebuffer.txt b/Documentation/devicetree/bindings/display/simple-framebuffer.txt similarity index 100% rename from Documentation/devicetree/bindings/video/simple-framebuffer.txt rename to Documentation/devicetree/bindings/display/simple-framebuffer.txt diff --git a/Documentation/devicetree/bindings/fb/sm501fb.txt b/Documentation/devicetree/bindings/display/sm501fb.txt similarity index 100% rename from Documentation/devicetree/bindings/fb/sm501fb.txt rename to Documentation/devicetree/bindings/display/sm501fb.txt diff --git a/Documentation/devicetree/bindings/video/ssd1289fb.txt b/Documentation/devicetree/bindings/display/ssd1289fb.txt similarity index 100% rename from Documentation/devicetree/bindings/video/ssd1289fb.txt rename to Documentation/devicetree/bindings/display/ssd1289fb.txt diff --git a/Documentation/devicetree/bindings/video/ssd1307fb.txt b/Documentation/devicetree/bindings/display/ssd1307fb.txt similarity index 100% rename from Documentation/devicetree/bindings/video/ssd1307fb.txt rename to Documentation/devicetree/bindings/display/ssd1307fb.txt diff --git a/Documentation/devicetree/bindings/gpu/st,stih4xx.txt b/Documentation/devicetree/bindings/display/st,stih4xx.txt similarity index 100% rename from Documentation/devicetree/bindings/gpu/st,stih4xx.txt rename to Documentation/devicetree/bindings/display/st,stih4xx.txt diff --git a/Documentation/devicetree/bindings/mipi/nvidia,tegra114-mipi.txt b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.txt similarity index 100% rename from Documentation/devicetree/bindings/mipi/nvidia,tegra114-mipi.txt rename to Documentation/devicetree/bindings/display/tegra/nvidia,tegra114-mipi.txt diff --git a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt similarity index 99% rename from Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt rename to Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt index e685610d38e2..a3bd8c050c4e 100644 --- a/Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt +++ b/Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt @@ -184,7 +184,7 @@ of the following host1x client modules: - avdd-dsi-supply: phandle of a supply that powers the DSI controller - nvidia,mipi-calibrate: Should contain a phandle and a specifier specifying which pads are used by this DSI output and need to be calibrated. See also - ../mipi/nvidia,tegra114-mipi.txt. + ../display/tegra/nvidia,tegra114-mipi.txt. Optional properties: - nvidia,ddc-i2c-bus: phandle of an I2C controller used for DDC EDID probing diff --git a/Documentation/devicetree/bindings/video/ti,dra7-dss.txt b/Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt similarity index 95% rename from Documentation/devicetree/bindings/video/ti,dra7-dss.txt rename to Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt index f33a05137b0e..c30f9ec189ed 100644 --- a/Documentation/devicetree/bindings/video/ti,dra7-dss.txt +++ b/Documentation/devicetree/bindings/display/ti/ti,dra7-dss.txt @@ -1,7 +1,7 @@ Texas Instruments DRA7x Display Subsystem ========================================= -See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic +See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic description about OMAP Display Subsystem bindings. DSS Core diff --git a/Documentation/devicetree/bindings/video/ti,omap-dss.txt b/Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt similarity index 100% rename from Documentation/devicetree/bindings/video/ti,omap-dss.txt rename to Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt diff --git a/Documentation/devicetree/bindings/video/ti,omap2-dss.txt b/Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt similarity index 93% rename from Documentation/devicetree/bindings/video/ti,omap2-dss.txt rename to Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt index fa8bb2ed1170..afcd5a86c6a4 100644 --- a/Documentation/devicetree/bindings/video/ti,omap2-dss.txt +++ b/Documentation/devicetree/bindings/display/ti/ti,omap2-dss.txt @@ -1,7 +1,7 @@ Texas Instruments OMAP2 Display Subsystem ========================================= -See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic +See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic description about OMAP Display Subsystem bindings. DSS Core diff --git a/Documentation/devicetree/bindings/video/ti,omap3-dss.txt b/Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt similarity index 95% rename from Documentation/devicetree/bindings/video/ti,omap3-dss.txt rename to Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt index 0023fa4b1328..dc66e1447c31 100644 --- a/Documentation/devicetree/bindings/video/ti,omap3-dss.txt +++ b/Documentation/devicetree/bindings/display/ti/ti,omap3-dss.txt @@ -1,7 +1,7 @@ Texas Instruments OMAP3 Display Subsystem ========================================= -See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic +See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic description about OMAP Display Subsystem bindings. DSS Core diff --git a/Documentation/devicetree/bindings/video/ti,omap4-dss.txt b/Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt similarity index 97% rename from Documentation/devicetree/bindings/video/ti,omap4-dss.txt rename to Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt index b8c29fbd1fbb..bc624db8888d 100644 --- a/Documentation/devicetree/bindings/video/ti,omap4-dss.txt +++ b/Documentation/devicetree/bindings/display/ti/ti,omap4-dss.txt @@ -1,7 +1,7 @@ Texas Instruments OMAP4 Display Subsystem ========================================= -See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic +See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic description about OMAP Display Subsystem bindings. DSS Core diff --git a/Documentation/devicetree/bindings/video/ti,omap5-dss.txt b/Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt similarity index 96% rename from Documentation/devicetree/bindings/video/ti,omap5-dss.txt rename to Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt index 38ffc8fcd816..118a486c47bb 100644 --- a/Documentation/devicetree/bindings/video/ti,omap5-dss.txt +++ b/Documentation/devicetree/bindings/display/ti/ti,omap5-dss.txt @@ -1,7 +1,7 @@ Texas Instruments OMAP5 Display Subsystem ========================================= -See Documentation/devicetree/bindings/video/ti,omap-dss.txt for generic +See Documentation/devicetree/bindings/display/ti/ti,omap-dss.txt for generic description about OMAP Display Subsystem bindings. DSS Core diff --git a/Documentation/devicetree/bindings/video/ti,opa362.txt b/Documentation/devicetree/bindings/display/ti/ti,opa362.txt similarity index 100% rename from Documentation/devicetree/bindings/video/ti,opa362.txt rename to Documentation/devicetree/bindings/display/ti/ti,opa362.txt diff --git a/Documentation/devicetree/bindings/video/ti,tfp410.txt b/Documentation/devicetree/bindings/display/ti/ti,tfp410.txt similarity index 100% rename from Documentation/devicetree/bindings/video/ti,tfp410.txt rename to Documentation/devicetree/bindings/display/ti/ti,tfp410.txt diff --git a/Documentation/devicetree/bindings/video/ti,tpd12s015.txt b/Documentation/devicetree/bindings/display/ti/ti,tpd12s015.txt similarity index 100% rename from Documentation/devicetree/bindings/video/ti,tpd12s015.txt rename to Documentation/devicetree/bindings/display/ti/ti,tpd12s015.txt diff --git a/Documentation/devicetree/bindings/drm/tilcdc/panel.txt b/Documentation/devicetree/bindings/display/tilcdc/panel.txt similarity index 96% rename from Documentation/devicetree/bindings/drm/tilcdc/panel.txt rename to Documentation/devicetree/bindings/display/tilcdc/panel.txt index 4ab9e2300907..f20b31cdc59a 100644 --- a/Documentation/devicetree/bindings/drm/tilcdc/panel.txt +++ b/Documentation/devicetree/bindings/display/tilcdc/panel.txt @@ -15,7 +15,7 @@ Required properties: - display-timings: typical videomode of lcd panel. Multiple video modes can be listed if the panel supports multiple timings, but the 'native-mode' should be the preferred/default resolution. Refer to - Documentation/devicetree/bindings/video/display-timing.txt for display + Documentation/devicetree/bindings/display/display-timing.txt for display timing binding details. Optional properties: diff --git a/Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt b/Documentation/devicetree/bindings/display/tilcdc/tfp410.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/tilcdc/tfp410.txt rename to Documentation/devicetree/bindings/display/tilcdc/tfp410.txt diff --git a/Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt b/Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt similarity index 100% rename from Documentation/devicetree/bindings/drm/tilcdc/tilcdc.txt rename to Documentation/devicetree/bindings/display/tilcdc/tilcdc.txt diff --git a/Documentation/devicetree/bindings/video/via,vt8500-fb.txt b/Documentation/devicetree/bindings/display/via,vt8500-fb.txt similarity index 100% rename from Documentation/devicetree/bindings/video/via,vt8500-fb.txt rename to Documentation/devicetree/bindings/display/via,vt8500-fb.txt diff --git a/Documentation/devicetree/bindings/video/wm,prizm-ge-rops.txt b/Documentation/devicetree/bindings/display/wm,prizm-ge-rops.txt similarity index 100% rename from Documentation/devicetree/bindings/video/wm,prizm-ge-rops.txt rename to Documentation/devicetree/bindings/display/wm,prizm-ge-rops.txt diff --git a/Documentation/devicetree/bindings/video/wm,wm8505-fb.txt b/Documentation/devicetree/bindings/display/wm,wm8505-fb.txt similarity index 100% rename from Documentation/devicetree/bindings/video/wm,wm8505-fb.txt rename to Documentation/devicetree/bindings/display/wm,wm8505-fb.txt diff --git a/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt b/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt index ad5d90482a0e..670831b29565 100644 --- a/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt +++ b/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt @@ -15,7 +15,7 @@ Required properties: The HLCDC IP exposes two subdevices: - a PWM chip: see ../pwm/atmel-hlcdc-pwm.txt - - a Display Controller: see ../drm/atmel-hlcdc-dc.txt + - a Display Controller: see ../display/atmel-hlcdc-dc.txt Example: From 7755313e69aac99800c617ea835d86cd06f7f54c Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Mon, 21 Sep 2015 10:50:52 -0500 Subject: [PATCH 13/45] dt-bindings: move backlight bindings under leds Backlights are generally a subtype of LEDs at least from a software point of view if not always electrically. Move the bindings from the video directory to underneath the leds dir. Signed-off-by: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- .../devicetree/bindings/{video => leds}/backlight/88pm860x.txt | 0 .../bindings/{video => leds}/backlight/gpio-backlight.txt | 0 .../devicetree/bindings/{video => leds}/backlight/lp855x.txt | 0 .../bindings/{video => leds}/backlight/max8925-backlight.txt | 0 .../bindings/{video => leds}/backlight/pm8941-wled.txt | 0 .../bindings/{video => leds}/backlight/pwm-backlight.txt | 0 .../bindings/{video => leds}/backlight/sky81452-backlight.txt | 0 .../bindings/{video => leds}/backlight/tps65217-backlight.txt | 0 Documentation/devicetree/bindings/mfd/sky81452.txt | 2 +- 9 files changed, 1 insertion(+), 1 deletion(-) rename Documentation/devicetree/bindings/{video => leds}/backlight/88pm860x.txt (100%) rename Documentation/devicetree/bindings/{video => leds}/backlight/gpio-backlight.txt (100%) rename Documentation/devicetree/bindings/{video => leds}/backlight/lp855x.txt (100%) rename Documentation/devicetree/bindings/{video => leds}/backlight/max8925-backlight.txt (100%) rename Documentation/devicetree/bindings/{video => leds}/backlight/pm8941-wled.txt (100%) rename Documentation/devicetree/bindings/{video => leds}/backlight/pwm-backlight.txt (100%) rename Documentation/devicetree/bindings/{video => leds}/backlight/sky81452-backlight.txt (100%) rename Documentation/devicetree/bindings/{video => leds}/backlight/tps65217-backlight.txt (100%) diff --git a/Documentation/devicetree/bindings/video/backlight/88pm860x.txt b/Documentation/devicetree/bindings/leds/backlight/88pm860x.txt similarity index 100% rename from Documentation/devicetree/bindings/video/backlight/88pm860x.txt rename to Documentation/devicetree/bindings/leds/backlight/88pm860x.txt diff --git a/Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/gpio-backlight.txt similarity index 100% rename from Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt rename to Documentation/devicetree/bindings/leds/backlight/gpio-backlight.txt diff --git a/Documentation/devicetree/bindings/video/backlight/lp855x.txt b/Documentation/devicetree/bindings/leds/backlight/lp855x.txt similarity index 100% rename from Documentation/devicetree/bindings/video/backlight/lp855x.txt rename to Documentation/devicetree/bindings/leds/backlight/lp855x.txt diff --git a/Documentation/devicetree/bindings/video/backlight/max8925-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/max8925-backlight.txt similarity index 100% rename from Documentation/devicetree/bindings/video/backlight/max8925-backlight.txt rename to Documentation/devicetree/bindings/leds/backlight/max8925-backlight.txt diff --git a/Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt b/Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt similarity index 100% rename from Documentation/devicetree/bindings/video/backlight/pm8941-wled.txt rename to Documentation/devicetree/bindings/leds/backlight/pm8941-wled.txt diff --git a/Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt similarity index 100% rename from Documentation/devicetree/bindings/video/backlight/pwm-backlight.txt rename to Documentation/devicetree/bindings/leds/backlight/pwm-backlight.txt diff --git a/Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/sky81452-backlight.txt similarity index 100% rename from Documentation/devicetree/bindings/video/backlight/sky81452-backlight.txt rename to Documentation/devicetree/bindings/leds/backlight/sky81452-backlight.txt diff --git a/Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt b/Documentation/devicetree/bindings/leds/backlight/tps65217-backlight.txt similarity index 100% rename from Documentation/devicetree/bindings/video/backlight/tps65217-backlight.txt rename to Documentation/devicetree/bindings/leds/backlight/tps65217-backlight.txt diff --git a/Documentation/devicetree/bindings/mfd/sky81452.txt b/Documentation/devicetree/bindings/mfd/sky81452.txt index 35181794aa24..511764acd4d5 100644 --- a/Documentation/devicetree/bindings/mfd/sky81452.txt +++ b/Documentation/devicetree/bindings/mfd/sky81452.txt @@ -6,7 +6,7 @@ Required properties: Required child nodes: - backlight : container node for backlight following the binding - in video/backlight/sky81452-backlight.txt + in leds/backlight/sky81452-backlight.txt - regulator : container node for regulators following the binding in regulator/sky81452-regulator.txt From 58598f5be4fc15070fcb95a2ff36b7b966c3dee7 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 3 Sep 2015 17:47:47 -0500 Subject: [PATCH 14/45] dt-bindings: consolidate eeprom bindings Create a top level eeprom binding directory and move several scattered binding files there. Signed-off-by: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- Documentation/devicetree/bindings/{misc => eeprom}/at25.txt | 0 Documentation/devicetree/bindings/{ => eeprom}/eeprom.txt | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Documentation/devicetree/bindings/{misc => eeprom}/at25.txt (100%) rename Documentation/devicetree/bindings/{ => eeprom}/eeprom.txt (100%) diff --git a/Documentation/devicetree/bindings/misc/at25.txt b/Documentation/devicetree/bindings/eeprom/at25.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/at25.txt rename to Documentation/devicetree/bindings/eeprom/at25.txt diff --git a/Documentation/devicetree/bindings/eeprom.txt b/Documentation/devicetree/bindings/eeprom/eeprom.txt similarity index 100% rename from Documentation/devicetree/bindings/eeprom.txt rename to Documentation/devicetree/bindings/eeprom/eeprom.txt From 4f2f76f1255444c034c7f95fbaa62b19387936a3 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 3 Sep 2015 17:49:07 -0500 Subject: [PATCH 15/45] dt-bindings: consolidate RNG bindings We have RNG bindings in hwrng/ and rng/. Consolidate them all under rng/. Signed-off-by: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- Documentation/devicetree/bindings/{hwrng => rng}/atmel-trng.txt | 0 .../devicetree/bindings/{hwrng => rng}/brcm,iproc-rng200.txt | 0 Documentation/devicetree/bindings/{hwrng => rng}/omap_rng.txt | 0 .../devicetree/bindings/{hwrng => rng}/timeriomem_rng.txt | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename Documentation/devicetree/bindings/{hwrng => rng}/atmel-trng.txt (100%) rename Documentation/devicetree/bindings/{hwrng => rng}/brcm,iproc-rng200.txt (100%) rename Documentation/devicetree/bindings/{hwrng => rng}/omap_rng.txt (100%) rename Documentation/devicetree/bindings/{hwrng => rng}/timeriomem_rng.txt (100%) diff --git a/Documentation/devicetree/bindings/hwrng/atmel-trng.txt b/Documentation/devicetree/bindings/rng/atmel-trng.txt similarity index 100% rename from Documentation/devicetree/bindings/hwrng/atmel-trng.txt rename to Documentation/devicetree/bindings/rng/atmel-trng.txt diff --git a/Documentation/devicetree/bindings/hwrng/brcm,iproc-rng200.txt b/Documentation/devicetree/bindings/rng/brcm,iproc-rng200.txt similarity index 100% rename from Documentation/devicetree/bindings/hwrng/brcm,iproc-rng200.txt rename to Documentation/devicetree/bindings/rng/brcm,iproc-rng200.txt diff --git a/Documentation/devicetree/bindings/hwrng/omap_rng.txt b/Documentation/devicetree/bindings/rng/omap_rng.txt similarity index 100% rename from Documentation/devicetree/bindings/hwrng/omap_rng.txt rename to Documentation/devicetree/bindings/rng/omap_rng.txt diff --git a/Documentation/devicetree/bindings/hwrng/timeriomem_rng.txt b/Documentation/devicetree/bindings/rng/timeriomem_rng.txt similarity index 100% rename from Documentation/devicetree/bindings/hwrng/timeriomem_rng.txt rename to Documentation/devicetree/bindings/rng/timeriomem_rng.txt From d9d41df3e8ef39b7b2cfeb4e9a2ba5c7cf7cad88 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 3 Sep 2015 17:50:01 -0500 Subject: [PATCH 16/45] dt-bindings: consolidate various misc bindings Move various bindings in misc to appropriate subsystem directories. Signed-off-by: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- .../devicetree/bindings/{nvec => arm/tegra}/nvidia,nvec.txt | 0 Documentation/devicetree/bindings/{misc => iio/accel}/lis302.txt | 0 .../devicetree/bindings/{misc => iio/dac}/ti,dac7512.txt | 0 .../devicetree/bindings/{misc => iio/pressure}/bmp085.txt | 0 Documentation/devicetree/bindings/{hid => input}/hid-over-i2c.txt | 0 .../devicetree/bindings/{ => interrupt-controller}/open-pic.txt | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename Documentation/devicetree/bindings/{nvec => arm/tegra}/nvidia,nvec.txt (100%) rename Documentation/devicetree/bindings/{misc => iio/accel}/lis302.txt (100%) rename Documentation/devicetree/bindings/{misc => iio/dac}/ti,dac7512.txt (100%) rename Documentation/devicetree/bindings/{misc => iio/pressure}/bmp085.txt (100%) rename Documentation/devicetree/bindings/{hid => input}/hid-over-i2c.txt (100%) rename Documentation/devicetree/bindings/{ => interrupt-controller}/open-pic.txt (100%) diff --git a/Documentation/devicetree/bindings/nvec/nvidia,nvec.txt b/Documentation/devicetree/bindings/arm/tegra/nvidia,nvec.txt similarity index 100% rename from Documentation/devicetree/bindings/nvec/nvidia,nvec.txt rename to Documentation/devicetree/bindings/arm/tegra/nvidia,nvec.txt diff --git a/Documentation/devicetree/bindings/misc/lis302.txt b/Documentation/devicetree/bindings/iio/accel/lis302.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/lis302.txt rename to Documentation/devicetree/bindings/iio/accel/lis302.txt diff --git a/Documentation/devicetree/bindings/misc/ti,dac7512.txt b/Documentation/devicetree/bindings/iio/dac/ti,dac7512.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/ti,dac7512.txt rename to Documentation/devicetree/bindings/iio/dac/ti,dac7512.txt diff --git a/Documentation/devicetree/bindings/misc/bmp085.txt b/Documentation/devicetree/bindings/iio/pressure/bmp085.txt similarity index 100% rename from Documentation/devicetree/bindings/misc/bmp085.txt rename to Documentation/devicetree/bindings/iio/pressure/bmp085.txt diff --git a/Documentation/devicetree/bindings/hid/hid-over-i2c.txt b/Documentation/devicetree/bindings/input/hid-over-i2c.txt similarity index 100% rename from Documentation/devicetree/bindings/hid/hid-over-i2c.txt rename to Documentation/devicetree/bindings/input/hid-over-i2c.txt diff --git a/Documentation/devicetree/bindings/open-pic.txt b/Documentation/devicetree/bindings/interrupt-controller/open-pic.txt similarity index 100% rename from Documentation/devicetree/bindings/open-pic.txt rename to Documentation/devicetree/bindings/interrupt-controller/open-pic.txt From 24aa40d3c122e57096a314b2503c1e4101f2e84f Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 25 Sep 2015 23:26:58 -0500 Subject: [PATCH 17/45] dt-bindings: consolidate USB PHYs in bindings/phy Move USB PHY bindings under usb directory to phy directory which already contains other USB PHY bindings. The Samsung USB PHY binding is obsolete and can be removed. Signed-off-by: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- .../keystone-usb-phy.txt} | 0 .../{usb/mxs-phy.txt => phy/mxs-usb-phy.txt} | 0 .../{usb => phy}/nvidia,tegra20-usb-phy.txt | 0 .../{usb => phy}/qcom,usb-8x16-phy.txt | 0 .../bindings/usb/samsung-usbphy.txt | 117 ------------------ 5 files changed, 117 deletions(-) rename Documentation/devicetree/bindings/{usb/keystone-phy.txt => phy/keystone-usb-phy.txt} (100%) rename Documentation/devicetree/bindings/{usb/mxs-phy.txt => phy/mxs-usb-phy.txt} (100%) rename Documentation/devicetree/bindings/{usb => phy}/nvidia,tegra20-usb-phy.txt (100%) rename Documentation/devicetree/bindings/{usb => phy}/qcom,usb-8x16-phy.txt (100%) delete mode 100644 Documentation/devicetree/bindings/usb/samsung-usbphy.txt diff --git a/Documentation/devicetree/bindings/usb/keystone-phy.txt b/Documentation/devicetree/bindings/phy/keystone-usb-phy.txt similarity index 100% rename from Documentation/devicetree/bindings/usb/keystone-phy.txt rename to Documentation/devicetree/bindings/phy/keystone-usb-phy.txt diff --git a/Documentation/devicetree/bindings/usb/mxs-phy.txt b/Documentation/devicetree/bindings/phy/mxs-usb-phy.txt similarity index 100% rename from Documentation/devicetree/bindings/usb/mxs-phy.txt rename to Documentation/devicetree/bindings/phy/mxs-usb-phy.txt diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt similarity index 100% rename from Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt rename to Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.txt diff --git a/Documentation/devicetree/bindings/usb/qcom,usb-8x16-phy.txt b/Documentation/devicetree/bindings/phy/qcom,usb-8x16-phy.txt similarity index 100% rename from Documentation/devicetree/bindings/usb/qcom,usb-8x16-phy.txt rename to Documentation/devicetree/bindings/phy/qcom,usb-8x16-phy.txt diff --git a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt b/Documentation/devicetree/bindings/usb/samsung-usbphy.txt deleted file mode 100644 index 33fd3543f3f8..000000000000 --- a/Documentation/devicetree/bindings/usb/samsung-usbphy.txt +++ /dev/null @@ -1,117 +0,0 @@ -SAMSUNG USB-PHY controllers - -** Samsung's usb 2.0 phy transceiver - -The Samsung's usb 2.0 phy transceiver is used for controlling -usb 2.0 phy for s3c-hsotg as well as ehci-s5p and ohci-exynos -usb controllers across Samsung SOCs. -TODO: Adding the PHY binding with controller(s) according to the under -development generic PHY driver. - -Required properties: - -Exynos4210: -- compatible : should be "samsung,exynos4210-usb2phy" -- reg : base physical address of the phy registers and length of memory mapped - region. -- clocks: Clock IDs array as required by the controller. -- clock-names: names of clock correseponding IDs clock property as requested - by the controller driver. - -Exynos5250: -- compatible : should be "samsung,exynos5250-usb2phy" -- reg : base physical address of the phy registers and length of memory mapped - region. - -Optional properties: -- #address-cells: should be '1' when usbphy node has a child node with 'reg' - property. -- #size-cells: should be '1' when usbphy node has a child node with 'reg' - property. -- ranges: allows valid translation between child's address space and parent's - address space. - -- The child node 'usbphy-sys' to the node 'usbphy' is for the system controller - interface for usb-phy. It should provide the following information required by - usb-phy controller to control phy. - - reg : base physical address of PHY_CONTROL registers. - The size of this register is the total sum of size of all PHY_CONTROL - registers that the SoC has. For example, the size will be - '0x4' in case we have only one PHY_CONTROL register (e.g. - OTHERS register in S3C64XX or USB_PHY_CONTROL register in S5PV210) - and, '0x8' in case we have two PHY_CONTROL registers (e.g. - USBDEVICE_PHY_CONTROL and USBHOST_PHY_CONTROL registers in exynos4x). - and so on. - -Example: - - Exynos4210 - - usbphy@125B0000 { - #address-cells = <1>; - #size-cells = <1>; - compatible = "samsung,exynos4210-usb2phy"; - reg = <0x125B0000 0x100>; - ranges; - - clocks = <&clock 2>, <&clock 305>; - clock-names = "xusbxti", "otg"; - - usbphy-sys { - /* USB device and host PHY_CONTROL registers */ - reg = <0x10020704 0x8>; - }; - }; - - -** Samsung's usb 3.0 phy transceiver - -Starting exynso5250, Samsung's SoC have usb 3.0 phy transceiver -which is used for controlling usb 3.0 phy for dwc3-exynos usb 3.0 -controllers across Samsung SOCs. - -Required properties: - -Exynos5250: -- compatible : should be "samsung,exynos5250-usb3phy" -- reg : base physical address of the phy registers and length of memory mapped - region. -- clocks: Clock IDs array as required by the controller. -- clock-names: names of clocks correseponding to IDs in the clock property - as requested by the controller driver. - -Optional properties: -- #address-cells: should be '1' when usbphy node has a child node with 'reg' - property. -- #size-cells: should be '1' when usbphy node has a child node with 'reg' - property. -- ranges: allows valid translation between child's address space and parent's - address space. - -- The child node 'usbphy-sys' to the node 'usbphy' is for the system controller - interface for usb-phy. It should provide the following information required by - usb-phy controller to control phy. - - reg : base physical address of PHY_CONTROL registers. - The size of this register is the total sum of size of all PHY_CONTROL - registers that the SoC has. For example, the size will be - '0x4' in case we have only one PHY_CONTROL register (e.g. - OTHERS register in S3C64XX or USB_PHY_CONTROL register in S5PV210) - and, '0x8' in case we have two PHY_CONTROL registers (e.g. - USBDEVICE_PHY_CONTROL and USBHOST_PHY_CONTROL registers in exynos4x). - and so on. - -Example: - usbphy@12100000 { - compatible = "samsung,exynos5250-usb3phy"; - reg = <0x12100000 0x100>; - #address-cells = <1>; - #size-cells = <1>; - ranges; - - clocks = <&clock 1>, <&clock 286>; - clock-names = "ext_xtal", "usbdrd30"; - - usbphy-sys { - /* USB device and host PHY_CONTROL registers */ - reg = <0x10040704 0x8>; - }; - }; From 5b0277af2e21c4ef4a12572badf66a4a4e827d51 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 25 Sep 2015 23:29:00 -0500 Subject: [PATCH 18/45] dt-bindings: move Calxeda bindings to appropriate subsystems Move the Calxeda memory controller and PHY bindings to appropriate subsystem directories. Signed-off-by: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- .../mem-ctrlr.txt => memory-controllers/calxeda-ddr-ctrlr.txt} | 0 .../{arm/calxeda/combophy.txt => phy/calxeda-combophy.txt} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename Documentation/devicetree/bindings/{arm/calxeda/mem-ctrlr.txt => memory-controllers/calxeda-ddr-ctrlr.txt} (100%) rename Documentation/devicetree/bindings/{arm/calxeda/combophy.txt => phy/calxeda-combophy.txt} (100%) diff --git a/Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt b/Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/calxeda/mem-ctrlr.txt rename to Documentation/devicetree/bindings/memory-controllers/calxeda-ddr-ctrlr.txt diff --git a/Documentation/devicetree/bindings/arm/calxeda/combophy.txt b/Documentation/devicetree/bindings/phy/calxeda-combophy.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/calxeda/combophy.txt rename to Documentation/devicetree/bindings/phy/calxeda-combophy.txt From 62bc9f15e443c3ca02e47f13f339bd7993ae1e65 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Fri, 25 Sep 2015 23:37:27 -0500 Subject: [PATCH 19/45] dt-bindings: merge ina209 binding into ina2xx binding The ina209 binding only differs from other ina2xx bindings in the compatible string, so add it to the common binding and remove the ina209 binding file. Signed-off-by: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Cc: Kumar Gala --- .../devicetree/bindings/hwmon/ina209.txt | 18 ------------------ .../devicetree/bindings/hwmon/ina2xx.txt | 1 + 2 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 Documentation/devicetree/bindings/hwmon/ina209.txt diff --git a/Documentation/devicetree/bindings/hwmon/ina209.txt b/Documentation/devicetree/bindings/hwmon/ina209.txt deleted file mode 100644 index 9dd2bee80840..000000000000 --- a/Documentation/devicetree/bindings/hwmon/ina209.txt +++ /dev/null @@ -1,18 +0,0 @@ -ina209 properties - -Required properties: -- compatible: Must be "ti,ina209" -- reg: I2C address - -Optional properties: - -- shunt-resistor - Shunt resistor value in micro-Ohm - -Example: - -temp-sensor@4c { - compatible = "ti,ina209"; - reg = <0x4c>; - shunt-resistor = <5000>; -}; diff --git a/Documentation/devicetree/bindings/hwmon/ina2xx.txt b/Documentation/devicetree/bindings/hwmon/ina2xx.txt index a2ad85d7e747..9bcd5e87830d 100644 --- a/Documentation/devicetree/bindings/hwmon/ina2xx.txt +++ b/Documentation/devicetree/bindings/hwmon/ina2xx.txt @@ -2,6 +2,7 @@ ina2xx properties Required properties: - compatible: Must be one of the following: + - "ti,ina209" for ina209 - "ti,ina219" for ina219 - "ti,ina220" for ina220 - "ti,ina226" for ina226 From eb3fcf007fffe5830d815e713591f3e858f2a365 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 1 Oct 2015 22:24:09 -0500 Subject: [PATCH 20/45] dt-bindings: consolidate interrupt controller bindings Move various interrupt controller bindings into the interrupt-controller/ directory. Signed-off-by: Rob Herring Cc: Matthias Brugger Cc: linux-mediatek@lists.infradead.org --- .../{arm/gic-v3.txt => interrupt-controller/arm,gic-v3.txt} | 0 .../bindings/{arm/gic.txt => interrupt-controller/arm,gic.txt} | 0 .../arm,versatile-fpga-irq.txt} | 0 .../bindings/{arm/vic.txt => interrupt-controller/arm,vic.txt} | 0 .../interrupts.txt => interrupt-controller/axis,crisv32-intc.txt} | 0 .../meta-intc.txt => interrupt-controller/img,meta-intc.txt} | 0 .../{metag/pdc-intc.txt => interrupt-controller/img,pdc-intc.txt} | 0 .../intel,ce4100-ioapic.txt} | 0 .../{arm/mediatek => interrupt-controller}/mediatek,sysirq.txt | 0 .../{arm/mrvl/intc.txt => interrupt-controller/mrvl,intc.txt} | 0 .../lpc32xx-mic.txt => interrupt-controller/nxp,lpc3220-mic.txt} | 0 .../samsung,exynos4210-combiner.txt} | 0 .../interrupts.txt => interrupt-controller/snps,arc700-intc.txt} | 0 .../snps,archs-idu-intc.txt} | 0 .../archs-intc.txt => interrupt-controller/snps,archs-intc.txt} | 0 .../shirq.txt => interrupt-controller/st,spear3xx-shirq.txt} | 0 .../ti,c64x+megamod-pic.txt} | 0 .../davinci/cp-intc.txt => interrupt-controller/ti,cp-intc.txt} | 0 .../{arm/omap/intc.txt => interrupt-controller/ti,omap2-intc.txt} | 0 .../{arm/vt8500 => interrupt-controller}/via,vt8500-intc.txt | 0 20 files changed, 0 insertions(+), 0 deletions(-) rename Documentation/devicetree/bindings/{arm/gic-v3.txt => interrupt-controller/arm,gic-v3.txt} (100%) rename Documentation/devicetree/bindings/{arm/gic.txt => interrupt-controller/arm,gic.txt} (100%) rename Documentation/devicetree/bindings/{arm/versatile-fpga-irq.txt => interrupt-controller/arm,versatile-fpga-irq.txt} (100%) rename Documentation/devicetree/bindings/{arm/vic.txt => interrupt-controller/arm,vic.txt} (100%) rename Documentation/devicetree/bindings/{cris/interrupts.txt => interrupt-controller/axis,crisv32-intc.txt} (100%) rename Documentation/devicetree/bindings/{metag/meta-intc.txt => interrupt-controller/img,meta-intc.txt} (100%) rename Documentation/devicetree/bindings/{metag/pdc-intc.txt => interrupt-controller/img,pdc-intc.txt} (100%) rename Documentation/devicetree/bindings/{x86/interrupt.txt => interrupt-controller/intel,ce4100-ioapic.txt} (100%) rename Documentation/devicetree/bindings/{arm/mediatek => interrupt-controller}/mediatek,sysirq.txt (100%) rename Documentation/devicetree/bindings/{arm/mrvl/intc.txt => interrupt-controller/mrvl,intc.txt} (100%) rename Documentation/devicetree/bindings/{arm/lpc32xx-mic.txt => interrupt-controller/nxp,lpc3220-mic.txt} (100%) rename Documentation/devicetree/bindings/{arm/samsung/interrupt-combiner.txt => interrupt-controller/samsung,exynos4210-combiner.txt} (100%) rename Documentation/devicetree/bindings/{arc/interrupts.txt => interrupt-controller/snps,arc700-intc.txt} (100%) rename Documentation/devicetree/bindings/{arc/archs-idu-intc.txt => interrupt-controller/snps,archs-idu-intc.txt} (100%) rename Documentation/devicetree/bindings/{arc/archs-intc.txt => interrupt-controller/snps,archs-intc.txt} (100%) rename Documentation/devicetree/bindings/{arm/spear/shirq.txt => interrupt-controller/st,spear3xx-shirq.txt} (100%) rename Documentation/devicetree/bindings/{c6x/interrupt.txt => interrupt-controller/ti,c64x+megamod-pic.txt} (100%) rename Documentation/devicetree/bindings/{arm/davinci/cp-intc.txt => interrupt-controller/ti,cp-intc.txt} (100%) rename Documentation/devicetree/bindings/{arm/omap/intc.txt => interrupt-controller/ti,omap2-intc.txt} (100%) rename Documentation/devicetree/bindings/{arm/vt8500 => interrupt-controller}/via,vt8500-intc.txt (100%) diff --git a/Documentation/devicetree/bindings/arm/gic-v3.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/gic-v3.txt rename to Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt diff --git a/Documentation/devicetree/bindings/arm/gic.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/gic.txt rename to Documentation/devicetree/bindings/interrupt-controller/arm,gic.txt diff --git a/Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt rename to Documentation/devicetree/bindings/interrupt-controller/arm,versatile-fpga-irq.txt diff --git a/Documentation/devicetree/bindings/arm/vic.txt b/Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/vic.txt rename to Documentation/devicetree/bindings/interrupt-controller/arm,vic.txt diff --git a/Documentation/devicetree/bindings/cris/interrupts.txt b/Documentation/devicetree/bindings/interrupt-controller/axis,crisv32-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/cris/interrupts.txt rename to Documentation/devicetree/bindings/interrupt-controller/axis,crisv32-intc.txt diff --git a/Documentation/devicetree/bindings/metag/meta-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/metag/meta-intc.txt rename to Documentation/devicetree/bindings/interrupt-controller/img,meta-intc.txt diff --git a/Documentation/devicetree/bindings/metag/pdc-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/img,pdc-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/metag/pdc-intc.txt rename to Documentation/devicetree/bindings/interrupt-controller/img,pdc-intc.txt diff --git a/Documentation/devicetree/bindings/x86/interrupt.txt b/Documentation/devicetree/bindings/interrupt-controller/intel,ce4100-ioapic.txt similarity index 100% rename from Documentation/devicetree/bindings/x86/interrupt.txt rename to Documentation/devicetree/bindings/interrupt-controller/intel,ce4100-ioapic.txt diff --git a/Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt b/Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/mediatek/mediatek,sysirq.txt rename to Documentation/devicetree/bindings/interrupt-controller/mediatek,sysirq.txt diff --git a/Documentation/devicetree/bindings/arm/mrvl/intc.txt b/Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/mrvl/intc.txt rename to Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.txt diff --git a/Documentation/devicetree/bindings/arm/lpc32xx-mic.txt b/Documentation/devicetree/bindings/interrupt-controller/nxp,lpc3220-mic.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/lpc32xx-mic.txt rename to Documentation/devicetree/bindings/interrupt-controller/nxp,lpc3220-mic.txt diff --git a/Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt b/Documentation/devicetree/bindings/interrupt-controller/samsung,exynos4210-combiner.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/samsung/interrupt-combiner.txt rename to Documentation/devicetree/bindings/interrupt-controller/samsung,exynos4210-combiner.txt diff --git a/Documentation/devicetree/bindings/arc/interrupts.txt b/Documentation/devicetree/bindings/interrupt-controller/snps,arc700-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/arc/interrupts.txt rename to Documentation/devicetree/bindings/interrupt-controller/snps,arc700-intc.txt diff --git a/Documentation/devicetree/bindings/arc/archs-idu-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/arc/archs-idu-intc.txt rename to Documentation/devicetree/bindings/interrupt-controller/snps,archs-idu-intc.txt diff --git a/Documentation/devicetree/bindings/arc/archs-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/snps,archs-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/arc/archs-intc.txt rename to Documentation/devicetree/bindings/interrupt-controller/snps,archs-intc.txt diff --git a/Documentation/devicetree/bindings/arm/spear/shirq.txt b/Documentation/devicetree/bindings/interrupt-controller/st,spear3xx-shirq.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/spear/shirq.txt rename to Documentation/devicetree/bindings/interrupt-controller/st,spear3xx-shirq.txt diff --git a/Documentation/devicetree/bindings/c6x/interrupt.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,c64x+megamod-pic.txt similarity index 100% rename from Documentation/devicetree/bindings/c6x/interrupt.txt rename to Documentation/devicetree/bindings/interrupt-controller/ti,c64x+megamod-pic.txt diff --git a/Documentation/devicetree/bindings/arm/davinci/cp-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,cp-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/davinci/cp-intc.txt rename to Documentation/devicetree/bindings/interrupt-controller/ti,cp-intc.txt diff --git a/Documentation/devicetree/bindings/arm/omap/intc.txt b/Documentation/devicetree/bindings/interrupt-controller/ti,omap2-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/omap/intc.txt rename to Documentation/devicetree/bindings/interrupt-controller/ti,omap2-intc.txt diff --git a/Documentation/devicetree/bindings/arm/vt8500/via,vt8500-intc.txt b/Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.txt similarity index 100% rename from Documentation/devicetree/bindings/arm/vt8500/via,vt8500-intc.txt rename to Documentation/devicetree/bindings/interrupt-controller/via,vt8500-intc.txt From f517256a68670b84528c45b6f60f21461bb2c60f Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Tue, 20 Oct 2015 16:03:03 -0500 Subject: [PATCH 21/45] Documentation/devicetree: Update PCI Device Tree bindings Update broken links to PCI bus and interrupt mapping bindings. Signed-off-by: Bjorn Helgaas Signed-off-by: Rob Herring --- Documentation/devicetree/bindings/pci/pci.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/pci/pci.txt b/Documentation/devicetree/bindings/pci/pci.txt index f8fbe9af7b2f..08dcfad09f8d 100644 --- a/Documentation/devicetree/bindings/pci/pci.txt +++ b/Documentation/devicetree/bindings/pci/pci.txt @@ -1,12 +1,12 @@ PCI bus bridges have standardized Device Tree bindings: PCI Bus Binding to: IEEE Std 1275-1994 -http://www.openfirmware.org/ofwg/bindings/pci/pci2_1.pdf +http://www.firmware.org/1275/bindings/pci/pci2_1.pdf And for the interrupt mapping part: Open Firmware Recommended Practice: Interrupt Mapping -http://www.openfirmware.org/1275/practice/imap/imap0_9d.pdf +http://www.firmware.org/1275/practice/imap/imap0_9d.pdf Additionally to the properties specified in the above standards a host bridge driver implementation may support the following properties: From 656875dfdb7b392eafa00abef5a71c0ef741471b Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Fri, 16 Oct 2015 16:23:06 +0200 Subject: [PATCH 22/45] serial: pl011: Spelling s/clocks-names/clock-names/ Signed-off-by: Geert Uytterhoeven Signed-off-by: Rob Herring --- Documentation/devicetree/bindings/serial/pl011.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/serial/pl011.txt b/Documentation/devicetree/bindings/serial/pl011.txt index cbae3d9a0278..77863aefe9ef 100644 --- a/Documentation/devicetree/bindings/serial/pl011.txt +++ b/Documentation/devicetree/bindings/serial/pl011.txt @@ -19,7 +19,7 @@ Optional properties: must correspond to the PCLK clocking the internal logic of the block. Just listing one clock (the first one) is deprecated. -- clocks-names: +- clock-names: When present, the first clock listed must be named "uartclk" and the second clock listed must be named "apb_pclk" From e300745a4c60f424eaf7c7b7cc6bab3e56380c89 Mon Sep 17 00:00:00 2001 From: Uri Mashiach Date: Wed, 21 Oct 2015 13:47:44 +0300 Subject: [PATCH 23/45] devicetree: bindings: Document CompuLab vendor Add CompuLab Ltd. to the list of device tree vendor prefixes. CompuLab manufacturers ARM-based computer-on-module, system-on-module products, and miniature fanless-PCs. Acked-by: Igor Grinberg Signed-off-by: Uri Mashiach Signed-off-by: Rob Herring --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 82d2ac97af74..0f60dbd98162 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -51,6 +51,7 @@ cirrus Cirrus Logic, Inc. cloudengines Cloud Engines, Inc. cnm Chips&Media, Inc. cnxt Conexant Systems, Inc. +compulab CompuLab Ltd. cortina Cortina Systems, Inc. cosmic Cosmic Circuits crystalfontz Crystalfontz America, Inc. From 855ff2878ec5ef15f0a69a528b2ca676edfb3ee4 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 22 Oct 2015 11:02:50 +0200 Subject: [PATCH 24/45] of/unittest: add missing of_node_put for_each_child_of_node performs an of_node_get on each iteration, so a break out of the loop requires an of_node_put. A simplified version of the semantic patch that fixes this problem is as follows (http://coccinelle.lip6.fr): // @@ expression root,e; local idexpression child; @@ for_each_child_of_node(root, child) { ... when != of_node_put(child) when != e = child ( return child; | + of_node_put(child); ? return ...; ) ... } // Combine the puts into code at the end of the function, for conciseness. Signed-off-by: Julia Lawall Signed-off-by: Rob Herring --- drivers/of/unittest.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/of/unittest.c b/drivers/of/unittest.c index 9f71770b6226..e16ea5717b7f 100644 --- a/drivers/of/unittest.c +++ b/drivers/of/unittest.c @@ -205,16 +205,20 @@ static int __init of_unittest_check_node_linkage(struct device_node *np) if (child->parent != np) { pr_err("Child node %s links to wrong parent %s\n", child->name, np->name); - return -EINVAL; + rc = -EINVAL; + goto put_child; } rc = of_unittest_check_node_linkage(child); if (rc < 0) - return rc; + goto put_child; count += rc; } return count + 1; +put_child: + of_node_put(child); + return rc; } static void __init of_unittest_check_tree_linkage(void) From 8363ccb917c6bd497392f5a6b716f46213d86495 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 22 Oct 2015 11:02:51 +0200 Subject: [PATCH 25/45] of/irq: add missing of_node_put for_each_matching_node performs an of_node_get on each iteration, so a break out of the loop requires an of_node_put. A simplified version of the semantic patch that fixes this problem is as follows (http://coccinelle.lip6.fr): // @@ local idexpression n; expression e; identifier l; @@ for_each_matching_node(n,...) { ... ( of_node_put(n); | e = n | + of_node_put(n); ? goto l; ) ... } ... l: ... when != n // Besides the issue found by the semantic patch, this code also stores the device_node value in a list, which requires an of_node_get, and then cleans up the list on exit from the function, which requires an of_node_put. Signed-off-by: Julia Lawall Signed-off-by: Rob Herring --- drivers/of/irq.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 0c7f4cbe3434..bcc1f4b2211e 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -501,10 +501,12 @@ void __init of_irq_init(const struct of_device_id *matches) * pointer, interrupt-parent device_node etc. */ desc = kzalloc(sizeof(*desc), GFP_KERNEL); - if (WARN_ON(!desc)) + if (WARN_ON(!desc)) { + of_node_put(np); goto err; + } - desc->dev = np; + desc->dev = of_node_get(np); desc->interrupt_parent = of_irq_find_parent(np); if (desc->interrupt_parent == np) desc->interrupt_parent = NULL; @@ -575,6 +577,7 @@ void __init of_irq_init(const struct of_device_id *matches) err: list_for_each_entry_safe(desc, temp_desc, &intc_desc_list, list) { list_del(&desc->list); + of_node_put(desc->dev); kfree(desc); } } From 7fad948a7c22cf47ef4e3c3127cd961ff5e2d394 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 22 Oct 2015 11:02:49 +0200 Subject: [PATCH 26/45] of/platform: add missing of_node_put for_each_child_of_node performs an of_node_get on each iteration, so a break out of the loop requires an of_node_put. A simplified version of the semantic patch that fixes this problem is as follows (http://coccinelle.lip6.fr): // @@ local idexpression n; expression root,e; @@ for_each_child_of_node(root,n) { ... ( of_node_put(n); | e = n | + of_node_put(n); ? break; ) ... } ... when != n // Signed-off-by: Julia Lawall Signed-off-by: Rob Herring --- drivers/of/platform.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index 1001efaedcb8..af98343614d8 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -405,8 +405,10 @@ int of_platform_bus_probe(struct device_node *root, if (!of_match_node(matches, child)) continue; rc = of_platform_bus_create(child, matches, NULL, parent, false); - if (rc) + if (rc) { + of_node_put(child); break; + } } of_node_put(root); @@ -447,8 +449,10 @@ int of_platform_populate(struct device_node *root, for_each_child_of_node(root, child) { rc = of_platform_bus_create(child, matches, lookup, parent, true); - if (rc) + if (rc) { + of_node_put(child); break; + } } of_node_set_flag(root, OF_POPULATED_BUS); From 001cf5048e99df7ddac2716ee9958083488b6071 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Thu, 22 Oct 2015 11:02:48 +0200 Subject: [PATCH 27/45] of/overlay: add missing of_node_put for_each_child_of_node performs an of_node_get on each iteration, so a break out of the loop requires an of_node_put. A simplified version of the semantic patch that fixes this problem is as follows (http://coccinelle.lip6.fr): // @@ expression root,e; local idexpression child; @@ for_each_child_of_node(root, child) { ... when != of_node_put(child) when != e = child ( return child; | + of_node_put(child); ? return ...; ) ... } // Signed-off-by: Julia Lawall Signed-off-by: Rob Herring --- drivers/of/overlay.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index 24e025f79299..54e5af9d7377 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c @@ -149,6 +149,7 @@ static int of_overlay_apply_one(struct of_overlay *ov, pr_err("%s: Failed to apply single node @%s/%s\n", __func__, target->full_name, child->name); + of_node_put(child); return ret; } } @@ -417,8 +418,10 @@ static int overlay_subtree_check(struct device_node *tree, return 1; for_each_child_of_node(tree, child) { - if (overlay_subtree_check(child, dn)) + if (overlay_subtree_check(child, dn)) { + of_node_put(child); return 1; + } } return 0; From 3f5ceec96470050d20d7281d49985e3b1cfc3995 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Fri, 23 Oct 2015 20:47:20 +0900 Subject: [PATCH 28/45] of/fdt: fix error checking for earlycon address fdt_translate_address() returns OF_BAD_ADDR on error. It is defined as a u64 value, so the variable "addr" should be defined as u64 as well. Fixes: fb11ffe74c79 ("of/fdt: add FDT serial scanning for earlycon") Signed-off-by: Masahiro Yamada Signed-off-by: Rob Herring --- drivers/of/fdt.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 9fc356830226..196e449fc853 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -822,14 +822,15 @@ static int __init early_init_dt_scan_chosen_serial(void) return -ENODEV; while (match->compatible[0]) { - unsigned long addr; + u64 addr; + if (fdt_node_check_compatible(fdt, offset, match->compatible)) { match++; continue; } addr = fdt_translate_address(fdt, offset); - if (!addr) + if (addr == OF_BAD_ADDR) return -ENXIO; of_setup_earlycon(addr, match->data); From 1b7c501b51a8c851ff82769cbe905ef19cb70239 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 6 Oct 2015 17:57:33 -0500 Subject: [PATCH 29/45] of: add config option to enable building of all dtbs Enable building all dtb files when CONFIG_OF_ALL_DTBS is enabled. The dtbs are not really dependent on a platform being enabled or any other kernel config, so for testing coverage it is convenient to build all of the dtbs. In order to only build dtbs, this option can be used by creating an allno.config file containing: CONFIG_COMPILE_TEST=y CONFIG_OF=y CONFIG_OF_ALL_DTBS=y And then running: make KCONFIG_ALLCONFIG=1 allnoconfig make dtbs While building the dtbs themselves don't need a cross compiler, the scripts dependency does need one. This can be hacked around by commenting out "subdir-y += mod" in scripts/Makefile. Signed-off-by: Rob Herring Cc: Frank Rowand Cc: Grant Likely --- drivers/of/Kconfig | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index 59bb8556e43a..e2a48415d969 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -23,6 +23,16 @@ config OF_UNITTEST If unsure, say N here, but this option is safe to enable. +config OF_ALL_DTBS + bool "Build all Device Tree Blobs" + depends on COMPILE_TEST + select DTC + help + This option builds all possible Device Tree Blobs (DTBs) for the + current architecture. + + If unsure, say N here, but this option is safe to enable. + config OF_FLATTREE bool select DTC From 10375ccc670669a26adbc059b6723aeee4bfa4bb Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 8 Oct 2015 10:10:53 -0500 Subject: [PATCH 30/45] arc: use common make variables for dtb builds Use dtb-y and always make variables to build dtbs instead of explicit dtbs rule. This is in preparation to support building all dtbs. Signed-off-by: Rob Herring Acked-by: Vineet Gupta --- arch/arc/Makefile | 2 +- arch/arc/boot/dts/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arc/Makefile b/arch/arc/Makefile index 8a27a48304a4..cf0cf34eeb24 100644 --- a/arch/arc/Makefile +++ b/arch/arc/Makefile @@ -121,7 +121,7 @@ $(boot_targets): vmlinux $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ dtbs: scripts - $(Q)$(MAKE) $(build)=$(boot)/dts dtbs + $(Q)$(MAKE) $(build)=$(boot)/dts archclean: $(Q)$(MAKE) $(clean)=$(boot) diff --git a/arch/arc/boot/dts/Makefile b/arch/arc/boot/dts/Makefile index b0e3f19bbd07..e8e46f941dd5 100644 --- a/arch/arc/boot/dts/Makefile +++ b/arch/arc/boot/dts/Makefile @@ -6,10 +6,10 @@ ifneq ($(CONFIG_ARC_BUILTIN_DTB_NAME),"") endif obj-y += $(builtindtb-y).dtb.o -targets += $(builtindtb-y).dtb +dtb-y := $(builtindtb-y).dtb .SECONDARY: $(obj)/$(builtindtb-y).dtb.S -dtbs: $(addprefix $(obj)/, $(builtindtb-y).dtb) +always := $(dtb-y) clean-files := *.dtb *.dtb.S From b83abc8c2c45f8a926bdeaa46fc8dce236e13fdd Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 6 Oct 2015 17:51:00 -0500 Subject: [PATCH 31/45] arc: enable building of all dtbs Enable building all dtb files when CONFIG_OF_ALL_DTBS is enabled. The dtbs are not really dependent on a platform being enabled or any other kernel config, so for testing coverage it is convenient to build all of the dtbs. This builds all dts files in the tree, not just targets listed. Signed-off-by: Rob Herring Acked-by: Vineet Gupta --- arch/arc/boot/dts/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arc/boot/dts/Makefile b/arch/arc/boot/dts/Makefile index e8e46f941dd5..a09f11b71e66 100644 --- a/arch/arc/boot/dts/Makefile +++ b/arch/arc/boot/dts/Makefile @@ -10,6 +10,8 @@ dtb-y := $(builtindtb-y).dtb .SECONDARY: $(obj)/$(builtindtb-y).dtb.S +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) always := $(dtb-y) clean-files := *.dtb *.dtb.S From efd8c4ff731e6fc851d24249aebde8e05b095cc5 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 8 Oct 2015 12:08:44 -0500 Subject: [PATCH 32/45] arm: enable building of all dtbs Enable building all dtb files when CONFIG_OF_ALL_DTBS is enabled. The dtbs are not really dependent on a platform being enabled or any other kernel config, so for testing coverage it is convenient to build all of the dtbs. This builds all dts files in the tree, not just targets listed. This is simpler for arm64 which has a bunch of sub-dirs. Signed-off-by: Rob Herring Cc: Russell King --- arch/arm/boot/dts/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 233159d2eaab..349eb1249b21 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -740,5 +740,8 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb endif +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) + always := $(dtb-y) clean-files := *.dtb From d58d76efffe77413668a4ff7cf0d506fcab98efd Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 8 Oct 2015 12:09:11 -0500 Subject: [PATCH 33/45] arm64: enable building of all dtbs Enable building all dtb files when CONFIG_OF_ALL_DTBS is enabled. The dtbs are not really dependent on a platform being enabled or any other kernel config, so for testing coverage it is convenient to build all of the dtbs. This builds all dts files in the tree, not just targets listed. This is simpler for arm64 which has a bunch of sub-dirs. Signed-off-by: Rob Herring Cc: Catalin Marinas Cc: Will Deacon Cc: linux-arm-kernel@lists.infradead.org --- arch/arm64/boot/dts/Makefile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/Makefile b/arch/arm64/boot/dts/Makefile index d9f88330e7b0..b01ec43d1ca9 100644 --- a/arch/arm64/boot/dts/Makefile +++ b/arch/arm64/boot/dts/Makefile @@ -14,3 +14,9 @@ dts-dirs += sprd dts-dirs += xilinx subdir-y := $(dts-dirs) + +dtstree := $(srctree)/$(src) + +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts))) + +always := $(dtb-y) From 0395c1aacfbaa0bc959faf415c7d95f20bb4a377 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 6 Oct 2015 17:59:26 -0500 Subject: [PATCH 34/45] h8300: enable building of all dtbs Enable building all dtb files when CONFIG_OF_ALL_DTBS is enabled. The dtbs are not really dependent on a platform being enabled or any other kernel config, so for testing coverage it is convenient to build all of the dtbs. This builds all dts files in the tree, not just targets listed. Signed-off-by: Rob Herring Cc: Yoshinori Sato Cc: uclinux-h8-devel@lists.sourceforge.jp --- arch/h8300/boot/dts/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/h8300/boot/dts/Makefile b/arch/h8300/boot/dts/Makefile index 0abaf1ad830e..6c08467c6a3a 100644 --- a/arch/h8300/boot/dts/Makefile +++ b/arch/h8300/boot/dts/Makefile @@ -8,5 +8,8 @@ dtb-$(CONFIG_H8300H_SIM) := h8300h_sim.dtb dtb-$(CONFIG_H8S_SIM) := h8s_sim.dtb dtb-$(CONFIG_H8S_EDOSK2674) := edosk2674.dtb +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) + always := $(dtb-y) clean-files := *.dtb.S *.dtb From 1aa4c51e468e3d38122c2da2f32b54a084d0efdb Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 6 Oct 2015 17:52:24 -0500 Subject: [PATCH 35/45] metag: use common make variables for dtb builds Use dtb-y and always make variables to build dtbs instead of explicit dtbs rule. This is in preparation to support building all dtbs. Signed-off-by: Rob Herring Cc: James Hogan Cc: linux-metag@vger.kernel.org --- arch/metag/Makefile | 2 +- arch/metag/boot/dts/Makefile | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/metag/Makefile b/arch/metag/Makefile index 9739857bdedc..033a58214119 100644 --- a/arch/metag/Makefile +++ b/arch/metag/Makefile @@ -72,7 +72,7 @@ $(boot_targets): vmlinux $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ dtbs: scripts - $(Q)$(MAKE) $(build)=$(boot)/dts dtbs + $(Q)$(MAKE) $(build)=$(boot)/dts archclean: $(Q)$(MAKE) $(clean)=$(boot) diff --git a/arch/metag/boot/dts/Makefile b/arch/metag/boot/dts/Makefile index 72c121879426..2533c38a691c 100644 --- a/arch/metag/boot/dts/Makefile +++ b/arch/metag/boot/dts/Makefile @@ -12,11 +12,7 @@ endif dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o -targets += dtbs -targets += $(dtb-y) - .SECONDARY: $(obj)/$(builtindtb-y).dtb.S -dtbs: $(addprefix $(obj)/, $(dtb-y)) - +always += $(dtb-y) clean-files += *.dtb *.dtb.S From b02a687508c4d49c54dd8eaac6ae9e84ddc86d18 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 6 Oct 2015 18:00:15 -0500 Subject: [PATCH 36/45] metag: enable building of all dtbs Enable building all dtb files when CONFIG_OF_ALL_DTBS is enabled. The dtbs are not really dependent on a platform being enabled or any other kernel config, so for testing coverage it is convenient to build all of the dtbs. This builds all dts files in the tree, not just targets listed. Signed-off-by: Rob Herring Cc: James Hogan Cc: linux-metag@vger.kernel.org --- arch/metag/boot/dts/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/metag/boot/dts/Makefile b/arch/metag/boot/dts/Makefile index 2533c38a691c..097c6da4547f 100644 --- a/arch/metag/boot/dts/Makefile +++ b/arch/metag/boot/dts/Makefile @@ -12,6 +12,9 @@ endif dtb-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb obj-$(CONFIG_METAG_BUILTIN_DTB) += $(builtindtb-y).dtb.o +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) + .SECONDARY: $(obj)/$(builtindtb-y).dtb.S always += $(dtb-y) From 0426f6482d5d61c0d762aafa03b27b96d02a68a7 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 6 Oct 2015 18:01:06 -0500 Subject: [PATCH 37/45] mips: enable building of all dtbs Enable building all dtb files when CONFIG_OF_ALL_DTBS is enabled. The dtbs are not really dependent on a platform being enabled or any other kernel config, so for testing coverage it is convenient to build all of the dtbs. This builds all dts files in the tree, not just targets listed. Signed-off-by: Rob Herring Cc: Ralf Baechle Cc: linux-mips@linux-mips.org --- arch/mips/boot/dts/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/mips/boot/dts/Makefile b/arch/mips/boot/dts/Makefile index 778a34028c1b..bac7b8dab9a4 100644 --- a/arch/mips/boot/dts/Makefile +++ b/arch/mips/boot/dts/Makefile @@ -9,6 +9,9 @@ dts-dirs += ralink obj-y := $(addsuffix /, $(dts-dirs)) +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(foreach d,$(dts-dirs), $(wildcard $(dtstree)/$(d)/*.dts))) + always := $(dtb-y) subdir-y := $(dts-dirs) clean-files := *.dtb *.dtb.S From 990857042f599440ea7a10b84c17a06ed21078e5 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 6 Oct 2015 17:51:21 -0500 Subject: [PATCH 38/45] xtensa: enable building of all dtbs Enable building all dtb files when CONFIG_OF_ALL_DTBS is enabled. The dtbs are not really dependent on a platform being enabled or any other kernel config, so for testing coverage it is convenient to build all of the dtbs. This builds all dts files in the tree, not just targets listed. Signed-off-by: Rob Herring Cc: Chris Zankel Cc: Max Filippov Cc: linux-xtensa@linux-xtensa.org --- arch/xtensa/Makefile | 4 ++++ arch/xtensa/boot/dts/Makefile | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile index f9e6a068aafd..709b5748a2d7 100644 --- a/arch/xtensa/Makefile +++ b/arch/xtensa/Makefile @@ -101,6 +101,10 @@ zImage: vmlinux %.dtb: $(Q)$(MAKE) $(build)=$(boot)/dts $(boot)/dts/$@ +dtbs: scripts + $(Q)$(MAKE) $(build)=$(boot)/dts + define archhelp @echo '* zImage - Compressed kernel image (arch/xtensa/boot/images/zImage.*)' + @echo ' dtbs - Build device tree blobs for enabled boards' endef diff --git a/arch/xtensa/boot/dts/Makefile b/arch/xtensa/boot/dts/Makefile index 5f711bba8307..a15e241c9153 100644 --- a/arch/xtensa/boot/dts/Makefile +++ b/arch/xtensa/boot/dts/Makefile @@ -12,4 +12,9 @@ ifneq ($(CONFIG_BUILTIN_DTB),"") obj-$(CONFIG_OF) += $(BUILTIN_DTB) endif -clean-files := *.dtb.S +dtstree := $(srctree)/$(src) +dtb-$(CONFIG_OF_ALL_DTBS) := $(patsubst $(dtstree)/%.dts,%.dtb, $(wildcard $(dtstree)/*.dts)) + +always += $(dtb-y) +clean-files += *.dtb *.dtb.S + From 0b13ea8e2661822960b59924b02b4a0ebcf22149 Mon Sep 17 00:00:00 2001 From: Saurabh Sengar Date: Tue, 27 Oct 2015 09:12:01 +0530 Subject: [PATCH 39/45] drivers: of: removing assignment of 0 to static variable no need to initialise static variable with 0, hence correcting it. Signed-off-by: Saurabh Sengar Signed-off-by: Rob Herring --- drivers/of/fdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 196e449fc853..d2430298a309 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -184,7 +184,7 @@ static void * unflatten_dt_node(const void *blob, struct property *pp, **prev_pp = NULL; const char *pathp; unsigned int l, allocl; - static int depth = 0; + static int depth; int old_depth; int offset; int has_name = 0; From a68eee4c748c006daae6b06c9c5bb85be77724f6 Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Wed, 21 Oct 2015 11:09:58 +0100 Subject: [PATCH 40/45] Documentation: devicetree: standardize/consolidate on "wakeup-source" property Currently different drivers use multiple forms of annotating devices that should be set up as wakeup sources for the system. This patch adds a separate binding document inorder to standardize and consolidate to use "wakeup-source" boolean property to mark the devices as wakeup capable. Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Signed-off-by: Sudeep Holla Signed-off-by: Rob Herring --- .../bindings/power/wakeup-source.txt | 71 +++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 Documentation/devicetree/bindings/power/wakeup-source.txt diff --git a/Documentation/devicetree/bindings/power/wakeup-source.txt b/Documentation/devicetree/bindings/power/wakeup-source.txt new file mode 100644 index 000000000000..963c6dfd484d --- /dev/null +++ b/Documentation/devicetree/bindings/power/wakeup-source.txt @@ -0,0 +1,71 @@ +Specifying wakeup capability for devices +============================================ + +Any device nodes +---------------- +Nodes that describe devices which has wakeup capability must contain an +"wakeup-source" boolean property. + +Also, if device is marked as a wakeup source, then all the primary +interrupt(s) can be used as wakeup interrupt(s). + +However if the devices have dedicated interrupt as the wakeup source +then they need to specify/identify the same using device specific +interrupt name. In such cases only that interrupt can be used as wakeup +interrupt. + +List of legacy properties and respective binding document +--------------------------------------------------------- + +1. "enable-sdio-wakeup" Documentation/devicetree/bindings/mmc/mmc.txt +2. "gpio-key,wakeup" Documentation/devicetree/bindings/input/gpio-keys{,-polled}.txt +3. "has-tpo" Documentation/devicetree/bindings/rtc/rtc-opal.txt +4. "isil,irq2-can-wakeup-machine" Documentation/devicetree/bindings/rtc/isil,isl12057.txt +5. "linux,wakeup" Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt + Documentation/devicetree/bindings/mfd/tc3589x.txt + Documentation/devicetree/bindings/input/ads7846.txt +6. "linux,keypad-wakeup" Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt +7. "linux,input-wakeup" Documentation/devicetree/bindings/input/samsung-keypad.txt +8. "nvidia,wakeup-source" Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt + +Examples +-------- + +1. With "wakeup" interrupt name + + device@10000 { + compatible = "vendor,device-id"; + reg = <0x10000 0x1000>; + interrupts = <0 19 4>, <0 21 4>, <0 22 4>; + interrupt-names = "ack", "err", "wakeup"; + wakeup-source; + }; + +2. Without "wakeup" interrupt name + + embedded-controller { + compatible = "google,cros-ec-i2c"; + reg = <0x1e>; + interrupts = <6 0>; + interrupt-parent = <&gpx1>; + pinctrl-names = "default"; + pinctrl-0 = <&ec_irq>; + wakeup-source; + }; + +3. Without interrupts + + gpio_keys { + compatible = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + + button@1 { + debounce_interval = <50>; + wakeup-source; + linux,code = <116>; + label = "POWER"; + gpios = <&iofpga_gpio0 0 0x4>; + }; + [....] + }; From 71a0151c5c82595b58c21b4dd5c07482d8a3d554 Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Wed, 21 Oct 2015 11:09:59 +0100 Subject: [PATCH 41/45] Documentation: devicetree: fix reference to legacy wakeup properties This patch marks all the reference to the legacy wakeup bindings and replaces them with the standard "wakeup-source" property. All these legacy property are also listed under a separate section in the generic wakeup-source binding document. Cc: Rob Herring Cc: Pawel Moll Cc: Mark Rutland Cc: Ian Campbell Signed-off-by: Sudeep Holla Signed-off-by: Rob Herring --- Documentation/devicetree/bindings/crypto/fsl-sec4.txt | 4 ++-- Documentation/devicetree/bindings/input/ads7846.txt | 3 ++- .../devicetree/bindings/input/gpio-keys-polled.txt | 1 + Documentation/devicetree/bindings/input/gpio-keys.txt | 1 + .../devicetree/bindings/input/gpio-matrix-keypad.txt | 1 + .../devicetree/bindings/input/nvidia,tegra20-kbc.txt | 3 ++- .../devicetree/bindings/input/qcom,pm8xxx-keypad.txt | 1 + .../devicetree/bindings/input/samsung-keypad.txt | 3 ++- Documentation/devicetree/bindings/mfd/tc3589x.txt | 1 + Documentation/devicetree/bindings/mmc/mmc.txt | 5 +++-- .../devicetree/bindings/rtc/isil,isl12057.txt | 10 +++++----- Documentation/devicetree/bindings/rtc/rtc-opal.txt | 5 +++-- 12 files changed, 24 insertions(+), 14 deletions(-) diff --git a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt index 6831d025ec24..adeca34c5a33 100644 --- a/Documentation/devicetree/bindings/crypto/fsl-sec4.txt +++ b/Documentation/devicetree/bindings/crypto/fsl-sec4.txt @@ -441,7 +441,7 @@ EXAMPLE: regmap = <&snvs>; interrupts = <0 4 0x4> linux,keycode = <116>; /* KEY_POWER */ - wakeup; + wakeup-source; }; ===================================================================== @@ -530,7 +530,7 @@ FULL EXAMPLE regmap = <&sec_mon>; interrupts = <0 4 0x4>; linux,keycode = <116>; /* KEY_POWER */ - wakeup; + wakeup-source; }; }; diff --git a/Documentation/devicetree/bindings/input/ads7846.txt b/Documentation/devicetree/bindings/input/ads7846.txt index df8b1279491d..33a1638b61d6 100644 --- a/Documentation/devicetree/bindings/input/ads7846.txt +++ b/Documentation/devicetree/bindings/input/ads7846.txt @@ -65,6 +65,7 @@ Optional properties: pendown-gpio GPIO handle describing the pin the !PENIRQ line is connected to. wakeup-source use any event on touchscreen as wakeup event. + (Legacy property support: "linux,wakeup") Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC:: @@ -86,6 +87,6 @@ Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC:: ti,x-plate-ohms = /bits/ 16 <40>; ti,pressure-max = /bits/ 16 <255>; - linux,wakeup; + wakeup-source; }; }; diff --git a/Documentation/devicetree/bindings/input/gpio-keys-polled.txt b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt index 5b91f5a3bd5c..d698475a9262 100644 --- a/Documentation/devicetree/bindings/input/gpio-keys-polled.txt +++ b/Documentation/devicetree/bindings/input/gpio-keys-polled.txt @@ -21,6 +21,7 @@ Optional subnode-properties: - debounce-interval: Debouncing interval time in milliseconds. If not specified defaults to 5. - wakeup-source: Boolean, button can wake-up the system. + (Legacy property supported: "gpio-key,wakeup") Example nodes: diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt index 072bf7573c37..cf1333d1dd52 100644 --- a/Documentation/devicetree/bindings/input/gpio-keys.txt +++ b/Documentation/devicetree/bindings/input/gpio-keys.txt @@ -24,6 +24,7 @@ Optional subnode-properties: - debounce-interval: Debouncing interval time in milliseconds. If not specified defaults to 5. - wakeup-source: Boolean, button can wake-up the system. + (Legacy property supported: "gpio-key,wakeup") - linux,can-disable: Boolean, indicates that button is connected to dedicated (not shared) interrupt which can be disabled to suppress events from the button. diff --git a/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt b/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt index 4d86059c370c..d0ea09ba249f 100644 --- a/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt +++ b/Documentation/devicetree/bindings/input/gpio-matrix-keypad.txt @@ -20,6 +20,7 @@ Required Properties: Optional Properties: - linux,no-autorepeat: do no enable autorepeat feature. - wakeup-source: use any event on keypad as wakeup event. + (Legacy property supported: "linux,wakeup") - debounce-delay-ms: debounce interval in milliseconds - col-scan-delay-us: delay, measured in microseconds, that is needed before we can scan keypad after activating column gpio diff --git a/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt index 0382b8bd69c6..1faa7292e21f 100644 --- a/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt +++ b/Documentation/devicetree/bindings/input/nvidia,tegra20-kbc.txt @@ -29,7 +29,8 @@ matrix-keyboard bindings: - nvidia,debounce-delay-ms: delay in milliseconds per row scan for debouncing - nvidia,repeat-delay-ms: delay in milliseconds before repeat starts - nvidia,ghost-filter: enable ghost filtering for this device -- nvidia,wakeup-source: configure keyboard as a wakeup source for suspend/resume +- wakeup-source: configure keyboard as a wakeup source for suspend/resume + (Legacy property supported: "nvidia,wakeup-source") Example: diff --git a/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt b/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt index ee6215681182..4a9dc6ba96b1 100644 --- a/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt +++ b/Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt @@ -37,6 +37,7 @@ PROPERTIES Usage: optional Value type: Definition: use any event on keypad as wakeup event. + (Legacy property supported: "linux,keypad-wakeup") - keypad,num-rows: Usage: required diff --git a/Documentation/devicetree/bindings/input/samsung-keypad.txt b/Documentation/devicetree/bindings/input/samsung-keypad.txt index 863e77f619dc..5305e74e5742 100644 --- a/Documentation/devicetree/bindings/input/samsung-keypad.txt +++ b/Documentation/devicetree/bindings/input/samsung-keypad.txt @@ -38,6 +38,7 @@ Required Board Specific Properties: Optional Properties: - wakeup-source: use any event on keypad as wakeup event. + (Legacy property supported: "linux,input-wakeup") Optional Properties specific to linux: - linux,keypad-no-autorepeat: do no enable autorepeat feature. @@ -51,7 +52,7 @@ Example: samsung,keypad-num-rows = <2>; samsung,keypad-num-columns = <8>; linux,input-no-autorepeat; - linux,input-wakeup; + wakeup-source; pinctrl-names = "default"; pinctrl-0 = <&keypad_rows &keypad_columns>; diff --git a/Documentation/devicetree/bindings/mfd/tc3589x.txt b/Documentation/devicetree/bindings/mfd/tc3589x.txt index 37bf7f1aa70a..23fc2f21f5a4 100644 --- a/Documentation/devicetree/bindings/mfd/tc3589x.txt +++ b/Documentation/devicetree/bindings/mfd/tc3589x.txt @@ -56,6 +56,7 @@ Optional nodes: bindings/input/matrix-keymap.txt - linux,no-autorepeat: do no enable autorepeat feature. - wakeup-source: use any event on keypad as wakeup event. + (Legacy property supported: "linux,wakeup") Example: diff --git a/Documentation/devicetree/bindings/mmc/mmc.txt b/Documentation/devicetree/bindings/mmc/mmc.txt index 0384fc3f64e8..a88f5dc775bd 100644 --- a/Documentation/devicetree/bindings/mmc/mmc.txt +++ b/Documentation/devicetree/bindings/mmc/mmc.txt @@ -67,7 +67,8 @@ polarity is in effect. Optional SDIO properties: - keep-power-in-suspend: Preserves card power during a suspend/resume cycle -- enable-sdio-wakeup: Enables wake up of host system on SDIO IRQ assertion +- wakeup-source: Enables wake up of host system on SDIO IRQ assertion + (Legacy property supported: "enable-sdio-wakeup") MMC power sequences: @@ -117,7 +118,7 @@ sdhci@ab000000 { wp-gpios = <&gpio 70 0>; max-frequency = <50000000>; keep-power-in-suspend; - enable-sdio-wakeup; + wakeup-source; mmc-pwrseq = <&sdhci0_pwrseq> } diff --git a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt index 501c39ceae79..cf83e0940302 100644 --- a/Documentation/devicetree/bindings/rtc/isil,isl12057.txt +++ b/Documentation/devicetree/bindings/rtc/isil,isl12057.txt @@ -5,7 +5,7 @@ consisting of a compatible field, an address and possibly an interrupt line). Nonetheless, it also supports an option boolean property -("isil,irq2-can-wakeup-machine") to handle the specific use-case found +("wakeup-source") to handle the specific use-case found on at least three in-tree users of the chip (NETGEAR ReadyNAS 102, 104 and 2120 ARM-based NAS); On those devices, the IRQ#2 pin of the chip (associated with the alarm supported by the driver) is not connected @@ -22,9 +22,9 @@ Required properties supported by the device: Optional properties: - - "isil,irq2-can-wakeup-machine": mark the chip as a wakeup source, - independently of the availability of an IRQ line connected to the - SoC. + - "wakeup-source": mark the chip as a wakeup source, independently of + the availability of an IRQ line connected to the SoC. + (Legacy property supported: "isil,irq2-can-wakeup-machine") - "interrupt-parent", "interrupts": for passing the interrupt line of the SoC connected to IRQ#2 of the RTC chip. @@ -74,5 +74,5 @@ PMIC, allowing the device to be started based on configured alarm: isl12057: isl12057@68 { compatible = "isil,isl12057"; reg = <0x68>; - isil,irq2-can-wakeup-machine; + wakeup-source; }; diff --git a/Documentation/devicetree/bindings/rtc/rtc-opal.txt b/Documentation/devicetree/bindings/rtc/rtc-opal.txt index af87e5ecac54..a1734e5cb75b 100644 --- a/Documentation/devicetree/bindings/rtc/rtc-opal.txt +++ b/Documentation/devicetree/bindings/rtc/rtc-opal.txt @@ -5,12 +5,13 @@ Required properties: - comapatible: Should be "ibm,opal-rtc" Optional properties: -- has-tpo: Decides if the wakeup is supported or not. +- wakeup-source: Decides if the wakeup is supported or not + (Legacy property supported: "has-tpo") Example: rtc { compatible = "ibm,opal-rtc"; - has-tpo; + wakeup-source; phandle = <0x10000029>; linux,phandle = <0x10000029>; }; From 794fab7d785a2fb5b3f1777619143a8e72955eac Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Fri, 30 Oct 2015 09:51:27 -0700 Subject: [PATCH 42/45] Documentation: arm: Fixed typo in socfpga fpga mgr example Addresses should not be prefixed contain '0x' in nodes. Signed-off-by: Moritz Fischer Signed-off-by: Rob Herring --- .../devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt b/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt index 9b027a615486..d52f3340414d 100644 --- a/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt +++ b/Documentation/devicetree/bindings/fpga/altera-socfpga-fpga-mgr.txt @@ -9,7 +9,7 @@ Required properties: Example: - hps_0_fpgamgr: fpgamgr@0xff706000 { + hps_0_fpgamgr: fpgamgr@ff706000 { compatible = "altr,socfpga-fpga-mgr"; reg = <0xFF706000 0x1000 0xFFB90000 0x1000>; From 510bd068db34b946a067629679c5cc99c8b99f1e Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Wed, 28 Oct 2015 12:05:27 +0900 Subject: [PATCH 43/45] of: simplify arch_find_n_match_cpu_physical_id() function This commit does not change the function behavior. Signed-off-by: Masahiro Yamada Signed-off-by: Rob Herring --- drivers/of/base.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 8b5a187a7682..017dd94f16ea 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -375,10 +375,7 @@ bool __weak arch_find_n_match_cpu_physical_id(struct device_node *cpun, cpu, thread)) return true; - if (__of_find_n_match_cpu_property(cpun, "reg", cpu, thread)) - return true; - - return false; + return __of_find_n_match_cpu_property(cpun, "reg", cpu, thread); } /** From 61dd90224c13ee6eab72822f9f946277a1ddd51f Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 2 Oct 2015 18:21:47 +0100 Subject: [PATCH 44/45] devicetree: add Sigma Designs vendor prefix Add the "sigma" vendor prefix for Sigma Designs, Inc. Signed-off-by: Mans Rullgard Signed-off-by: Rob Herring --- Documentation/devicetree/bindings/vendor-prefixes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index 0f60dbd98162..5a47e8895084 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -193,6 +193,7 @@ schindler Schindler seagate Seagate Technology PLC semtech Semtech Corporation sharp Sharp Corporation +sigma Sigma Designs, Inc. sil Silicon Image silabs Silicon Laboratories siliconmitus Silicon Mitus, Inc. From 2d799dde8e69494e0234b8ecd5ce95cd06224329 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Thu, 5 Nov 2015 13:40:40 -0600 Subject: [PATCH 45/45] MAINTAINERS: update DT binding doc locations After the recent moving of DT binding documents, some maintainers entries are stale. Update them to the new locations. In bindings/fb/, there were only 2 files and I'm assuming the FB maintainers don't want to be copied on all of bindings/display/. So I've dropped them. Reported-by: Thierry Reding Cc: Thierry Reding Cc: Jianwei Wang Cc: Alison Wang Cc: Philipp Zabel Cc: Mark Yao Cc: Benjamin Gaignard Cc: Vincent Abriou Cc: Jean-Christophe Plagniol-Villard Cc: Tomi Valkeinen Cc: James Hogan Cc: Hans de Goede Cc: Vineet Gupta Signed-off-by: Rob Herring --- MAINTAINERS | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 9f6685f6c5a9..e2aa9736fd0f 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3577,7 +3577,7 @@ S: Maintained F: drivers/gpu/drm/drm_panel.c F: drivers/gpu/drm/panel/ F: include/drm/drm_panel.h -F: Documentation/devicetree/bindings/panel/ +F: Documentation/devicetree/bindings/display/panel/ INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets) M: Daniel Vetter @@ -3609,15 +3609,15 @@ M: Alison Wang L: dri-devel@lists.freedesktop.org S: Supported F: drivers/gpu/drm/fsl-dcu/ -F: Documentation/devicetree/bindings/video/fsl,dcu.txt -F: Documentation/devicetree/bindings/panel/nec,nl4827hc19_05b.txt +F: Documentation/devicetree/bindings/display/fsl,dcu.txt +F: Documentation/devicetree/bindings/display/panel/nec,nl4827hc19_05b.txt DRM DRIVERS FOR FREESCALE IMX M: Philipp Zabel L: dri-devel@lists.freedesktop.org S: Maintained F: drivers/gpu/drm/imx/ -F: Documentation/devicetree/bindings/drm/imx/ +F: Documentation/devicetree/bindings/display/imx/ DRM DRIVERS FOR NVIDIA TEGRA M: Thierry Reding @@ -3630,7 +3630,7 @@ F: drivers/gpu/drm/tegra/ F: drivers/gpu/host1x/ F: include/linux/host1x.h F: include/uapi/drm/tegra_drm.h -F: Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt +F: Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.txt DRM DRIVERS FOR RENESAS M: Laurent Pinchart @@ -3647,7 +3647,7 @@ M: Mark Yao L: dri-devel@lists.freedesktop.org S: Maintained F: drivers/gpu/drm/rockchip/ -F: Documentation/devicetree/bindings/video/rockchip* +F: Documentation/devicetree/bindings/display/rockchip* DRM DRIVERS FOR STI M: Benjamin Gaignard @@ -3656,7 +3656,7 @@ L: dri-devel@lists.freedesktop.org T: git http://git.linaro.org/people/benjamin.gaignard/kernel.git S: Maintained F: drivers/gpu/drm/sti -F: Documentation/devicetree/bindings/gpu/st,stih4xx.txt +F: Documentation/devicetree/bindings/display/st,stih4xx.txt DSBR100 USB FM RADIO DRIVER M: Alexey Klimov @@ -4342,7 +4342,6 @@ Q: http://patchwork.kernel.org/project/linux-fbdev/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/plagnioj/linux-fbdev.git S: Maintained F: Documentation/fb/ -F: Documentation/devicetree/bindings/fb/ F: drivers/video/ F: include/video/ F: include/linux/fb.h @@ -6855,6 +6854,7 @@ S: Supported F: arch/metag/ F: Documentation/metag/ F: Documentation/devicetree/bindings/metag/ +F: Documentation/devicetree/bindings/interrupt-controller/img,* F: drivers/clocksource/metag_generic.c F: drivers/irqchip/irq-metag.c F: drivers/irqchip/irq-metag-ext.c @@ -9443,7 +9443,7 @@ SIMPLEFB FB DRIVER M: Hans de Goede L: linux-fbdev@vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/video/simple-framebuffer.txt +F: Documentation/devicetree/bindings/display/simple-framebuffer.txt F: drivers/video/fbdev/simplefb.c F: include/linux/platform_data/simplefb.h @@ -10072,6 +10072,7 @@ M: Vineet Gupta S: Supported F: arch/arc/ F: Documentation/devicetree/bindings/arc/* +F: Documentation/devicetree/bindings/interrupt-controller/snps,arc* F: drivers/tty/serial/arc_uart.c T: git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git