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

Commit 34aa83c2 authored by David S. Miller's avatar David S. Miller
Browse files

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



Overlapping changes in drivers/net/phy/marvell.c, bug fix in 'net'
restricting a HW workaround alongside cleanups in 'net-next'.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 47936d35 e2a9aa5a

Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,11 @@ Required properties: 
- reg:                  Base address of PMIC on Hi6220 SoC.

- interrupt-controller: Hi655x has internal IRQs (has own IRQ domain).

- pmic-gpios:           The GPIO used by PMIC IRQ.

- #clock-cells:		From common clock binding; shall be set to 0



Optional properties:

- clock-output-names: From common clock binding to override the

  default output clock name



Example:

	pmic: pmic@f8000000 {
@@ -24,4 +29,5 @@ Example: 
		interrupt-controller;

		#interrupt-cells = <2>;

		pmic-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;

		#clock-cells = <0>;

	}

Documentation/devicetree/bindings/mmc/mmc-pwrseq-simple.txt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ Optional properties: 
  "ext_clock" (External clock provided to the card).

- post-power-on-delay-ms : Delay in ms after powering the card and

	de-asserting the reset-gpios (if any)

- power-off-delay-us : Delay in us after asserting the reset-gpios (if any)

	during power off of the card.



Example:

Documentation/devicetree/bindings/net/fsl-fec.txt

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ Optional properties: 
- phy-reset-active-high : If present then the reset sequence using the GPIO

  specified in the "phy-reset-gpios" property is reversed (H=reset state,

  L=operation state).

- phy-reset-post-delay : Post reset delay in milliseconds. If present then

  a delay of phy-reset-post-delay milliseconds will be observed after the

  phy-reset-gpios has been toggled. Can be omitted thus no delay is

  observed. Delay is in range of 1ms to 1000ms. Other delays are invalid.

- phy-supply : regulator that powers the Ethernet PHY.

- phy-handle : phandle to the PHY device connected to this device.

- fixed-link : Assume a fixed link. See fixed-link.txt in the same directory.

Documentation/sound/hd-audio/models.rst

+65 −49
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ ALC880 
    6-jack in back, 2-jack in front

6stack-digout

    6-jack with a SPDIF out

6stack-automute

    6-jack with headphone jack detection



ALC260

======
@@ -62,6 +64,8 @@ lenovo-dock 
    Enables docking station I/O for some Lenovos

hp-gpio-led

    GPIO LED support on HP laptops

hp-dock-gpio-mic1-led

    HP dock with mic LED support

dell-headset-multi

    Headset jack, which can also be used as mic-in

dell-headset-dock
@@ -72,6 +76,12 @@ alc283-sense-combo 
    Combo jack sensing on ALC283

tpt440-dock

    Pin configs for Lenovo Thinkpad Dock support

tpt440

    Lenovo Thinkpad T440s setup

tpt460

    Lenovo Thinkpad T460/560 setup

dual-codecs

    Lenovo laptops with dual codecs



ALC66x/67x/892

==============
@@ -97,6 +107,8 @@ inv-dmic 
    Inverted internal mic workaround

dell-headset-multi

    Headset jack, which can also be used as mic-in

dual-codecs

    Lenovo laptops with dual codecs



ALC680

======
@@ -114,6 +126,8 @@ inv-dmic 
    Inverted internal mic workaround

no-primary-hp

    VAIO Z/VGC-LN51JGB workaround (for fixed speaker DAC)

dual-codecs

    ALC1220 dual codecs for Gaming mobos



ALC861/660

==========
@@ -206,65 +220,47 @@ auto 


Conexant 5045

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

laptop-hpsense

    Laptop with HP sense (old model laptop)

laptop-micsense

    Laptop with Mic sense (old model fujitsu)

laptop-hpmicsense

    Laptop with HP and Mic senses

benq

    Benq R55E

laptop-hp530

    HP 530 laptop

test

    for testing/debugging purpose, almost all controls can be

    adjusted.  Appearing only when compiled with $CONFIG_SND_DEBUG=y

cap-mix-amp

    Fix max input level on mixer widget

toshiba-p105

    Toshiba P105 quirk

hp-530

    HP 530 quirk



Conexant 5047

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

laptop

    Basic Laptop config 

laptop-hp

    Laptop config for some HP models (subdevice 30A5)

laptop-eapd

    Laptop config with EAPD support

test

    for testing/debugging purpose, almost all controls can be

    adjusted.  Appearing only when compiled with $CONFIG_SND_DEBUG=y

cap-mix-amp

    Fix max input level on mixer widget



Conexant 5051

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

laptop

    Basic Laptop config (default)

hp

    HP Spartan laptop

hp-dv6736

    HP dv6736

hp-f700

    HP Compaq Presario F700

ideapad

    Lenovo IdeaPad laptop

toshiba

    Toshiba Satellite M300

lenovo-x200

    Lenovo X200 quirk



Conexant 5066

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

laptop

    Basic Laptop config (default)

hp-laptop

    HP laptops, e g G60

asus

    Asus K52JU, Lenovo G560

dell-laptop

    Dell laptops

dell-vostro

    Dell Vostro

olpc-xo-1_5

    OLPC XO 1.5

ideapad

    Lenovo IdeaPad U150

