korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-26 20:44:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

DTS updates for the Gemini:

Browse Source 
- Set righ flashes on DNS-313
 - Activate ATA1 on NAS4220B
 - Set right harddisk triggers on the D-Link devices
 - Fix all DTC warnings
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABAgAGBQJa9s/sAAoJEEEQszewGV1zbhUQALLrhwlQc+TIj4J58bEMD+rj
 Icsc8Kp7Jo42Ep2YJ13GafcLEld5pBzBxAi8sjln6mM2dmIN3oymT6k7STykJw53
 YjUspSIhFbcJEom9a40LqigWvZsev0pgiNhYU8CGRmCkuI45t9ZMwRoO7mOQKoJN
 MY7ZSpYcHDY8CssJ/b5ipdWKrNJdyJPqSzGk1L0Eq7pidIE6gkKmS9SrcXk5amiG
 5MvQEJkFLM/sKFa761gj9ncphmbdeMYEu7emqn1ulz0XSqV3dKIrrYQM8bnhRpFs
 W0uZs8UHAUYwYzO0isNISjxCzLsNU7BA3m6QC4obLhvoS8sLUqmrtLFBK0qY2l3h
 Feba5mGXIvoekeNL0haMGCOzVmJYaYxZXJTCV3fIP2+1t20KQh0jfDgrNr1Zzg8b
 g65K2BbEXHQz3bgQkpbFHXS+4tUie0hqkefIEbBd+pbWgmiHebEOIpoYKNHVGJtv
 ZXbZAAdeSRxopnkrhO6oaKss1KftS8ve4s75HiqYyQZ4VLU9dDcCJQ/Aqfau/QDx
 us0lfH9nsJH2zuF/X17jdDQyeXVqCWFwA02unKPcl11lpJ8GO8ohXcJx24z1fuDU
 XUSiSBL44hCcO+NpzeDvw9/Lw2XaXmiAFQ56jqIImQWisOxKuMH5NHq1+KwtJso+
 JZ7q8qO6sbTIzA+SoKE/
 =pLJv
 -----END PGP SIGNATURE-----

Merge tag 'gemini-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt

DTS updates for the Gemini:
- Set righ flashes on DNS-313
- Activate ATA1 on NAS4220B
- Set right harddisk triggers on the D-Link devices
- Fix all DTC warnings

* tag 'gemini-dts-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik:
  ARM: dts: Fix DTC warnings
  ARM: dts: Add second ATA to NAS4220B
  ARM: dts: Fix bootargs for Gemini D-Link devices
  ARM: dts: Fix the DNS-313 flash compatible
  ARM: dts: Set DNS-685 LEDs to use better triggers
  ARM: dtd: Set DNS-313 LEDs to use better triggers
  ARM: dts: gemini: Fix "debounce-interval" property misspelling

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-05-14 13:33:05 -07:00
commit 11040c1670
8 changed files with 56 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/boot/dts/gemini-dlink-dir-685.dts
View File

@ -13,22 +13,22 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { memory@0 {
/* 128 MB SDRAM in 2 x Hynix HY5DU121622DTP-D43 */ /* 128 MB SDRAM in 2 x Hynix HY5DU121622DTP-D43 */
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x8000000>; reg = <0x00000000 0x8000000>;
}; };
chosen { chosen {
stdout-path = "uart0:115200n8"; bootargs = "console=ttyS0,19200n8 root=/dev/sda1 rw rootwait";
stdout-path = "uart0:19200n8";
}; };
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button-esc { button-esc {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
label = "reset"; label = "reset";
@ -36,7 +36,7 @@
gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; gpios = <&gpio0 8 GPIO_ACTIVE_LOW>;
}; };
button-eject { button-eject {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_EJECTCD>; linux,code = <KEY_EJECTCD>;
label = "unmount"; label = "unmount";
@ -98,7 +98,7 @@
/* /*
* These two LEDs are on the side of the device. * These two LEDs are on the side of the device.
* For electrical reasons, both LEDs cannot be active * For electrical reasons, both LEDs cannot be active
* at the same time so only blue or orange can on at * at the same time so only blue or orange can be on at
* one time. Enabling both makes the LED go dark. * one time. Enabling both makes the LED go dark.
* The LEDs both sit inside the unmount button and the * The LEDs both sit inside the unmount button and the
* label on the case says "unmount". * label on the case says "unmount".
@ -108,12 +108,14 @@
/* Collides with LPC_SERIRQ, UART DTR, SSP FSC pins */ /* Collides with LPC_SERIRQ, UART DTR, SSP FSC pins */
gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
linux,default-trigger = "disk-read";
}; };
led-orange-hd { led-orange-hd {
label = "dir685:orange:HD"; label = "dir685:orange:HD";
/* Collides with LPC_LAD[2], UART DSR, SSP ECLK pins */ /* Collides with LPC_LAD[2], UART DSR, SSP ECLK pins */
gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
linux,default-trigger = "disk-write";
}; };
}; };

