mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

DT Changes for 4.8:

Browse source 
- New board: Olimex SAM9-L9260
  - Fix crystal definitions for Denx ma5d4
  - Remove leftover clock definitions
  - Add stdout-path for usb_a9260/a9g20
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCgAGBQJXXUN5AAoJENiigzvaE+LCDpkP/0w7RA9ka7ABAYO6espZ4bO8
 lUDMJeOXGA04dLD0H4QwVxVd4OeculwhvdQ9EwInF0wscmQXyqIFjlefebOGjQUp
 FCwys1KXyAVLNz02Qc1uy4Lnq25N2XzGn/nyAJZYm9GesjI0mJ6zHmk2NsIgRKZP
 yEBTNnGWtnOHDO6GVi/QHGyfA/LHbJaTddwsUBoFrlRET6XW/ppLOKmxMKVEoZR8
 XyfRcbEJ6GuUMQ4rv3NzUoUoFCl0AFaROcrtJfCf7MBhjlXFho9eXQh33rx8J7po
 4FyKKqi7yi3a27F0Dwt3Y/M13FBV178MI+J0IFFiqx6aghFtSEYg+Edz7/rtR+dQ
 dhAlU1DLB8rjlItK9EvFUfUpED3JGfc2kVHHsrzjx+oj/nyJ8pO7B5ew7Il/8tKM
 7e1ujKbJo2hvmxNJ+ULhKc+Ma8z0ofUbvrxGo/vYQn5/5+ZCPzpYmJBfNCh5JqJC
 sNJL4L83CfwHYCiQgT7bI+X1GyC7AGbpggLx7pGi4ji+wsCqZ275zVozrG4dm2u5
 jWlIYm4QGZ0B+qo4qwOqinldfNK06KUqtQMazYY3mmRw2USvc2uNq5ka9OLnUNI8
 PKCjoCaYql0iYJSAKpHdEF3+4ST6WcduQrxW4btGximGRQFx60nlnGLqe9jGNpCz
 IrxscsTkqsUd89m4/jYk
 =9TFL
 -----END PGP SIGNATURE-----

Merge tag 'at91-ab-4.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

DT Changes for 4.8:
 - New board: Olimex SAM9-L9260
 - Fix crystal definitions for Denx ma5d4
 - Remove leftover clock definitions
 - Add stdout-path for usb_a9260/a9g20

* tag 'at91-ab-4.8-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91: calao: remove leftovers clock definition
  ARM: dts: at91: pm9g45: remove leftovers clock definition
  ARM: dts: at91: mpa1600: remove leftovers clock definition
  ARM: dts: at91: ge863-pro3: remove leftovers clock definition
  ARM: dts: at91: at91-foxg20: remove leftovers clock definition
  ARM: dts: at91: at91-cosino: remove leftovers clock definition
  ARM: dts: at91: at91-ariag25: remove leftovers clock definition
  ARM: dts: at91: animeo_ip: remove leftovers clock definition
  ARM: dts: at91: ma5d4: properly define crystals frequencies
  ARM: dts: at91: usb_a9g20: use stdout-path
  ARM: dts: at91: Add DT support for Olimex SAM9-L9260 board.
  ARM: dts: at91: at91sam9260: Remove leading zeros in OHCI node.

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2016-06-14 10:26:25 -07:00
commit 27c1e36223
23 changed files with 139 additions and 123 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Documentation/devicetree/bindings/arm/olimex.txt
View file

@ -1,5 +1,9 @@
Olimex i.MX Platforms Device Tree Bindings
------------------------------------------
Olimex Device Tree Bindings
---------------------------
SAM9-L9260 Board
Required root node properties:
- compatible = "olimex,sam9-l9260", "atmel,at91sam9260";
i.MX23 Olinuxino Low Cost Board
Required root node properties:

1
arch/arm/boot/dts/Makefile
View file

@ -19,6 +19,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
usb_a9260.dtb \
at91sam9261ek.dtb \
at91sam9263ek.dtb \
at91-sam9_l9260.dtb \
tny_a9263.dtb \
usb_a9263.dtb \
at91-foxg20.dtb \

2
arch/arm/boot/dts/aks-cdu.dts
View file

@ -57,7 +57,7 @@ usb1: gadget@fffa4000 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <2>;
status = "okay";
};

11
arch/arm/boot/dts/animeo_ip.dts
View file

@ -32,15 +32,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal {
clock-frequency = <32768>;
};
@ -114,7 +105,7 @@ ubi@60000 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <2>;
atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>;
status = "okay";

9
arch/arm/boot/dts/at91-ariag25.dts
View file

@ -34,15 +34,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal {
clock-frequency = <32768>;
};

9
arch/arm/boot/dts/at91-cosino.dtsi
View file

@ -26,15 +26,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal {
clock-frequency = <32768>;
};

11
arch/arm/boot/dts/at91-foxg20.dts
View file

@ -23,15 +23,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal {
clock-frequency = <32768>;
};
@ -128,7 +119,7 @@ watchdog@fffffd40 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <2>;
status = "okay";
};

2
arch/arm/boot/dts/at91-kizbox.dts
View file

@ -54,7 +54,7 @@ watchdog@fffffd40 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <1>;
status = "okay";
};

11
arch/arm/boot/dts/at91-qil_a9260.dts
View file

@ -20,15 +20,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal {
clock-frequency = <32768>;
};
@ -111,7 +102,7 @@ shdwc@fffffd10 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <2>;
status = "okay";
};

115
arch/arm/boot/dts/at91-sam9_l9260.dts Normal file
View file

@ -0,0 +1,115 @@
/*
* at91-sam9_l9260.dts - Device Tree file for Olimex SAM9-L9260 board
*
* Copyright (C) 2016 Raashid Muhammed <raashidmuhammed@zilogic.com>
*
* Licensed under GPLv2 or later.
*/
/dts-v1/;
#include "at91sam9260.dtsi"
/ {
model = "Olimex sam9-l9260";
compatible = "olimex,sam9-l9260", "atmel,at91sam9260", "atmel,at91sam9";
chosen {
stdout-path = "serial0:115200n8";
};
memory {
reg = <0x20000000 0x4000000>;
};
clocks {
slow_xtal {
clock-frequency = <32768>;
};
main_xtal {
clock-frequency = <18432000>;
};
};
ahb {
apb {
mmc0: mmc@fffa8000 {
pinctrl-0 = <
&pinctrl_board_mmc0
&pinctrl_mmc0_clk
&pinctrl_mmc0_slot1_cmd_dat0
&pinctrl_mmc0_slot1_dat1_3>;
status = "okay";
slot@1 {
reg = <1>;
bus-width = <4>;
cd-gpios = <&pioC 8 GPIO_ACTIVE_HIGH>;
wp-gpios = <&pioC 4 GPIO_ACTIVE_HIGH>;
};
};
macb0: ethernet@fffc4000 {
phy-mode = "mii";
#address-cells = <1>;
#size-cells = <0>;
status = "okay";
ethernet-phy@1 {
reg = <0x1>;
};
};
spi0: spi@fffc8000 {
cs-gpios = <&pioC 11 0>, <0>, <0>, <0>;
status = "okay";
flash@0 {
compatible = "atmel,at45", "atmel,dataflash";
spi-max-frequency = <15000000>;
reg = <0>;
};
};
dbgu: serial@fffff200 {
status = "okay";
};
pinctrl@fffff400 {
mmc0 {
pinctrl_board_mmc0: mmc0-board {
atmel,pins =
<AT91_PIOC 8 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH /* CD pin */
AT91_PIOC 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* WP pin */
};
};
};
};
nand0: nand@40000000 {
nand-bus-width = <8>;
nand-ecc-mode = "soft";
nand-on-flash-bbt = <1>;
status = "okay";
};
usb0: ohci@500000 {
status = "okay";
};
};
i2c@0 {
status = "okay";
};
leds {
compatible = "gpio-leds";
b0 {
label = "b0";
gpios = <&pioA 6 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat";
};
};
};

7
arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi
View file

@ -20,8 +20,11 @@ memory {
};
clocks {
main_clock: main_clock {
compatible = "atmel,osc", "fixed-clock";
slow_xtal {
clock-frequency = <32768>;
};
main_xtal {
clock-frequency = <12000000>;
};

2
arch/arm/boot/dts/at91sam9260.dtsi
View file

@ -1007,7 +1007,7 @@ &pioC 14 GPIO_ACTIVE_HIGH
status = "disabled";
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
compatible = "atmel,at91rm9200-ohci", "usb-ohci";
reg = <0x00500000 0x100000>;
interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;

2
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
View file

@ -170,7 +170,7 @@ data@7ca0000 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <2>;
status = "okay";
};

2
arch/arm/boot/dts/ethernut5.dts
View file

@ -77,7 +77,7 @@ data@20000 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <2>;
status = "okay";
};

2
arch/arm/boot/dts/evk-pro3.dts
View file

@ -46,7 +46,7 @@ watchdog@fffffd40 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <2>;
status = "okay";
};

9
arch/arm/boot/dts/ge863-pro3.dtsi
View file

@ -11,15 +11,6 @@
/ {
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <6000000>;
};
main_xtal {
clock-frequency = <6000000>;
};

9
arch/arm/boot/dts/mpa1600.dts
View file

@ -17,15 +17,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <18432000>;
};
slow_xtal {
clock-frequency = <32768>;
};

9
arch/arm/boot/dts/pm9g45.dts
View file

@ -21,15 +21,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal {
clock-frequency = <32768>;
};

9
arch/arm/boot/dts/tny_a9260_common.dtsi
View file

@ -16,15 +16,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal {
clock-frequency = <32768>;
};

9
arch/arm/boot/dts/tny_a9263.dts
View file

@ -21,15 +21,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal {
clock-frequency = <32768>;
};

11
arch/arm/boot/dts/usb_a9260_common.dtsi
View file

@ -8,15 +8,6 @@
/ {
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal {
clock-frequency = <32768>;
};
@ -90,7 +81,7 @@ data@7ca0000 {
};
};
usb0: ohci@00500000 {
usb0: ohci@500000 {
num-ports = <2>;
status = "okay";
};

9
arch/arm/boot/dts/usb_a9263.dts
View file

@ -21,15 +21,6 @@ memory {
};
clocks {
#address-cells = <1>;
#size-cells = <1>;
ranges;
main_clock: clock@0 {
compatible = "atmel,osc", "fixed-clock";
clock-frequency = <12000000>;
};
slow_xtal {
clock-frequency = <32768>;
};

3
arch/arm/boot/dts/usb_a9g20_common.dtsi
View file

@ -11,7 +11,8 @@
/ {
chosen {
bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock5 rw rootfstype=ubifs";
bootargs = "mem=64M root=/dev/mtdblock5 rw rootfstype=ubifs";
stdout-path = "serial0:115200n8";
};
memory {