Skip to content

Commit

Permalink
Merge tag 'vexpress-for-v4.6/dt-updates-2' of git://git.kernel.org/pu…
Browse files Browse the repository at this point in the history 
…b/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: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Mar 13, 2016
2 parents b2af8e5 + 6d6acd1 commit 301c6e0
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 36 deletions.
10 changes: 9 additions & 1 deletion arch/arm64/boot/dts/arm/foundation-v8.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,15 @@
<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";
arm,v2m-memory-map = "rs1";
#address-cells = <2>; /* SMB chipselect number and offset */
Expand Down
14 changes: 7 additions & 7 deletions arch/arm64/boot/dts/arm/juno-base.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,13 +105,13 @@
clocks {
compatible = "arm,scpi-clocks";

scpi_dvfs: scpi_clocks@0 {
scpi_dvfs: scpi-dvfs {
compatible = "arm,scpi-dvfs-clocks";
#clock-cells = <1>;
clock-indices = <0>, <1>, <2>;
clock-output-names = "atlclk", "aplclk","gpuclk";
};
scpi_clk: scpi_clocks@3 {
scpi_clk: scpi-clk {
compatible = "arm,scpi-variable-clocks";
#clock-cells = <1>;
clock-indices = <3>;
Expand Down Expand Up @@ -154,7 +154,7 @@
clock-names = "pxlclk";

port {
hdlcd1_output: endpoint@0 {
hdlcd1_output: hdlcd1-endpoint {
remote-endpoint = <&tda998x_1_input>;
};
};
Expand All @@ -168,7 +168,7 @@
clock-names = "pxlclk";

port {
hdlcd0_output: endpoint@0 {
hdlcd0_output: hdlcd0-endpoint {
remote-endpoint = <&tda998x_0_input>;
};
};
Expand Down Expand Up @@ -196,7 +196,7 @@
compatible = "nxp,tda998x";
reg = <0x70>;
port {
tda998x_0_input: endpoint@0 {
tda998x_0_input: tda998x-0-endpoint {
remote-endpoint = <&hdlcd0_output>;
};
};
Expand All @@ -206,7 +206,7 @@
compatible = "nxp,tda998x";
reg = <0x71>;
port {
tda998x_1_input: endpoint@0 {
tda998x_1_input: tda998x-1-endpoint {
remote-endpoint = <&hdlcd1_output>;
};
};
Expand Down Expand Up @@ -243,7 +243,7 @@
<0x00000008 0x80000000 0x1 0x80000000>;
};

smb {
smb@08000000 {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;
Expand Down
30 changes: 15 additions & 15 deletions arch/arm64/boot/dts/arm/juno-motherboard.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
arm,vexpress,site = <0>;
arm,v2m-memory-map = "rs1";

mb_fixed_3v3: fixedregulator@0 {
mb_fixed_3v3: mcc-sb-3v3 {
compatible = "regulator-fixed";
regulator-name = "MCC_SB_3V3";
regulator-min-microvolt = <3300000>;
Expand All @@ -59,42 +59,42 @@
#address-cells = <1>;
#size-cells = <0>;

button@1 {
power-button {
debounce_interval = <50>;
wakeup-source;
linux,code = <116>;
label = "POWER";
gpios = <&iofpga_gpio0 0 0x4>;
};
button@2 {
home-button {
debounce_interval = <50>;
wakeup-source;
linux,code = <102>;
label = "HOME";
gpios = <&iofpga_gpio0 1 0x4>;
};
button@3 {
rlock-button {
debounce_interval = <50>;
wakeup-source;
linux,code = <152>;
label = "RLOCK";
gpios = <&iofpga_gpio0 2 0x4>;
};
button@4 {
vol-up-button {
debounce_interval = <50>;
wakeup-source;
linux,code = <115>;
label = "VOL+";
gpios = <&iofpga_gpio0 3 0x4>;
};
button@5 {
vol-down-button {
debounce_interval = <50>;
wakeup-source;
linux,code = <114>;
label = "VOL-";
gpios = <&iofpga_gpio0 4 0x4>;
};
button@6 {
nmi-button {
debounce_interval = <50>;
wakeup-source;
linux,code = <99>;
Expand Down Expand Up @@ -159,62 +159,62 @@
compatible = "syscon", "simple-mfd";
reg = <0x010000 0x1000>;

led@08.0 {
led0 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x01>;
label = "vexpress:0";
linux,default-trigger = "heartbeat";
default-state = "on";
};
led@08.1 {
led1 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x02>;
label = "vexpress:1";
linux,default-trigger = "mmc0";
default-state = "off";
};
led@08.2 {
led2 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x04>;
label = "vexpress:2";
linux,default-trigger = "cpu0";
default-state = "off";
};
led@08.3 {
led3 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x08>;
label = "vexpress:3";
linux,default-trigger = "cpu1";
default-state = "off";
};
led@08.4 {
led4 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x10>;
label = "vexpress:4";
linux,default-trigger = "cpu2";
default-state = "off";
};
led@08.5 {
led5 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x20>;
label = "vexpress:5";
linux,default-trigger = "cpu3";
default-state = "off";
};
led@08.6 {
led6 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x40>;
label = "vexpress:6";
default-state = "off";
};
led@08.7 {
led7 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x80>;
Expand Down
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@
<0 63 4>;
};

smb {
smb@08000000 {
compatible = "simple-bus";

#address-cells = <2>;
Expand Down
14 changes: 7 additions & 7 deletions arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
};
};

v2m_fixed_3v3: fixedregulator@0 {
v2m_fixed_3v3: v2m-3v3 {
compatible = "regulator-fixed";
regulator-name = "3V3";
regulator-min-microvolt = <3300000>;
Expand All @@ -238,7 +238,7 @@
compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>;

v2m_oscclk1: osc@1 {
v2m_oscclk1: oscclk1 {
/* CLCD clock */
compatible = "arm,vexpress-osc";
arm,vexpress-sysreg,func = <1 1>;
Expand All @@ -247,27 +247,27 @@
clock-output-names = "v2m:oscclk1";
};

reset@0 {
reset {
compatible = "arm,vexpress-reset";
arm,vexpress-sysreg,func = <5 0>;
};

muxfpga@0 {
muxfpga {
compatible = "arm,vexpress-muxfpga";
arm,vexpress-sysreg,func = <7 0>;
};

shutdown@0 {
shutdown {
compatible = "arm,vexpress-shutdown";
arm,vexpress-sysreg,func = <8 0>;
};

reboot@0 {
reboot {
compatible = "arm,vexpress-reboot";
arm,vexpress-sysreg,func = <9 0>;
};

dvimode@0 {
dvimode {
compatible = "arm,vexpress-dvimode";
arm,vexpress-sysreg,func = <11 0>;
};
Expand Down
10 changes: 5 additions & 5 deletions arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
compatible = "arm,vexpress,config-bus";
arm,vexpress,config-bridge = <&v2m_sysreg>;

smbclk: osc@4 {
smbclk: smclk {
/* SMC clock */
compatible = "arm,vexpress-osc";
arm,vexpress-sysreg,func = <1 4>;
Expand All @@ -102,7 +102,7 @@
clock-output-names = "smclk";
};

volt@0 {
volt-vio {
/* VIO to expansion board above */
compatible = "arm,vexpress-volt";
arm,vexpress-sysreg,func = <2 0>;
Expand All @@ -112,23 +112,23 @@
regulator-always-on;
};

volt@1 {
volt-12v {
/* 12V from power connector J6 */
compatible = "arm,vexpress-volt";
arm,vexpress-sysreg,func = <2 1>;
regulator-name = "12";
regulator-always-on;
};

temp@0 {
temp-fpga {
/* FPGA temperature */
compatible = "arm,vexpress-temp";
arm,vexpress-sysreg,func = <4 0>;
label = "FPGA";
};
};

smb {
smb@08000000 {
compatible = "simple-bus";

#address-cells = <2>;
Expand Down

0 comments on commit 301c6e0

Please sign in to comment.