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

Unverified Commit 6b3170c2 authored by hmtheboy154's avatar hmtheboy154
Browse files

Merge commit '19be8f1d' into lineage-22.2

parents bbe8ec88 19be8f1d

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 315

SUBLEVEL = 318

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/exynos4210-smdkv310.dts

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
&keypad {

	samsung,keypad-num-rows = <2>;

	samsung,keypad-num-columns = <8>;

	linux,keypad-no-autorepeat;

	linux,input-no-autorepeat;

	wakeup-source;

	pinctrl-names = "default";

	pinctrl-0 = <&keypad_rows &keypad_cols>;

arch/arm/boot/dts/exynos4412-origen.dts

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ 
&keypad {

	samsung,keypad-num-rows = <3>;

	samsung,keypad-num-columns = <2>;

	linux,keypad-no-autorepeat;

	linux,input-no-autorepeat;

	wakeup-source;

	pinctrl-0 = <&keypad_rows &keypad_cols>;

	pinctrl-names = "default";

arch/arm/boot/dts/exynos4412-smdk4412.dts

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
&keypad {

	samsung,keypad-num-rows = <3>;

	samsung,keypad-num-columns = <8>;

	linux,keypad-no-autorepeat;

	linux,input-no-autorepeat;

	wakeup-source;

	pinctrl-0 = <&keypad_rows &keypad_cols>;

	pinctrl-names = "default";

arch/arm/mach-davinci/pm.c

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ static void davinci_pm_suspend(void) 


	/* Configure sleep count in deep sleep register */

	val = __raw_readl(pm_config.deepsleep_reg);

	val &= ~DEEPSLEEP_SLEEPCOUNT_MASK,

	val &= ~DEEPSLEEP_SLEEPCOUNT_MASK;

	val |= pm_config.sleepcount;

	__raw_writel(val, pm_config.deepsleep_reg);