Skip to content

L
linux
Commit 301c6e0b authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'vexpress-for-v4.6/dt-updates-2' of... 

Merge tag 'vexpress-for-v4.6/dt-updates-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into next/dt

Additional updates for ARM VExpress/Juno platforms

1. Add support for SBSA Generic Watchdog on foundation models

2. Fix node name unit-address presence/absence mismatch warnings in
   all the device trees

* tag 'vexpress-for-v4.6/dt-updates-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux:
  arm64: dts: juno/vexpress: fix node name unit-address presence warnings
  arm64: dts: foundation-v8: add SBSA Generic Watchdog device node
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b2af8e58 6d6acd14
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 36 deletions
arch/arm64/boot/dts/arm/foundation-v8.dtsi
View file @ 301c6e0b
...@@ -89,7 +89,15 @@ pmu { ...@@ -89,7 +89,15 @@ pmu {
<0 63 4>; <0 63 4>;
}; };
smb { watchdog@2a440000 {
compatible = "arm,sbsa-gwdt";
reg = <0x0 0x2a440000 0 0x1000>,
<0x0 0x2a450000 0 0x1000>;
interrupts = <0 27 4>;
timeout-sec = <30>;
};
smb@08000000 {
compatible = "arm,vexpress,v2m-p1", "simple-bus"; compatible = "arm,vexpress,v2m-p1", "simple-bus";
arm,v2m-memory-map = "rs1"; arm,v2m-memory-map = "rs1";
#address-cells = <2>; /* SMB chipselect number and offset */ #address-cells = <2>; /* SMB chipselect number and offset */
......
arch/arm64/boot/dts/arm/juno-base.dtsi
View file @ 301c6e0b
...@@ -105,13 +105,13 @@ scpi { ...@@ -105,13 +105,13 @@ scpi {
clocks { clocks {
compatible = "arm,scpi-clocks"; compatible = "arm,scpi-clocks";
scpi_dvfs: scpi_clocks@0 { scpi_dvfs: scpi-dvfs {
compatible = "arm,scpi-dvfs-clocks"; compatible = "arm,scpi-dvfs-clocks";
#clock-cells = <1>; #clock-cells = <1>;
clock-indices = <0>, <1>, <2>; clock-indices = <0>, <1>, <2>;
clock-output-names = "atlclk", "aplclk","gpuclk"; clock-output-names = "atlclk", "aplclk","gpuclk";
}; };
scpi_clk: scpi_clocks@3 { scpi_clk: scpi-clk {
compatible = "arm,scpi-variable-clocks"; compatible = "arm,scpi-variable-clocks";
#clock-cells = <1>; #clock-cells = <1>;
clock-indices = <3>; clock-indices = <3>;
...@@ -154,7 +154,7 @@ hdlcd@7ff50000 { ...@@ -154,7 +154,7 @@ hdlcd@7ff50000 {
clock-names = "pxlclk"; clock-names = "pxlclk";
port { port {
hdlcd1_output: endpoint@0 { hdlcd1_output: hdlcd1-endpoint {
remote-endpoint = <&tda998x_1_input>; remote-endpoint = <&tda998x_1_input>;
}; };
}; };
...@@ -168,7 +168,7 @@ hdlcd@7ff60000 { ...@@ -168,7 +168,7 @@ hdlcd@7ff60000 {
clock-names = "pxlclk"; clock-names = "pxlclk";
port { port {
hdlcd0_output: endpoint@0 { hdlcd0_output: hdlcd0-endpoint {
remote-endpoint = <&tda998x_0_input>; remote-endpoint = <&tda998x_0_input>;
}; };
}; };
...@@ -196,7 +196,7 @@ hdmi-transmitter@70 { ...@@ -196,7 +196,7 @@ hdmi-transmitter@70 {
compatible = "nxp,tda998x"; compatible = "nxp,tda998x";
reg = <0x70>; reg = <0x70>;
port { port {
tda998x_0_input: endpoint@0 { tda998x_0_input: tda998x-0-endpoint {
remote-endpoint = <&hdlcd0_output>; remote-endpoint = <&hdlcd0_output>;
}; };
}; };
...@@ -206,7 +206,7 @@ hdmi-transmitter@71 { ...@@ -206,7 +206,7 @@ hdmi-transmitter@71 {
compatible = "nxp,tda998x"; compatible = "nxp,tda998x";
reg = <0x71>; reg = <0x71>;
port { port {
tda998x_1_input: endpoint@0 { tda998x_1_input: tda998x-1-endpoint {
remote-endpoint = <&hdlcd1_output>; remote-endpoint = <&hdlcd1_output>;
}; };
}; };
...@@ -243,7 +243,7 @@ memory@80000000 { ...@@ -243,7 +243,7 @@ memory@80000000 {
<0x00000008 0x80000000 0x1 0x80000000>; <0x00000008 0x80000000 0x1 0x80000000>;
}; };
smb { smb@08000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;
#size-cells = <1>; #size-cells = <1>;
......
arch/arm64/boot/dts/arm/juno-motherboard.dtsi
View file @ 301c6e0b
...@@ -46,7 +46,7 @@ motherboard { ...@@ -46,7 +46,7 @@ motherboard {
arm,vexpress,site = <0>; arm,vexpress,site = <0>;
arm,v2m-memory-map = "rs1"; arm,v2m-memory-map = "rs1";
mb_fixed_3v3: fixedregulator@0 { mb_fixed_3v3: mcc-sb-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "MCC_SB_3V3"; regulator-name = "MCC_SB_3V3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -59,42 +59,42 @@ gpio_keys { ...@@ -59,42 +59,42 @@ gpio_keys {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
button@1 { power-button {
debounce_interval = <50>; debounce_interval = <50>;
wakeup-source; wakeup-source;
linux,code = <116>; linux,code = <116>;
label = "POWER"; label = "POWER";
gpios = <&iofpga_gpio0 0 0x4>; gpios = <&iofpga_gpio0 0 0x4>;
}; };
button@2 { home-button {
debounce_interval = <50>; debounce_interval = <50>;
wakeup-source; wakeup-source;
linux,code = <102>; linux,code = <102>;
label = "HOME"; label = "HOME";
gpios = <&iofpga_gpio0 1 0x4>; gpios = <&iofpga_gpio0 1 0x4>;
}; };
button@3 { rlock-button {
debounce_interval = <50>; debounce_interval = <50>;
wakeup-source; wakeup-source;
linux,code = <152>; linux,code = <152>;
label = "RLOCK"; label = "RLOCK";
gpios = <&iofpga_gpio0 2 0x4>; gpios = <&iofpga_gpio0 2 0x4>;
}; };
button@4 { vol-up-button {
debounce_interval = <50>; debounce_interval = <50>;
wakeup-source; wakeup-source;
linux,code = <115>; linux,code = <115>;
label = "VOL+"; label = "VOL+";
gpios = <&iofpga_gpio0 3 0x4>; gpios = <&iofpga_gpio0 3 0x4>;
}; };
button@5 { vol-down-button {
debounce_interval = <50>; debounce_interval = <50>;
wakeup-source; wakeup-source;
linux,code = <114>; linux,code = <114>;
label = "VOL-"; label = "VOL-";
gpios = <&iofpga_gpio0 4 0x4>; gpios = <&iofpga_gpio0 4 0x4>;
}; };
button@6 { nmi-button {
debounce_interval = <50>; debounce_interval = <50>;
wakeup-source; wakeup-source;
linux,code = <99>; linux,code = <99>;
...@@ -159,7 +159,7 @@ apbregs@010000 { ...@@ -159,7 +159,7 @@ apbregs@010000 {
compatible = "syscon", "simple-mfd"; compatible = "syscon", "simple-mfd";
reg = <0x010000 0x1000>; reg = <0x010000 0x1000>;
led@08.0 { led0 {
compatible = "register-bit-led"; compatible = "register-bit-led";
offset = <0x08>; offset = <0x08>;
mask = <0x01>; mask = <0x01>;
...@@ -167,7 +167,7 @@ led@08.0 { ...@@ -167,7 +167,7 @@ led@08.0 {
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
default-state = "on"; default-state = "on";
}; };
led@08.1 { led1 {
compatible = "register-bit-led"; compatible = "register-bit-led";
offset = <0x08>; offset = <0x08>;
mask = <0x02>; mask = <0x02>;
...@@ -175,7 +175,7 @@ led@08.1 { ...@@ -175,7 +175,7 @@ led@08.1 {
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
default-state = "off"; default-state = "off";
}; };
led@08.2 { led2 {
compatible = "register-bit-led"; compatible = "register-bit-led";
offset = <0x08>; offset = <0x08>;
mask = <0x04>; mask = <0x04>;
...@@ -183,7 +183,7 @@ led@08.2 { ...@@ -183,7 +183,7 @@ led@08.2 {
linux,default-trigger = "cpu0"; linux,default-trigger = "cpu0";
default-state = "off"; default-state = "off";
}; };
led@08.3 { led3 {
compatible = "register-bit-led"; compatible = "register-bit-led";
offset = <0x08>; offset = <0x08>;
mask = <0x08>; mask = <0x08>;
...@@ -191,7 +191,7 @@ led@08.3 { ...@@ -191,7 +191,7 @@ led@08.3 {
linux,default-trigger = "cpu1"; linux,default-trigger = "cpu1";
default-state = "off"; default-state = "off";
}; };
led@08.4 { led4 {
compatible = "register-bit-led"; compatible = "register-bit-led";
offset = <0x08>; offset = <0x08>;
mask = <0x10>; mask = <0x10>;
...@@ -199,7 +199,7 @@ led@08.4 { ...@@ -199,7 +199,7 @@ led@08.4 {
linux,default-trigger = "cpu2"; linux,default-trigger = "cpu2";
default-state = "off"; default-state = "off";
}; };
led@08.5 { led5 {
compatible = "register-bit-led"; compatible = "register-bit-led";
offset = <0x08>; offset = <0x08>;
mask = <0x20>; mask = <0x20>;
...@@ -207,14 +207,14 @@ led@08.5 { ...@@ -207,14 +207,14 @@ led@08.5 {
linux,default-trigger = "cpu3"; linux,default-trigger = "cpu3";
default-state = "off"; default-state = "off";
}; };
led@08.6 { led6 {
compatible = "register-bit-led"; compatible = "register-bit-led";
offset = <0x08>; offset = <0x08>;
mask = <0x40>; mask = <0x40>;
label = "vexpress:6"; label = "vexpress:6";
default-state = "off"; default-state = "off";
}; };
led@08.7 { led7 {
compatible = "register-bit-led"; compatible = "register-bit-led";
offset = <0x08>; offset = <0x08>;
mask = <0x80>; mask = <0x80>;
......
arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
View file @ 301c6e0b
...@@ -104,7 +104,7 @@ pmu { ...@@ -104,7 +104,7 @@ pmu {
<0 63 4>; <0 63 4>;
}; };
smb { smb@08000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;
......
arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
View file @ 301c6e0b
...@@ -226,7 +226,7 @@ virtio_block@0130000 { ...@@ -226,7 +226,7 @@ virtio_block@0130000 {
}; };
}; };
v2m_fixed_3v3: fixedregulator@0 { v2m_fixed_3v3: v2m-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "3V3"; regulator-name = "3V3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -238,7 +238,7 @@ mcc { ...@@ -238,7 +238,7 @@ mcc {
compatible = "arm,vexpress,config-bus"; compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>; arm,vexpress,config-bridge = <&v2m_sysreg>;
v2m_oscclk1: osc@1 { v2m_oscclk1: oscclk1 {
/* CLCD clock */ /* CLCD clock */
compatible = "arm,vexpress-osc"; compatible = "arm,vexpress-osc";
arm,vexpress-sysreg,func = <1 1>; arm,vexpress-sysreg,func = <1 1>;
...@@ -247,27 +247,27 @@ v2m_oscclk1: osc@1 { ...@@ -247,27 +247,27 @@ v2m_oscclk1: osc@1 {
clock-output-names = "v2m:oscclk1"; clock-output-names = "v2m:oscclk1";
}; };
reset@0 { reset {
compatible = "arm,vexpress-reset"; compatible = "arm,vexpress-reset";
arm,vexpress-sysreg,func = <5 0>; arm,vexpress-sysreg,func = <5 0>;
}; };
muxfpga@0 { muxfpga {
compatible = "arm,vexpress-muxfpga"; compatible = "arm,vexpress-muxfpga";
arm,vexpress-sysreg,func = <7 0>; arm,vexpress-sysreg,func = <7 0>;
}; };
shutdown@0 { shutdown {
compatible = "arm,vexpress-shutdown"; compatible = "arm,vexpress-shutdown";
arm,vexpress-sysreg,func = <8 0>; arm,vexpress-sysreg,func = <8 0>;
}; };
reboot@0 { reboot {
compatible = "arm,vexpress-reboot"; compatible = "arm,vexpress-reboot";
arm,vexpress-sysreg,func = <9 0>; arm,vexpress-sysreg,func = <9 0>;
}; };
dvimode@0 { dvimode {
compatible = "arm,vexpress-dvimode"; compatible = "arm,vexpress-dvimode";
arm,vexpress-sysreg,func = <11 0>; arm,vexpress-sysreg,func = <11 0>;
}; };
......
arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
View file @ 301c6e0b
...@@ -93,7 +93,7 @@ dcc { ...@@ -93,7 +93,7 @@ dcc {
compatible = "arm,vexpress,config-bus"; compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>; arm,vexpress,config-bridge = <&v2m_sysreg>;
smbclk: osc@4 { smbclk: smclk {
/* SMC clock */ /* SMC clock */
compatible = "arm,vexpress-osc"; compatible = "arm,vexpress-osc";
arm,vexpress-sysreg,func = <1 4>; arm,vexpress-sysreg,func = <1 4>;
...@@ -102,7 +102,7 @@ smbclk: osc@4 { ...@@ -102,7 +102,7 @@ smbclk: osc@4 {
clock-output-names = "smclk"; clock-output-names = "smclk";
}; };
volt@0 { volt-vio {
/* VIO to expansion board above */ /* VIO to expansion board above */
compatible = "arm,vexpress-volt"; compatible = "arm,vexpress-volt";
arm,vexpress-sysreg,func = <2 0>; arm,vexpress-sysreg,func = <2 0>;
...@@ -112,7 +112,7 @@ volt@0 { ...@@ -112,7 +112,7 @@ volt@0 {
regulator-always-on; regulator-always-on;
}; };
volt@1 { volt-12v {
/* 12V from power connector J6 */ /* 12V from power connector J6 */
compatible = "arm,vexpress-volt"; compatible = "arm,vexpress-volt";
arm,vexpress-sysreg,func = <2 1>; arm,vexpress-sysreg,func = <2 1>;
...@@ -120,7 +120,7 @@ volt@1 { ...@@ -120,7 +120,7 @@ volt@1 {
regulator-always-on; regulator-always-on;
}; };
temp@0 { temp-fpga {
/* FPGA temperature */ /* FPGA temperature */
compatible = "arm,vexpress-temp"; compatible = "arm,vexpress-temp";
arm,vexpress-sysreg,func = <4 0>; arm,vexpress-sysreg,func = <4 0>;
...@@ -128,7 +128,7 @@ temp@0 { ...@@ -128,7 +128,7 @@ temp@0 {
}; };
}; };
smb { smb@08000000 {
compatible = "simple-bus"; compatible = "simple-bus";
#address-cells = <2>; #address-cells = <2>;
......
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