Reverting below patches from android-4.19-stable.125 (d6bbbe01) · Commits · e / devices / android_kernel_fairphone_FP4

Documentation/devicetree/bindings/regulator/proxy-consumer.txt

deleted100644 → 0

+0 −32

Original line number	Diff line number	Diff line
		Regulator Proxy Consumer Bindings

		Regulator proxy consumers provide a means to use a default regulator state
		during bootup only which is removed at the end of boot. This feature can be
		used in situations where a shared regulator can be scaled between several
		possible voltages and hardware requires that it be at a high level at the
		beginning of boot before the consumer device responsible for requesting the
		high level has probed.

		Optional properties:
		proxy-supply: phandle of the regulator's own device node.
		This property is required if any of the three
		properties below are specified.
		qcom,proxy-consumer-enable: Boolean indicating that the regulator must be
		kept enabled during boot.
		qcom,proxy-consumer-voltage: List of two integers corresponding the minimum
		and maximum voltage allowed during boot in
		microvolts.
		qcom,proxy-consumer-current: Minimum current in microamps required during
		boot.

		Example:

		foo_vreg: regulator@0 {
		regulator-name = "foo";
		regulator-min-microvolt = <1000000>;
		regulator-max-microvolt = <2000000>;
		proxy-supply = <&foo_vreg>;
		qcom,proxy-consumer-voltage = <1500000 2000000>;
		qcom,proxy-consumer-current = <25000>;
		qcom,proxy-consumer-enable;
		};

+0 −3

Original line number	Diff line number	Diff line
		@@ -169,9 +169,6 @@ Optional property:
		Type: bool thresholds, so the governors may mitigate by ensuring
		timing closures and other low temperature operating
		issues.
		- wake-capable-sensor: Set to true if thermal zone sensor is wake up capable
		Type: bool and cooling devices binded to this thermal zone are not
		Size: none affected during suspend.

		Note: The delay properties are bound to the maximum dT/dt (temperature
		derivative over time) in two situations for a thermal zone:

+21 −0

Original line number	Diff line number	Diff line
		@@ -64,6 +64,7 @@ Currently, these files are in /proc/sys/vm:
		- swappiness
		- user_reserve_kbytes
		- vfs_cache_pressure
		- watermark_boost_factor
		- watermark_scale_factor
		- zone_reclaim_mode

		@@ -872,6 +873,26 @@ ten times more freeable objects than there are.

		=============================================================

		watermark_boost_factor:

		This factor controls the level of reclaim when memory is being fragmented.
		It defines the percentage of the high watermark of a zone that will be
		reclaimed if pages of different mobility are being mixed within pageblocks.
		The intent is that compaction has less work to do in the future and to
		increase the success rate of future high-order allocations such as SLUB
		allocations, THP and hugetlbfs pages.

		To make it sensible with respect to the watermark_scale_factor parameter,
		the unit is in fractions of 10,000. The default value of 15,000 means
		that up to 150% of the high watermark will be reclaimed in the event of
		a pageblock being mixed due to fragmentation. The level of reclaim is
		determined by the number of fragmentation events that occurred in the
		recent past. If this value is smaller than a pageblock then a pageblocks
		worth of pages will be reclaimed (e.g. 2MB on 64-bit x86). A boost factor
		of 0 will disable the feature.

		=============================================================

		watermark_scale_factor:

		This factor controls the aggressiveness of kswapd. It defines the

+12 −19

Original line number	Diff line number	Diff line
		@@ -288,6 +288,7 @@ static int rmnet_changelink(struct net_device dev, struct nlattr tb[],
		{
		struct rmnet_priv *priv = netdev_priv(dev);
		struct net_device *real_dev;
		struct rmnet_endpoint *ep;
		struct rmnet_port *port;
		u16 mux_id;

		@@ -302,28 +303,20 @@ static int rmnet_changelink(struct net_device dev, struct nlattr tb[],

		if (data[IFLA_RMNET_MUX_ID]) {
		mux_id = nla_get_u16(data[IFLA_RMNET_MUX_ID]);

		if (mux_id != priv->mux_id) {
		struct rmnet_endpoint *ep;

		ep = rmnet_get_endpoint(port, priv->mux_id);
		if (!ep)
		return -ENODEV;

		if (rmnet_get_endpoint(port, mux_id)) {
		NL_SET_ERR_MSG_MOD(extack,
		"MUX ID already exists");
		NL_SET_ERR_MSG_MOD(extack, "MUX ID already exists");
		return -EINVAL;
		}
		ep = rmnet_get_endpoint(port, priv->mux_id);
		if (!ep)
		return -ENODEV;

		hlist_del_init_rcu(&ep->hlnode);
		hlist_add_head_rcu(&ep->hlnode,
		&port->muxed_ep[mux_id]);
		hlist_add_head_rcu(&ep->hlnode, &port->muxed_ep[mux_id]);

		ep->mux_id = mux_id;
		priv->mux_id = mux_id;
		}
		}

		if (data[IFLA_RMNET_FLAGS]) {
		struct ifla_rmnet_flags *flags;

+0 −10

Original line number	Diff line number	Diff line
		@@ -469,7 +469,6 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(comp_clamp_level),
		POWER_SUPPLY_ATTR(adapter_cc_mode),
		POWER_SUPPLY_ATTR(skin_health),
		POWER_SUPPLY_ATTR(charge_disable),
		POWER_SUPPLY_ATTR(adapter_details),
		POWER_SUPPLY_ATTR(dead_battery),
		POWER_SUPPLY_ATTR(voltage_fifo),
		@@ -477,7 +476,6 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(operating_freq),
		POWER_SUPPLY_ATTR(aicl_delay),
		POWER_SUPPLY_ATTR(aicl_icl),
		POWER_SUPPLY_ATTR(rtx),
		POWER_SUPPLY_ATTR(cutoff_soc),
		POWER_SUPPLY_ATTR(sys_soc),
		POWER_SUPPLY_ATTR(batt_soc),
		@@ -506,8 +504,6 @@ static struct device_attribute power_supply_attrs[] = {
		POWER_SUPPLY_ATTR(irq_status),
		POWER_SUPPLY_ATTR(parallel_output_mode),
		POWER_SUPPLY_ATTR(alignment),
		POWER_SUPPLY_ATTR(moisture_detection_enabled),
		POWER_SUPPLY_ATTR(fg_type),
		/* Local extensions of type int64_t */
		POWER_SUPPLY_ATTR(charge_counter_ext),
		POWER_SUPPLY_ATTR(charge_charger_state),
		@@ -613,12 +609,6 @@ int power_supply_uevent(struct device dev, struct kobj_uevent_env env)

		attr = &power_supply_attrs[psy->desc->properties[j]];

		if (!attr->attr.name) {
		dev_info(dev, "%s:%d FAKE attr.name=NULL skip\n",
		__FILE__, __LINE__);
		continue;
		}

		ret = power_supply_show_property(dev, attr, prop_buf);
		if (ret == -ENODEV \|\| ret == -ENODATA) {
		/* When a battery is absent, we expect -ENODEV. Don't abort;