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

Commit bf2bcc1d authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge remote-tracking branch 'origin/tmp-11da3a7f' into msm-kona"

parents 0fb58da7 bfee6d7f

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -3530,6 +3530,12 @@ 
	ramdisk_size=	[RAM] Sizes of RAM disks in kilobytes

			See Documentation/blockdev/ramdisk.txt.



	random.trust_cpu={on,off}

			[KNL] Enable or disable trusting the use of the

			CPU's random number generator (if available) to

			fully seed the kernel's CRNG. Default is controlled

			by CONFIG_RANDOM_TRUST_CPU.



	ras=option[,option,...]	[KNL] RAS-specific options



		cec_disable	[X86]

Documentation/devicetree/bindings/i2c/i2c-imx-lpi2c.txt

+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
Required properties:

- compatible :

  - "fsl,imx7ulp-lpi2c" for LPI2C compatible with the one integrated on i.MX7ULP soc

  - "fsl,imx8dv-lpi2c" for LPI2C compatible with the one integrated on i.MX8DV soc

- reg : address and length of the lpi2c master registers

- interrupts : lpi2c interrupt

- clocks : lpi2c clock specifier
@@ -11,7 +10,7 @@ Required properties: 
Examples:



lpi2c7: lpi2c7@40a50000 {

	compatible = "fsl,imx8dv-lpi2c";

	compatible = "fsl,imx7ulp-lpi2c";

	reg = <0x40A50000 0x10000>;

	interrupt-parent = <&intc>;

	interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;

Documentation/devicetree/bindings/net/cpsw.txt

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ Required properties: 
- slaves		: Specifies number for slaves

- active_slave		: Specifies the slave to use for time stamping,

			  ethtool and SIOCGMIIPHY

- cpsw-phy-sel		: Specifies the phandle to the CPSW phy mode selection

			  device. See also cpsw-phy-sel.txt for it's binding.

			  Note that in legacy cases cpsw-phy-sel may be

			  a child device instead of a phandle.



Optional properties:

- ti,hwmods		: Must be "cpgmac0"
@@ -75,6 +79,7 @@ Examples: 
		cpts_clock_mult = <0x80000000>;

		cpts_clock_shift = <29>;

		syscon = <&cm>;

		cpsw-phy-sel = <&phy_sel>;

		cpsw_emac0: slave@0 {

			phy_id = <&davinci_mdio>, <0>;

			phy-mode = "rgmii-txid";
@@ -103,6 +108,7 @@ Examples: 
		cpts_clock_mult = <0x80000000>;

		cpts_clock_shift = <29>;

		syscon = <&cm>;

		cpsw-phy-sel = <&phy_sel>;

		cpsw_emac0: slave@0 {

			phy_id = <&davinci_mdio>, <0>;

			phy-mode = "rgmii-txid";

Documentation/devicetree/bindings/net/sh_eth.txt

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ Required properties: 
	      "renesas,ether-r8a7794"  if the device is a part of R8A7794 SoC.

	      "renesas,gether-r8a77980" if the device is a part of R8A77980 SoC.

	      "renesas,ether-r7s72100" if the device is a part of R7S72100 SoC.

	      "renesas,ether-r7s9210" if the device is a part of R7S9210 SoC.

	      "renesas,rcar-gen1-ether" for a generic R-Car Gen1 device.

	      "renesas,rcar-gen2-ether" for a generic R-Car Gen2 or RZ/G1

	                                device.

Documentation/process/changes.rst

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ pkg-config 


The build system, as of 4.18, requires pkg-config to check for installed

kconfig tools and to determine flags settings for use in

'make {menu,n,g,x}config'.  Previously pkg-config was being used but not

'make {g,x}config'.  Previously pkg-config was being used but not

verified or documented.



Flex