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

Commit 9ec83463 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'next/cleanup' into next/soc 

* next/cleanup:
  soc: versatile: remove unnecessary static in realview_soc_probe()
  ARM: Convert to using %pOF instead of full_name
  ARM: hisi: Fix typo in comment
  ARM: OMAP4+: PRM: fix of_irq_get() result checks
  ARM: OMAP3+: PRM: fix of_irq_get() result check
  ARM: dts: dra72-evm-revc: workaround incorrect DP83867 RX_CTRL pin strap
  ARM: dts: dra71-evm: workaround incorrect DP83867 RX_CTRL pin strap
  ARM: OMAP2+: omap_device: drop broken RPM status update from suspend_noirq
  bus: omap-ocp2scp: Fix error handling in omap_ocp2scp_probe
parents a93fae75 2ad93fa3

arch/arm/boot/dts/dra71-evm.dts

+2 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ 
		ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;

		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;

		ti,min-output-impedance;

		ti,dp83867-rxctrl-strap-quirk;

	};



	dp83867_1: ethernet-phy@3 {
@@ -199,6 +200,7 @@ 
		ti,tx-internal-delay = <DP83867_RGMIIDCTL_250_PS>;

		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_8_B_NIB>;

		ti,min-output-impedance;

		ti,dp83867-rxctrl-strap-quirk;

	};

};

arch/arm/boot/dts/dra72-evm-revc.dts

+2 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ 
		ti,min-output-impedance;

		interrupt-parent = <&gpio6>;

		interrupts = <16 IRQ_TYPE_EDGE_FALLING>;

		ti,dp83867-rxctrl-strap-quirk;

	};



	dp83867_1: ethernet-phy@3 {
@@ -80,5 +81,6 @@ 
		ti,min-output-impedance;

		interrupt-parent = <&gpio6>;

		interrupts = <16 IRQ_TYPE_EDGE_FALLING>;

		ti,dp83867-rxctrl-strap-quirk;

	};

};

arch/arm/kernel/cpuidle.c

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ static int __init arm_cpuidle_read_ops(struct device_node *dn, int cpu) 


	ops = arm_cpuidle_get_ops(enable_method);

	if (!ops) {

		pr_warn("%s: unsupported enable-method property: %s\n",

			dn->full_name, enable_method);

		pr_warn("%pOF: unsupported enable-method property: %s\n",

			dn, enable_method);

		return -EOPNOTSUPP;

	}

arch/arm/kernel/devtree.c

+2 −3
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ void __init arm_dt_init_cpu_maps(void) 
		if (of_node_cmp(cpu->type, "cpu"))

			continue;



		pr_debug(" * %s...\n", cpu->full_name);

		pr_debug(" * %pOF...\n", cpu);

		/*

		 * A device tree containing CPU nodes with missing "reg"

		 * properties is considered invalid to build the
@@ -103,8 +103,7 @@ void __init arm_dt_init_cpu_maps(void) 
		 */

		cell = of_get_property(cpu, "reg", &prop_bytes);

		if (!cell || prop_bytes < sizeof(*cell)) {

			pr_debug(" * %s missing reg property\n",

				     cpu->full_name);

			pr_debug(" * %pOF missing reg property\n", cpu);

			of_node_put(cpu);

			return;

		}

arch/arm/kernel/topology.c

+1 −2
Original line number Diff line number Diff line
@@ -127,8 +127,7 @@ static void __init parse_dt_topology(void) 


		rate = of_get_property(cn, "clock-frequency", &len);

		if (!rate || len != 4) {

			pr_err("%s missing clock-frequency property\n",

				cn->full_name);

			pr_err("%pOF missing clock-frequency property\n", cn);

			continue;

		}