From 8b607cf0243c52c2d5528080c3f4b89453d562ae Mon Sep 17 00:00:00 2001 From: Douglas Gilbert <[mailto:dgilbert@interlog.com]> Date: Mon, 12 Aug 2013 10:36:25 -0500 Subject: [PATCH 2/3] at91: ariag25 updates v2: dropped at91sam9x5 usart fix, as merged mainline Signed-off-by: Douglas Gilbert Signed-off-by: Robert Nelson --- arch/arm/boot/dts/at91-ariag25.dts | 39 +++++++++++++++++++++++++++++++++++--- 1 file changed, 36 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/at91-ariag25.dts b/arch/arm/boot/dts/at91-ariag25.dts index 1c86537a42a0..2819cc07fdd6 100644 --- a/arch/arm/boot/dts/at91-ariag25.dts +++ b/arch/arm/boot/dts/at91-ariag25.dts @@ -108,7 +108,7 @@ * following can be overwritten by bootloader: * for example u-boot 'ftd set' command */ - local-mac-address = [00 00 00 00 00 00]; + local-mac-address = [00 04 25 ef 00 00]; status = "okay"; }; @@ -118,13 +118,41 @@ * Change to "okay" if you need additional serial ports */ uart0: serial@f8040000 { - status = "disabled"; + status = "okay"; }; uart1: serial@f8044000 { status = "disabled"; }; + spi0: spi@f0000000 { + status = "okay"; + cs-gpios = <&pioA 14 0>, <0>, <0>, <0>; + anything@0 { + compatible = "spidev"; + // spi-max-frequency = <50000000>; // 50 MHz + spi-max-frequency = <5000000>; // 5 MHz + reg = <0>; + }; + // m25p80@0 { + // compatible = "spidev"; + // spi-max-frequency = <50000000>; + // reg = <0>; + // }; + + mmc-slot@0 { + compatible = "mmc-spi-slot"; + reg = <0>; + voltage-ranges = <3300 3300>; + // Use one of next 3 lines, comment out other 2 + gpios = <&pioA 26 0>; /* CD to PA26 */ + // broken-cd; + // non-removable; + cd-inverted; + spi-max-frequency = <8000000>; + }; + }; + adc0: adc@f804c000 { status = "okay"; atmel,adc-channels-used = <0xf>; @@ -137,7 +165,7 @@ pinctrl@fffff400 { w1_0 { pinctrl_w1_0: w1_0-0 { - atmel,pins = <0 21 0x0 0x1>; /* PA21 PIO, pull-up */ + atmel,pins = ; }; }; }; @@ -145,6 +173,11 @@ rtc@fffffeb0 { status = "okay"; }; + + watchdog@fffffe40 { + /* timeout-sec = <14>; */ + status = "okay"; + }; }; usb0: ohci@600000 { -- 2.15.0