Unverified Commit 737db3d8 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!4663 Backport 5.10.191 - 5.10.192 LTS patches from upstream 

Merge Pull Request from: @sanglipeng 
 
issue: https://gitee.com/openeuler/kernel/issues/I933RF

Conflicts:
Already merged(25):
cb1eefc04634 x86/srso: Fix build breakage with the LLVM linker
eda9f8ffca46 x86/cpu/amd: Enable Zenbleed fix for AMD Custom APU 0405
3b55ce96efc5 sch_netem: fix issues in netem_change() vs get_dist_table()
98eaa12c967b x86: Move gds_ucode_mitigated() declaration to header
6d0bd7b7b3a7 bonding: Fix incorrect deletion of ETH_P_8021AD protocol vid from slaves
7e50815d2903 net: xfrm: Fix xfrm_address_filter OOB read
c080cee93030 af_unix: Fix null-ptr-deref in unix_stream_sendpage().
d5b3c88d153c x86/cpu: Fix __x86_return_thunk symbol type
043d3bfe0a72 x86/cpu: Fix up srso_safe_ret() and __x86_return_thunk()
bd3d12e6fda0 x86/alternative: Make custom return thunk unconditional
bbbe1b23c7e6 objtool: Add frame-pointer-specific function ignore
20e24c8b4c2a x86/ibt: Add ANNOTATE_NOENDBR
8b0ff83e8ad3 x86/cpu: Clean up SRSO return thunk mess
0676a392539b x86/cpu: Rename original retbleed methods
e0f50b0e4186 x86/cpu: Rename srso_(.*)_alias to srso_alias_\1
06597b650beb x86/cpu: Cleanup the untrain mess
62ebfeb0dcf7 x86/retpoline: Don't clobber RFLAGS during srso_safe_ret()
69712baf2495 x86/CPU/AMD: Fix the DIV(0) initial fix attempt
88e16ce7f8a6 x86/srso: Disable the mitigation on unaffected configurations 
23e59874657c objtool/x86: Fixup frame-pointer vs rethunk
0e8139f92304 x86/srso: Correct the mitigation status when SMT is disabled
b870b9a47fdb drm/amdgpu: Fix potential fence use-after-free v2
66a3b2a12138 ring-buffer: Do not swap cpu_buffer during resize process
869ce5e59845 tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
bd30aa9c7feb xfrm: add NULL check in xfrm_update_ae_params


Rejected(8):
a16c66baa4de x86/pkeys: Revert a5eff725 ("x86/pkeys: Add PKRU value to init_fpstate")
70660e6faac5 net: hns3: refactor hclge_mac_link_status_wait for interface reuse
e8d349408a49 net: hns3: add wait until mac link down
9ad83e3e6121 nvme-tcp: fix potential unbalanced freeze & unfreeze
cbaebbba722c quota: fix warning in dqgrab()
ecf0e627fbbb macsec: Fix traffic counters/statistics
e77ef787415b macsec: use DEV_STATS_INC()
614811692e21 xfrm: add forgotten nla_policy for XFRMA_MTIMER_THRESH

Total patches: 196 - 25 - 8 = 163 
 
Link:https://gitee.com/openeuler/kernel/pulls/4663

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents b024e407 1f552ce7

Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml

0 → 100644
+158 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/addac/adi,ad74413r.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Analog Devices AD74412R/AD74413R device



maintainers:

  - Cosmin Tanislav <cosmin.tanislav@analog.com>



description: |

  The AD74412R and AD74413R are quad-channel software configurable input/output

  solutions for building and process control applications. They contain

  functionality for analog output, analog input, digital input, resistance

  temperature detector, and thermocouple measurements integrated

  into a single chip solution with an SPI interface.

  The devices feature a 16-bit ADC and four configurable 13-bit DACs to provide

  four configurable input/output channels and a suite of diagnostic functions.

  The AD74413R differentiates itself from the AD74412R by being HART-compatible.

    https://www.analog.com/en/products/ad74412r.html

    https://www.analog.com/en/products/ad74413r.html



