mirror of
https://github.com/torvalds/linux.git
synced 2024-12-15 07:33:56 +00:00
dccfd1e439
Device tree and bindings updates for 3.12.
General additions of various on-chip and on-board peripherals on various
platforms as support gets added. Some of the bigger changes are:
- Addition of (new) PCI-e support on Tegra.
- More Tegra4 support, including PMC configuration for Dalmore.
- Addition of a new board for Exynos4 (trats2) and more bindings for 4x12 IP.
- Addition of Allwinner A20 and A31 SoC and board files.
- Move of the ST Ericsson device tree files to now use ste-* prefix.
- More move of hardware description of shmobile platforms to DT.
- Two new board dts files for Freescale MXs.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAABAgAGBQJSKhJrAAoJEIwa5zzehBx3O6YP/AzskDtXdgdaopgZXVQxCIhE
svby8xG2pcFvuAYEv7KNwgk02oC+B5JrUj7ZG42IOPeVo4HN7k80ehxmP5MZwnqs
LpvBRXqUGAzEoJRhCD/lF4tuw+J5R/XgVWkIVz4nQ8tLdsSWJ3QY5LSS6ePTP6Qi
2B3AbeW/7DSada7lHJE9CqIX5xienLo4YgfCWXHNT8ouFGfqKjBxqIbCFyvzrGfs
jSsIsqy1IO0hnk61yHtbPCRl9FJg2rbVwqHBZvKHMW0ls19Q42chlK/dPO5JCb4w
VWMqbdOr8fnbqzicVqUPbShYZjgEd5I6PUgZMXJqEacgX9dj3SfOOtcR9kfrntHE
of7Wi3FzVzWTzclRnub9nHrBIwvThAr+WX+mvbZrD+tuQte8qkFZXO9mw5/hRA7M
K1O1HgaH1R1Xcdo69EWx9o94NYJ9Vs9F6wmS2+nb1B8u83Ee2Uq0GES5oyYqhU56
qg8FOMYUBDwXlHpjt1qiSwAYrabdCyxMx8lt351bxmiyKRFx0hmyGsv6HvlHJ7Oz
hn6xHcNyIoCIuOvWxiLmKKU2ameDn16uSd71MSwomnQ+U4V+QzoqQ4QDgYD6Sgd5
5fln3OYV3JniWeYFw9DkSLKQTYBodz06wA+XOurcNWs3Ls0E9GilKFixKC6GoEVC
uIywadgelMfDux8GGD3x
=1GuI
-----END PGP SIGNATURE-----
Merge tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC DT updates from Olof Johansson:
"Device tree and bindings updates for 3.12.
General additions of various on-chip and on-board peripherals on
various platforms as support gets added. Some of the bigger changes
are:
- Addition of (new) PCI-e support on Tegra.
- More Tegra4 support, including PMC configuration for Dalmore.
- Addition of a new board for Exynos4 (trats2) and more bindings for
4x12 IP.
- Addition of Allwinner A20 and A31 SoC and board files.
- Move of the ST Ericsson device tree files to now use ste-* prefix.
- More move of hardware description of shmobile platforms to DT.
- Two new board dts files for Freescale MXs"
* tag 'dt-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (177 commits)
dts: Rename DW APB timer compatible strings
dts: Deprecate ALTR as a vendor prefix
of: add vendor prefix for Altera Corp.
ARM: at91/dt: sam9x5ek: add sound configuration
ARM: at91/dt: sam9x5ek: enable SSC
ARM: at91/dt: sam9x5ek: add WM8731 codec
ARM: at91/dt: sam9x5: add SSC DMA parameters
ARM: at91/dt: add at91rm9200 PQFP package version
ARM: at91: at91rm9200: set default mmc0 pinctrl-names
ARM: at91: at91sam9n12: correct pin number of gpio-key
ARM: at91: at91sam9n12: add qt1070 support
ARM: at91: at91sam9n12: add pinctrl of TWI
ARM: at91: Add PMU support for sama5d3
ARM: at91: at91sam9260: add missing pinctrl-names on mmc
ARM: tegra: configure power off for Dalmore
ARM: DT: binding fixup to align with vendor-prefixes.txt (DT)
ARM: dts: add sdio blocks to bcm28155-ap board
ARM: dts: align sdio numbers to HW definition
ARM: sun7i: Add Olimex A20-Olinuxino-Micro support
ARM: sun7i: Add Allwinner A20 DTSI
...
133 lines
2.7 KiB
Plaintext
133 lines
2.7 KiB
Plaintext
/*
|
|
* at91sam9x5ek.dtsi - Device Tree file for AT91SAM9x5CM Base board
|
|
*
|
|
* Copyright (C) 2012 Atmel,
|
|
* 2012 Nicolas Ferre <nicolas.ferre@atmel.com>
|
|
*
|
|
* Licensed under GPLv2 or later.
|
|
*/
|
|
#include "at91sam9x5cm.dtsi"
|
|
|
|
/ {
|
|
model = "Atmel AT91SAM9X5-EK";
|
|
compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
|
|
|
|
chosen {
|
|
bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";
|
|
};
|
|
|
|
ahb {
|
|
apb {
|
|
mmc0: mmc@f0008000 {
|
|
pinctrl-0 = <
|
|
&pinctrl_board_mmc0
|
|
&pinctrl_mmc0_slot0_clk_cmd_dat0
|
|
&pinctrl_mmc0_slot0_dat1_3>;
|
|
status = "okay";
|
|
slot@0 {
|
|
reg = <0>;
|
|
bus-width = <4>;
|
|
cd-gpios = <&pioD 15 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
|
|
mmc1: mmc@f000c000 {
|
|
pinctrl-0 = <
|
|
&pinctrl_board_mmc1
|
|
&pinctrl_mmc1_slot0_clk_cmd_dat0
|
|
&pinctrl_mmc1_slot0_dat1_3>;
|
|
status = "okay";
|
|
slot@0 {
|
|
reg = <0>;
|
|
bus-width = <4>;
|
|
cd-gpios = <&pioD 14 GPIO_ACTIVE_HIGH>;
|
|
};
|
|
};
|
|
|
|
dbgu: serial@fffff200 {
|
|
status = "okay";
|
|
};
|
|
|
|
usart0: serial@f801c000 {
|
|
status = "okay";
|
|
};
|
|
|
|
usb2: gadget@f803c000 {
|
|
atmel,vbus-gpio = <&pioB 16 GPIO_ACTIVE_HIGH>;
|
|
status = "okay";
|
|
};
|
|
|
|
i2c0: i2c@f8010000 {
|
|
status = "okay";
|
|
|
|
wm8731: wm8731@1a {
|
|
compatible = "wm8731";
|
|
reg = <0x1a>;
|
|
};
|
|
};
|
|
|
|
pinctrl@fffff400 {
|
|
mmc0 {
|
|
pinctrl_board_mmc0: mmc0-board {
|
|
atmel,pins =
|
|
<AT91_PIOD 15 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD15 gpio CD pin pull up and deglitch */
|
|
};
|
|
};
|
|
|
|
mmc1 {
|
|
pinctrl_board_mmc1: mmc1-board {
|
|
atmel,pins =
|
|
<AT91_PIOD 14 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PD14 gpio CD pin pull up and deglitch */
|
|
};
|
|
};
|
|
};
|
|
|
|
spi0: spi@f0000000 {
|
|
status = "okay";
|
|
cs-gpios = <&pioA 14 0>, <0>, <0>, <0>;
|
|
m25p80@0 {
|
|
compatible = "atmel,at25df321a";
|
|
spi-max-frequency = <50000000>;
|
|
reg = <0>;
|
|
};
|
|
};
|
|
|
|
watchdog@fffffe40 {
|
|
status = "okay";
|
|
};
|
|
|
|
ssc0: ssc@f0010000 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
|
|
usb0: ohci@00600000 {
|
|
status = "okay";
|
|
num-ports = <3>;
|
|
atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */
|
|
&pioD 19 GPIO_ACTIVE_LOW
|
|
&pioD 20 GPIO_ACTIVE_LOW
|
|
>;
|
|
};
|
|
|
|
usb1: ehci@00700000 {
|
|
status = "okay";
|
|
};
|
|
};
|
|
|
|
sound {
|
|
compatible = "atmel,sam9x5-wm8731-audio";
|
|
|
|
atmel,model = "wm8731 @ AT91SAM9X5EK";
|
|
|
|
atmel,audio-routing =
|
|
"Headphone Jack", "RHPOUT",
|
|
"Headphone Jack", "LHPOUT",
|
|
"LLINEIN", "Line In Jack",
|
|
"RLINEIN", "Line In Jack";
|
|
|
|
atmel,ssc-controller = <&ssc0>;
|
|
atmel,audio-codec = <&wm8731>;
|
|
};
|
|
};
|