system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-16 16:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fourth batch of DT changes for 4.2:

Browse source 
- rtc node for at91sam9rl/at91sam9rlek
 - move to stdout-path for console on kizbox and all Atmel's boards
 - Addition of the Acme Systems' Arietta G25
 - two little fixes for Kizbox and sama5d4ek
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQEcBAABAgAGBQJVcZyfAAoJEAf03oE53VmQv+sH+wbJx4PN0KdgGQXhOzj/UBRp
 6LU4LZGGmCTxM0+FRDH9Bepjwwr8iiHTfaNPnM3bgDrEj3Ik43ekMLqgtIwrkIn2
 YRfZY0t4oPZIte+weBAqDl7qHVKaVlttbZABEAVI2rQgui+LAj6T4u3rmUsvoPHU
 j8NP6Ng7mWD6nb31ulrPezo33cz8jutoPerWIzclWa+sJhB4bHZHb7N4z7SvouDG
 SXlvq5HkK2Az3DwT+RgHyqzSAVa/zl+rOce5LhOgD1I0p3OCPJ+aO0oxQJOaS48F
 JmLsEY6xO3wavMFm5z/AHOD+sJej+iGpmHf6EwF93OVtiu83wfxIWml+xQdcjNg=
 =FN7g
 -----END PGP SIGNATURE-----

Merge tag 'at91-dt4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt

Fourth batch of DT changes for 4.2:
- rtc node for at91sam9rl/at91sam9rlek
- move to stdout-path for console on kizbox and all Atmel's boards
- Addition of the Acme Systems' Arietta G25
- two little fixes for Kizbox and sama5d4ek

* tag 'at91-dt4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
  ARM: at91/dt: sama5d4ek: mci0 uses slot 0
  ARM: at91/dt: kizbox: fix mismatch LED PWM device
  ARM: at91/dt: Add Acme Arietta G25
  ARM: at91/dt: sama5d4 xplained: use stdout-path
  ARM: at91/dt: sama5d4ek: use stdout-path
  ARM: at91/dt: sama5d3 xplained: use stdout-path
  ARM: at91/dt: sama5d3xek: use stdout-path
  ARM: at91/dt: at91sam9x5ek: use stdout-path
  ARM: at91/dt: at91sam9rlek: use stdout-path
  ARM: at91/dt: at91sam9n12ek: use stdout-path
  ARM: at91/dt: at91sam9m10g45ek use stdout-path
  ARM: at91/dt: at91sam9g20ek: use stdout-path
  ARM: at91/dt: at91sam9263ek: use stdout-path
  ARM: at91/dt: at91sam9261ek: use stdout-path
  ARM: at91/dt: at91rm9200ek: use stdout-path
  ARM: at91/dt: kizbox: use stdout-path
  ARM: at91/dt: at91sam9rlek: add RTC
  ARM: at91/dt: at91sam9rl: fix rtc node
This commit is contained in:
Kevin Hilman 2015-06-10 17:03:07 -07:00
parent b3182ff6d9 ea25525ce0
commit 36d32ed978
18 changed files with 123 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -31,6 +31,7 @@ dtb-$(CONFIG_SOC_SAM_V4_V5) += \
at91sam9n12ek.dtb \
at91sam9rlek.dtb \
at91-ariag25.dtb \
at91-ariettag25.dtb \
at91-cosino_mega2560.dtb \
at91-kizboxmini.dtb \
at91sam9g15ek.dtb \

79
arch/arm/boot/dts/at91-ariettag25.dts Normal file
View file

@ -0,0 +1,79 @@
/*
* Device Tree file for Arietta G25
* This device tree is minimal, to activate more peripherals, see:
* http://dts.acmesystems.it/arietta/
*/
/dts-v1/;
#include "at91sam9g25.dtsi"
/ {
model = "Acme Systems Arietta G25";
compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";
aliases {
serial0 = &dbgu;
};
chosen {
stdout-path = "serial0:115200n8";
};
memory {
reg = <0x20000000 0x8000000>;
};
clocks {
slow_xtal {
clock-frequency = <32768>;
};
main_xtal {
clock-frequency = <12000000>;
};
};
ahb {
apb {
mmc0: mmc@f0008000 {
pinctrl-0 = <
&pinctrl_mmc0_slot0_clk_cmd_dat0
&pinctrl_mmc0_slot0_dat1_3>;
status = "okay";
slot@0 {
reg = <0>;
bus-width = <4>;
};
};
usb2: gadget@f803c000 {
status = "okay";
};
dbgu: serial@fffff200 {
status = "okay";
};
rtc@fffffeb0 {
status = "okay";
};
};
usb0: ohci@00600000 {
status = "okay";
num-ports = <3>;
};
usb1: ehci@00700000 {
status = "okay";
};
};
leds {
compatible = "gpio-leds";
arietta_led {
label = "arietta_led";
gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
linux,default-trigger = "heartbeat";
};
};
};

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

