Skip to content

L
linux
Commit 3abb0c6c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'omap-for-v4.9/dt-pt1-signed' of... 

Merge tag 'omap-for-v4.9/dt-pt1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt

Merge "DTS related changes for omaps for v4.9 merge window" from Tony Lindgren:

- Update elm phandle for am335x

- Fix overo NAND gpmc ranges, this has always been broken so it can
  wait for the merge window

- Fix NAND and use NAND ready pin for logicpd gpmc, this can wait too
  as it's been using the older configration since the dts got added

- A series of dtc warning fixes for unit names

- Keep dcdc3, 5 and 6 enabled during suspend on am347x boards

- Disable DDR regulator during rtc-only/poweroff mode for am437x boards

- Remove redundant regulator compatibles for am437x boards

- Increas QSPI max frequency for dra7 boards

- Enable QSPI for am57xx-idk-common

- Enable am335x-wega audio support

- Workaround for i845 for dra7

- Update binding for logicpd boards

- Add gpio-decoder nodes for am335x-icev2 board

- Add linux,pci-domain property for dra7

- Fix dra7 clock data gmac_gmii_ref_clk_div and related clock tree
  entries, these can wait for merge window as Ethernet works on dra7

- A series of changes to drop skeleton.dtsi because of dtc warnings

* tag 'omap-for-v4.9/dt-pt1-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (54 commits)
  ARM: dts: dra7: Add missing unit name to memory nodes
  ARM: dts: dra62x: Add missing unit name to memory nodes
  ARM: dts: dm8168: Add missing unit name to memory nodes
  ARM: dts: dm8148: Add missing unit name to memory nodes
  ARM: dts: am572x: Add missing unit name to memory nodes
  ARM: dts: am4372: Add missing unit name to memory nodes
  ARM: dts: am3517: Add missing unit name to memory nodes
  ARM: dts: am335x: Add missing unit name to memory nodes
  ARM: dts: omap5: Add missing unit name to memory nodes
  ARM: dts: omap4: Add missing unit name to memory nodes
  ARM: dts: omap3: Add missing unit name to memory nodes
  ARM: dts: omap2: Add missing unit name to memory nodes
  ARM: dts: am4372: Remove skeleton.dtsi usage
  ARM: dts: dra7: Remove skeleton.dtsi usage
  ARM: dts: dm816x: Remove skeleton.dtsi usage
  ARM: dts: dm814x: Remove skeleton.dtsi usage
  ARM: dts: am33xx: Remove skeleton.dtsi usage
  ARM: dts: omap5: Remove skeleton.dtsi usage
  ARM: dts: omap4: Remove skeleton.dtsi usage
  ARM: dts: omap3: Remove skeleton.dtsi usage
  ...
