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

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

Pull more devicetree updates from Rob Herring:
 "Most of this is a treewide change to of_property_for_each_u32() which
  was small enough to do in one go before rc1 and avoids the need to
  create of_property_for_each_u32_some_new_name().

   - Treewide conversion of of_property_for_each_u32() to drop internal
     arguments making struct property opaque

   - Add binding for Amlogic A4 SoC watchdog

   - Fix constraints for AD7192 'single-channel' property"

* tag 'devicetree-fixes-for-6.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: iio: adc: ad7192: Fix 'single-channel' constraints
  of: remove internal arguments from of_property_for_each_u32()
  dt-bindings: watchdog: add support for Amlogic A4 SoCs
parents b465ed28 6dc55268

Documentation/devicetree/bindings/iio/adc/adi,ad7192.yaml

+2 −3
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ patternProperties: 
        description:

          Positive input can be connected to pins AIN1 to AIN16 by choosing the

          appropriate value from 1 to 16. Negative input is connected to AINCOM.

        items:

        minimum: 1

        maximum: 16

Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ properties: 
          - amlogic,t7-wdt

      - items:

          - enum:

              - amlogic,a4-wdt

              - amlogic,c3-wdt

              - amlogic,s4-wdt

          - const: amlogic,t7-wdt

arch/powerpc/sysdev/xive/native.c

+1 −3
Original line number Diff line number Diff line
@@ -559,9 +559,7 @@ bool __init xive_native_init(void) 
	struct device_node *np;

	struct resource r;

	void __iomem *tima;

	struct property *prop;

	u8 max_prio = 7;

	const __be32 *p;

	u32 val, cpu;

	s64 rc;
@@ -592,7 +590,7 @@ bool __init xive_native_init(void) 
		max_prio = val - 1;



	/* Iterate the EQ sizes and pick one */

	of_property_for_each_u32(np, "ibm,xive-eq-sizes", prop, p, val) {

	of_property_for_each_u32(np, "ibm,xive-eq-sizes", val) {

		xive_queue_shift = val;

		if (val == PAGE_SHIFT)

			break;

arch/powerpc/sysdev/xive/spapr.c

+1 −2
Original line number Diff line number Diff line
@@ -814,7 +814,6 @@ bool __init xive_spapr_init(void) 
	struct device_node *np;

	struct resource r;

	void __iomem *tima;

	struct property *prop;

	u8 max_prio;

	u32 val;

	u32 len;
@@ -866,7 +865,7 @@ bool __init xive_spapr_init(void) 
	}



	/* Iterate the EQ sizes and pick one */

	of_property_for_each_u32(np, "ibm,xive-eq-sizes", prop, reg, val) {

	of_property_for_each_u32(np, "ibm,xive-eq-sizes", val) {

		xive_queue_shift = val;

		if (val == PAGE_SHIFT)

			break;

drivers/bus/ti-sysc.c

+1 −3
Original line number Diff line number Diff line
@@ -2291,11 +2291,9 @@ static int sysc_init_idlemode(struct sysc *ddata, u8 *idlemodes, 
			      const char *name)

{

	struct device_node *np = ddata->dev->of_node;

	struct property *prop;

	const __be32 *p;

	u32 val;



	of_property_for_each_u32(np, name, prop, p, val) {

	of_property_for_each_u32(np, name, val) {

		if (val >= SYSC_NR_IDLEMODES) {

			dev_err(ddata->dev, "invalid idlemode: %i\n", val);

			return -EINVAL;