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

Commit 1e43388f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.9.216(4ad9bb85) into msm-4.9"

parents 602b9339 4bdb0f40

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -8606,6 +8606,12 @@ S: Maintained 
F:	Documentation/scsi/NinjaSCSI.txt

F:	drivers/scsi/nsp32*



NINTENDO HID DRIVER

M:	Daniel J. Ogorchock <djogorchock@gmail.com>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/hid/hid-nintendo*



NIOS2 ARCHITECTURE

M:	Ley Foon Tan <lftan@altera.com>

L:	nios2-dev@lists.rocketboards.org (moderated for non-subscribers)

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 215

SUBLEVEL = 216

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/ls1021a.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -505,7 +505,7 @@ 
		};



		mdio0: mdio@2d24000 {

			compatible = "fsl,etsec2-mdio";

			compatible = "gianfar";

			device_type = "mdio";

			#address-cells = <1>;

			#size-cells = <0>;
@@ -513,7 +513,7 @@ 
		};



		mdio1: mdio@2d64000 {

			compatible = "fsl,etsec2-mdio";

			compatible = "gianfar";

			device_type = "mdio";

			#address-cells = <1>;

			#size-cells = <0>;

arch/arm/mach-imx/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,8 @@ AFLAGS_suspend-imx6.o :=-Wa,-march=armv7-a 
obj-$(CONFIG_SOC_IMX6) += suspend-imx6.o

obj-$(CONFIG_SOC_IMX53) += suspend-imx53.o

endif

AFLAGS_resume-imx6.o :=-Wa,-march=armv7-a

obj-$(CONFIG_SOC_IMX6) += resume-imx6.o

obj-$(CONFIG_SOC_IMX6) += pm-imx6.o



obj-$(CONFIG_SOC_IMX1) += mach-imx1.o

arch/arm/mach-imx/common.h

+2 −2
Original line number Diff line number Diff line
@@ -112,17 +112,17 @@ void imx_cpu_die(unsigned int cpu); 
int imx_cpu_kill(unsigned int cpu);



#ifdef CONFIG_SUSPEND

void v7_cpu_resume(void);

void imx53_suspend(void __iomem *ocram_vbase);

extern const u32 imx53_suspend_sz;

void imx6_suspend(void __iomem *ocram_vbase);

#else

static inline void v7_cpu_resume(void) {}

static inline void imx53_suspend(void __iomem *ocram_vbase) {}

static const u32 imx53_suspend_sz;

static inline void imx6_suspend(void __iomem *ocram_vbase) {}

#endif



void v7_cpu_resume(void);



void imx6_pm_ccm_init(const char *ccm_compat);

void imx6q_pm_init(void);

void imx6dl_pm_init(void);