diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-02-02 09:58:59 (GMT) |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-02-02 09:58:59 (GMT) |
| commit | c5517b1ea7b2f8e6acb8de194eef2e69c51c8994 (patch) | |
| tree | d740b5b584dcc9d7a178f908f8950153157c1bb6 /arch | |
| parent | eaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff) | |
| parent | b8659752c37ec157ee254cff443b1c9d523aea22 (diff) | |
| download | linux-c5517b1ea7b2f8e6acb8de194eef2e69c51c8994.tar.xz | |
Merge branch 'at91-3.19-fixes' into at91-3.20-soc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9263.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sama5d3xmb.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/sama5d4.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/mach-at91/board-dt-sama5.c | 18 |
4 files changed, 22 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi index 1467750..e8c6c60 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 49c10d3..77e0365 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 1b0f30c..b94995d 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 8fb9ef5..97f7367 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); } |