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

Commit 7d305aa1 authored by Alexander Grund's avatar Alexander Grund
Browse files

Merge remote-tracking branch 'github/lineage-17.1' into lineage-18.1 

Change-Id: Ib7c727b12738429ed0cac22229db8a1c6c9b8a2c
parents 82913fc0 f9f0c0b3

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 299

SUBLEVEL = 302

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/qcom/msm8916.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
	#size-cells = <2>;



	aliases {

		sdhc1 = &sdhc_1; /* SDC1 eMMC slot */

		sdhc2 = &sdhc_2; /* SDC2 SD card slot */

		mmc0 = &sdhc_1; /* SDC1 eMMC slot */

		mmc1 = &sdhc_2; /* SDC2 SD card slot */

	};



	chosen { };

arch/mips/bcm63xx/clk.c

+6 −0
Original line number Diff line number Diff line
@@ -339,6 +339,12 @@ struct clk *clk_get_parent(struct clk *clk) 
}

EXPORT_SYMBOL(clk_get_parent);



int clk_set_parent(struct clk *clk, struct clk *parent)

{

	return 0;

}

EXPORT_SYMBOL(clk_set_parent);



unsigned long clk_get_rate(struct clk *clk)

{

	return clk->rate;

arch/mips/include/asm/octeon/cvmx-bootinfo.h

+2 −2
Original line number Diff line number Diff line
@@ -303,7 +303,7 @@ enum cvmx_chip_types_enum { 


/* Functions to return string based on type */

#define ENUM_BRD_TYPE_CASE(x) \

	case x: return(#x + 16);	/* Skip CVMX_BOARD_TYPE_ */

	case x: return (&#x[16]);	/* Skip CVMX_BOARD_TYPE_ */

static inline const char *cvmx_board_type_to_string(enum

						    cvmx_board_types_enum type)

{
@@ -392,7 +392,7 @@ static inline const char *cvmx_board_type_to_string(enum 
}



#define ENUM_CHIP_TYPE_CASE(x) \

	case x: return(#x + 15);	/* Skip CVMX_CHIP_TYPE */

	case x: return (&#x[15]);	/* Skip CVMX_CHIP_TYPE */

static inline const char *cvmx_chip_type_to_string(enum

						   cvmx_chip_types_enum type)

{

arch/mips/lantiq/clk.c

+6 −0
Original line number Diff line number Diff line
@@ -165,6 +165,12 @@ struct clk *of_clk_get_from_provider(struct of_phandle_args *clkspec) 
	return NULL;

}



int clk_set_parent(struct clk *clk, struct clk *parent)

{

	return 0;

}

EXPORT_SYMBOL(clk_set_parent);



static inline u32 get_counter_resolution(void)

{

	u32 res;