Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 6fda93b95e388c82a84c201324f77997d82fada2

Authored by Olof Johansson
2 parents c9b75d51c9 b8659752c3
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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>

Showing 4 changed files Side-by-side Diff

arch/arm/boot/dts/at91sam9263.dtsi
Diff comments   View file @ 6fda93b
... ... @@ -953,6 +953,8 @@
953 953 interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>;
954 954 pinctrl-names = "default";
955 955 pinctrl-0 = <&pinctrl_fb>;
  956 + clocks = <&lcd_clk>, <&lcd_clk>;
  957 + clock-names = "lcdc_clk", "hclk";
956 958 status = "disabled";
957 959 };
958 960  
arch/arm/boot/dts/sama5d3xmb.dtsi
Diff comments   View file @ 6fda93b
... ... @@ -176,7 +176,7 @@
176 176 "Headphone Jack", "HPOUTR",
177 177 "IN2L", "Line In Jack",
178 178 "IN2R", "Line In Jack",
179   - "MICBIAS", "IN1L",
  179 + "Mic", "MICBIAS",
180 180 "IN1L", "Mic";
181 181  
182 182 atmel,ssc-controller = <&ssc0>;
arch/arm/boot/dts/sama5d4.dtsi
Diff comments   View file @ 6fda93b
... ... @@ -1008,7 +1008,7 @@
1008 1008  
1009 1009 pit: timer@fc068630 {
1010 1010 compatible = "atmel,at91sam9260-pit";
1011   - reg = <0xfc068630 0xf>;
  1011 + reg = <0xfc068630 0x10>;
1012 1012 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
1013 1013 clocks = <&h32ck>;
1014 1014 };
arch/arm/mach-at91/board-dt-sama5.c
Diff comments   View file @ 6fda93b
... ... @@ -17,6 +17,7 @@
17 17 #include <linux/of_platform.h>
18 18 #include <linux/phy.h>
19 19 #include <linux/clk-provider.h>
  20 +#include <linux/phy.h>
20 21  
21 22 #include <asm/setup.h>
22 23 #include <asm/irq.h>
23 24  
... ... @@ -26,8 +27,25 @@
26 27  
27 28 #include "generic.h"
28 29  
  30 +static int ksz8081_phy_fixup(struct phy_device *phy)
  31 +{
  32 + int value;
  33 +
  34 + value = phy_read(phy, 0x16);
  35 + value &= ~0x20;
  36 + phy_write(phy, 0x16, value);
  37 +
  38 + return 0;
  39 +}
  40 +
29 41 static void __init sama5_dt_device_init(void)
30 42 {
  43 + if (of_machine_is_compatible("atmel,sama5d4ek") &&
  44 + IS_ENABLED(CONFIG_PHYLIB)) {
  45 + phy_register_fixup_for_id("fc028000.etherne:00",
  46 + ksz8081_phy_fixup);
  47 + }
  48 +
31 49 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
32 50 }
33 51