properties:

  compatible:

    enum:

      - adi,ad74412r

      - adi,ad74413r



  reg:

    maxItems: 1



  '#address-cells':

    const: 1



  '#size-cells':

    const: 0



  spi-max-frequency:

    maximum: 1000000



  spi-cpol: true



  interrupts:

    maxItems: 1



  refin-supply: true



  shunt-resistor-micro-ohms:

    description:

      Shunt (sense) resistor value in micro-Ohms.

    default: 100000000



required:

  - compatible

  - reg

  - spi-max-frequency

  - spi-cpol

  - refin-supply



additionalProperties: false



patternProperties:

  "^channel@[0-3]$":

    type: object

    description: Represents the external channels which are connected to the device.



    properties:

      reg:

        description: |

          The channel number. It can have up to 4 channels numbered from 0 to 3.

        minimum: 0

        maximum: 3



      adi,ch-func:

        $ref: /schemas/types.yaml#/definitions/uint32

        description: |

          Channel function.

          HART functions are not supported on AD74412R.

          0 - CH_FUNC_HIGH_IMPEDANCE

          1 - CH_FUNC_VOLTAGE_OUTPUT

          2 - CH_FUNC_CURRENT_OUTPUT

          3 - CH_FUNC_VOLTAGE_INPUT

          4 - CH_FUNC_CURRENT_INPUT_EXT_POWER

          5 - CH_FUNC_CURRENT_INPUT_LOOP_POWER

          6 - CH_FUNC_RESISTANCE_INPUT

          7 - CH_FUNC_DIGITAL_INPUT_LOGIC

          8 - CH_FUNC_DIGITAL_INPUT_LOOP_POWER

          9 - CH_FUNC_CURRENT_INPUT_EXT_POWER_HART

          10 - CH_FUNC_CURRENT_INPUT_LOOP_POWER_HART

        minimum: 0

        maximum: 10

        default: 0



      adi,gpo-comparator:

        type: boolean

        description: |

          Whether to configure GPO as a comparator or not.

          When not configured as a comparator, the GPO will be treated as an

          output-only GPIO.



    required:

      - reg



examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    #include <dt-bindings/interrupt-controller/irq.h>

    #include <dt-bindings/iio/addac/adi,ad74413r.h>



    spi {

      #address-cells = <1>;

      #size-cells = <0>;



      cs-gpios = <&gpio 17 GPIO_ACTIVE_LOW>;

      status = "okay";



      ad74413r@0 {

        compatible = "adi,ad74413r";

        reg = <0>;

        spi-max-frequency = <1000000>;

        spi-cpol;



        #address-cells = <1>;

        #size-cells = <0>;



        interrupt-parent = <&gpio>;

        interrupts = <26 IRQ_TYPE_EDGE_FALLING>;



        refin-supply = <&ad74413r_refin>;



        channel@0 {

          reg = <0>;



          adi,ch-func = <CH_FUNC_VOLTAGE_OUTPUT>;

        };



        channel@1 {

          reg = <1>;



          adi,ch-func = <CH_FUNC_CURRENT_OUTPUT>;

        };



        channel@2 {

          reg = <2>;



          adi,ch-func = <CH_FUNC_DIGITAL_INPUT_LOGIC>;

          adi,gpo-comparator;

        };



        channel@3 {

          reg = <3>;



          adi,ch-func = <CH_FUNC_CURRENT_INPUT_EXT_POWER>;

        };

      };

    };

...

arch/alpha/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -394,8 +394,7 @@ setup_memory(void *kernel_end) 
extern void setup_memory(void *);

#endif /* !CONFIG_DISCONTIGMEM */



int __init

page_is_ram(unsigned long pfn)

int page_is_ram(unsigned long pfn)

{

	struct memclust_struct * cluster;

	struct memdesc_struct * memdesc;

arch/arm/boot/dts/imx6dl-prtrvt.dts

+4 −0
Original line number Diff line number Diff line
@@ -126,6 +126,10 @@ 
	status = "disabled";

};



&usbotg {

	disable-over-current;

};



&vpu {

	status = "disabled";

};

arch/arm/boot/dts/imx6qdl-prti6q.dtsi

+10 −1
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ 
	vbus-supply = <&reg_usb_h1_vbus>;

	phy_type = "utmi";

	dr_mode = "host";

	disable-over-current;

	status = "okay";

};
@@ -78,10 +79,18 @@ 
	pinctrl-0 = <&pinctrl_usbotg>;

	phy_type = "utmi";

	dr_mode = "host";

	disable-over-current;

	over-current-active-low;

	status = "okay";

};



&usbphynop1 {

	status = "disabled";

};



&usbphynop2 {

	status = "disabled";

};



&usdhc1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usdhc1>;

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi

+121 −76
Original line number Diff line number Diff line
@@ -31,32 +31,56 @@ 
		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;

	};



	vcc12v_dcin: dc-12v {

	sound {

		compatible = "audio-graph-card";

		label = "Analog";

		dais = <&i2s0_p0>;

	};



	sound-dit {

		compatible = "audio-graph-card";

		label = "SPDIF";

		dais = <&spdif_p0>;

	};



	spdif-dit {

		compatible = "linux,spdif-dit";

		#sound-dai-cells = <0>;



		port {

			dit_p0_0: endpoint {

				remote-endpoint = <&spdif_p0_0>;

			};

		};

	};



	vbus_typec: vbus-typec-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc12v_dcin";

		enable-active-high;

		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc5v0_typec_en>;

		regulator-name = "vbus_typec";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

		vin-supply = <&vcc5v0_sys>;

	};



	vcc5v0_sys: vcc-sys {

	vcc12v_dcin: dc-12v {

		compatible = "regulator-fixed";

		regulator-name = "vcc5v0_sys";

		regulator-name = "vcc12v_dcin";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&vcc12v_dcin>;

		regulator-min-microvolt = <12000000>;

		regulator-max-microvolt = <12000000>;

	};



	vcc_0v9: vcc-0v9 {

	vcc3v3_lan: vcc3v3-lan-regulator {

		compatible = "regulator-fixed";

		regulator-name = "vcc_0v9";

		regulator-name = "vcc3v3_lan";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <900000>;

		regulator-max-microvolt = <900000>;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vcc3v3_sys>;

	};
@@ -93,28 +117,24 @@ 
		vin-supply = <&vcc5v0_sys>;

	};



	vcc5v0_typec: vcc5v0-typec-regulator {

	vcc5v0_sys: vcc-sys {

		compatible = "regulator-fixed";

		enable-active-high;

		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&vcc5v0_typec_en>;

		regulator-name = "vcc5v0_typec";

		regulator-name = "vcc5v0_sys";

		regulator-always-on;

		vin-supply = <&vcc5v0_sys>;

		regulator-boot-on;

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		vin-supply = <&vcc12v_dcin>;

	};



	vcc_lan: vcc3v3-phy-regulator {

	vcc_0v9: vcc-0v9 {

		compatible = "regulator-fixed";

		regulator-name = "vcc_lan";

		regulator-name = "vcc_0v9";

		regulator-always-on;

		regulator-boot-on;

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;



		regulator-state-mem {

			regulator-off-in-suspend;

		};

		regulator-min-microvolt = <900000>;

		regulator-max-microvolt = <900000>;

		vin-supply = <&vcc3v3_sys>;

	};



	vdd_log: vdd-log {
@@ -161,7 +181,7 @@ 
	assigned-clocks = <&cru SCLK_RMII_SRC>;

	assigned-clock-parents = <&clkin_gmac>;

	clock_in_out = "input";

	phy-supply = <&vcc_lan>;

	phy-supply = <&vcc3v3_lan>;

	phy-mode = "rgmii";

	pinctrl-names = "default";

	pinctrl-0 = <&rgmii_pins>;
@@ -266,8 +286,8 @@ 
				};

			};



			vcc1v8_codec: LDO_REG1 {

				regulator-name = "vcc1v8_codec";

			vcca1v8_codec: LDO_REG1 {

				regulator-name = "vcca1v8_codec";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;
@@ -277,8 +297,8 @@ 
				};

			};



			vcc1v8_hdmi: LDO_REG2 {

				regulator-name = "vcc1v8_hdmi";

			vcca1v8_hdmi: LDO_REG2 {

				regulator-name = "vcca1v8_hdmi";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <1800000>;
@@ -335,8 +355,8 @@ 
				};

			};



			vcc0v9_hdmi: LDO_REG7 {

				regulator-name = "vcc0v9_hdmi";

			vcca0v9_hdmi: LDO_REG7 {

				regulator-name = "vcca0v9_hdmi";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <900000>;
@@ -362,8 +382,6 @@ 
				regulator-name = "vcc_cam";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-state-mem {

					regulator-off-in-suspend;

				};
@@ -373,8 +391,6 @@ 
				regulator-name = "vcc_mipi";

				regulator-always-on;

				regulator-boot-on;

				regulator-min-microvolt = <3300000>;

				regulator-max-microvolt = <3300000>;

				regulator-state-mem {

					regulator-off-in-suspend;

				};
@@ -425,6 +441,20 @@ 
	i2c-scl-rising-time-ns = <300>;

	i2c-scl-falling-time-ns = <15>;

	status = "okay";



	es8316: codec@11 {

		compatible = "everest,es8316";

		reg = <0x11>;

		clocks = <&cru SCLK_I2S_8CH_OUT>;

		clock-names = "mclk";

		#sound-dai-cells = <0>;



		port {

			es8316_p0_0: endpoint {

				remote-endpoint = <&i2s0_p0_0>;

			};

		};

	};

};



&i2c3 {
@@ -443,6 +473,14 @@ 
	rockchip,playback-channels = <8>;

	rockchip,capture-channels = <8>;

	status = "okay";



	i2s0_p0: port {

		i2s0_p0_0: endpoint {

			dai-format = "i2s";

			mclk-fs = <256>;

			remote-endpoint = <&es8316_p0_0>;

		};

	};

};



&i2s1 {
@@ -455,21 +493,10 @@ 
};



&io_domains {

	status = "okay";



	audio-supply = <&vcca1v8_codec>;

	bt656-supply = <&vcc_3v0>;

	audio-supply = <&vcc1v8_codec>;

	sdmmc-supply = <&vcc_sdio>;

	gpio1830-supply = <&vcc_3v0>;

};



&pmu_io_domains {

	status = "okay";



	pmu1830-supply = <&vcc_3v0>;

};



&pcie_phy {

	sdmmc-supply = <&vcc_sdio>;

	status = "okay";

};
@@ -485,6 +512,10 @@ 
	status = "okay";

};



&pcie_phy {

	status = "okay";

};



&pinctrl {

	bt {

		bt_enable_h: bt-enable-h {
@@ -506,6 +537,20 @@ 
		};

	};



	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		vsel1_pin: vsel1-pin {

			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		vsel2_pin: vsel2-pin {

			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;

		};

	};



	sdio0 {

		sdio0_bus4: sdio0-bus4 {

			rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
@@ -523,20 +568,6 @@ 
		};

	};



	pmic {

		pmic_int_l: pmic-int-l {

			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;

		};



		vsel1_pin: vsel1-pin {

			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;

		};



		vsel2_pin: vsel2-pin {

			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;

		};

	};



	usb-typec {

		vcc5v0_typec_en: vcc5v0-typec-en {

			rockchip,pins = <1 RK_PA3 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -560,6 +591,11 @@ 
	};

};



&pmu_io_domains {

	pmu1830-supply = <&vcc_3v0>;

	status = "okay";

};



&pwm2 {

	status = "okay";

};
@@ -570,6 +606,14 @@ 
	vref-supply = <&vcc_1v8>;

};



&sdhci {

	max-frequency = <150000000>;

	bus-width = <8>;

	mmc-hs200-1_8v;

	non-removable;

	status = "okay";

};



&sdio0 {

	#address-cells = <1>;

	#size-cells = <0>;
@@ -597,12 +641,13 @@ 
	status = "okay";

};



&sdhci {

	bus-width = <8>;

	mmc-hs400-1_8v;

	mmc-hs400-enhanced-strobe;

	non-removable;

	status = "okay";

&spdif {



	spdif_p0: port {

		spdif_p0_0: endpoint {

			remote-endpoint = <&dit_p0_0>;

		};

	};

};



&tcphy0 {
@@ -677,13 +722,13 @@ 
	status = "okay";

};



&usbdrd_dwc3_0 {

&usbdrd3_1 {

	status = "okay";

	dr_mode = "otg";

};



&usbdrd3_1 {

&usbdrd_dwc3_0 {

	status = "okay";

	dr_mode = "host";

};



&usbdrd_dwc3_1 {