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

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

Merge "Merge remote-tracking branch 'remotes/origin/tmp-85ab9a04' into msm-4.14" into msm-4.14

parents a20da5b5 07f0d9dd

Makefile

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

VERSION = 4

PATCHLEVEL = 14

SUBLEVEL = 23

SUBLEVEL = 24

EXTRAVERSION =

NAME = Petit Gorille

arch/arm/boot/dts/ls1021a-qds.dts

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ 
				reg = <0x2a>;

				VDDA-supply = <&reg_3p3v>;

				VDDIO-supply = <&reg_3p3v>;

				clocks = <&sys_mclk 1>;

				clocks = <&sys_mclk>;

			};

		};

	};

arch/arm/boot/dts/ls1021a-twr.dts

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ 
		reg = <0x0a>;

		VDDA-supply = <&reg_3p3v>;

		VDDIO-supply = <&reg_3p3v>;

		clocks = <&sys_mclk 1>;

		clocks = <&sys_mclk>;

	};

};

arch/arm/lib/csumpartialcopyuser.S

+4 −0
Original line number Diff line number Diff line
@@ -85,7 +85,11 @@ 
		.pushsection .text.fixup,"ax"

		.align	4

9001:		mov	r4, #-EFAULT

#ifdef CONFIG_CPU_SW_DOMAIN_PAN

		ldr	r5, [sp, #9*4]		@ *err_ptr

#else

		ldr	r5, [sp, #8*4]		@ *err_ptr

#endif

		str	r4, [r5]

		ldmia	sp, {r1, r2}		@ retrieve dst, len

		add	r2, r2, r1

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts

+9 −0
Original line number Diff line number Diff line
@@ -228,8 +228,11 @@ 


&cpm_eth0 {

	status = "okay";

	/* Network PHY */

	phy = <&phy0>;

	phy-mode = "10gbase-kr";

	/* Generic PHY, providing serdes lanes */

	phys = <&cpm_comphy4 0>;

};



&cpm_sata0 {
@@ -263,15 +266,21 @@ 


&cps_eth0 {

	status = "okay";

	/* Network PHY */

	phy = <&phy8>;

	phy-mode = "10gbase-kr";

	/* Generic PHY, providing serdes lanes */

	phys = <&cps_comphy4 0>;

};



&cps_eth1 {

	/* CPS Lane 0 - J5 (Gigabit RJ45) */

	status = "okay";

	/* Network PHY */

	phy = <&ge_phy>;

	phy-mode = "sgmii";

	/* Generic PHY, providing serdes lanes */

	phys = <&cps_comphy0 1>;

};



&cps_pinctrl {