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

Commit 9421a145 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-4.4-fixes-2' of... 

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

Merge "Second fixes for 4.4" from Alexandre Belloni:

- fix of a hardware setup that prevents the sd/mmc interface to show up on
  sama5d2.
- proper selection of pinctrl drivers. PIO4 is necessary for the sama5d2 to
  boot.

* tag 'at91-4.4-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91: fix pinctrl driver selection
  ARM: at91/dt: add always-on to 1.8V regulator
parents 789d73b3 8423536f

arch/arm/boot/dts/at91-sama5d2_xplained.dts

+1 −0
Original line number Diff line number Diff line
@@ -184,6 +184,7 @@ 
							regulator-name = "VDD_SDHC_1V8";

							regulator-min-microvolt = <1800000>;

							regulator-max-microvolt = <1800000>;

							regulator-always-on;

						};

					};

				};

arch/arm/mach-at91/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ menuconfig ARCH_AT91 
	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK_AT91

	select PINCTRL

	select PINCTRL_AT91

	select SOC_BUS



if ARCH_AT91
@@ -17,6 +16,7 @@ config SOC_SAMA5D2 
	select HAVE_AT91_USB_CLK

	select HAVE_AT91_H32MX

	select HAVE_AT91_GENERATED_CLK

	select PINCTRL_AT91PIO4

	help

	  Select this if ou are using one of Atmel's SAMA5D2 family SoC.
@@ -27,6 +27,7 @@ config SOC_SAMA5D3 
	select HAVE_AT91_UTMI

	select HAVE_AT91_SMD

	select HAVE_AT91_USB_CLK

	select PINCTRL_AT91

	help

	  Select this if you are using one of Atmel's SAMA5D3 family SoC.

	  This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.
@@ -40,6 +41,7 @@ config SOC_SAMA5D4 
	select HAVE_AT91_SMD

	select HAVE_AT91_USB_CLK

	select HAVE_AT91_H32MX

	select PINCTRL_AT91

	help

	  Select this if you are using one of Atmel's SAMA5D4 family SoC.
@@ -50,6 +52,7 @@ config SOC_AT91RM9200 
	select CPU_ARM920T

	select HAVE_AT91_USB_CLK

	select MIGHT_HAVE_PCI

	select PINCTRL_AT91

	select SOC_SAM_V4_V5

	select SRAM if PM

	help
@@ -65,6 +68,7 @@ config SOC_AT91SAM9 
	select HAVE_AT91_UTMI

	select HAVE_FB_ATMEL

	select MEMORY

	select PINCTRL_AT91

	select SOC_SAM_V4_V5

	select SRAM if PM

	help

arch/arm/mach-at91/pm.c

+6 −1
Original line number Diff line number Diff line
@@ -41,8 +41,10 @@ 
 * implementation should be moved down into the pinctrl driver and get

 * called as part of the generic suspend/resume path.

 */

#ifdef CONFIG_PINCTRL_AT91

extern void at91_pinctrl_gpio_suspend(void);

extern void at91_pinctrl_gpio_resume(void);

#endif



static struct {

	unsigned long uhp_udp_mask;
@@ -151,8 +153,9 @@ static void at91_pm_suspend(suspend_state_t state) 


static int at91_pm_enter(suspend_state_t state)

{

#ifdef CONFIG_PINCTRL_AT91

	at91_pinctrl_gpio_suspend();



#endif

	switch (state) {

	/*

	 * Suspend-to-RAM is like STANDBY plus slow clock mode, so
@@ -192,7 +195,9 @@ static int at91_pm_enter(suspend_state_t state) 
error:

	target_state = PM_SUSPEND_ON;



#ifdef CONFIG_PINCTRL_AT91

	at91_pinctrl_gpio_resume();

#endif

	return 0;

}