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

Merge "at91: fixes for 3.19 #1 (ter)" from Nicolas Ferre:

First fixes batch for AT91 on 3.19:
- fix some DT entries
- correct clock entry for the at91sam9263 LCD
- add a phy_fixup for Eth1 on sama5d4

* tag 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91: board-dt-sama5: add phy_fixup to override NAND_Tree
  ARM: at91/dt: sam9263: Add missing clocks to lcdc node
  ARM: at91: sama5d3: dt: correct the sound route
  ARM: at91/dt: sama5d4: fix the timer reg length

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

4 files changed, 22 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 1467750e3377..e8c6c600a5b6 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -953,6 +953,8 @@
                         interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_fb>;
+                        clocks = <&lcd_clk>, <&lcd_clk>;
+                        clock-names = "lcdc_clk", "hclk";
                         status = "disabled";
                 };
 
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 49c10d33df30..77e03655aca3 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -176,7 +176,7 @@
                         "Headphone Jack", "HPOUTR",
                         "IN2L", "Line In Jack",
                         "IN2R", "Line In Jack",
-                        "MICBIAS", "IN1L",
+                        "Mic", "MICBIAS",
                         "IN1L", "Mic";
 
                 atmel,ssc-controller = <&ssc0>;
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 1b0f30c2c4a5..b94995d1889f 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -1008,7 +1008,7 @@
 
                         pit: timer@fc068630 {
                                 compatible = "atmel,at91sam9260-pit";
-                                reg = <0xfc068630 0xf>;
+                                reg = <0xfc068630 0x10>;
                                 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
                                 clocks = <&h32ck>;
                         };
diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c
index 8fb9ef5333f1..97f7367d32b8 100644
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@ -17,6 +17,7 @@
 #include <linux/of_platform.h>
 #include <linux/phy.h>
 #include <linux/clk-provider.h>
+#include <linux/phy.h>
 
 #include <asm/setup.h>
 #include <asm/irq.h>
@@ -26,8 +27,25 @@
 
 #include "generic.h"
 
+static int ksz8081_phy_fixup(struct phy_device *phy)
+{
+        int value;
+
+        value = phy_read(phy, 0x16);
+        value &= ~0x20;
+        phy_write(phy, 0x16, value);
+
+        return 0;
+}
+
 static void __init sama5_dt_device_init(void)
 {
+        if (of_machine_is_compatible("atmel,sama5d4ek") &&
+           IS_ENABLED(CONFIG_PHYLIB)) {
+                phy_register_fixup_for_id("fc028000.etherne:00",
+                                                ksz8081_phy_fixup);
+        }
+
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }