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

Fixes for 4.14:
- three DT fixes for the newly introduced sama5d27_som1_ek board
- one treewide modification that didn't touch this new PM code: we
  synchronize now to be coherent with the other ARM platforms

* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91: Replace uses of virt_to_phys with __pa_symbol
  ARM: dts: at91: sama5d27_som1_ek: fix USB host vbus
  ARM: dts: at91: sama5d27_som1_ek: fix typos
  ARM: dts: at91: sama5d27_som1_ek: update pinmux/pinconf for LEDs and USB

Signed-off-by: Olof Johansson <olof@lixom.net>

2 files changed, 13 insertions, 10 deletions

diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
index 9c9088c99cc4..60cb084a8d92 100644
--- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts
@@ -67,7 +67,10 @@
 
                 usb1: ohci@00400000 {
                         num-ports = <3>;
-                        atmel,vbus-gpio = <&pioA PIN_PA10 GPIO_ACTIVE_HIGH>;
+                        atmel,vbus-gpio = <0 /* &pioA PIN_PD20 GPIO_ACTIVE_HIGH */
+                                           &pioA PIN_PA27 GPIO_ACTIVE_HIGH
+                                           0
+                                          >;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_usb_default>;
                         status = "okay";
@@ -120,7 +123,7 @@
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_mikrobus2_uart>;
                                 atmel,use-dma-rx;
-                                atmel-use-dma-tx;
+                                atmel,use-dma-tx;
                                 status = "okay";
                         };
 
@@ -178,7 +181,7 @@
                         uart4: serial@fc00c000 {
                                 atmel,use-dma-rx;
                                 atmel,use-dma-tx;
-                                pinctrl-name = "default";
+                                pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_mikrobus1_uart>;
                                 status = "okay";
                         };
@@ -330,7 +333,7 @@
                                 };
 
                                 pinctrl_led_gpio_default: led_gpio_default {
-                                        pinmux = <PIN_PA27__GPIO>,
+                                        pinmux = <PIN_PA10__GPIO>,
                                                  <PIN_PB1__GPIO>,
                                                  <PIN_PA31__GPIO>;
                                         bias-pull-up;
@@ -396,7 +399,7 @@
                                 };
 
                                 pinctrl_usb_default: usb_default {
-                                        pinmux = <PIN_PA10__GPIO>,
+                                        pinmux = <PIN_PA27__GPIO>,
                                                  <PIN_PD19__GPIO>;
                                         bias-disable;
                                 };
@@ -520,17 +523,17 @@
 
                 red {
                         label = "red";
-                        gpios = <&pioA PIN_PA27 GPIO_ACTIVE_LOW>;
+                        gpios = <&pioA PIN_PA10 GPIO_ACTIVE_HIGH>;
                 };
 
                 green {
                         label = "green";
-                        gpios = <&pioA PIN_PB1 GPIO_ACTIVE_LOW>;
+                        gpios = <&pioA PIN_PB1 GPIO_ACTIVE_HIGH>;
                 };
 
                 blue {
                         label = "blue";
-                        gpios = <&pioA PIN_PA31 GPIO_ACTIVE_LOW>;
+                        gpios = <&pioA PIN_PA31 GPIO_ACTIVE_HIGH>;
                         linux,default-trigger = "heartbeat";
                 };
         };
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 5036f996e694..849014c01cf4 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -533,8 +533,8 @@ static void __init at91_pm_backup_init(void)
         }
 
         pm_bu->suspended = 0;
-        pm_bu->canary = virt_to_phys(&canary);
-        pm_bu->resume = virt_to_phys(cpu_resume);
+        pm_bu->canary = __pa_symbol(&canary);
+        pm_bu->resume = __pa_symbol(cpu_resume);
 
         return;