Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+23
-71
+5
-5
Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
+5
-5
Documentation/devicetree/bindings/mmc/exynos-dw-mshc.txt
···
1
-
* Samsung Exynos specific extensions to the Synopsis Designware Mobile
1
+
* Samsung Exynos specific extensions to the Synopsys Designware Mobile
2
2
Storage Host Controller
3
3
4
-
The Synopsis designware mobile storage host controller is used to interface
4
+
The Synopsys designware mobile storage host controller is used to interface
5
5
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
6
-
differences between the core Synopsis dw mshc controller properties described
7
-
by synopsis-dw-mshc.txt and the properties used by the Samsung Exynos specific
8
-
extensions to the Synopsis Designware Mobile Storage Host Controller.
6
+
differences between the core Synopsys dw mshc controller properties described
7
+
by synopsys-dw-mshc.txt and the properties used by the Samsung Exynos specific
8
+
extensions to the Synopsys Designware Mobile Storage Host Controller.
9
9
10
10
Required Properties:
11
11
+5
-5
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt
+5
-5
Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.txt
···
1
-
* Rockchip specific extensions to the Synopsis Designware Mobile
1
+
* Rockchip specific extensions to the Synopsys Designware Mobile
2
2
Storage Host Controller
3
3
4
-
The Synopsis designware mobile storage host controller is used to interface
4
+
The Synopsys designware mobile storage host controller is used to interface
5
5
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
6
-
differences between the core Synopsis dw mshc controller properties described
7
-
by synopsis-dw-mshc.txt and the properties used by the Rockchip specific
8
-
extensions to the Synopsis Designware Mobile Storage Host Controller.
6
+
differences between the core Synopsys dw mshc controller properties described
7
+
by synopsys-dw-mshc.txt and the properties used by the Rockchip specific
8
+
extensions to the Synopsys Designware Mobile Storage Host Controller.
9
9
10
10
Required Properties:
11
11
+4
-4
Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
+4
-4
Documentation/devicetree/bindings/mmc/synopsis-dw-mshc.txt
Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
···
1
-
* Synopsis Designware Mobile Storage Host Controller
1
+
* Synopsys Designware Mobile Storage Host Controller
2
2
3
-
The Synopsis designware mobile storage host controller is used to interface
3
+
The Synopsys designware mobile storage host controller is used to interface
4
4
a SoC with storage medium such as eMMC or SD/MMC cards. This file documents
5
5
differences between the core mmc properties described by mmc.txt and the
6
-
properties used by the Synopsis Designware Mobile Storage Host Controller.
6
+
properties used by the Synopsys Designware Mobile Storage Host Controller.
7
7
8
8
Required Properties:
9
9
10
10
* compatible: should be
11
-
- snps,dw-mshc: for controllers compliant with synopsis dw-mshc.
11
+
- snps,dw-mshc: for controllers compliant with synopsys dw-mshc.
12
12
* #address-cells: should be 1.
13
13
* #size-cells: should be 0.
14
14
+1
-1
Documentation/devicetree/bindings/pci/designware-pcie.txt
+1
-1
Documentation/devicetree/bindings/pci/designware-pcie.txt
-44
arch/openrisc/include/asm/prom.h
-44
arch/openrisc/include/asm/prom.h
···
14
14
* the Free Software Foundation; either version 2 of the License, or
15
15
* (at your option) any later version.
16
16
*/
17
-
18
-
#include <linux/of.h> /* linux/of.h gets to determine #include ordering */
19
-
20
17
#ifndef _ASM_OPENRISC_PROM_H
21
18
#define _ASM_OPENRISC_PROM_H
22
-
#ifdef __KERNEL__
23
-
#ifndef __ASSEMBLY__
24
19
25
-
#include <linux/types.h>
26
-
#include <asm/irq.h>
27
-
#include <linux/irqdomain.h>
28
-
#include <linux/atomic.h>
29
-
#include <linux/of_irq.h>
30
-
#include <linux/of_fdt.h>
31
-
#include <linux/of_address.h>
32
-
#include <linux/proc_fs.h>
33
-
#include <linux/platform_device.h>
34
20
#define HAVE_ARCH_DEVTREE_FIXUPS
35
21
36
-
/* Other Prototypes */
37
-
extern int early_uartlite_console(void);
38
-
39
-
/* Parse the ibm,dma-window property of an OF node into the busno, phys and
40
-
* size parameters.
41
-
*/
42
-
void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
43
-
unsigned long *busno, unsigned long *phys, unsigned long *size);
44
-
45
-
extern void kdump_move_device_tree(void);
46
-
47
-
/* Get the MAC address */
48
-
extern const void *of_get_mac_address(struct device_node *np);
49
-
50
-
/**
51
-
* of_irq_map_pci - Resolve the interrupt for a PCI device
52
-
* @pdev: the device whose interrupt is to be resolved
53
-
* @out_irq: structure of_irq filled by this function
54
-
*
55
-
* This function resolves the PCI interrupt for a given PCI device. If a
56
-
* device-node exists for a given pci_dev, it will use normal OF tree
57
-
* walking. If not, it will implement standard swizzling and walk up the
58
-
* PCI tree until an device-node is found, at which point it will finish
59
-
* resolving using the OF tree walking.
60
-
*/
61
-
struct pci_dev;
62
-
extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq);
63
-
64
-
#endif /* __ASSEMBLY__ */
65
-
#endif /* __KERNEL__ */
66
22
#endif /* _ASM_OPENRISC_PROM_H */
+8
-12
include/linux/of_irq.h
+8
-12
include/linux/of_irq.h
···
1
1
#ifndef __OF_IRQ_H
2
2
#define __OF_IRQ_H
3
3
4
-
#if defined(CONFIG_OF)
5
-
struct of_irq;
6
4
#include <linux/types.h>
7
5
#include <linux/errno.h>
8
6
#include <linux/irq.h>
···
8
10
#include <linux/ioport.h>
9
11
#include <linux/of.h>
10
12
11
-
/*
12
-
* irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
13
-
* implements it differently. However, the prototype is the same for all,
14
-
* so declare it here regardless of the CONFIG_OF_IRQ setting.
15
-
*/
16
-
extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
17
-
18
-
#if defined(CONFIG_OF_IRQ)
19
13
/**
20
14
* of_irq - container for device_node/irq_specifier pair for an irq controller
21
15
* @controller: pointer to interrupt controller device tree node
···
61
71
extern int of_irq_count(struct device_node *dev);
62
72
extern int of_irq_to_resource_table(struct device_node *dev,
63
73
struct resource *res, int nr_irqs);
64
-
extern struct device_node *of_irq_find_parent(struct device_node *child);
65
74
66
75
extern void of_irq_init(const struct of_device_id *matches);
67
76
68
-
#endif /* CONFIG_OF_IRQ */
77
+
#if defined(CONFIG_OF)
78
+
/*
79
+
* irq_of_parse_and_map() is used by all OF enabled platforms; but SPARC
80
+
* implements it differently. However, the prototype is the same for all,
81
+
* so declare it here regardless of the CONFIG_OF_IRQ setting.
82
+
*/
83
+
extern unsigned int irq_of_parse_and_map(struct device_node *node, int index);
84
+
extern struct device_node *of_irq_find_parent(struct device_node *child);
69
85
70
86
#else /* !CONFIG_OF */
71
87
static inline unsigned int irq_of_parse_and_map(struct device_node *dev,