Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux
Pull device tree changes from Grant Likely: "All around device tree changes destined for v3.8. Aside from the documentation updates the highlights in this branch include: - Kbuild changes for using CPP with .dts files - locking fix from preempt_rt patchset - include DT alias names in device uevent - Selftest bugfixes and improvements - New function for counting phandles stanzas in a property - constify argument to of_node_full_name() - Various bug fixes This tree did also contain a commit to use platform_device_add instead of open-coding the device add code, but it caused problems with amba devices and needed to be reverted." * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux: (23 commits) Revert "of: use platform_device_add" kbuild: limit dtc+cpp include path gpio: Make of_count_named_gpios() use new of_count_phandle_with_args() of: Create function for counting number of phandles in a property of/base: Clean up exit paths for of_parse_phandle_with_args() of/selftest: Use selftest() macro throughout of/selftest: Fix GPIOs selftest to cover the 7th case of: fix recursive locking in of_get_next_available_child() documentation/devicetree: Fix a typo in exynos-dw-mshc.txt OF: convert devtree lock from rw_lock to raw spinlock of/exynos_g2d: Add Bindings for exynos G2D driver kbuild: create a rule to run the pre-processor on *.dts files input: Extend matrix-keypad device tree binding devicetree: Move NS2 LEDs binding into LEDs directory of: use platform_device_add powerpc/5200: Fix size to request_mem_region() call documentation/devicetree: Fix typos of: add 'const' to of_node_full_name parameter of: Output devicetree alias names in uevent DT: add vendor prefixes for Renesas and Toshiba ...
This commit is contained in:
@@ -88,41 +88,6 @@ int of_get_named_gpio_flags(struct device_node *np, const char *propname,
|
||||
}
|
||||
EXPORT_SYMBOL(of_get_named_gpio_flags);
|
||||
|
||||
/**
|
||||
* of_gpio_named_count - Count GPIOs for a device
|
||||
* @np: device node to count GPIOs for
|
||||
* @propname: property name containing gpio specifier(s)
|
||||
*
|
||||
* The function returns the count of GPIOs specified for a node.
|
||||
*
|
||||
* Note that the empty GPIO specifiers counts too. For example,
|
||||
*
|
||||
* gpios = <0
|
||||
* &pio1 1 2
|
||||
* 0
|
||||
* &pio2 3 4>;
|
||||
*
|
||||
* defines four GPIOs (so this function will return 4), two of which
|
||||
* are not specified.
|
||||
*/
|
||||
unsigned int of_gpio_named_count(struct device_node *np, const char* propname)
|
||||
{
|
||||
unsigned int cnt = 0;
|
||||
|
||||
do {
|
||||
int ret;
|
||||
|
||||
ret = of_parse_phandle_with_args(np, propname, "#gpio-cells",
|
||||
cnt, NULL);
|
||||
/* A hole in the gpios = <> counts anyway. */
|
||||
if (ret < 0 && ret != -EEXIST)
|
||||
break;
|
||||
} while (++cnt);
|
||||
|
||||
return cnt;
|
||||
}
|
||||
EXPORT_SYMBOL(of_gpio_named_count);
|
||||
|
||||
/**
|
||||
* of_gpio_simple_xlate - translate gpio_spec to the GPIO number and flags
|
||||
* @gc: pointer to the gpio_chip structure
|
||||
|
Verwijs in nieuw issue
Block a user