leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Additional updates for ARM VExpress/Juno platforms

Browse Source 
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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJW3vnXAAoJEABBurwxfuKY1CcP/iGb7aS31UUOvmQzzFZg8hKq
 Jgms1P1KGohD4cjN9DKWR4HOa/1s5LfEqifY92Y4BOmninWZdQmhUYJnUbFF6qT+
 I4Z3Bs05RZGnMcaGM8zseWjk5C9cvtTAU/mAVpWtxqJnodVte0FtbFA/2E7N0hZU
 Dh4sbK12CTYYnafZf9ilWo75TlE86OwSGHCprAFRIcypqDD6xsWU0c3gpFeLixxH
 CHWe7m66IPO8C9wYBYzUHHumT275K2IZS05mV0yBpQWAZC4upQjt7GION5wSMvxT
 DTqHSwRge0SL7zaj1YOP6MpRApYXhFpRr8nSsdU84H4TlvxgyMzzSqet4Ou1W4He
 lE9RaHk9ISreeqb+7cLv4sDz1R4h+PrxE5GknC/+WR9bvXhdN8DS75y9zT3HACiE
 W1glLb+5B7cR/hr0Otbm7iEB0WickLtCLdQ6usAkqBOmFI0VaOGJeod1oRWrFh8Z
 TQ2csrhE073akutdOEnVCTzHO94BR3ElYHAVYmdnvNMgeinrd1C+2I5Ce0rs4BIT
 OoMPA8ed11dASj4p496qIL7Stkzd3sYV72vQKV+EOk8m8i2YjkSbBj9aEWdDzzI5
 o9pvNHA1Bts84nc0SVa2a7XDI/RFxREUBwUVhFieSA2PRJSL+YVvpPSwVBNnuFWq
 cE681DOj4e9RBsW74WgU
 =uO7I
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2016-03-12 17:26:37 -08:00
commit 301c6e0b16
6 changed files with 44 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm64/boot/dts/arm/foundation-v8.dtsi
View File

@ -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 */

14
arch/arm64/boot/dts/arm/juno-base.dtsi
View File

@ -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>;
@ -154,7 +154,7 @@
clock-names = "pxlclk";
port {
hdlcd1_output: endpoint@0 {
hdlcd1_output: hdlcd1-endpoint {
remote-endpoint = <&tda998x_1_input>;
};
};
@ -168,7 +168,7 @@
clock-names = "pxlclk";
port {
hdlcd0_output: endpoint@0 {
hdlcd0_output: hdlcd0-endpoint {
remote-endpoint = <&tda998x_0_input>;
};
};
@ -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>;
};
};
@ -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>;
};
};
@ -243,7 +243,7 @@
<0x00000008 0x80000000 0x1 0x80000000>;
};
smb {
smb@08000000 {
compatible = "simple-bus";
#address-cells = <2>;
#size-cells = <1>;

30
arch/arm64/boot/dts/arm/juno-motherboard.dtsi
View File

@ -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>;
@ -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>;
@ -159,7 +159,7 @@
compatible = "syscon", "simple-mfd";
reg = <0x010000 0x1000>;
led@08.0 {
led0 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x01>;
@ -167,7 +167,7 @@
linux,default-trigger = "heartbeat";
default-state = "on";
};
led@08.1 {
led1 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x02>;
@ -175,7 +175,7 @@
linux,default-trigger = "mmc0";
default-state = "off";
};
led@08.2 {
led2 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x04>;
@ -183,7 +183,7 @@
linux,default-trigger = "cpu0";
default-state = "off";
};
led@08.3 {
led3 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x08>;
@ -191,7 +191,7 @@
linux,default-trigger = "cpu1";
default-state = "off";
};
led@08.4 {
led4 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x10>;
@ -199,7 +199,7 @@
linux,default-trigger = "cpu2";
default-state = "off";
};
led@08.5 {
led5 {
compatible = "register-bit-led";
offset = <0x08>;
mask = <0x20>;
@ -207,14 +207,14 @@
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>;

2
arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts
View File

@ -104,7 +104,7 @@
<0 63 4>;
};
smb {
smb@08000000 {
compatible = "simple-bus";
#address-cells = <2>;

14
arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi
View File

@ -226,7 +226,7 @@
};
};
v2m_fixed_3v3: fixedregulator@0 {
v2m_fixed_3v3: v2m-3v3 {
compatible = "regulator-fixed";
regulator-name = "3V3";
regulator-min-microvolt = <3300000>;
@ -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>;
@ -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>;
};

10
arch/arm64/boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts
View File

@ -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>;
@ -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>;
@ -112,7 +112,7 @@
regulator-always-on;
};
volt@1 {
volt-12v {
/* 12V from power connector J6 */
compatible = "arm,vexpress-volt";
arm,vexpress-sysreg,func = <2 1>;
@ -120,7 +120,7 @@
regulator-always-on;
};
temp@0 {
temp-fpga {
/* FPGA temperature */
compatible = "arm,vexpress-temp";
arm,vexpress-sysreg,func = <4 0>;
@ -128,7 +128,7 @@
};
};
smb {
smb@08000000 {
compatible = "simple-bus";
#address-cells = <2>;