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
Unified · Split
| @@ -953,6 +953,8 @@ · 952 unmodified lines | |||
| 953 | interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>; | 953 | interrupts = <26 IRQ_TYPE_LEVEL_HIGH 3>; |
| 954 | pinctrl-names = "default"; | 954 | pinctrl-names = "default"; |
| 955 | pinctrl-0 = <&pinctrl_fb>; | 955 | pinctrl-0 = <&pinctrl_fb>; |
| 956 | clocks = <&lcd_clk>, <&lcd_clk>; | ||
| 957 | clock-names = "lcdc_clk", "hclk"; | ||
| 956 | status = "disabled"; | 958 | status = "disabled"; |
| 957 | }; | 959 | }; |
| 958 | 960 | ||
| @@ -176,7 +176,7 @@ · 175 unmodified lines | |||
| 176 | "Headphone Jack", "HPOUTR", | 176 | "Headphone Jack", "HPOUTR", |
| 177 | "IN2L", "Line In Jack", | 177 | "IN2L", "Line In Jack", |
| 178 | "IN2R", "Line In Jack", | 178 | "IN2R", "Line In Jack", |
| 179 | "MICBIAS", "IN1L", | 179 | "Mic", "MICBIAS", |
| 180 | "IN1L", "Mic"; | 180 | "IN1L", "Mic"; |
| 181 | 181 | ||
| 182 | atmel,ssc-controller = <&ssc0>; | 182 | atmel,ssc-controller = <&ssc0>; |
| @@ -1008,7 +1008,7 @@ · 1007 unmodified lines | |||
| 1008 | 1008 | ||
| 1009 | pit: timer@fc068630 { | 1009 | pit: timer@fc068630 { |
| 1010 | compatible = "atmel,at91sam9260-pit"; | 1010 | compatible = "atmel,at91sam9260-pit"; |
| 1011 | reg = <0xfc068630 0xf>; | 1011 | reg = <0xfc068630 0x10>; |
| 1012 | interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>; | 1012 | interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>; |
| 1013 | clocks = <&h32ck>; | 1013 | clocks = <&h32ck>; |
| 1014 | }; | 1014 | }; |
| @@ -17,6 +17,7 @@ · 16 unmodified lines | |||
| 17 | #include <linux/of_platform.h> | 17 | #include <linux/of_platform.h> |
| 18 | #include <linux/phy.h> | 18 | #include <linux/phy.h> |
| 19 | #include <linux/clk-provider.h> | 19 | #include <linux/clk-provider.h> |
| 20 | #include <linux/phy.h> | ||
| 20 | 21 | ||
| 21 | #include <asm/setup.h> | 22 | #include <asm/setup.h> |
| 22 | #include <asm/irq.h> | 23 | #include <asm/irq.h> |
| @@ -26,8 +27,25 @@ · 3 unmodified lines | |||
| 26 | 27 | ||
| 27 | #include "generic.h" | 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 | static void __init sama5_dt_device_init(void) | 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 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 49 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
| 32 | } | 50 | } |
| 33 | 51 | ||