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

Commit dfaa34e3 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 '4.9/tmp-c96f6512' into msm-4.9" into msm-4.9

parents 430727f2 0078bd9a

Makefile

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

PATCHLEVEL = 9

SUBLEVEL = 18

SUBLEVEL = 20

EXTRAVERSION =

NAME = Roaring Lionus

arch/arm/boot/dts/sama5d2.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ 
		};



		usb1: ohci@00400000 {

			compatible = "atmel,sama5d2-ohci", "usb-ohci";

			compatible = "atmel,at91rm9200-ohci", "usb-ohci";

			reg = <0x00400000 0x100000>;

			interrupts = <41 IRQ_TYPE_LEVEL_HIGH 2>;

			clocks = <&uhphs_clk>, <&uhphs_clk>, <&uhpck>;

arch/arm/mach-at91/pm.c

+17 −1
Original line number Diff line number Diff line
@@ -289,6 +289,22 @@ static void at91_ddr_standby(void) 
		at91_ramc_write(1, AT91_DDRSDRC_LPR, saved_lpr1);

}



static void sama5d3_ddr_standby(void)

{

	u32 lpr0;

	u32 saved_lpr0;



	saved_lpr0 = at91_ramc_read(0, AT91_DDRSDRC_LPR);

	lpr0 = saved_lpr0 & ~AT91_DDRSDRC_LPCB;

	lpr0 |= AT91_DDRSDRC_LPCB_POWER_DOWN;



	at91_ramc_write(0, AT91_DDRSDRC_LPR, lpr0);



	cpu_do_idle();



	at91_ramc_write(0, AT91_DDRSDRC_LPR, saved_lpr0);

}



/* We manage both DDRAM/SDRAM controllers, we need more than one value to

 * remember.

 */
@@ -323,7 +339,7 @@ static const struct of_device_id const ramc_ids[] __initconst = { 
	{ .compatible = "atmel,at91rm9200-sdramc", .data = at91rm9200_standby },

	{ .compatible = "atmel,at91sam9260-sdramc", .data = at91sam9_sdram_standby },

	{ .compatible = "atmel,at91sam9g45-ddramc", .data = at91_ddr_standby },

	{ .compatible = "atmel,sama5d3-ddramc", .data = at91_ddr_standby },

	{ .compatible = "atmel,sama5d3-ddramc", .data = sama5d3_ddr_standby },

	{ /*sentinel*/ }

};

arch/arm64/Kconfig

+20 −0
Original line number Diff line number Diff line
@@ -1079,6 +1079,26 @@ config BUILD_ARM64_APPENDED_DTB_IMAGE 
	  DTBs to be built by default (instead of a standalone Image.gz.)

	  The image will built in arch/arm64/boot/Image.gz-dtb



choice

	prompt "Appended DTB Kernel Image name"

	depends on BUILD_ARM64_APPENDED_DTB_IMAGE

	help

	  Enabling this option will cause a specific kernel image Image or

	  Image.gz to be used for final image creation.

	  The image will built in arch/arm64/boot/IMAGE-NAME-dtb



	config IMG_GZ_DTB

		bool "Image.gz-dtb"

	config IMG_DTB

		bool "Image-dtb"

endchoice



config BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME

	string

	depends on BUILD_ARM64_APPENDED_DTB_IMAGE

	default "Image.gz-dtb" if IMG_GZ_DTB

	default "Image-dtb" if IMG_DTB



config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES

	string "Default dtb names"

	depends on BUILD_ARM64_APPENDED_DTB_IMAGE

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ core-$(CONFIG_EFI_STUB) += $(objtree)/drivers/firmware/efi/libstub/lib.a 


# Default target when executing plain make

ifeq ($(CONFIG_BUILD_ARM64_APPENDED_DTB_IMAGE),y)

KBUILD_IMAGE	:= Image.gz-dtb

KBUILD_IMAGE	:= $(subst $\",,$(CONFIG_BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME))

else

KBUILD_IMAGE	:= Image.gz

endif