@ -16,7 +16,7 @@ / {
chosen {
bootargs = "ubi.mtd=ubi";
linux,stdout-path = &dbgu;
stdout-path = &dbgu;
};
memory {
@ -126,7 +126,7 @@ network_green {
network_red {
label = "pwm:red:network";
pwms = <&tcb_pwm 3 10000000 PWM_POLARITY_INVERTED>;
pwms = <&tcb_pwm 4 10000000 PWM_POLARITY_INVERTED>;
max-brightness = <255>;
linux,default-trigger = "default-on";
};

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

@ -15,7 +15,7 @@ / {
chosen {
bootargs = "ubi.mtd=ubi";
linux,stdout-path = &dbgu;
stdout-path = &dbgu;
};
memory {

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

@ -15,7 +15,7 @@ / {
chosen {
bootargs = "ubi.mtd=ubi";
linux,stdout-path = &dbgu;
stdout-path = &dbgu;
};
memory {

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

@ -14,7 +14,7 @@ / {
compatible = "atmel,sama5d3-xplained", "atmel,sama5d3", "atmel,sama5";
chosen {
bootargs = "console=ttyS0,115200";
stdout-path = "serial0:115200n8";
};
memory {

3
arch/arm/boot/dts/at91-sama5d4_xplained.dts
View file

@ -50,7 +50,8 @@ / {
compatible = "atmel,sama5d4-xplained", "atmel,sama5d4", "atmel,sama5";
chosen {
bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk";
bootargs = "ignore_loglevel earlyprintk";
stdout-path = "serial0:115200n8";
};
memory {

7
arch/arm/boot/dts/at91-sama5d4ek.dts
View file

@ -50,7 +50,8 @@ / {
compatible = "atmel,sama5d4ek", "atmel,sama5d4", "atmel,sama5";
chosen {
bootargs = "console=ttyS0,115200 ignore_loglevel earlyprintk";
bootargs = "ignore_loglevel earlyprintk";
stdout-path = "serial0:115200n8";
};
memory {
@ -108,8 +109,8 @@ adc0: adc@fc034000 {
mmc0: mmc@f8000000 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>;
slot@1 {
reg = <1>;
slot@0 {
reg = <0>;
bus-width = <4>;
cd-gpios = <&pioE 5 0>;
};

4
arch/arm/boot/dts/at91rm9200ek.dts
View file

@ -12,6 +12,10 @@ / {
model = "Atmel AT91RM9200 evaluation kit";
compatible = "atmel,at91rm9200ek", "atmel,at91rm9200";
chosen {
stdout-path = "serial0:115200n8";
};
memory {
reg = <0x20000000 0x4000000>;
};

3
arch/arm/boot/dts/at91sam9261ek.dts
View file

@ -13,7 +13,8 @@ / {
compatible = "atmel,at91sam9261ek", "atmel,at91sam9261", "atmel,at91sam9";
chosen {
bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs rw";
bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs rw";
stdout-path = "serial0:115200n8";
};
memory {

3
arch/arm/boot/dts/at91sam9263ek.dts
View file

@ -13,7 +13,8 @@ / {
compatible = "atmel,at91sam9263ek", "atmel,at91sam9263", "atmel,at91sam9";
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 {

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

@ -10,7 +10,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 {

3
arch/arm/boot/dts/at91sam9m10g45ek.dts
View file

@ -15,7 +15,8 @@ / {
compatible = "atmel,at91sam9m10g45ek", "atmel,at91sam9g45", "atmel,at91sam9";
chosen {
bootargs = "mem=64M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
bootargs = "mem=64M root=/dev/mtdblock1 rw rootfstype=jffs2";
stdout-path = "serial0:115200n8";
};
memory {

3
arch/arm/boot/dts/at91sam9n12ek.dts
View file

@ -14,7 +14,8 @@ / {
compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9";
chosen {
bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";
bootargs = "root=/dev/mtdblock1 rw rootfstype=jffs2";
stdout-path = "serial0:115200n8";
};
memory {

15
arch/arm/boot/dts/at91sam9rl.dtsi
View file

@ -1065,13 +1065,6 @@ clk32k: slck {
};
};
rtc@fffffeb0 {
compatible = "atmel,at91rm9200-rtc";
reg = <0xfffffeb0 0x40>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
status = "disabled";
};
rtc@fffffd20 {
compatible = "atmel,at91sam9260-rtt";
reg = <0xfffffd20 0x10>;
@ -1085,6 +1078,14 @@ gpbr: syscon@fffffd60 {
reg = <0xfffffd60 0x10>;
status = "disabled";
};
rtc@fffffe00 {
compatible = "atmel,at91rm9200-rtc";
reg = <0xfffffe00 0x40>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
status = "disabled";
};
};
};

7
arch/arm/boot/dts/at91sam9rlek.dts
View file

@ -13,7 +13,8 @@ / {
compatible = "atmel,at91sam9rlek", "atmel,at91sam9rl", "atmel,at91sam9";
chosen {
bootargs = "console=ttyS0,115200 rootfstype=ubifs root=ubi0:rootfs ubi.mtd=5 rw";
bootargs = "rootfstype=ubifs root=ubi0:rootfs ubi.mtd=5 rw";
stdout-path = "serial0:115200n8";
};
memory {
@ -184,6 +185,10 @@ pinctrl_board_mmc0: mmc0-board {
watchdog@fffffd40 {
status = "okay";
};
rtc@fffffe00 {
status = "okay";
};
};
};

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

@ -13,7 +13,8 @@ / {
compatible = "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
chosen {
bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";
bootargs = "root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs";
stdout-path = "serial0:115200n8";
};
ahb {

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

@ -11,7 +11,8 @@ / {
compatible = "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
chosen {
bootargs = "console=ttyS0,115200 rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs";
bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs";
stdout-path = "serial0:115200n8";
};
memory {