19
arch/arm/boot/dts/gemini-dlink-dns-313.dts
View File

@ -15,7 +15,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { memory@0 {
/* 64 MB SDRAM in a Nanya NT5DS32M16BS-6K package */ /* 64 MB SDRAM in a Nanya NT5DS32M16BS-6K package */
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x4000000>; reg = <0x00000000 0x4000000>;
@ -26,15 +26,15 @@
}; };
chosen { chosen {
bootargs = "console=ttyS0,19200n8 root=/dev/sda4 rw rootwait";
stdout-path = "uart0:19200n8"; stdout-path = "uart0:19200n8";
}; };
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button-esc { button-esc {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_ESC>; linux,code = <KEY_ESC>;
label = "reset"; label = "reset";
@ -59,14 +59,13 @@
label = "dns313:green:disk"; label = "dns313:green:disk";
gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
linux,default-trigger = "ide-disk"; linux,default-trigger = "disk-read";
/* Ideally should activate while reading */
}; };
led-disk-red { led-disk-red {
label = "dns313:red:disk"; label = "dns313:red:disk";
gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 4 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
/* Ideally should activate while writing */ linux,default-trigger = "disk-write";
}; };
}; };
@ -158,8 +157,12 @@
soc { soc {
flash@30000000 { flash@30000000 {
/*
* This is a Eon EN29LV400AB 512 KiB flash with
* three partitions.
*/
compatible = "cortina,gemini-flash", "jedec-flash";
status = "okay"; status = "okay";
/* 512KB of flash */
reg = <0x30000000 0x00080000>; reg = <0x30000000 0x00080000>;
/* /*

20
arch/arm/boot/dts/gemini-nas4220b.dts
View File

@ -14,7 +14,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { /* 128 MB */ memory@0 { /* 128 MB */
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x8000000>; reg = <0x00000000 0x8000000>;
}; };
@ -26,19 +26,17 @@
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@29 { button-setup {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_SETUP>; linux,code = <KEY_SETUP>;
label = "Backup button"; label = "Backup button";
/* Conflict with TVC */ /* Conflict with TVC */
gpios = <&gpio1 29 GPIO_ACTIVE_LOW>; gpios = <&gpio1 29 GPIO_ACTIVE_LOW>;
}; };
button@31 { button-restart {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_RESTART>; linux,code = <KEY_RESTART>;
label = "Softreset button"; label = "Softreset button";
@ -49,13 +47,13 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@28 { led-orange-hdd {
label = "nas4220b:orange:hdd"; label = "nas4220b:orange:hdd";
/* Conflict with TVC */ /* Conflict with TVC */
gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
default-state = "on"; default-state = "on";
}; };
led@30 { led-green-os {
label = "nas4220b:green:os"; label = "nas4220b:green:os";
/* Conflict with TVC */ /* Conflict with TVC */
gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
@ -202,5 +200,9 @@
ata@63000000 { ata@63000000 {
status = "okay"; status = "okay";
}; };
ata@63400000 {
status = "okay";
};
}; };
}; };

12
arch/arm/boot/dts/gemini-rut1xx.dts
View File

@ -14,7 +14,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { /* 128 MB */ memory@0 { /* 128 MB */
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x8000000>; reg = <0x00000000 0x8000000>;
}; };
@ -26,11 +26,9 @@
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@28 { button-setup {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_SETUP>; linux,code = <KEY_SETUP>;
label = "Reset to defaults"; label = "Reset to defaults";
@ -41,14 +39,14 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@7 { led-gsm {
/* FIXME: add the LED color */ /* FIXME: add the LED color */
label = "rut1xx::gsm"; label = "rut1xx::gsm";
/* Conflict with ICE */ /* Conflict with ICE */
gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
default-state = "on"; default-state = "on";
}; };
led@31 { led-power {
/* FIXME: add the LED color */ /* FIXME: add the LED color */
label = "rut1xx::power"; label = "rut1xx::power";
/* Conflict with NAND CE0 */ /* Conflict with NAND CE0 */

12
arch/arm/boot/dts/gemini-sq201.dts
View File

@ -14,7 +14,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { /* 128 MB */ memory@0 { /* 128 MB */
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x8000000>; reg = <0x00000000 0x8000000>;
}; };
@ -26,11 +26,9 @@
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@18 { button-setup {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_SETUP>; linux,code = <KEY_SETUP>;
label = "factory reset"; label = "factory reset";
@ -41,14 +39,14 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@20 { led-green-info {
label = "sq201:green:info"; label = "sq201:green:info";
/* Conflict with parallel flash */ /* Conflict with parallel flash */
gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
default-state = "on"; default-state = "on";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led@31 { led-green-usb {
label = "sq201:green:usb"; label = "sq201:green:usb";
/* Conflict with parallel and NAND flash */ /* Conflict with parallel and NAND flash */
gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 31 GPIO_ACTIVE_HIGH>;

17
arch/arm/boot/dts/gemini-wbd111.dts
View File

@ -14,7 +14,8 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { /* 128 MB */ memory@0 {
/* 128 MB */
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x8000000>; reg = <0x00000000 0x8000000>;
}; };
@ -26,11 +27,9 @@
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@5 { button-setup {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_SETUP>; linux,code = <KEY_SETUP>;
label = "reset"; label = "reset";
@ -42,25 +41,25 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@1 { led-red-l3 {
label = "wbd111:red:L3"; label = "wbd111:red:L3";
/* Conflict with TVC and extended parallel flash */ /* Conflict with TVC and extended parallel flash */
gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@2 { led-green-l4 {
label = "wbd111:green:L4"; label = "wbd111:green:L4";
/* Conflict with TVC and extended parallel flash */ /* Conflict with TVC and extended parallel flash */
gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@3 { led-red-l4 {
label = "wbd111:red:L4"; label = "wbd111:red:L4";
/* Conflict with TVC and extended parallel flash */ /* Conflict with TVC and extended parallel flash */
gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@5 { led-greeb-l3 {
label = "wbd111:green:L3"; label = "wbd111:green:L3";
/* Conflict with TVC and extended parallel flash */ /* Conflict with TVC and extended parallel flash */
gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;

16
arch/arm/boot/dts/gemini-wbd222.dts
View File

@ -14,7 +14,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
memory { /* 128 MB */ memory@0 { /* 128 MB */
device_type = "memory"; device_type = "memory";
reg = <0x00000000 0x8000000>; reg = <0x00000000 0x8000000>;
}; };
@ -26,11 +26,9 @@
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
button@5 { button-setup {
debounce_interval = <50>; debounce-interval = <50>;
wakeup-source; wakeup-source;
linux,code = <KEY_SETUP>; linux,code = <KEY_SETUP>;
label = "reset"; label = "reset";
@ -42,25 +40,25 @@
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@1 { led-red-l3 {
label = "wbd111:red:L3"; label = "wbd111:red:L3";
/* Conflict with TVC and extended parallel flash */ /* Conflict with TVC and extended parallel flash */
gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 1 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@2 { led-green-l4 {
label = "wbd111:green:L4"; label = "wbd111:green:L4";
/* Conflict with TVC and extended parallel flash */ /* Conflict with TVC and extended parallel flash */
gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@3 { led-red-l4 {
label = "wbd111:red:L4"; label = "wbd111:red:L4";
/* Conflict with TVC and extended parallel flash */ /* Conflict with TVC and extended parallel flash */
gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 3 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@5 { led-green-l3 {
label = "wbd111:green:L3"; label = "wbd111:green:L3";
/* Conflict with TVC and extended parallel flash */ /* Conflict with TVC and extended parallel flash */
gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 5 GPIO_ACTIVE_HIGH>;

2
arch/arm/boot/dts/gemini.dtsi
View File

@ -3,8 +3,6 @@
* Device Tree file for Cortina systems Gemini SoC * Device Tree file for Cortina systems Gemini SoC
*/ */
/include/ "skeleton.dtsi"
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/clock/cortina,gemini-clock.h> #include <dt-bindings/clock/cortina,gemini-clock.h>
#include <dt-bindings/reset/cortina,gemini-reset.h> #include <dt-bindings/reset/cortina,gemini-reset.h>