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

Commit 5510b3c2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 



Conflicts:
	arch/s390/net/bpf_jit_comp.c
	drivers/net/ethernet/ti/netcp_ethss.c
	net/bridge/br_multicast.c
	net/ipv4/ip_fragment.c

All four conflicts were cases of simple overlapping
changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 17f901e8 7c764cec

Documentation/devicetree/bindings/iommu/arm,smmu-v3.txt

+3 −0
Original line number Diff line number Diff line
@@ -35,3 +35,6 @@ the PCIe specification. 


                      NOTE: this only applies to the SMMU itself, not

                      masters connected upstream of the SMMU.



- hisilicon,broken-prefetch-cmd

                    : Avoid sending CMD_PREFETCH_* commands to the SMMU.

Documentation/devicetree/bindings/mmc/fsl-imx-esdhc.txt

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ Required properties: 
	       "fsl,imx6sx-usdhc"



Optional properties:

- fsl,cd-controller : Indicate to use controller internal card detection

- fsl,wp-controller : Indicate to use controller internal write protection

- fsl,delay-line : Specify the number of delay cells for override mode.

  This is used to set the clock delay for DLL(Delay Line) on override mode
@@ -35,7 +34,6 @@ esdhc@70004000 { 
	compatible = "fsl,imx51-esdhc";

	reg = <0x70004000 0x4000>;

	interrupts = <1>;

	fsl,cd-controller;

	fsl,wp-controller;

};

Documentation/devicetree/bindings/sound/mt8173-max98090.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ MT8173 with MAX98090 CODEC 
Required properties:

- compatible : "mediatek,mt8173-max98090"

- mediatek,audio-codec: the phandle of the MAX98090 audio codec

- mediatek,platform: the phandle of MT8173 ASoC platform



Example:



	sound {

		compatible = "mediatek,mt8173-max98090";

		mediatek,audio-codec = <&max98090>;

		mediatek,platform = <&afe>;

	};

Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5676.txt

+2 −0
Original line number Diff line number Diff line
@@ -3,11 +3,13 @@ MT8173 with RT5650 RT5676 CODECS 
Required properties:

- compatible : "mediatek,mt8173-rt5650-rt5676"

- mediatek,audio-codec: the phandles of rt5650 and rt5676 codecs

- mediatek,platform: the phandle of MT8173 ASoC platform



Example:



	sound {

		compatible = "mediatek,mt8173-rt5650-rt5676";

		mediatek,audio-codec = <&rt5650 &rt5676>;

		mediatek,platform = <&afe>;

	};

Documentation/devicetree/bindings/spi/spi-ath79.txt

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ Binding for Qualcomm Atheros AR7xxx/AR9xxx SPI controller 
Required properties:

- compatible: has to be "qca,<soc-type>-spi", "qca,ar7100-spi" as fallback.

- reg: Base address and size of the controllers memory area

- clocks: phandle to the AHB clock.

- clocks: phandle of the AHB clock.

- clock-names: has to be "ahb".

- #address-cells: <1>, as required by generic SPI binding.

- #size-cells: <0>, also as required by generic SPI binding.
@@ -12,9 +12,9 @@ Child nodes as per the generic SPI binding. 


Example:



	spi@1F000000 {

	spi@1f000000 {

		compatible = "qca,ar9132-spi", "qca,ar7100-spi";

		reg = <0x1F000000 0x10>;

		reg = <0x1f000000 0x10>;



		clocks = <&pll 2>;

		clock-names = "ahb";