parents cbd1d63c 5c4d9f0d
Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 248 deletions
Documentation/devicetree/bindings/arm/omap/omap.txt
View file @ 3abb0c6c
...@@ -180,3 +180,9 @@ Boards: ...@@ -180,3 +180,9 @@ Boards:
- DRA722 EVM: Software Development Board for DRA722 - DRA722 EVM: Software Development Board for DRA722
compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7" compatible = "ti,dra72-evm", "ti,dra722", "ti,dra72", "ti,dra7"
- DM3730 Logic PD Torpedo + Wireless: Commercial System on Module with WiFi and Bluetooth
compatible = "logicpd,dm3730-torpedo-devkit", "ti,omap3630", "ti,omap3"
- DM3730 Logic PD SOM-LV: Commercial System on Module with WiFi and Bluetooth
compatible = "logicpd,dm3730-som-lv-devkit", "ti,omap3630", "ti,omap3"
arch/arm/boot/dts/am335x-baltos.dtsi
View file @ 3abb0c6c
...@@ -24,12 +24,12 @@ cpu@0 { ...@@ -24,12 +24,12 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vbat"; regulator-name = "vbat";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -37,7 +37,7 @@ vbat: fixedregulator@0 { ...@@ -37,7 +37,7 @@ vbat: fixedregulator@0 {
regulator-boot-on; regulator-boot-on;
}; };
wl12xx_vmmc: fixedregulator@2 { wl12xx_vmmc: fixedregulator2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wl12xx_gpio>; pinctrl-0 = <&wl12xx_gpio>;
compatible = "regulator-fixed"; compatible = "regulator-fixed";
...@@ -226,7 +226,7 @@ nand@0,0 { ...@@ -226,7 +226,7 @@ nand@0,0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
elm_id = <&elm>; ti,elm-id = <&elm>;
}; };
}; };
......
arch/arm/boot/dts/am335x-base0033.dts
View file @ 3abb0c6c
...@@ -29,13 +29,13 @@ leds_base { ...@@ -29,13 +29,13 @@ leds_base {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@0 { led0 {
label = "base:red:user"; label = "base:red:user";
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; /* gpio1_21 */ gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; /* gpio1_21 */
default-state = "off"; default-state = "off";
}; };
led@1 { led1 {
label = "base:green:user"; label = "base:green:user";
gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; /* gpio2_0 */ gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>; /* gpio2_0 */
default-state = "off"; default-state = "off";
......
arch/arm/boot/dts/am335x-bone-common.dtsi
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ cpu@0 { ...@@ -13,7 +13,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
...@@ -28,28 +28,28 @@ leds { ...@@ -28,28 +28,28 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@2 { led2 {
label = "beaglebone:green:heartbeat"; label = "beaglebone:green:heartbeat";
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "beaglebone:green:mmc0"; label = "beaglebone:green:mmc0";
gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
default-state = "off"; default-state = "off";
}; };
led@4 { led4 {
label = "beaglebone:green:usr2"; label = "beaglebone:green:usr2";
gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "cpu0"; linux,default-trigger = "cpu0";
default-state = "off"; default-state = "off";
}; };
led@5 { led5 {
label = "beaglebone:green:usr3"; label = "beaglebone:green:usr3";
gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "mmc1"; linux,default-trigger = "mmc1";
...@@ -57,7 +57,7 @@ led@5 { ...@@ -57,7 +57,7 @@ led@5 {
}; };
}; };
vmmcsd_fixed: fixedregulator@0 { vmmcsd_fixed: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed"; regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/am335x-chilisom.dtsi
View file @ 3abb0c6c
...@@ -19,7 +19,7 @@ cpu@0 { ...@@ -19,7 +19,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
......
arch/arm/boot/dts/am335x-cm-t335.dts
View file @ 3abb0c6c
...@@ -17,7 +17,7 @@ / { ...@@ -17,7 +17,7 @@ / {
model = "CompuLab CM-T335"; model = "CompuLab CM-T335";
compatible = "compulab,cm-t335", "ti,am33xx"; compatible = "compulab,cm-t335", "ti,am33xx";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128 MB */ reg = <0x80000000 0x8000000>; /* 128 MB */
}; };
...@@ -26,7 +26,7 @@ leds { ...@@ -26,7 +26,7 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gpio_led_pins>; pinctrl-0 = <&gpio_led_pins>;
led@0 { led0 {
label = "cm_t335:green"; label = "cm_t335:green";
gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* gpio2_0 */ gpios = <&gpio2 0 GPIO_ACTIVE_LOW>; /* gpio2_0 */
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
...@@ -34,7 +34,7 @@ led@0 { ...@@ -34,7 +34,7 @@ led@0 {
}; };
/* regulator for mmc */ /* regulator for mmc */
vmmc_fixed: fixedregulator@0 { vmmc_fixed: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmc_fixed"; regulator-name = "vmmc_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -42,7 +42,7 @@ vmmc_fixed: fixedregulator@0 { ...@@ -42,7 +42,7 @@ vmmc_fixed: fixedregulator@0 {
}; };
/* Regulator for WiFi */ /* Regulator for WiFi */
vwlan_fixed: fixedregulator@2 { vwlan_fixed: fixedregulator2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vwlan_fixed"; regulator-name = "vwlan_fixed";
gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>; /* gpio0_20 */ gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>; /* gpio0_20 */
......
arch/arm/boot/dts/am335x-evm.dts
View file @ 3abb0c6c
...@@ -20,12 +20,12 @@ cpu@0 { ...@@ -20,12 +20,12 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vbat"; regulator-name = "vbat";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -33,13 +33,13 @@ vbat: fixedregulator@0 { ...@@ -33,13 +33,13 @@ vbat: fixedregulator@0 {
regulator-boot-on; regulator-boot-on;
}; };
lis3_reg: fixedregulator@1 { lis3_reg: fixedregulator1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "lis3_reg"; regulator-name = "lis3_reg";
regulator-boot-on; regulator-boot-on;
}; };
wlan_en_reg: fixedregulator@2 { wlan_en_reg: fixedregulator2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "wlan-en-regulator"; regulator-name = "wlan-en-regulator";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
...@@ -53,7 +53,7 @@ wlan_en_reg: fixedregulator@2 { ...@@ -53,7 +53,7 @@ wlan_en_reg: fixedregulator@2 {
enable-active-high; enable-active-high;
}; };
matrix_keypad: matrix_keypad@0 { matrix_keypad: matrix_keypad0 {
compatible = "gpio-matrix-keypad"; compatible = "gpio-matrix-keypad";
debounce-delay-ms = <5>; debounce-delay-ms = <5>;
col-scan-delay-us = <2>; col-scan-delay-us = <2>;
...@@ -73,20 +73,20 @@ &gpio1 26 GPIO_ACTIVE_HIGH /* Bank1, pin26 */ ...@@ -73,20 +73,20 @@ &gpio1 26 GPIO_ACTIVE_HIGH /* Bank1, pin26 */
0x0201006c>; /* DOWN */ 0x0201006c>; /* DOWN */
}; };
gpio_keys: volume_keys@0 { gpio_keys: volume_keys0 {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
autorepeat; autorepeat;
switch@9 { switch9 {
label = "volume-up"; label = "volume-up";
linux,code = <115>; linux,code = <115>;
gpios = <&gpio0 2 GPIO_ACTIVE_LOW>; gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
wakeup-source; wakeup-source;
}; };
switch@10 { switch10 {
label = "volume-down"; label = "volume-down";
linux,code = <114>; linux,code = <114>;
gpios = <&gpio0 3 GPIO_ACTIVE_LOW>; gpios = <&gpio0 3 GPIO_ACTIVE_LOW>;
......
arch/arm/boot/dts/am335x-evmsk.dts
View file @ 3abb0c6c
...@@ -27,12 +27,12 @@ cpu@0 { ...@@ -27,12 +27,12 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vbat"; regulator-name = "vbat";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -40,13 +40,13 @@ vbat: fixedregulator@0 { ...@@ -40,13 +40,13 @@ vbat: fixedregulator@0 {
regulator-boot-on; regulator-boot-on;
}; };
lis3_reg: fixedregulator@1 { lis3_reg: fixedregulator1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "lis3_reg"; regulator-name = "lis3_reg";
regulator-boot-on; regulator-boot-on;
}; };
wl12xx_vmmc: fixedregulator@2 { wl12xx_vmmc: fixedregulator2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&wl12xx_gpio>; pinctrl-0 = <&wl12xx_gpio>;
compatible = "regulator-fixed"; compatible = "regulator-fixed";
...@@ -58,7 +58,7 @@ wl12xx_vmmc: fixedregulator@2 { ...@@ -58,7 +58,7 @@ wl12xx_vmmc: fixedregulator@2 {
enable-active-high; enable-active-high;
}; };
vtt_fixed: fixedregulator@3 { vtt_fixed: fixedregulator3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vtt"; regulator-name = "vtt";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
...@@ -75,26 +75,26 @@ leds { ...@@ -75,26 +75,26 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@1 { led1 {
label = "evmsk:green:usr0"; label = "evmsk:green:usr0";
gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "evmsk:green:usr1"; label = "evmsk:green:usr1";
gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 5 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "evmsk:green:mmc0"; label = "evmsk:green:mmc0";
gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
default-state = "off"; default-state = "off";
}; };
led@4 { led4 {
label = "evmsk:green:heartbeat"; label = "evmsk:green:heartbeat";
gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
...@@ -102,31 +102,31 @@ led@4 { ...@@ -102,31 +102,31 @@ led@4 {
}; };
}; };
gpio_buttons: gpio_buttons@0 { gpio_buttons: gpio_buttons0 {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
switch@1 { switch1 {
label = "button0"; label = "button0";
linux,code = <0x100>; linux,code = <0x100>;
gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
}; };
switch@2 { switch2 {
label = "button1"; label = "button1";
linux,code = <0x101>; linux,code = <0x101>;
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
}; };
switch@3 { switch3 {
label = "button2"; label = "button2";
linux,code = <0x102>; linux,code = <0x102>;
gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 30 GPIO_ACTIVE_HIGH>;
wakeup-source; wakeup-source;
}; };
switch@4 { switch4 {
label = "button3"; label = "button3";
linux,code = <0x103>; linux,code = <0x103>;
gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
......
arch/arm/boot/dts/am335x-icev2.dts
View file @ 3abb0c6c
...@@ -19,12 +19,12 @@ / { ...@@ -19,12 +19,12 @@ / {
model = "TI AM3359 ICE-V2"; model = "TI AM3359 ICE-V2";
compatible = "ti,am3359-icev2", "ti,am33xx"; compatible = "ti,am3359-icev2", "ti,am33xx";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vbat"; regulator-name = "vbat";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -32,7 +32,7 @@ vbat: fixedregulator@0 { ...@@ -32,7 +32,7 @@ vbat: fixedregulator@0 {
regulator-boot-on; regulator-boot-on;
}; };
vtt_fixed: fixedregulator@1 { vtt_fixed: fixedregulator1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vtt"; regulator-name = "vtt";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
...@@ -43,52 +43,52 @@ vtt_fixed: fixedregulator@1 { ...@@ -43,52 +43,52 @@ vtt_fixed: fixedregulator@1 {
enable-active-high; enable-active-high;
}; };
leds@0 { leds0 {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@0 { led0 {
label = "out0"; label = "out0";
gpios = <&tpic2810 0 GPIO_ACTIVE_HIGH>; gpios = <&tpic2810 0 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@1 { led1 {
label = "out1"; label = "out1";
gpios = <&tpic2810 1 GPIO_ACTIVE_HIGH>; gpios = <&tpic2810 1 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "out2"; label = "out2";
gpios = <&tpic2810 2 GPIO_ACTIVE_HIGH>; gpios = <&tpic2810 2 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "out3"; label = "out3";
gpios = <&tpic2810 3 GPIO_ACTIVE_HIGH>; gpios = <&tpic2810 3 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@4 { led4 {
label = "out4"; label = "out4";
gpios = <&tpic2810 4 GPIO_ACTIVE_HIGH>; gpios = <&tpic2810 4 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@5 { led5 {
label = "out5"; label = "out5";
gpios = <&tpic2810 5 GPIO_ACTIVE_HIGH>; gpios = <&tpic2810 5 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@6 { led6 {
label = "out6"; label = "out6";
gpios = <&tpic2810 6 GPIO_ACTIVE_HIGH>; gpios = <&tpic2810 6 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@7 { led7 {
label = "out7"; label = "out7";
gpios = <&tpic2810 7 GPIO_ACTIVE_HIGH>; gpios = <&tpic2810 7 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
...@@ -96,49 +96,58 @@ led@7 { ...@@ -96,49 +96,58 @@ led@7 {
}; };
/* Tricolor status LEDs */ /* Tricolor status LEDs */
leds@1 { leds1 {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&user_leds>; pinctrl-0 = <&user_leds>;
led@0 { led0 {
label = "status0:red:cpu0"; label = "status0:red:cpu0";
gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 17 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
linux,default-trigger = "cpu0"; linux,default-trigger = "cpu0";
}; };
led@1 { led1 {
label = "status0:green:usr"; label = "status0:green:usr";
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "status0:yellow:usr"; label = "status0:yellow:usr";
gpios = <&gpio3 9 GPIO_ACTIVE_HIGH>; gpios = <&gpio3 9 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "status1:red:mmc0"; label = "status1:red:mmc0";
gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 30 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
led@4 { led4 {
label = "status1:green:usr"; label = "status1:green:usr";
gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 20 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@5 { led5 {
label = "status1:yellow:usr"; label = "status1:yellow:usr";
gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 19 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
}; };
gpio-decoder {
compatible = "gpio-decoder";
gpios = <&pca9536 3 GPIO_ACTIVE_HIGH>,
<&pca9536 2 GPIO_ACTIVE_HIGH>,
<&pca9536 1 GPIO_ACTIVE_HIGH>,
<&pca9536 0 GPIO_ACTIVE_HIGH>;
linux,axis = <0>; /* ABS_X */
decoder-max-value = <9>;
};
}; };
&am33xx_pinmux { &am33xx_pinmux {
......
arch/arm/boot/dts/am335x-igep0033.dtsi
View file @ 3abb0c6c
...@@ -20,7 +20,7 @@ cpu@0 { ...@@ -20,7 +20,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
...@@ -31,14 +31,14 @@ leds { ...@@ -31,14 +31,14 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@0 { led0 {
label = "com:green:user"; label = "com:green:user";
gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
default-state = "on"; default-state = "on";
}; };
}; };
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vbat"; regulator-name = "vbat";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -46,7 +46,7 @@ vbat: fixedregulator@0 { ...@@ -46,7 +46,7 @@ vbat: fixedregulator@0 {
regulator-boot-on; regulator-boot-on;
}; };
vmmc: fixedregulator@0 { vmmc: fixedregulator1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmc"; regulator-name = "vmmc";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -161,7 +161,7 @@ nand@0,0 { ...@@ -161,7 +161,7 @@ nand@0,0 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
elm_id = <&elm>; ti,elm-id = <&elm>;
/* MTD partition table */ /* MTD partition table */
partition@0 { partition@0 {
......
arch/arm/boot/dts/am335x-lxm.dts
View file @ 3abb0c6c
...@@ -19,13 +19,13 @@ cpu@0 { ...@@ -19,13 +19,13 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
/* Power supply provides a fixed 5V @2A */ /* Power supply provides a fixed 5V @2A */
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vbat"; regulator-name = "vbat";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -34,7 +34,7 @@ vbat: fixedregulator@0 { ...@@ -34,7 +34,7 @@ vbat: fixedregulator@0 {
}; };
/* Power supply provides a fixed 3.3V @3A */ /* Power supply provides a fixed 3.3V @3A */
vmmcsd_fixed: fixedregulator@1 { vmmcsd_fixed: fixedregulator1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed"; regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/am335x-nano.dts
View file @ 3abb0c6c
...@@ -19,7 +19,7 @@ cpu@0 { ...@@ -19,7 +19,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
...@@ -27,7 +27,7 @@ memory { ...@@ -27,7 +27,7 @@ memory {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@0 { led0 {
label = "nanobone:green:usr1"; label = "nanobone:green:usr1";
gpios = <&gpio1 5 0>; gpios = <&gpio1 5 0>;
default-state = "off"; default-state = "off";
......
arch/arm/boot/dts/am335x-pepper.dts
View file @ 3abb0c6c
...@@ -20,7 +20,7 @@ cpu@0 { ...@@ -20,7 +20,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
...@@ -41,15 +41,15 @@ sound: sound_iface { ...@@ -41,15 +41,15 @@ sound: sound_iface {
compatible = "ti,da830-evm-audio"; compatible = "ti,da830-evm-audio";
}; };
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
}; };
v3v3c_reg: fixedregulator@1 { v3v3c_reg: fixedregulator1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
}; };
vdd5_reg: fixedregulator@2 { vdd5_reg: fixedregulator2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
}; };
}; };
...@@ -595,14 +595,14 @@ &leds { ...@@ -595,14 +595,14 @@ &leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&user_leds_pins>; pinctrl-0 = <&user_leds_pins>;
led@0 { led0 {
label = "pepper:user0:blue"; label = "pepper:user0:blue";
gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 20 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "none"; linux,default-trigger = "none";
default-state = "off"; default-state = "off";
}; };
led@1 { led1 {
label = "pepper:user1:red"; label = "pepper:user1:red";
gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "none"; linux,default-trigger = "none";
...@@ -616,21 +616,21 @@ &buttons { ...@@ -616,21 +616,21 @@ &buttons {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button@0 { button0 {
label = "home"; label = "home";
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
wakeup-source; wakeup-source;
}; };
button@1 { button1 {
label = "menu"; label = "menu";
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
wakeup-source; wakeup-source;
}; };
buttons@2 { buttons2 {
label = "power"; label = "power";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; gpios = <&gpio0 7 GPIO_ACTIVE_LOW>;
......
arch/arm/boot/dts/am335x-phycore-som.dtsi
View file @ 3abb0c6c
...@@ -25,7 +25,7 @@ cpu@0 { ...@@ -25,7 +25,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
...@@ -33,7 +33,7 @@ memory { ...@@ -33,7 +33,7 @@ memory {
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
vcc5v: fixedregulator@0 { vcc5v: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc5v"; regulator-name = "vcc5v";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -197,7 +197,7 @@ nandflash: nand@0,0 { ...@@ -197,7 +197,7 @@ nandflash: nand@0,0 {
gpmc,wr-access-ns = <30>; gpmc,wr-access-ns = <30>;
gpmc,wr-data-mux-bus-ns = <0>; gpmc,wr-data-mux-bus-ns = <0>;
elm_id = <&elm>; ti,elm-id = <&elm>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
arch/arm/boot/dts/am335x-shc.dts
View file @ 3abb0c6c
...@@ -64,50 +64,50 @@ leds { ...@@ -64,50 +64,50 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@1 { led1 {
label = "shc:power:red"; label = "shc:power:red";
gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 23 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "shc:power:bl"; label = "shc:power:bl";
gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "timer"; linux,default-trigger = "timer";
default-state = "on"; default-state = "on";
}; };
led@3 { led3 {
label = "shc:lan:red"; label = "shc:lan:red";
gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>; gpios = <&gpio0 26 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@4 { led4 {
label = "shc:lan:bl"; label = "shc:lan:bl";
gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 17 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@5 { led5 {
label = "shc:cloud:red"; label = "shc:cloud:red";
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
led@6 { led6 {
label = "shc:cloud:bl"; label = "shc:cloud:bl";
gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>; gpios = <&gpio1 18 GPIO_ACTIVE_HIGH>;
default-state = "off"; default-state = "off";
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
vmmcsd_fixed: fixedregulator@0 { vmmcsd_fixed: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed"; regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/am335x-sl50.dts
View file @ 3abb0c6c
...@@ -19,6 +19,11 @@ cpu@0 { ...@@ -19,6 +19,11 @@ cpu@0 {
}; };
}; };
memory@80000000 {
device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */
};
chosen { chosen {
stdout-path = &uart0; stdout-path = &uart0;
}; };
...@@ -28,25 +33,25 @@ leds { ...@@ -28,25 +33,25 @@ leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_pins>; pinctrl-0 = <&led_pins>;
led@0 { led0 {
label = "sl50:green:usr0"; label = "sl50:green:usr0";
gpios = <&gpio1 21 GPIO_ACTIVE_LOW>; gpios = <&gpio1 21 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
led@1 { led1 {
label = "sl50:red:usr1"; label = "sl50:red:usr1";
gpios = <&gpio1 22 GPIO_ACTIVE_LOW>; gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "sl50:green:usr2"; label = "sl50:green:usr2";
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; gpios = <&gpio1 23 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "sl50:red:usr3"; label = "sl50:red:usr3";
gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
...@@ -103,7 +108,7 @@ emmc_pwrseq: pwrseq@0 { ...@@ -103,7 +108,7 @@ emmc_pwrseq: pwrseq@0 {
reset-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio1 20 GPIO_ACTIVE_LOW>;
}; };
vmmcsd_fixed: fixedregulator@0 { vmmcsd_fixed: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed"; regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/am335x-wega.dtsi
View file @ 3abb0c6c
...@@ -11,10 +11,14 @@ / { ...@@ -11,10 +11,14 @@ / {
model = "Phytec AM335x phyBOARD-WEGA"; model = "Phytec AM335x phyBOARD-WEGA";
compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx"; compatible = "phytec,am335x-wega", "phytec,am335x-phycore-som", "ti,am33xx";
sound: sound_iface {
compatible = "ti,da830-evm-audio";
};
regulators { regulators {
compatible = "simple-bus"; compatible = "simple-bus";
vcc3v3: fixedregulator@1 { vcc3v3: fixedregulator1 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc3v3"; regulator-name = "vcc3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -24,6 +28,58 @@ vcc3v3: fixedregulator@1 { ...@@ -24,6 +28,58 @@ vcc3v3: fixedregulator@1 {
}; };
}; };
/* Audio */
&am33xx_pinmux {
mcasp0_pins: pinmux_mcasp0 {
pinctrl-single,pins = <
AM33XX_IOPAD(0x9AC, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_ahclkx.mcasp0_ahclkx */
AM33XX_IOPAD(0x990, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_aclkx.mcasp0_aclkx */
AM33XX_IOPAD(0x994, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_fsx.mcasp0_fsx */
AM33XX_IOPAD(0x998, PIN_INPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr0.mcasp0_axr0 */
AM33XX_IOPAD(0x9A8, PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mcasp0_axr1.mcasp0_axr1 */
>;
};
};
&i2c0 {
tlv320aic3007: tlv320aic3007@18 {
compatible = "ti,tlv320aic3007";
reg = <0x18>;
AVDD-supply = <&vcc3v3>;
IOVDD-supply = <&vcc3v3>;
DRVDD-supply = <&vcc3v3>;
DVDD-supply = <&vdig1_reg>;
status = "okay";
};
};
&mcasp0 {
pinctrl-names = "default";
pinctrl-0 = <&mcasp0_pins>;
op-mode = <0>; /* DAVINCI_MCASP_IIS_MODE */
tdm-slots = <2>;
serial-dir = <
2 1 0 0 /* # 0: INACTIVE, 1: TX, 2: RX */
>;
tx-num-evt = <16>;
rt-num-evt = <16>;
status = "okay";
};
&sound {
ti,model = "AM335x-Wega";
ti,audio-codec = <&tlv320aic3007>;
ti,mcasp-controller = <&mcasp0>;
ti,audio-routing =
"Line Out", "LLOUT",
"Line Out", "RLOUT",
"LINE1L", "Line In",
"LINE1R", "Line In";
clocks = <&mcasp0_fck>;
clock-names = "mclk";
status = "okay";
};
/* CAN Busses */ /* CAN Busses */
&am33xx_pinmux { &am33xx_pinmux {
dcan1_pins: pinmux_dcan1 { dcan1_pins: pinmux_dcan1 {
...@@ -99,6 +155,12 @@ &mmc1 { ...@@ -99,6 +155,12 @@ &mmc1 {
status = "okay"; status = "okay";
}; };
/* Power */
&vdig1_reg {
regulator-boot-on;
regulator-always-on;
};
/* UARTs */ /* UARTs */
&am33xx_pinmux { &am33xx_pinmux {
uart0_pins: pinmux_uart0 { uart0_pins: pinmux_uart0 {
......
arch/arm/boot/dts/am33xx.dtsi
View file @ 3abb0c6c
...@@ -11,11 +11,11 @@ ...@@ -11,11 +11,11 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/am33xx.h> #include <dt-bindings/pinctrl/am33xx.h>
#include "skeleton.dtsi"
/ { / {
compatible = "ti,am33xx"; compatible = "ti,am33xx";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
i2c0 = &i2c0; i2c0 = &i2c0;
......
arch/arm/boot/dts/am3517-craneboard.dts
View file @ 3abb0c6c
...@@ -15,7 +15,7 @@ / { ...@@ -15,7 +15,7 @@ / {
model = "TI AM3517 CraneBoard (TMDSEVM3517)"; model = "TI AM3517 CraneBoard (TMDSEVM3517)";
compatible = "ti,am3517-craneboard", "ti,am3517", "ti,omap3"; compatible = "ti,am3517-craneboard", "ti,am3517", "ti,omap3";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/am3517-evm.dts
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
model = "TI AM3517 EVM (AM3517/05 TMDSEVM3517)"; model = "TI AM3517 EVM (AM3517/05 TMDSEVM3517)";
compatible = "ti,am3517-evm", "ti,am3517", "ti,omap3"; compatible = "ti,am3517-evm", "ti,am3517", "ti,omap3";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/am3517.dtsi
View file @ 3abb0c6c
...@@ -15,7 +15,7 @@ aliases { ...@@ -15,7 +15,7 @@ aliases {
serial3 = &uart4; serial3 = &uart4;
}; };
ocp { ocp@68000000 {
am35x_otg_hs: am35x_otg_hs@5c040000 { am35x_otg_hs: am35x_otg_hs@5c040000 {
compatible = "ti,omap3-musb"; compatible = "ti,omap3-musb";
ti,hwmods = "am35x_otg_hs"; ti,hwmods = "am35x_otg_hs";
......
arch/arm/boot/dts/am3517_mt_ventoux.dts
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
model = "TeeJet Mt.Ventoux"; model = "TeeJet Mt.Ventoux";
compatible = "teejet,mt_ventoux", "ti,omap3"; compatible = "teejet,mt_ventoux", "ti,omap3";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/am4372.dtsi
View file @ 3abb0c6c
...@@ -11,12 +11,16 @@ ...@@ -11,12 +11,16 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include "skeleton.dtsi"
/ { / {
compatible = "ti,am4372", "ti,am43"; compatible = "ti,am4372", "ti,am43";
interrupt-parent = <&wakeupgen>; interrupt-parent = <&wakeupgen>;
#address-cells = <1>;
#size-cells = <1>;
memory@0 {
device_type = "memory";
reg = <0 0>;
};
aliases { aliases {
i2c0 = &i2c0; i2c0 = &i2c0;
...@@ -132,7 +136,7 @@ l2-cache-controller@48242000 { ...@@ -132,7 +136,7 @@ l2-cache-controller@48242000 {
cache-level = <2>; cache-level = <2>;
}; };
ocp { ocp@44000000 {
compatible = "ti,am4372-l3-noc", "simple-bus"; compatible = "ti,am4372-l3-noc", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
arch/arm/boot/dts/am437x-cm-t43.dts
View file @ 3abb0c6c
...@@ -209,7 +209,6 @@ tps65218: tps65218@24 { ...@@ -209,7 +209,6 @@ tps65218: tps65218@24 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
dcdc1: regulator-dcdc1 { dcdc1: regulator-dcdc1 {
compatible = "ti,tps65218-dcdc1";
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <912000>; regulator-min-microvolt = <912000>;
regulator-max-microvolt = <1144000>; regulator-max-microvolt = <1144000>;
...@@ -218,7 +217,6 @@ dcdc1: regulator-dcdc1 { ...@@ -218,7 +217,6 @@ dcdc1: regulator-dcdc1 {
}; };
dcdc2: regulator-dcdc2 { dcdc2: regulator-dcdc2 {
compatible = "ti,tps65218-dcdc2";
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <912000>; regulator-min-microvolt = <912000>;
regulator-max-microvolt = <1378000>; regulator-max-microvolt = <1378000>;
...@@ -227,7 +225,6 @@ dcdc2: regulator-dcdc2 { ...@@ -227,7 +225,6 @@ dcdc2: regulator-dcdc2 {
}; };
dcdc3: regulator-dcdc3 { dcdc3: regulator-dcdc3 {
compatible = "ti,tps65218-dcdc3";
regulator-name = "vdcdc3"; regulator-name = "vdcdc3";
regulator-suspend-enable; regulator-suspend-enable;
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
...@@ -237,7 +234,6 @@ dcdc3: regulator-dcdc3 { ...@@ -237,7 +234,6 @@ dcdc3: regulator-dcdc3 {
}; };
dcdc5: regulator-dcdc5 { dcdc5: regulator-dcdc5 {
compatible = "ti,tps65218-dcdc5";
regulator-name = "v1_0bat"; regulator-name = "v1_0bat";
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
...@@ -246,7 +242,6 @@ dcdc5: regulator-dcdc5 { ...@@ -246,7 +242,6 @@ dcdc5: regulator-dcdc5 {
}; };
dcdc6: regulator-dcdc6 { dcdc6: regulator-dcdc6 {
compatible = "ti,tps65218-dcdc6";
regulator-name = "v1_8bat"; regulator-name = "v1_8bat";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
...@@ -255,7 +250,6 @@ dcdc6: regulator-dcdc6 { ...@@ -255,7 +250,6 @@ dcdc6: regulator-dcdc6 {
}; };
ldo1: regulator-ldo1 { ldo1: regulator-ldo1 {
compatible = "ti,tps65218-ldo1";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-boot-on; regulator-boot-on;
......
arch/arm/boot/dts/am437x-gp-evm.dts
View file @ 3abb0c6c
...@@ -58,7 +58,7 @@ backlight { ...@@ -58,7 +58,7 @@ backlight {
default-brightness-level = <8>; default-brightness-level = <8>;
}; };
matrix_keypad: matrix_keypad@0 { matrix_keypad: matrix_keypad0 {
compatible = "gpio-matrix-keypad"; compatible = "gpio-matrix-keypad";
debounce-delay-ms = <5>; debounce-delay-ms = <5>;
col-scan-delay-us = <2>; col-scan-delay-us = <2>;
...@@ -513,7 +513,6 @@ tps65218: tps65218@24 { ...@@ -513,7 +513,6 @@ tps65218: tps65218@24 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
dcdc1: regulator-dcdc1 { dcdc1: regulator-dcdc1 {
compatible = "ti,tps65218-dcdc1";
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <912000>; regulator-min-microvolt = <912000>;
regulator-max-microvolt = <1144000>; regulator-max-microvolt = <1144000>;
...@@ -522,7 +521,6 @@ dcdc1: regulator-dcdc1 { ...@@ -522,7 +521,6 @@ dcdc1: regulator-dcdc1 {
}; };
dcdc2: regulator-dcdc2 { dcdc2: regulator-dcdc2 {
compatible = "ti,tps65218-dcdc2";
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <912000>; regulator-min-microvolt = <912000>;
regulator-max-microvolt = <1378000>; regulator-max-microvolt = <1378000>;
...@@ -531,33 +529,42 @@ dcdc2: regulator-dcdc2 { ...@@ -531,33 +529,42 @@ dcdc2: regulator-dcdc2 {
}; };
dcdc3: regulator-dcdc3 { dcdc3: regulator-dcdc3 {
compatible = "ti,tps65218-dcdc3";
regulator-name = "vdcdc3"; regulator-name = "vdcdc3";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
regulator-state-mem {
regulator-on-in-suspend;
};
regulator-state-disk {
regulator-off-in-suspend;
};
}; };
dcdc5: regulator-dcdc5 { dcdc5: regulator-dcdc5 {
compatible = "ti,tps65218-dcdc5";
regulator-name = "v1_0bat"; regulator-name = "v1_0bat";
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
regulator-state-mem {
regulator-on-in-suspend;
};
}; };
dcdc6: regulator-dcdc6 { dcdc6: regulator-dcdc6 {
compatible = "ti,tps65218-dcdc6";
regulator-name = "v1_8bat"; regulator-name = "v1_8bat";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
regulator-state-mem {
regulator-on-in-suspend;
};
}; };
ldo1: regulator-ldo1 { ldo1: regulator-ldo1 {
compatible = "ti,tps65218-ldo1";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-boot-on; regulator-boot-on;
......
arch/arm/boot/dts/am437x-idk-evm.dts
View file @ 3abb0c6c
...@@ -104,7 +104,7 @@ gpio_keys: gpio_keys { ...@@ -104,7 +104,7 @@ gpio_keys: gpio_keys {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
switch@0 { switch0 {
label = "power-button"; label = "power-button";
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
gpios = <&gpio4 2 GPIO_ACTIVE_LOW>; gpios = <&gpio4 2 GPIO_ACTIVE_LOW>;
......
arch/arm/boot/dts/am437x-sk-evm.dts
View file @ 3abb0c6c
...@@ -64,7 +64,7 @@ sound_master: simple-audio-card,codec { ...@@ -64,7 +64,7 @@ sound_master: simple-audio-card,codec {
}; };
}; };
matrix_keypad: matrix_keypad@0 { matrix_keypad: matrix_keypad0 {
compatible = "gpio-matrix-keypad"; compatible = "gpio-matrix-keypad";
pinctrl-names = "default"; pinctrl-names = "default";
...@@ -93,28 +93,28 @@ leds { ...@@ -93,28 +93,28 @@ leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&leds_pins>; pinctrl-0 = <&leds_pins>;
led@0 { led0 {
label = "am437x-sk:red:heartbeat"; label = "am437x-sk:red:heartbeat";
gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>; /* Bank 5, pin 0 */ gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>; /* Bank 5, pin 0 */
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
default-state = "off"; default-state = "off";
}; };
led@1 { led1 {
label = "am437x-sk:green:mmc1"; label = "am437x-sk:green:mmc1";
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* Bank 5, pin 1 */ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* Bank 5, pin 1 */
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "am437x-sk:blue:cpu0"; label = "am437x-sk:blue:cpu0";
gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; /* Bank 5, pin 2 */ gpios = <&gpio5 2 GPIO_ACTIVE_HIGH>; /* Bank 5, pin 2 */
linux,default-trigger = "cpu0"; linux,default-trigger = "cpu0";
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "am437x-sk:blue:usr3"; label = "am437x-sk:blue:usr3";
gpios = <&gpio5 3 GPIO_ACTIVE_HIGH>; /* Bank 5, pin 3 */ gpios = <&gpio5 3 GPIO_ACTIVE_HIGH>; /* Bank 5, pin 3 */
default-state = "off"; default-state = "off";
...@@ -428,7 +428,6 @@ tps@24 { ...@@ -428,7 +428,6 @@ tps@24 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
dcdc1: regulator-dcdc1 { dcdc1: regulator-dcdc1 {
compatible = "ti,tps65218-dcdc1";
/* VDD_CORE limits min of OPP50 and max of OPP100 */ /* VDD_CORE limits min of OPP50 and max of OPP100 */
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <912000>; regulator-min-microvolt = <912000>;
...@@ -438,7 +437,6 @@ dcdc1: regulator-dcdc1 { ...@@ -438,7 +437,6 @@ dcdc1: regulator-dcdc1 {
}; };
dcdc2: regulator-dcdc2 { dcdc2: regulator-dcdc2 {
compatible = "ti,tps65218-dcdc2";
/* VDD_MPU limits min of OPP50 and max of OPP_NITRO */ /* VDD_MPU limits min of OPP50 and max of OPP_NITRO */
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <912000>; regulator-min-microvolt = <912000>;
...@@ -448,16 +446,20 @@ dcdc2: regulator-dcdc2 { ...@@ -448,16 +446,20 @@ dcdc2: regulator-dcdc2 {
}; };
dcdc3: regulator-dcdc3 { dcdc3: regulator-dcdc3 {
compatible = "ti,tps65218-dcdc3";
regulator-name = "vdds_ddr"; regulator-name = "vdds_ddr";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-boot-on; regulator-boot-on;
regulator-always-on; regulator-always-on;
regulator-state-mem {
regulator-on-in-suspend;
};
regulator-state-disk {
regulator-off-in-suspend;
};
}; };
dcdc4: regulator-dcdc4 { dcdc4: regulator-dcdc4 {
compatible = "ti,tps65218-dcdc4";
regulator-name = "v3_3d"; regulator-name = "v3_3d";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -465,8 +467,31 @@ dcdc4: regulator-dcdc4 { ...@@ -465,8 +467,31 @@ dcdc4: regulator-dcdc4 {
regulator-always-on; regulator-always-on;
}; };
dcdc5: regulator-dcdc5 {
compatible = "ti,tps65218-dcdc5";
regulator-name = "v1_0bat";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>;
regulator-boot-on;
regulator-always-on;
regulator-state-mem {
regulator-on-in-suspend;
};
};
dcdc6: regulator-dcdc6 {
compatible = "ti,tps65218-dcdc6";
regulator-name = "v1_8bat";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-boot-on;
regulator-always-on;
regulator-state-mem {
regulator-on-in-suspend;
};
};
ldo1: regulator-ldo1 { ldo1: regulator-ldo1 {
compatible = "ti,tps65218-ldo1";
regulator-name = "v1_8d"; regulator-name = "v1_8d";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
......
arch/arm/boot/dts/am43x-epos-evm.dts
View file @ 3abb0c6c
...@@ -32,7 +32,7 @@ vmmcsd_fixed: fixedregulator-sd { ...@@ -32,7 +32,7 @@ vmmcsd_fixed: fixedregulator-sd {
enable-active-high; enable-active-high;
}; };
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vbat"; regulator-name = "vbat";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -67,7 +67,7 @@ lcd_in: endpoint { ...@@ -67,7 +67,7 @@ lcd_in: endpoint {
}; };
}; };
matrix_keypad: matrix_keypad@0 { matrix_keypad: matrix_keypad0 {
compatible = "gpio-matrix-keypad"; compatible = "gpio-matrix-keypad";
debounce-delay-ms = <5>; debounce-delay-ms = <5>;
col-scan-delay-us = <2>; col-scan-delay-us = <2>;
...@@ -421,7 +421,6 @@ tps65218: tps65218@24 { ...@@ -421,7 +421,6 @@ tps65218: tps65218@24 {
#interrupt-cells = <2>; #interrupt-cells = <2>;
dcdc1: regulator-dcdc1 { dcdc1: regulator-dcdc1 {
compatible = "ti,tps65218-dcdc1";
regulator-name = "vdd_core"; regulator-name = "vdd_core";
regulator-min-microvolt = <912000>; regulator-min-microvolt = <912000>;
regulator-max-microvolt = <1144000>; regulator-max-microvolt = <1144000>;
...@@ -430,7 +429,6 @@ dcdc1: regulator-dcdc1 { ...@@ -430,7 +429,6 @@ dcdc1: regulator-dcdc1 {
}; };
dcdc2: regulator-dcdc2 { dcdc2: regulator-dcdc2 {
compatible = "ti,tps65218-dcdc2";
regulator-name = "vdd_mpu"; regulator-name = "vdd_mpu";
regulator-min-microvolt = <912000>; regulator-min-microvolt = <912000>;
regulator-max-microvolt = <1378000>; regulator-max-microvolt = <1378000>;
...@@ -439,7 +437,6 @@ dcdc2: regulator-dcdc2 { ...@@ -439,7 +437,6 @@ dcdc2: regulator-dcdc2 {
}; };
dcdc3: regulator-dcdc3 { dcdc3: regulator-dcdc3 {
compatible = "ti,tps65218-dcdc3";
regulator-name = "vdcdc3"; regulator-name = "vdcdc3";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
...@@ -448,7 +445,6 @@ dcdc3: regulator-dcdc3 { ...@@ -448,7 +445,6 @@ dcdc3: regulator-dcdc3 {
}; };
dcdc4: regulator-dcdc4 { dcdc4: regulator-dcdc4 {
compatible = "ti,tps65218-dcdc4";
regulator-name = "vdcdc4"; regulator-name = "vdcdc4";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -457,21 +453,18 @@ dcdc4: regulator-dcdc4 { ...@@ -457,21 +453,18 @@ dcdc4: regulator-dcdc4 {
}; };
dcdc5: regulator-dcdc5 { dcdc5: regulator-dcdc5 {
compatible = "ti,tps65218-dcdc5";
regulator-name = "v1_0bat"; regulator-name = "v1_0bat";
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
}; };
dcdc6: regulator-dcdc6 { dcdc6: regulator-dcdc6 {
compatible = "ti,tps65218-dcdc6";
regulator-name = "v1_8bat"; regulator-name = "v1_8bat";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
}; };
ldo1: regulator-ldo1 { ldo1: regulator-ldo1 {
compatible = "ti,tps65218-ldo1";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-boot-on; regulator-boot-on;
......
arch/arm/boot/dts/am572x-idk.dts
View file @ 3abb0c6c
...@@ -18,7 +18,7 @@ / { ...@@ -18,7 +18,7 @@ / {
compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74", compatible = "ti,am5728-idk", "ti,am5728", "ti,dra742", "ti,dra74",
"ti,dra7"; "ti,dra7";
memory { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x80000000>; reg = <0x0 0x80000000 0x0 0x80000000>;
}; };
......
arch/arm/boot/dts/am57xx-beagle-x15.dts
View file @ 3abb0c6c
...@@ -23,7 +23,7 @@ aliases { ...@@ -23,7 +23,7 @@ aliases {
display0 = &hdmi0; display0 = &hdmi0;
}; };
memory { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x80000000>; reg = <0x0 0x80000000 0x0 0x80000000>;
}; };
...@@ -62,28 +62,28 @@ leds { ...@@ -62,28 +62,28 @@ leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&leds_pins_default>; pinctrl-0 = <&leds_pins_default>;
led@0 { led0 {
label = "beagle-x15:usr0"; label = "beagle-x15:usr0";
gpios = <&gpio7 9 GPIO_ACTIVE_HIGH>; gpios = <&gpio7 9 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
default-state = "off"; default-state = "off";
}; };
led@1 { led1 {
label = "beagle-x15:usr1"; label = "beagle-x15:usr1";
gpios = <&gpio7 8 GPIO_ACTIVE_HIGH>; gpios = <&gpio7 8 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "cpu0"; linux,default-trigger = "cpu0";
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "beagle-x15:usr2"; label = "beagle-x15:usr2";
gpios = <&gpio7 14 GPIO_ACTIVE_HIGH>; gpios = <&gpio7 14 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "beagle-x15:usr3"; label = "beagle-x15:usr3";
gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>; gpios = <&gpio7 15 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "disk-activity"; linux,default-trigger = "disk-activity";
......
arch/arm/boot/dts/am57xx-cl-som-am57x.dts
View file @ 3abb0c6c
...@@ -19,7 +19,7 @@ / { ...@@ -19,7 +19,7 @@ / {
model = "CompuLab CL-SOM-AM57x"; model = "CompuLab CL-SOM-AM57x";
compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7"; compatible = "compulab,cl-som-am57x", "ti,am5728", "ti,dra742", "ti,dra74", "ti,dra7";
memory { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x20000000>; /* 512 MB - minimal configuration */ reg = <0x0 0x80000000 0x0 0x20000000>; /* 512 MB - minimal configuration */
}; };
...@@ -29,7 +29,7 @@ leds { ...@@ -29,7 +29,7 @@ leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&leds_pins_default>; pinctrl-0 = <&leds_pins_default>;
led@0 { led0 {
label = "cl-som-am57x:green"; label = "cl-som-am57x:green";
gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>; gpios = <&gpio2 5 GPIO_ACTIVE_HIGH>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
......
arch/arm/boot/dts/am57xx-idk-common.dtsi
View file @ 3abb0c6c
...@@ -304,3 +304,52 @@ &mmc2 { ...@@ -304,3 +304,52 @@ &mmc2 {
ti,non-removable; ti,non-removable;
max-frequency = <96000000>; max-frequency = <96000000>;
}; };
&qspi {
status = "okay";
spi-max-frequency = <76800000>;
m25p80@0 {
compatible = "s25fl256s1", "jedec,spi-nor";
spi-max-frequency = <76800000>;
reg = <0>;
spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>;
#address-cells = <1>;
#size-cells = <1>;
/* MTD partition table.
* The ROM checks the first four physical blocks
* for a valid file to boot and the flash here is
* 64KiB block size.
*/
partition@0 {
label = "QSPI.SPL";
reg = <0x00000000 0x000040000>;
};
partition@1 {
label = "QSPI.u-boot";
reg = <0x00040000 0x00100000>;
};
partition@2 {
label = "QSPI.u-boot-spl-os";
reg = <0x00140000 0x00080000>;
};
partition@3 {
label = "QSPI.u-boot-env";
reg = <0x001c0000 0x00010000>;
};
partition@4 {
label = "QSPI.u-boot-env.backup1";
reg = <0x001d0000 0x0010000>;
};
partition@5 {
label = "QSPI.kernel";
reg = <0x001e0000 0x0800000>;
};
partition@6 {
label = "QSPI.file-system";
reg = <0x009e0000 0x01620000>;
};
};
};
arch/arm/boot/dts/da850-evm.dts
View file @ 3abb0c6c
...@@ -136,7 +136,7 @@ nand_cs3@62000000 { ...@@ -136,7 +136,7 @@ nand_cs3@62000000 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&nand_cs3_pins>; pinctrl-0 = <&nand_cs3_pins>;
}; };
vbat: fixedregulator@0 { vbat: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vbat"; regulator-name = "vbat";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
......
arch/arm/boot/dts/dm8148-evm.dts
View file @ 3abb0c6c
...@@ -12,13 +12,13 @@ / { ...@@ -12,13 +12,13 @@ / {
model = "DM8148 EVM"; model = "DM8148 EVM";
compatible = "ti,dm8148-evm", "ti,dm8148"; compatible = "ti,dm8148-evm", "ti,dm8148";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
/* MIC94060YC6 controlled by SD1_POW pin */ /* MIC94060YC6 controlled by SD1_POW pin */
vmmcsd_fixed: fixedregulator@0 { vmmcsd_fixed: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed"; regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/dm8148-t410.dts
View file @ 3abb0c6c
...@@ -11,7 +11,7 @@ / { ...@@ -11,7 +11,7 @@ / {
model = "HP t410 Smart Zero Client"; model = "HP t410 Smart Zero Client";
compatible = "hp,t410", "ti,dm8148"; compatible = "hp,t410", "ti,dm8148";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
...@@ -27,7 +27,7 @@ usb_power: regulator@9 { ...@@ -27,7 +27,7 @@ usb_power: regulator@9 {
regulator-always-on; regulator-always-on;
}; };
vmmcsd_fixed: fixedregulator@0 { vmmcsd_fixed: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed"; regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/dm814x.dtsi
View file @ 3abb0c6c
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/dm814x.h> #include <dt-bindings/pinctrl/dm814x.h>
#include "skeleton.dtsi"
/ { / {
compatible = "ti,dm814"; compatible = "ti,dm814";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
i2c0 = &i2c1; i2c0 = &i2c1;
......
arch/arm/boot/dts/dm8168-evm.dts
View file @ 3abb0c6c
...@@ -12,14 +12,14 @@ / { ...@@ -12,14 +12,14 @@ / {
model = "DM8168 EVM"; model = "DM8168 EVM";
compatible = "ti,dm8168-evm", "ti,dm8168"; compatible = "ti,dm8168-evm", "ti,dm8168";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000 /* 1 GB */ reg = <0x80000000 0x40000000 /* 1 GB */
0xc0000000 0x40000000>; /* 1 GB */ 0xc0000000 0x40000000>; /* 1 GB */
}; };
/* FDC6331L controlled by SD_POW pin */ /* FDC6331L controlled by SD_POW pin */
vmmcsd_fixed: fixedregulator@0 { vmmcsd_fixed: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed"; regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/dm816x.dtsi
View file @ 3abb0c6c
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/pinctrl/omap.h> #include <dt-bindings/pinctrl/omap.h>
#include "skeleton.dtsi"
/ { / {
compatible = "ti,dm816"; compatible = "ti,dm816";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
i2c0 = &i2c1; i2c0 = &i2c1;
......
arch/arm/boot/dts/dra62x-j5eco-evm.dts
View file @ 3abb0c6c
...@@ -12,13 +12,13 @@ / { ...@@ -12,13 +12,13 @@ / {
model = "DRA62x J5 Eco EVM"; model = "DRA62x J5 Eco EVM";
compatible = "ti,dra62x-j5eco-evm", "ti,dra62x", "ti,dm8148"; compatible = "ti,dra62x-j5eco-evm", "ti,dra62x", "ti,dm8148";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
/* MIC94060YC6 controlled by SD1_POW pin */ /* MIC94060YC6 controlled by SD1_POW pin */
vmmcsd_fixed: fixedregulator@0 { vmmcsd_fixed: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vmmcsd_fixed"; regulator-name = "vmmcsd_fixed";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/dra7-evm.dts
View file @ 3abb0c6c
...@@ -16,7 +16,7 @@ / { ...@@ -16,7 +16,7 @@ / {
model = "TI DRA742"; model = "TI DRA742";
compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7"; compatible = "ti,dra7-evm", "ti,dra742", "ti,dra74", "ti,dra7";
memory { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x60000000>; /* 1536 MB */ reg = <0x0 0x80000000 0x0 0x60000000>; /* 1536 MB */
}; };
...@@ -105,25 +105,25 @@ simple-audio-card,codec { ...@@ -105,25 +105,25 @@ simple-audio-card,codec {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@0 { led0 {
label = "dra7:usr1"; label = "dra7:usr1";
gpios = <&pcf_lcd 4 GPIO_ACTIVE_LOW>; gpios = <&pcf_lcd 4 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
led@1 { led1 {
label = "dra7:usr2"; label = "dra7:usr2";
gpios = <&pcf_lcd 5 GPIO_ACTIVE_LOW>; gpios = <&pcf_lcd 5 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "dra7:usr3"; label = "dra7:usr3";
gpios = <&pcf_lcd 6 GPIO_ACTIVE_LOW>; gpios = <&pcf_lcd 6 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "dra7:usr4"; label = "dra7:usr4";
gpios = <&pcf_lcd 7 GPIO_ACTIVE_LOW>; gpios = <&pcf_lcd 7 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
...@@ -664,10 +664,10 @@ &cpu0 { ...@@ -664,10 +664,10 @@ &cpu0 {
&qspi { &qspi {
status = "okay"; status = "okay";
spi-max-frequency = <64000000>; spi-max-frequency = <76800000>;
m25p80@0 { m25p80@0 {
compatible = "s25fl256s1"; compatible = "s25fl256s1";
spi-max-frequency = <64000000>; spi-max-frequency = <76800000>;
reg = <0>; reg = <0>;
spi-tx-bus-width = <1>; spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>; spi-rx-bus-width = <4>;
......
arch/arm/boot/dts/dra7.dtsi
View file @ 3abb0c6c
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/pinctrl/dra.h> #include <dt-bindings/pinctrl/dra.h>
#include "skeleton.dtsi"
#define MAX_SOURCES 400 #define MAX_SOURCES 400
/ { / {
...@@ -301,6 +299,7 @@ pcie1: pcie@51000000 { ...@@ -301,6 +299,7 @@ pcie1: pcie@51000000 {
0x82000000 0 0x20013000 0x13000 0 0xffed000>; 0x82000000 0 0x20013000 0x13000 0 0xffed000>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
num-lanes = <1>; num-lanes = <1>;
linux,pci-domain = <0>;
ti,hwmods = "pcie1"; ti,hwmods = "pcie1";
phys = <&pcie1_phy>; phys = <&pcie1_phy>;
phy-names = "pcie-phy0"; phy-names = "pcie-phy0";
...@@ -336,6 +335,7 @@ pcie@51800000 { ...@@ -336,6 +335,7 @@ pcie@51800000 {
0x82000000 0 0x30013000 0x13000 0 0xffed000>; 0x82000000 0 0x30013000 0x13000 0 0xffed000>;
#interrupt-cells = <1>; #interrupt-cells = <1>;
num-lanes = <1>; num-lanes = <1>;
linux,pci-domain = <1>;
ti,hwmods = "pcie2"; ti,hwmods = "pcie2";
phys = <&pcie2_phy>; phys = <&pcie2_phy>;
phy-names = "pcie-phy0"; phy-names = "pcie-phy0";
...@@ -1413,7 +1413,7 @@ ocp2scp@4a080000 { ...@@ -1413,7 +1413,7 @@ ocp2scp@4a080000 {
ti,hwmods = "ocp2scp1"; ti,hwmods = "ocp2scp1";
usb2_phy1: phy@4a084000 { usb2_phy1: phy@4a084000 {
compatible = "ti,omap-usb2"; compatible = "ti,dra7x-usb2", "ti,omap-usb2";
reg = <0x4a084000 0x400>; reg = <0x4a084000 0x400>;
syscon-phy-power = <&scm_conf 0x300>; syscon-phy-power = <&scm_conf 0x300>;
clocks = <&usb_phy1_always_on_clk32k>, clocks = <&usb_phy1_always_on_clk32k>,
...@@ -1717,7 +1717,7 @@ crossbar_mpu: crossbar@4a002a48 { ...@@ -1717,7 +1717,7 @@ crossbar_mpu: crossbar@4a002a48 {
mac: ethernet@48484000 { mac: ethernet@48484000 {
compatible = "ti,dra7-cpsw","ti,cpsw"; compatible = "ti,dra7-cpsw","ti,cpsw";
ti,hwmods = "gmac"; ti,hwmods = "gmac";
clocks = <&dpll_gmac_ck>, <&gmac_gmii_ref_clk_div>; clocks = <&gmac_main_clk>, <&gmac_rft_clk_mux>;
clock-names = "fck", "cpts"; clock-names = "fck", "cpts";
cpdma_channels = <8>; cpdma_channels = <8>;
ale_entries = <1024>; ale_entries = <1024>;
...@@ -1726,7 +1726,7 @@ mac: ethernet@48484000 { ...@@ -1726,7 +1726,7 @@ mac: ethernet@48484000 {
mac_control = <0x20>; mac_control = <0x20>;
slaves = <2>; slaves = <2>;
active_slave = <0>; active_slave = <0>;
cpts_clock_mult = <0x80000000>; cpts_clock_mult = <0x784CFE14>;
cpts_clock_shift = <29>; cpts_clock_shift = <29>;
reg = <0x48484000 0x1000 reg = <0x48484000 0x1000
0x48485200 0x2E00>; 0x48485200 0x2E00>;
......
arch/arm/boot/dts/dra72-evm-common.dtsi
View file @ 3abb0c6c
...@@ -681,10 +681,10 @@ &dcan1 { ...@@ -681,10 +681,10 @@ &dcan1 {
&qspi { &qspi {
status = "okay"; status = "okay";
spi-max-frequency = <64000000>; spi-max-frequency = <76800000>;
m25p80@0 { m25p80@0 {
compatible = "s25fl256s1"; compatible = "s25fl256s1";
spi-max-frequency = <64000000>; spi-max-frequency = <76800000>;
reg = <0>; reg = <0>;
spi-tx-bus-width = <1>; spi-tx-bus-width = <1>;
spi-rx-bus-width = <4>; spi-rx-bus-width = <4>;
......
arch/arm/boot/dts/dra72-evm-revc.dts
View file @ 3abb0c6c
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
/ { / {
model = "TI DRA722 Rev C EVM"; model = "TI DRA722 Rev C EVM";
memory { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */ reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */
}; };
......
arch/arm/boot/dts/dra72-evm.dts
View file @ 3abb0c6c
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
/ { / {
model = "TI DRA722"; model = "TI DRA722";
memory { memory@0 {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */ reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */
}; };
......
arch/arm/boot/dts/dra7xx-clocks.dtsi
View file @ 3abb0c6c
...@@ -1003,6 +1003,14 @@ gmac_250m_dclk_div: gmac_250m_dclk_div@19c { ...@@ -1003,6 +1003,14 @@ gmac_250m_dclk_div: gmac_250m_dclk_div@19c {
ti,index-power-of-two; ti,index-power-of-two;
}; };
gmac_main_clk: gmac_main_clk {
#clock-cells = <0>;
compatible = "fixed-factor-clock";
clocks = <&gmac_250m_dclk_div>;
clock-mult = <1>;
clock-div = <2>;
};
l3init_480m_dclk_div: l3init_480m_dclk_div@1ac { l3init_480m_dclk_div: l3init_480m_dclk_div@1ac {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,divider-clock"; compatible = "ti,divider-clock";
...@@ -1718,13 +1726,12 @@ atl_gfclk_mux: atl_gfclk_mux@c00 { ...@@ -1718,13 +1726,12 @@ atl_gfclk_mux: atl_gfclk_mux@c00 {
reg = <0x0c00>; reg = <0x0c00>;
}; };
gmac_gmii_ref_clk_div: gmac_gmii_ref_clk_div@13d0 { rmii_50mhz_clk_mux: rmii_50mhz_clk_mux@13d0 {
#clock-cells = <0>; #clock-cells = <0>;
compatible = "ti,divider-clock"; compatible = "ti,mux-clock";
clocks = <&dpll_gmac_m2_ck>; clocks = <&dpll_gmac_h11x2_ck>, <&rmii_clk_ck>;
ti,bit-shift = <24>; ti,bit-shift = <24>;
reg = <0x13d0>; reg = <0x13d0>;
ti,dividers = <2>;
}; };
gmac_rft_clk_mux: gmac_rft_clk_mux@13d0 { gmac_rft_clk_mux: gmac_rft_clk_mux@13d0 {
......
arch/arm/boot/dts/logicpd-som-lv.dtsi
View file @ 3abb0c6c
...@@ -35,10 +35,15 @@ &gpmc { ...@@ -35,10 +35,15 @@ &gpmc {
ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */ ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */
nand@0,0 { nand@0,0 {
linux,mtd-name = "micron,mt29f4g16abbda3w"; compatible = "ti,omap2-nand";
reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ reg = <0 0 4>; /* CS0, offset 0, IO size 4 */
interrupt-parent = <&gpmc>;
interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */
<1 IRQ_TYPE_NONE>; /* termcount */
linux,mtd-name = "micron,mt29f4g16abbda3w";
nand-bus-width = <16>; nand-bus-width = <16>;
ti,nand-ecc-opt = "bch8"; ti,nand-ecc-opt = "bch8";
rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */
gpmc,sync-clk-ps = <0>; gpmc,sync-clk-ps = <0>;
gpmc,cs-on-ns = <0>; gpmc,cs-on-ns = <0>;
gpmc,cs-rd-off-ns = <44>; gpmc,cs-rd-off-ns = <44>;
...@@ -54,10 +59,6 @@ nand@0,0 { ...@@ -54,10 +59,6 @@ nand@0,0 {
gpmc,wr-access-ns = <40>; gpmc,wr-access-ns = <40>;
gpmc,wr-data-mux-bus-ns = <0>; gpmc,wr-data-mux-bus-ns = <0>;
gpmc,device-width = <2>; gpmc,device-width = <2>;
gpmc,page-burst-access-ns = <5>;
gpmc,cycle2cycle-delay-ns = <50>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
arch/arm/boot/dts/logicpd-torpedo-som.dtsi
View file @ 3abb0c6c
...@@ -13,6 +13,11 @@ cpu@0 { ...@@ -13,6 +13,11 @@ cpu@0 {
}; };
}; };
memory@0 {
device_type = "memory";
reg = <0 0>;
};
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
user0 { user0 {
...@@ -46,6 +51,7 @@ nand@0,0 { ...@@ -46,6 +51,7 @@ nand@0,0 {
linux,mtd-name = "micron,mt29f4g16abbda3w"; linux,mtd-name = "micron,mt29f4g16abbda3w";
nand-bus-width = <16>; nand-bus-width = <16>;
ti,nand-ecc-opt = "bch8"; ti,nand-ecc-opt = "bch8";
rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */
gpmc,sync-clk-ps = <0>; gpmc,sync-clk-ps = <0>;
gpmc,cs-on-ns = <0>; gpmc,cs-on-ns = <0>;
gpmc,cs-rd-off-ns = <44>; gpmc,cs-rd-off-ns = <44>;
......
arch/arm/boot/dts/omap2.dtsi
View file @ 3abb0c6c
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/omap.h> #include <dt-bindings/pinctrl/omap.h>
#include "skeleton.dtsi"
/ { / {
compatible = "ti,omap2430", "ti,omap2420", "ti,omap2"; compatible = "ti,omap2430", "ti,omap2420", "ti,omap2";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
serial0 = &uart1; serial0 = &uart1;
......
arch/arm/boot/dts/omap2420-h4.dts
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
model = "TI OMAP2420 H4 board"; model = "TI OMAP2420 H4 board";
compatible = "ti,omap2420-h4", "ti,omap2420", "ti,omap2"; compatible = "ti,omap2420-h4", "ti,omap2420", "ti,omap2";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x4000000>; /* 64 MB */ reg = <0x80000000 0x4000000>; /* 64 MB */
}; };
......
arch/arm/boot/dts/omap2420-n8x0-common.dtsi
View file @ 3abb0c6c
#include "omap2420.dtsi" #include "omap2420.dtsi"
/ { / {
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128 MB */ reg = <0x80000000 0x8000000>; /* 128 MB */
}; };
......
arch/arm/boot/dts/omap2430-sdp.dts
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
model = "TI OMAP2430 SDP"; model = "TI OMAP2430 SDP";
compatible = "ti,omap2430-sdp", "ti,omap2430", "ti,omap2"; compatible = "ti,omap2430-sdp", "ti,omap2430", "ti,omap2";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128 MB */ reg = <0x80000000 0x8000000>; /* 128 MB */
}; };
......
arch/arm/boot/dts/omap3-beagle-xm.dts
View file @ 3abb0c6c
...@@ -19,7 +19,7 @@ cpu@0 { ...@@ -19,7 +19,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
......
arch/arm/boot/dts/omap3-beagle.dts
View file @ 3abb0c6c
...@@ -19,7 +19,7 @@ cpu@0 { ...@@ -19,7 +19,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/omap3-cm-t3x.dtsi
View file @ 3abb0c6c
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
/ { / {
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/omap3-devkit8000-common.dtsi
View file @ 3abb0c6c
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include "omap34xx.dtsi" #include "omap34xx.dtsi"
/ { / {
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/omap3-evm-37xx.dts
View file @ 3abb0c6c
...@@ -15,7 +15,7 @@ / { ...@@ -15,7 +15,7 @@ / {
model = "TI OMAP37XX EVM (TMDSEVM3730)"; model = "TI OMAP37XX EVM (TMDSEVM3730)";
compatible = "ti,omap3-evm-37xx", "ti,omap3630", "ti,omap3"; compatible = "ti,omap3-evm-37xx", "ti,omap3630", "ti,omap3";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/omap3-evm.dts
View file @ 3abb0c6c
...@@ -14,7 +14,7 @@ / { ...@@ -14,7 +14,7 @@ / {
model = "TI OMAP35XX EVM (TMDSEVM3530)"; model = "TI OMAP35XX EVM (TMDSEVM3530)";
compatible = "ti,omap3-evm", "ti,omap3"; compatible = "ti,omap3-evm", "ti,omap3";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/omap3-gta04.dtsi
View file @ 3abb0c6c
...@@ -21,7 +21,7 @@ cpu@0 { ...@@ -21,7 +21,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
......
arch/arm/boot/dts/omap3-igep.dtsi
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
#include "omap36xx.dtsi" #include "omap36xx.dtsi"
/ { / {
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
......
arch/arm/boot/dts/omap3-ldp.dts
View file @ 3abb0c6c
...@@ -15,7 +15,7 @@ / { ...@@ -15,7 +15,7 @@ / {
model = "TI OMAP3430 LDP (Zoom1 Labrador)"; model = "TI OMAP3430 LDP (Zoom1 Labrador)";
compatible = "ti,omap3-ldp", "ti,omap3"; compatible = "ti,omap3-ldp", "ti,omap3";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128 MB */ reg = <0x80000000 0x8000000>; /* 128 MB */
}; };
......
arch/arm/boot/dts/omap3-lilly-a83x.dtsi
View file @ 3abb0c6c
...@@ -17,7 +17,7 @@ chosen { ...@@ -17,7 +17,7 @@ chosen {
bootargs = "console=ttyO0,115200n8 vt.global_cursor_default=0 consoleblank=0"; bootargs = "console=ttyO0,115200n8 vt.global_cursor_default=0 consoleblank=0";
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x8000000>; /* 128 MB */ reg = <0x80000000 0x8000000>; /* 128 MB */
}; };
......
arch/arm/boot/dts/omap3-n900.dts
View file @ 3abb0c6c
...@@ -54,7 +54,7 @@ heartbeat { ...@@ -54,7 +54,7 @@ heartbeat {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/omap3-n950-n9.dtsi
View file @ 3abb0c6c
...@@ -24,12 +24,12 @@ cpu@0 { ...@@ -24,12 +24,12 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
vemmc: fixedregulator@0 { vemmc: fixedregulator0 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "VEMMC"; regulator-name = "VEMMC";
regulator-min-microvolt = <2900000>; regulator-min-microvolt = <2900000>;
...@@ -39,7 +39,7 @@ vemmc: fixedregulator@0 { ...@@ -39,7 +39,7 @@ vemmc: fixedregulator@0 {
enable-active-high; enable-active-high;
}; };
vwlan_fixed: fixedregulator@2 { vwlan_fixed: fixedregulator2 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "VWLAN"; regulator-name = "VWLAN";
gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; /* gpio 35 */ gpio = <&gpio2 3 GPIO_ACTIVE_HIGH>; /* gpio 35 */
......
arch/arm/boot/dts/omap3-overo-alto35-common.dtsi
View file @ 3abb0c6c
...@@ -44,7 +44,7 @@ gpio_keys { ...@@ -44,7 +44,7 @@ gpio_keys {
#size-cells = <0>; #size-cells = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&button_pins>; pinctrl-0 = <&button_pins>;
button0@10 { button0 {
label = "button0"; label = "button0";
linux,code = <BTN_0>; linux,code = <BTN_0>;
gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; /* gpio_10 */ gpios = <&gpio1 10 GPIO_ACTIVE_LOW>; /* gpio_10 */
......
arch/arm/boot/dts/omap3-overo-base.dtsi
View file @ 3abb0c6c
...@@ -11,6 +11,12 @@ ...@@ -11,6 +11,12 @@
*/ */
/ { / {
memory@0 {
device_type = "memory";
reg = <0 0>;
};
pwmleds { pwmleds {
compatible = "pwm-leds"; compatible = "pwm-leds";
...@@ -223,7 +229,9 @@ &mcbsp2 { ...@@ -223,7 +229,9 @@ &mcbsp2 {
}; };
&gpmc { &gpmc {
ranges = <0 0 0x00000000 0x20000000>; ranges = <0 0 0x30000000 0x1000000>, /* CS0 */
<4 0 0x2b000000 0x1000000>, /* CS4 */
<5 0 0x2c000000 0x1000000>; /* CS5 */
nand@0,0 { nand@0,0 {
compatible = "ti,omap2-nand"; compatible = "ti,omap2-nand";
......
arch/arm/boot/dts/omap3-overo-chestnut43-common.dtsi
View file @ 3abb0c6c
...@@ -37,13 +37,13 @@ gpio_keys { ...@@ -37,13 +37,13 @@ gpio_keys {
pinctrl-0 = <&button_pins>; pinctrl-0 = <&button_pins>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button0@23 { button0 {
label = "button0"; label = "button0";
linux,code = <BTN_0>; linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */ gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
wakeup-source; wakeup-source;
}; };
button1@14 { button1 {
label = "button1"; label = "button1";
linux,code = <BTN_1>; linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
...@@ -55,8 +55,6 @@ button1@14 { ...@@ -55,8 +55,6 @@ button1@14 {
#include "omap-gpmc-smsc9221.dtsi" #include "omap-gpmc-smsc9221.dtsi"
&gpmc { &gpmc {
ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */
ethernet@gpmc { ethernet@gpmc {
reg = <5 0 0xff>; reg = <5 0 0xff>;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
......
arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi
View file @ 3abb0c6c
...@@ -119,7 +119,7 @@ &mcspi1 { ...@@ -119,7 +119,7 @@ &mcspi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mcspi1_pins>; pinctrl-0 = <&mcspi1_pins>;
lcd0: display { lcd0: display@1 {
compatible = "lgphilips,lb035q02"; compatible = "lgphilips,lb035q02";
label = "lcd35"; label = "lcd35";
......
arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi
View file @ 3abb0c6c
...@@ -37,13 +37,13 @@ gpio_keys { ...@@ -37,13 +37,13 @@ gpio_keys {
pinctrl-0 = <&button_pins>; pinctrl-0 = <&button_pins>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button0@23 { button0 {
label = "button0"; label = "button0";
linux,code = <BTN_0>; linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */ gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
wakeup-source; wakeup-source;
}; };
button1@14 { button1 {
label = "button1"; label = "button1";
linux,code = <BTN_1>; linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
......
arch/arm/boot/dts/omap3-overo-palo35-common.dtsi
View file @ 3abb0c6c
...@@ -37,13 +37,13 @@ gpio_keys { ...@@ -37,13 +37,13 @@ gpio_keys {
pinctrl-0 = <&button_pins>; pinctrl-0 = <&button_pins>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button0@23 { button0 {
label = "button0"; label = "button0";
linux,code = <BTN_0>; linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */ gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
wakeup-source; wakeup-source;
}; };
button1@14 { button1 {
label = "button1"; label = "button1";
linux,code = <BTN_1>; linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
......
arch/arm/boot/dts/omap3-overo-palo43-common.dtsi
View file @ 3abb0c6c
...@@ -37,13 +37,13 @@ gpio_keys { ...@@ -37,13 +37,13 @@ gpio_keys {
pinctrl-0 = <&button_pins>; pinctrl-0 = <&button_pins>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button0@23 { button0 {
label = "button0"; label = "button0";
linux,code = <BTN_0>; linux,code = <BTN_0>;
gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */ gpios = <&gpio1 23 GPIO_ACTIVE_LOW>; /* gpio_23 */
wakeup-source; wakeup-source;
}; };
button1@14 { button1 {
label = "button1"; label = "button1";
linux,code = <BTN_1>; linux,code = <BTN_1>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */ gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; /* gpio_14 */
......
arch/arm/boot/dts/omap3-overo-tobi-common.dtsi
View file @ 3abb0c6c
...@@ -27,8 +27,6 @@ heartbeat { ...@@ -27,8 +27,6 @@ heartbeat {
#include "omap-gpmc-smsc9221.dtsi" #include "omap-gpmc-smsc9221.dtsi"
&gpmc { &gpmc {
ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */
ethernet@gpmc { ethernet@gpmc {
reg = <5 0 0xff>; reg = <5 0 0xff>;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
......
arch/arm/boot/dts/omap3-overo-tobiduo-common.dtsi
View file @ 3abb0c6c
...@@ -15,9 +15,6 @@ ...@@ -15,9 +15,6 @@
#include "omap-gpmc-smsc9221.dtsi" #include "omap-gpmc-smsc9221.dtsi"
&gpmc { &gpmc {
ranges = <4 0 0x2b000000 0x1000000>, /* CS4 */
<5 0 0x2c000000 0x1000000>; /* CS5 */
smsc1: ethernet@gpmc { smsc1: ethernet@gpmc {
reg = <5 0 0xff>; reg = <5 0 0xff>;
interrupt-parent = <&gpio6>; interrupt-parent = <&gpio6>;
......
arch/arm/boot/dts/omap3-pandora-common.dtsi
View file @ 3abb0c6c
...@@ -18,7 +18,7 @@ cpu@0 { ...@@ -18,7 +18,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
...@@ -45,28 +45,28 @@ gpio-leds { ...@@ -45,28 +45,28 @@ gpio-leds {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&led_pins>; pinctrl-0 = <&led_pins>;
led@1 { led1 {
label = "pandora::sd1"; label = "pandora::sd1";
gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>; /* GPIO_128 */ gpios = <&gpio5 0 GPIO_ACTIVE_HIGH>; /* GPIO_128 */
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
default-state = "off"; default-state = "off";
}; };
led@2 { led2 {
label = "pandora::sd2"; label = "pandora::sd2";
gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* GPIO_129 */ gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* GPIO_129 */
linux,default-trigger = "mmc1"; linux,default-trigger = "mmc1";
default-state = "off"; default-state = "off";
}; };
led@3 { led3 {
label = "pandora::bluetooth"; label = "pandora::bluetooth";
gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>; /* GPIO_158 */ gpios = <&gpio5 30 GPIO_ACTIVE_HIGH>; /* GPIO_158 */
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
default-state = "off"; default-state = "off";
}; };
led@4 { led4 {
label = "pandora::wifi"; label = "pandora::wifi";
gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>; /* GPIO_159 */ gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>; /* GPIO_159 */
linux,default-trigger = "mmc2"; linux,default-trigger = "mmc2";
......
arch/arm/boot/dts/omap3-sniper.dts
View file @ 3abb0c6c
...@@ -20,7 +20,7 @@ cpu@0 { ...@@ -20,7 +20,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
......
arch/arm/boot/dts/omap3-tao3530.dtsi
View file @ 3abb0c6c
...@@ -26,7 +26,7 @@ cpu@0 { ...@@ -26,7 +26,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/omap3-zoom3.dts
View file @ 3abb0c6c
...@@ -20,7 +20,7 @@ cpu@0 { ...@@ -20,7 +20,7 @@ cpu@0 {
}; };
}; };
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
......
arch/arm/boot/dts/omap3.dtsi
View file @ 3abb0c6c
...@@ -12,11 +12,11 @@ ...@@ -12,11 +12,11 @@
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/pinctrl/omap.h> #include <dt-bindings/pinctrl/omap.h>
#include "skeleton.dtsi"
/ { / {
compatible = "ti,omap3430", "ti,omap3"; compatible = "ti,omap3430", "ti,omap3";
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
i2c0 = &i2c1; i2c0 = &i2c1;
...@@ -78,7 +78,7 @@ dsp { ...@@ -78,7 +78,7 @@ dsp {
* the moment, just use a fake OCP bus entry to represent the whole bus * the moment, just use a fake OCP bus entry to represent the whole bus
* hierarchy. * hierarchy.
*/ */
ocp { ocp@68000000 {
compatible = "ti,omap3-l3-smx", "simple-bus"; compatible = "ti,omap3-l3-smx", "simple-bus";
reg = <0x68000000 0x10000>; reg = <0x68000000 0x10000>;
interrupts = <9 10>; interrupts = <9 10>;
......
arch/arm/boot/dts/omap3430-sdp.dts
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
model = "TI OMAP3430 SDP"; model = "TI OMAP3430 SDP";
compatible = "ti,omap3430-sdp", "ti,omap3"; compatible = "ti,omap3430-sdp", "ti,omap3";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x10000000>; /* 256 MB */ reg = <0x80000000 0x10000000>; /* 256 MB */
}; };
......
arch/arm/boot/dts/omap34xx.dtsi
View file @ 3abb0c6c
...@@ -28,7 +28,7 @@ cpu@0 { ...@@ -28,7 +28,7 @@ cpu@0 {
}; };
}; };
ocp { ocp@68000000 {
omap3_pmx_core2: pinmux@480025d8 { omap3_pmx_core2: pinmux@480025d8 {
compatible = "ti,omap3-padconf", "pinctrl-single"; compatible = "ti,omap3-padconf", "pinctrl-single";
reg = <0x480025d8 0x24>; reg = <0x480025d8 0x24>;
......
arch/arm/boot/dts/omap36xx.dtsi
View file @ 3abb0c6c
...@@ -30,7 +30,7 @@ cpu@0 { ...@@ -30,7 +30,7 @@ cpu@0 {
}; };
}; };
ocp { ocp@68000000 {
uart4: serial@49042000 { uart4: serial@49042000 {
compatible = "ti,omap3-uart"; compatible = "ti,omap3-uart";
reg = <0x49042000 0x400>; reg = <0x49042000 0x400>;
......
arch/arm/boot/dts/omap4-duovero-parlor.dts
View file @ 3abb0c6c
...@@ -32,7 +32,7 @@ gpio_keys { ...@@ -32,7 +32,7 @@ gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button0@121 { button0 {
label = "button0"; label = "button0";
linux,code = <BTN_0>; linux,code = <BTN_0>;
gpios = <&gpio4 25 GPIO_ACTIVE_LOW>; /* gpio_121 */ gpios = <&gpio4 25 GPIO_ACTIVE_LOW>; /* gpio_121 */
......
arch/arm/boot/dts/omap4-duovero.dtsi
View file @ 3abb0c6c
...@@ -12,7 +12,7 @@ / { ...@@ -12,7 +12,7 @@ / {
model = "Gumstix Duovero"; model = "Gumstix Duovero";
compatible = "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4"; compatible = "gumstix,omap4-duovero", "ti,omap4430", "ti,omap4";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
......
arch/arm/boot/dts/omap4-kc1.dts
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
model = "Amazon Kindle Fire (first generation)"; model = "Amazon Kindle Fire (first generation)";
compatible = "amazon,omap4-kc1", "ti,omap4430", "ti,omap4"; compatible = "amazon,omap4-kc1", "ti,omap4430", "ti,omap4";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x20000000>; /* 512 MB */ reg = <0x80000000 0x20000000>; /* 512 MB */
}; };
......
arch/arm/boot/dts/omap4-panda-common.dtsi
View file @ 3abb0c6c
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
#include "elpida_ecb240abacn.dtsi" #include "elpida_ecb240abacn.dtsi"
/ { / {
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
......
arch/arm/boot/dts/omap4-sdp.dts
View file @ 3abb0c6c
...@@ -14,7 +14,7 @@ / { ...@@ -14,7 +14,7 @@ / {
model = "TI OMAP4 SDP board"; model = "TI OMAP4 SDP board";
compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4"; compatible = "ti,omap4-sdp", "ti,omap4430", "ti,omap4";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
......
arch/arm/boot/dts/omap4-var-som-om44.dtsi
View file @ 3abb0c6c
...@@ -12,7 +12,7 @@ / { ...@@ -12,7 +12,7 @@ / {
model = "Variscite VAR-SOM-OM44"; model = "Variscite VAR-SOM-OM44";
compatible = "variscite,var-som-om44", "ti,omap4460", "ti,omap4"; compatible = "variscite,var-som-om44", "ti,omap4460", "ti,omap4";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x40000000>; /* 1 GB */ reg = <0x80000000 0x40000000>; /* 1 GB */
}; };
......
arch/arm/boot/dts/omap4.dtsi
View file @ 3abb0c6c
...@@ -10,11 +10,11 @@ ...@@ -10,11 +10,11 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/pinctrl/omap.h> #include <dt-bindings/pinctrl/omap.h>
#include "skeleton.dtsi"
/ { / {
compatible = "ti,omap4430", "ti,omap4"; compatible = "ti,omap4430", "ti,omap4";
interrupt-parent = <&wakeupgen>; interrupt-parent = <&wakeupgen>;
#address-cells = <1>;
#size-cells = <1>;
aliases { aliases {
i2c0 = &i2c1; i2c0 = &i2c1;
......
arch/arm/boot/dts/omap5-board-common.dtsi
View file @ 3abb0c6c
...@@ -79,7 +79,7 @@ hsusb3_phy: hsusb3_phy { ...@@ -79,7 +79,7 @@ hsusb3_phy: hsusb3_phy {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@1 { led1 {
label = "omap5:blue:usr1"; label = "omap5:blue:usr1";
gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>; /* gpio5_153 D1 LED */ gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>; /* gpio5_153 D1 LED */
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
......
arch/arm/boot/dts/omap5-cm-t54.dts
View file @ 3abb0c6c
...@@ -11,7 +11,7 @@ / { ...@@ -11,7 +11,7 @@ / {
model = "CompuLab CM-T54"; model = "CompuLab CM-T54";
compatible = "compulab,omap5-cm-t54", "ti,omap5"; compatible = "compulab,omap5-cm-t54", "ti,omap5";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x7F000000>; /* 2048 MB */ reg = <0x80000000 0x7F000000>; /* 2048 MB */
}; };
...@@ -72,7 +72,7 @@ hsusb3_phy: hsusb3_phy { ...@@ -72,7 +72,7 @@ hsusb3_phy: hsusb3_phy {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led@1 { led1 {
label = "Heartbeat"; label = "Heartbeat";
gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>; /* gpio3_80 ACT_LED */ gpios = <&gpio3 16 GPIO_ACTIVE_HIGH>; /* gpio3_80 ACT_LED */
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
......
arch/arm/boot/dts/omap5-igep0050.dts
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
model = "IGEPv5"; model = "IGEPv5";
compatible = "isee,omap5-igep0050", "ti,omap5"; compatible = "isee,omap5-igep0050", "ti,omap5";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x7f000000>; /* 2032 MB */ reg = <0x80000000 0x7f000000>; /* 2032 MB */
}; };
......
arch/arm/boot/dts/omap5-uevm.dts
View file @ 3abb0c6c
...@@ -13,7 +13,7 @@ / { ...@@ -13,7 +13,7 @@ / {
model = "TI OMAP5 uEVM board"; model = "TI OMAP5 uEVM board";
compatible = "ti,omap5-uevm", "ti,omap5"; compatible = "ti,omap5-uevm", "ti,omap5";
memory { memory@80000000 {
device_type = "memory"; device_type = "memory";
reg = <0x80000000 0x7F000000>; /* 2032 MB */ reg = <0x80000000 0x7F000000>; /* 2032 MB */
}; };
......
arch/arm/boot/dts/omap5.dtsi
View file @ 3abb0c6c
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/pinctrl/omap.h> #include <dt-bindings/pinctrl/omap.h>
#include "skeleton.dtsi"
/ { / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7