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

Unverified Commit 3c6f01e9 authored by derfelot's avatar derfelot Committed by GitHub
Browse files

Merge pull request #19 from derfelot/lineage-18.1_update_sov36 

[lineage-18.1] Update
parents a6c7f978 c3e2516d

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 251

SUBLEVEL = 255

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arc/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ bootpImage: vmlinux 


boot_targets += uImage uImage.bin uImage.gz



PHONY += $(boot_targets)

$(boot_targets): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@

arch/arc/include/asm/page.h

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define free_user_page(page, addr)	free_page(addr)



#define clear_page(paddr)		memset((paddr), 0, PAGE_SIZE)

#define copy_user_page(to, from, vaddr, pg)	copy_page(to, from)

#define copy_page(to, from)		memcpy((to), (from), PAGE_SIZE)



struct vm_area_struct;

arch/arm/boot/dts/picoxcell-pc3x2.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -54,18 +54,21 @@ 
		emac: gem@30000 {

			compatible = "cadence,gem";

			reg = <0x30000 0x10000>;

			interrupt-parent = <&vic0>;

			interrupts = <31>;

		};



		dmac1: dmac@40000 {

			compatible = "snps,dw-dmac";

			reg = <0x40000 0x10000>;

			interrupt-parent = <&vic0>;

			interrupts = <25>;

		};



		dmac2: dmac@50000 {

			compatible = "snps,dw-dmac";

			reg = <0x50000 0x10000>;

			interrupt-parent = <&vic0>;

			interrupts = <26>;

		};
@@ -243,6 +246,7 @@ 
		axi2pico@c0000000 {

			compatible = "picochip,axi2pico-pc3x2";

			reg = <0xc0000000 0x10000>;

			interrupt-parent = <&vic0>;

			interrupts = <13 14 15 16 17 18 19 20 21>;

		};

	};

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ dtb-$(CONFIG_MACH_SONY_POPLAR) += msm8998-yoshino-poplar_generic.dtb \ 
dtb-$(CONFIG_MACH_SONY_POPLAR_DSDS) += msm8998-yoshino-poplar_dsds.dtb \

	msm8998-v2-yoshino-poplar_dsds.dtb \

	msm8998-v2.1-yoshino-poplar_dsds.dtb

dtb-$(CONFIG_MACH_SONY_POPLAR_KDDI) += msm8998-v2.1-yoshino-poplar_kddi.dtb

dtb-$(CONFIG_MACH_SONY_LILAC) += msm8998-yoshino-lilac_generic.dtb \

	msm8998-v2-yoshino-lilac_generic.dtb \

	msm8998-v2.1-yoshino-lilac_generic.dtb