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

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

Merge "Merge android-4.19.25 (b2215a54) into msm-4.19"

parents 30071dfd d7243ebd

Documentation/devicetree/bindings/eeprom/at24.txt

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ Required properties: 
                "atmel,24c256",

                "atmel,24c512",

                "atmel,24c1024",

                "atmel,24c2048",



                If <manufacturer> is not "atmel", then a fallback must be used

                with the same <model> and "atmel" as manufacturer.

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 23

SUBLEVEL = 25

EXTRAVERSION =

NAME = "People's Front"

arch/alpha/include/asm/irq.h

+3 −3
Original line number Diff line number Diff line
@@ -56,15 +56,15 @@ 


#elif defined(CONFIG_ALPHA_DP264) || \

      defined(CONFIG_ALPHA_LYNX)  || \

      defined(CONFIG_ALPHA_SHARK) || \

      defined(CONFIG_ALPHA_EIGER)

      defined(CONFIG_ALPHA_SHARK)

# define NR_IRQS	64



#elif defined(CONFIG_ALPHA_TITAN)

#define NR_IRQS		80



#elif defined(CONFIG_ALPHA_RAWHIDE) || \

	defined(CONFIG_ALPHA_TAKARA)

      defined(CONFIG_ALPHA_TAKARA) || \

      defined(CONFIG_ALPHA_EIGER)

# define NR_IRQS	128



#elif defined(CONFIG_ALPHA_WILDFIRE)

arch/alpha/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ __load_new_mm_context(struct mm_struct *next_mm) 
/* Macro for exception fixup code to access integer registers.  */

#define dpf_reg(r)							\

	(((unsigned long *)regs)[(r) <= 8 ? (r) : (r) <= 15 ? (r)-16 :	\

				 (r) <= 18 ? (r)+8 : (r)-10])

				 (r) <= 18 ? (r)+10 : (r)-10])



asmlinkage void

do_page_fault(unsigned long address, unsigned long mmcsr,

arch/arm/boot/dts/da850-evm.dts

+26 −5
Original line number Diff line number Diff line
@@ -94,6 +94,28 @@ 
		regulator-boot-on;

	};



	baseboard_3v3: fixedregulator-3v3 {

		/* TPS73701DCQ */

		compatible = "regulator-fixed";

		regulator-name = "baseboard_3v3";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		vin-supply = <&vbat>;

		regulator-always-on;

		regulator-boot-on;

	};



	baseboard_1v8: fixedregulator-1v8 {

		/* TPS73701DCQ */

		compatible = "regulator-fixed";

		regulator-name = "baseboard_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&vbat>;

		regulator-always-on;

		regulator-boot-on;

	};



	backlight_lcd: backlight-regulator {

		compatible = "regulator-fixed";

		regulator-name = "lcd_backlight_pwr";
@@ -105,7 +127,7 @@ 


	sound {

		compatible = "simple-audio-card";

		simple-audio-card,name = "DA850/OMAP-L138 EVM";

		simple-audio-card,name = "DA850-OMAPL138 EVM";

		simple-audio-card,widgets =

			"Line", "Line In",

			"Line", "Line Out";
@@ -210,10 +232,9 @@ 


		/* Regulators */

		IOVDD-supply = <&vdcdc2_reg>;

		/* Derived from VBAT: Baseboard 3.3V / 1.8V */

		AVDD-supply = <&vbat>;

		DRVDD-supply = <&vbat>;

		DVDD-supply = <&vbat>;

		AVDD-supply = <&baseboard_3v3>;

		DRVDD-supply = <&baseboard_3v3>;

		DVDD-supply = <&baseboard_1v8>;

	};

	tca6416: gpio@20 {

		compatible = "ti,tca6416";