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

Commit 6479ca8e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-ab-4.11-fixes' of... 

Merge tag 'at91-ab-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into fixes

Fixes for 4.11:

 - Fix USB host for sama5d2
 - Fix cpuidle on sama5

* tag 'at91-ab-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

:
  ARM: at91: pm: cpu_idle: switch DDR to power-down mode
  Revert "ARM: at91/dt: sama5d2: Use new compatible for ohci node"

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 6014ce85 60b89f19

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*/ }

};