Commit f2e98aa8 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull DeviceTree fixes from Rob Herring:
 "Clean-up to fix some warnings for !OF builds and spelling fixes in
  docs:

   - Clean-up openrisc prom.h
   - Fix warnings caused by of_irq.h ifdefs
   - Spelling fix for Synopsys"

* tag 'devicetree-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dts: Fix misspelling of Synopsys
  of: clean-up ifdefs in of_irq.h
  openrisc: clean-up prom.h
parents 874db4d8 53126a2f
* Samsung Exynos specific extensions to the Synopsis Designware Mobile * Samsung Exynos specific extensions to the Synopsys Designware Mobile
Storage Host Controller Storage Host Controller
The Synopsis designware mobile storage host controller is used to interface The Synopsys designware mobile storage host controller is used to interface
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
differences between the core Synopsis dw mshc controller properties described differences between the core Synopsys dw mshc controller properties described
by synopsis-dw-mshc.txt and the properties used by the Samsung Exynos specific by synopsys-dw-mshc.txt and the properties used by the Samsung Exynos specific
extensions to the Synopsis Designware Mobile Storage Host Controller. extensions to the Synopsys Designware Mobile Storage Host Controller.
Required Properties: Required Properties:
......
* Rockchip specific extensions to the Synopsis Designware Mobile * Rockchip specific extensions to the Synopsys Designware Mobile
Storage Host Controller Storage Host Controller
The Synopsis designware mobile storage host controller is used to interface The Synopsys designware mobile storage host controller is used to interface
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
differences between the core Synopsis dw mshc controller properties described differences between the core Synopsys dw mshc controller properties described
by synopsis-dw-mshc.txt and the properties used by the Rockchip specific by synopsys-dw-mshc.txt and the properties used by the Rockchip specific
extensions to the Synopsis Designware Mobile Storage Host Controller. extensions to the Synopsys Designware Mobile Storage Host Controller.
Required Properties: Required Properties:
......
* Synopsis Designware Mobile Storage Host Controller * Synopsys Designware Mobile Storage Host Controller
The Synopsis designware mobile storage host controller is used to interface The Synopsys designware mobile storage host controller is used to interface
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
differences between the core mmc properties described by mmc.txt and the differences between the core mmc properties described by mmc.txt and the
properties used by the Synopsis Designware Mobile Storage Host Controller. properties used by the Synopsys Designware Mobile Storage Host Controller.
Required Properties: Required Properties:
* compatible: should be * compatible: should be
- snps,dw-mshc: for controllers compliant with synopsis dw-mshc. - snps,dw-mshc: for controllers compliant with synopsys dw-mshc.
* #address-cells: should be 1. * #address-cells: should be 1.
* #size-cells: should be 0. * #size-cells: should be 0.
......
* Synopsis Designware PCIe interface * Synopsys Designware PCIe interface
Required properties: Required properties:
- compatible: should contain "snps,dw-pcie" to identify the - compatible: should contain "snps,dw-pcie" to identify the
......
...@@ -14,53 +14,9 @@ ...@@ -14,53 +14,9 @@
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
*/ */
#include <linux/of.h> /* linux/of.h gets to determine #include ordering */
#ifndef _ASM_OPENRISC_PROM_H #ifndef _ASM_OPENRISC_PROM_H
#define _ASM_OPENRISC_PROM_H #define _ASM_OPENRISC_PROM_H
#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#include <linux/types.h>
#include <asm/irq.h>
#include <linux/irqdomain.h>
#include <linux/atomic.h>
#include <linux/of_irq.h>
#include <linux/of_fdt.h>
#include <linux/of_address.h>
#include <linux/proc_fs.h>
#include <linux/platform_device.h>
#define HAVE_ARCH_DEVTREE_FIXUPS #define HAVE_ARCH_DEVTREE_FIXUPS
/* Other Prototypes */
extern int early_uartlite_console(void);
/* Parse the ibm,dma-window property of an OF node into the busno, phys and
* size parameters.
*/
void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
unsigned long *busno, unsigned long *phys, unsigned long *size);
extern void kdump_move_device_tree(void);
/* Get the MAC address */
extern const void *of_get_mac_address(struct device_node *np);
/**
* of_irq_map_pci - Resolve the interrupt for a PCI device
* @pdev: the device whose interrupt is to be resolved
* @out_irq: structure of_irq filled by this function
*
* This function resolves the PCI interrupt for a given PCI device. If a
* device-node exists for a given pci_dev, it will use normal OF tree
* walking. If not, it will implement standard swizzling and walk up the
* PCI tree until an device-node is found, at which point it will finish
* resolving using the OF tree walking.
*/
struct pci_dev;
extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
#endif /* __ASSEMBLY__ */
#endif /* __KERNEL__ */
#endif /* _ASM_OPENRISC_PROM_H */ #endif /* _ASM_OPENRISC_PROM_H */
#ifndef __OF_IRQ_H #ifndef __OF_IRQ_H
#define __OF_IRQ_H #define __OF_IRQ_H
#if defined(CONFIG_OF)
struct of_irq;
#include <linux/types.h> #include <linux/types.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/irq.h> #include <linux/irq.h>
...@@ -10,14 +8,6 @@ struct of_irq; ...@@ -10,14 +8,6 @@ struct of_irq;
#include <linux/ioport.h> #include <linux/ioport.h>
#include <linux/of.h> #include <linux/of.h>
/*
* 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,
* 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);
#if defined(CONFIG_OF_IRQ)
/** /**
* of_irq - container for device_node/irq_specifier pair for an irq controller * of_irq - container for device_node/irq_specifier pair for an irq controller
* @controller: pointer to interrupt controller device tree node * @controller: pointer to interrupt controller device tree node
...@@ -71,11 +61,17 @@ extern int of_irq_to_resource(struct device_node *dev, int index, ...@@ -71,11 +61,17 @@ extern int of_irq_to_resource(struct device_node *dev, int index,
extern int of_irq_count(struct device_node *dev); extern int of_irq_count(struct device_node *dev);
extern int of_irq_to_resource_table(struct device_node *dev, extern int of_irq_to_resource_table(struct device_node *dev,
struct resource *res, int nr_irqs); struct resource *res, int nr_irqs);
extern struct device_node *of_irq_find_parent(struct device_node *child);
extern void of_irq_init(const struct of_device_id *matches); extern void of_irq_init(const struct of_device_id *matches);
#endif /* CONFIG_OF_IRQ */ #if defined(CONFIG_OF)
/*
* 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,
* 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 */ #else /* !CONFIG_OF */
static inline unsigned int irq_of_parse_and_map(struct device_node *dev, static inline unsigned int irq_of_parse_and_map(struct device_node *dev,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment