Merge tag 'devicetree-for-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull more devicetree updates from Rob Herring: - First part of DT header detangling dropping cpu.h from of_device.h and replacing some includes with forward declarations. A handful of drivers needed some adjustment to their includes as a result. - Refactor of_device.h to be used by bus drivers rather than various device drivers. This moves non-bus related functions out of of_device.h. The end goal is for of_platform.h and of_device.h to stop including each other. - Refactor open coded parsing of "ranges" in some bus drivers to use DT address parsing functions - Add some new address parsing functions of_property_read_reg(), of_range_count(), and of_range_to_resource() in preparation to convert more open coded parsing of DT addresses to use them. - Treewide clean-ups to use of_property_read_bool() and of_property_present() as appropriate. The ones here are the ones that didn't get picked up elsewhere. * tag 'devicetree-for-6.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (34 commits) bus: tegra-gmi: Replace of_platform.h with explicit includes hte: Use of_property_present() for testing DT property presence w1: w1-gpio: Use of_property_read_bool() for boolean properties virt: fsl: Use of_property_present() for testing DT property presence soc: fsl: Use of_property_present() for testing DT property presence sbus: display7seg: Use of_property_read_bool() for boolean properties sparc: Use of_property_read_bool() for boolean properties sparc: Use of_property_present() for testing DT property presence bus: mvebu-mbus: Remove open coded "ranges" parsing of/address: Add of_property_read_reg() helper of/address: Add of_range_count() helper of/address: Add support for 3 address cell bus of/address: Add of_range_to_resource() helper of: unittest: Add bus address range parsing tests of: Drop cpu.h include from of_device.h OPP: Adjust includes to remove of_device.h irqchip: loongson-eiointc: Add explicit include for cpuhotplug.h cpuidle: Adjust includes to remove of_device.h cpufreq: sun50i: Add explicit include for cpu.h cpufreq: Adjust includes to remove of_device.h ...
This commit is contained in:
@@ -19,11 +19,14 @@
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/atomic.h>
|
||||
#include <linux/irqdomain.h>
|
||||
#include <linux/spinlock.h>
|
||||
|
||||
#define of_compat_cmp(s1, s2, l) strncmp((s1), (s2), (l))
|
||||
#define of_prop_cmp(s1, s2) strcasecmp((s1), (s2))
|
||||
#define of_node_cmp(s1, s2) strcmp((s1), (s2))
|
||||
|
||||
extern raw_spinlock_t devtree_lock;
|
||||
|
||||
struct of_irq_controller {
|
||||
unsigned int (*irq_build)(struct device_node *, unsigned int, void *);
|
||||
void *data;
|
||||
|
||||
@@ -29,7 +29,7 @@ static int of_bus_pci_match(struct device_node *np)
|
||||
* parent as-is, not with the PCI translate
|
||||
* method which chops off the top address cell.
|
||||
*/
|
||||
if (!of_find_property(np, "ranges", NULL))
|
||||
if (!of_property_present(np, "ranges"))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
@@ -223,7 +223,7 @@ static int __init build_one_resource(struct device_node *parent,
|
||||
static int __init use_1to1_mapping(struct device_node *pp)
|
||||
{
|
||||
/* If we have a ranges property in the parent, use it. */
|
||||
if (of_find_property(pp, "ranges", NULL) != NULL)
|
||||
if (of_property_present(pp, "ranges"))
|
||||
return 0;
|
||||
|
||||
/* Some SBUS devices use intermediate nodes to express
|
||||
|
||||
@@ -58,7 +58,7 @@ static int of_bus_pci_match(struct device_node *np)
|
||||
* parent as-is, not with the PCI translate
|
||||
* method which chops off the top address cell.
|
||||
*/
|
||||
if (!of_find_property(np, "ranges", NULL))
|
||||
if (!of_property_present(np, "ranges"))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
@@ -78,7 +78,7 @@ static int of_bus_simba_match(struct device_node *np)
|
||||
* simba.
|
||||
*/
|
||||
if (of_node_name_eq(np, "pci")) {
|
||||
if (!of_find_property(np, "ranges", NULL))
|
||||
if (!of_property_present(np, "ranges"))
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -283,7 +283,7 @@ static int __init build_one_resource(struct device_node *parent,
|
||||
static int __init use_1to1_mapping(struct device_node *pp)
|
||||
{
|
||||
/* If we have a ranges property in the parent, use it. */
|
||||
if (of_find_property(pp, "ranges", NULL) != NULL)
|
||||
if (of_property_present(pp, "ranges"))
|
||||
return 0;
|
||||
|
||||
/* If the parent is the dma node of an ISA bus, pass
|
||||
|
||||
@@ -162,7 +162,7 @@ int of_bus_sbus_match(struct device_node *np)
|
||||
* don't have some intervening real bus that provides
|
||||
* ranges based translations.
|
||||
*/
|
||||
if (of_find_property(dp, "ranges", NULL) != NULL)
|
||||
if (of_property_present(dp, "ranges"))
|
||||
break;
|
||||
|
||||
dp = dp->parent;
|
||||
|
||||
@@ -1270,7 +1270,7 @@ static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
|
||||
pbm->chip_version >= 0x2)
|
||||
tmp |= 0x3UL << SCHIZO_PCICTRL_PTO_SHIFT;
|
||||
|
||||
if (!of_find_property(pbm->op->dev.of_node, "no-bus-parking", NULL))
|
||||
if (!of_property_read_bool(pbm->op->dev.of_node, "no-bus-parking"))
|
||||
tmp |= SCHIZO_PCICTRL_PARK;
|
||||
else
|
||||
tmp &= ~SCHIZO_PCICTRL_PARK;
|
||||
|
||||
@@ -28,7 +28,7 @@ static int has_button_interrupt(unsigned int irq, struct device_node *dp)
|
||||
{
|
||||
if (irq == 0xffffffff)
|
||||
return 0;
|
||||
if (!of_find_property(dp, "button", NULL))
|
||||
if (!of_property_read_bool(dp, "button"))
|
||||
return 0;
|
||||
|
||||
return 1;
|
||||
|
||||
@@ -502,7 +502,7 @@ static void *fill_in_one_cpu(struct device_node *dp, int cpuid, int arg)
|
||||
struct device_node *portid_parent = NULL;
|
||||
int portid = -1;
|
||||
|
||||
if (of_find_property(dp, "cpuid", NULL)) {
|
||||
if (of_property_present(dp, "cpuid")) {
|
||||
int limit = 2;
|
||||
|
||||
portid_parent = dp;
|
||||
|
||||
@@ -277,7 +277,7 @@ static int clock_probe(struct platform_device *op)
|
||||
return -ENODEV;
|
||||
|
||||
/* Only the primary RTC has an address property */
|
||||
if (!of_find_property(dp, "address", NULL))
|
||||
if (!of_property_present(dp, "address"))
|
||||
return -ENODEV;
|
||||
|
||||
m48t59_rtc.resource = &op->resource[0];
|
||||
|
||||
Reference in New Issue
Block a user