stereo-dmic

    Workaround for inverted stereo digital mic

gpio1

    Enable GPIO1 pin

headphone-mic-pin

    Enable headphone mic NID 0x18 without detection

tp410

    Thinkpad T400 & co quirks

thinkpad

    Lenovo Thinkpad

    Thinkpad mute/mic LED quirk

lemote-a1004

    Lemote A1004 quirk

lemote-a1205

    Lemote A1205 quirk

olpc-xo

    OLPC XO quirk

mute-led-eapd

    Mute LED control via EAPD

hp-dock

    HP dock support

mute-led-gpio

    Mute LED control via GPIO



STAC9200

========
@@ -444,6 +440,8 @@ dell-eq 
    Dell desktops/laptops

alienware

    Alienware M17x

asus-mobo

    Pin configs for ASUS mobo with 5.1/SPDIF out

auto

    BIOS setup (default)
@@ -477,6 +475,8 @@ hp-envy-ts-bass 
    Pin fixup for HP Envy TS bass speaker (NID 0x10)

hp-bnb13-eq

    Hardware equalizer setup for HP laptops

hp-envy-ts-bass

    HP Envy TS bass support

auto

    BIOS setup (default)
@@ -496,10 +496,22 @@ auto 


Cirrus Logic CS4206/4207

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

mbp53

    MacBook Pro 5,3

mbp55

    MacBook Pro 5,5

imac27

    IMac 27 Inch

imac27_122

    iMac 12,2

apple

    Generic Apple quirk

mbp101

    MacBookPro 10,1

mbp81

    MacBookPro 8,1

mba42

    MacBookAir 4,2

auto

    BIOS setup (default)
@@ -509,6 +521,10 @@ mba6 
    MacBook Air 6,1 and 6,2

gpio0

    Enable GPIO 0 amp

mbp11

    MacBookPro 11,2

macmini

    MacMini 7,1

auto

    BIOS setup (default)

arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts

+63 −15
Original line number Diff line number Diff line
@@ -81,6 +81,45 @@ 
		};

	};



	reg_sys_5v: regulator@0 {

		compatible = "regulator-fixed";

		regulator-name = "SYS_5V";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-boot-on;

		regulator-always-on;

	};



	reg_vdd_3v3: regulator@1 {

		compatible = "regulator-fixed";

		regulator-name = "VDD_3V3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-boot-on;

		regulator-always-on;

		vin-supply = <&reg_sys_5v>;

	};



	reg_5v_hub: regulator@2 {

		compatible = "regulator-fixed";

		regulator-name = "5V_HUB";

		regulator-min-microvolt = <5000000>;

		regulator-max-microvolt = <5000000>;

		regulator-boot-on;

		gpio = <&gpio0 7 0>;

		regulator-always-on;

		vin-supply = <&reg_sys_5v>;

	};



	wl1835_pwrseq: wl1835-pwrseq {

		compatible = "mmc-pwrseq-simple";

		/* WLAN_EN GPIO */

		reset-gpios = <&gpio0 5 GPIO_ACTIVE_LOW>;

		clocks = <&pmic>;

		clock-names = "ext_clock";

		power-off-delay-us = <10>;

	};



	soc {

		spi0: spi@f7106000 {

			status = "ok";
@@ -256,11 +295,31 @@ 


		/* GPIO blocks 16 thru 19 do not appear to be routed to pins */



		dwmmc_0: dwmmc0@f723d000 {

			cap-mmc-highspeed;

			non-removable;

			bus-width = <0x8>;

			vmmc-supply = <&ldo19>;

		};



		dwmmc_1: dwmmc1@f723e000 {

			card-detect-delay = <200>;

			cap-sd-highspeed;

			sd-uhs-sdr12;

			sd-uhs-sdr25;

			sd-uhs-sdr50;

			vqmmc-supply = <&ldo7>;

			vmmc-supply = <&ldo10>;

			bus-width = <0x4>;

			disable-wp;

			cd-gpios = <&gpio1 0 1>;

		};



		dwmmc_2: dwmmc2@f723f000 {

			ti,non-removable;

			bus-width = <0x4>;

			non-removable;

			/* WL_EN */

			vmmc-supply = <&wlan_en_reg>;

			vmmc-supply = <&reg_vdd_3v3>;

			mmc-pwrseq = <&wl1835_pwrseq>;



			#address-cells = <0x1>;

			#size-cells = <0x0>;
@@ -272,18 +331,6 @@ 
				interrupts = <3 IRQ_TYPE_EDGE_RISING>;

			};

		};



		wlan_en_reg: regulator@1 {

			compatible = "regulator-fixed";

			regulator-name = "wlan-en-regulator";

			regulator-min-microvolt = <1800000>;

			regulator-max-microvolt = <1800000>;

			/* WLAN_EN GPIO */

			gpio = <&gpio0 5 0>;

			/* WLAN card specific delay */

			startup-delay-us = <70000>;

			enable-active-high;

		};

	};



	leds {
@@ -330,6 +377,7 @@ 
	pmic: pmic@f8000000 {

		compatible = "hisilicon,hi655x-pmic";

		reg = <0x0 0xf8000000 0x0 0x1000>;

		#clock-cells = <0>;

		interrupt-controller;

		#interrupt-cells = <2>;

		pmic-gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;