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

Unverified Commit 1bf50de9 authored by derfelot's avatar derfelot Committed by GitHub
Browse files

Merge pull request #11 from derfelot/lineage-17.1_update 

[lineage-17.1] October ASB
parents 394bcdc8 4c644ec4

Documentation/DocBook/libata.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -324,7 +324,7 @@ Many legacy IDE drivers use ata_bmdma_status() as the bmdma_status() hook. 




	<sect2><title>High-level taskfile hooks</title>

	<sect2><title>High-level taskfile hooks</title>

	<programlisting>

	<programlisting>

void (*qc_prep) (struct ata_queued_cmd *qc);

enum ata_completion_errors (*qc_prep) (struct ata_queued_cmd *qc);

int (*qc_issue) (struct ata_queued_cmd *qc);

int (*qc_issue) (struct ata_queued_cmd *qc);

	</programlisting>

	</programlisting>

Documentation/devicetree/bindings/sound/wm8994.txt

+12 −6
Original line number Original line Diff line number Diff line
@@ -14,9 +14,15 @@ Required properties: 
  - #gpio-cells : Must be 2. The first cell is the pin number and the

  - #gpio-cells : Must be 2. The first cell is the pin number and the

    second cell is used to specify optional parameters (currently unused).

    second cell is used to specify optional parameters (currently unused).





  - AVDD2-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply, CPVDD-supply,

  - power supplies for the device, as covered in

    SPKVDD1-supply, SPKVDD2-supply : power supplies for the device, as covered

    Documentation/devicetree/bindings/regulator/regulator.txt, depending

    in Documentation/devicetree/bindings/regulator/regulator.txt

    on compatible:

    - for wlf,wm1811 and wlf,wm8958:

      AVDD1-supply, AVDD2-supply, DBVDD1-supply, DBVDD2-supply, DBVDD3-supply,

      DCVDD-supply, CPVDD-supply, SPKVDD1-supply, SPKVDD2-supply

    - for wlf,wm8994:

      AVDD1-supply, AVDD2-supply, DBVDD-supply, DCVDD-supply, CPVDD-supply,

      SPKVDD1-supply, SPKVDD2-supply





Optional properties:

Optional properties:
@@ -68,11 +74,11 @@ codec: wm8994@1a { 




	lineout1-se;

	lineout1-se;





	AVDD1-supply = <&regulator>;

	AVDD2-supply = <&regulator>;

	AVDD2-supply = <&regulator>;

	CPVDD-supply = <&regulator>;

	CPVDD-supply = <&regulator>;

	DBVDD1-supply = <&regulator>;

	DBVDD-supply = <&regulator>;

	DBVDD2-supply = <&regulator>;

	DCVDD-supply = <&regulator>;

	DBVDD3-supply = <&regulator>;

	SPKVDD1-supply = <&regulator>;

	SPKVDD1-supply = <&regulator>;

	SPKVDD2-supply = <&regulator>;

	SPKVDD2-supply = <&regulator>;

};
 
};

Makefile

+1 −1
Original line number Original line Diff line number Diff line 
VERSION = 4

VERSION = 4

PATCHLEVEL = 4

PATCHLEVEL = 4

SUBLEVEL = 237

SUBLEVEL = 238

EXTRAVERSION =

EXTRAVERSION =

NAME = Blurry Fish Butt

NAME = Blurry Fish Butt

arch/m68k/q40/config.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -303,6 +303,7 @@ static int q40_get_rtc_pll(struct rtc_pll_info *pll) 
{

{

	int tmp = Q40_RTC_CTRL;

	int tmp = Q40_RTC_CTRL;





	pll->pll_ctrl = 0;

	pll->pll_value = tmp & Q40_RTC_PLL_MASK;

	pll->pll_value = tmp & Q40_RTC_PLL_MASK;

	if (tmp & Q40_RTC_PLL_SIGN)

	if (tmp & Q40_RTC_PLL_SIGN)

		pll->pll_value = -pll->pll_value;

		pll->pll_value = -pll->pll_value;

arch/mips/include/asm/cpu-type.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,7 @@ static inline int __pure __get_cpu_type(const int cpu_type) 
	case CPU_34K:

	case CPU_34K:

	case CPU_1004K:

	case CPU_1004K:

	case CPU_74K:

	case CPU_74K:

	case CPU_1074K:

	case CPU_M14KC:

	case CPU_M14KC:

	case CPU_M14KEC:

	case CPU_M14KEC:

	case CPU_INTERAPTIV:

	case CPU_INTERAPTIV: