Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2e98aa8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt

+5 −5
Original line number Diff line number Diff line 
* Samsung Exynos specific extensions to the Synopsis Designware Mobile

* Samsung Exynos specific extensions to the 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

differences between the core Synopsis dw mshc controller properties described

by synopsis-dw-mshc.txt and the properties used by the Samsung Exynos specific

extensions to the Synopsis Designware Mobile Storage Host Controller.

differences between the core Synopsys dw mshc controller properties described

by synopsys-dw-mshc.txt and the properties used by the Samsung Exynos specific

extensions to the Synopsys Designware Mobile Storage Host Controller.



Required Properties:

Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt

+5 −5
Original line number Diff line number Diff line 
* Rockchip specific extensions to the Synopsis Designware Mobile

* Rockchip specific extensions to the 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

differences between the core Synopsis dw mshc controller properties described

by synopsis-dw-mshc.txt and the properties used by the Rockchip specific

extensions to the Synopsis Designware Mobile Storage Host Controller.

differences between the core Synopsys dw mshc controller properties described

by synopsys-dw-mshc.txt and the properties used by the Rockchip specific

extensions to the Synopsys Designware Mobile Storage Host Controller.



Required Properties:

Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt→Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt

+4 −4
Original line number Diff line number Diff line 
* 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

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:



* 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.

* #size-cells: should be 0.

Documentation/devicetree/bindings/pci/designware-pcie.txt

+1 −1
Original line number Diff line number Diff line 
* Synopsis Designware PCIe interface

* Synopsys Designware PCIe interface



Required properties:

- compatible: should contain "snps,dw-pcie" to identify the

arch/openrisc/include/asm/prom.h

+0 −44
Original line number Diff line number Diff line
@@ -14,53 +14,9 @@ 
 * the Free Software Foundation; either version 2 of the License, or

 * (at your option) any later version.

 */



#include <linux/of.h>	/* linux/of.h gets to determine #include ordering */



#ifndef _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



/* 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 */