Berlin DT changes for v4.9
- enable dw wdt nodes unconditionally, driver supports multiple instances now - fix some dtc compiler warnings -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJX7C7vAAoJEN2kpao7fSL4hEsP/RfmMjAB+fWuHUevEkLZv4LW QqutgKPZVHClZavfXcmDQ9uITDWPxU7yc+/UzcRI8YSHspciF7Xf/n7COzMX0iV+ Tw7cppC6iMOuTdApqNhkQ5UQjlkIPo+NVZI82mYDXo/rRdmetYtT3pDrtQ28SxXz kpBy0PO73wgWx/nzD6JzkTIUtVvL8rSDJxROCjPRDI59q0eISOkCTaCmiuLZxV4P 3Toh+CpdiyoRH5K7q2Vfv0M1wWv/ohrB8pBRUl8nJn4G22X32hBgA1PaSkEUabve wQM1BE8oHagdueoGZX5zpAiJF9MYNOjoySrCwuRMXPvDqkmc2qGYQ1DOk31+5IYU 64FY/RVpDD8YfqCwbFDpM9qvthqmVRv1NUeZ44OU0fJEfhhndzt5zDyRgBC2f2lQ YGgBhOVRM+GcSmbWJuPj8sCz8P2BnlpiHcBbV9R8hRf3vpD8wvgJKOVsxVv4XxdR +wDMNBKmE0i4xRMCwX7Z3ppGHxEoWdbk6zKqTewu2AW7gejN+fOem1W2zEcGOdwu eKx22SSLPORFm3wTHNiPmG0Yq9ChcdPbTQMNhFiWTZDbed+J6Eh1BAUve0T8K1x3 sCaAbtibYg/QZ2we1o2MKwep9hA5p6jd1D1d5QV6kpeffCA/WGtmhxDwM7XBiMTa ljhh8RDqGjtQ0Q1PK2t8 =I0yB -----END PGP SIGNATURE----- Merge tag 'berlin-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt Berlin DT changes for v4.9 - enable dw wdt nodes unconditionally, driver supports multiple instances now - fix some dtc compiler warnings * tag 'berlin-dt-for-v4.9-1' of git://git.infradead.org/users/hesselba/linux-berlin: ARM: dts: sony-nsz-gs7: add missing unit name to /memory node ARM: dts: chromecast: add missing unit name to /memory node ARM: dts: berlin2q-marvell-dmp: add missing unit name to /memory node ARM: dts: berlin2: Add missing unit name to /soc node ARM: dts: berlin2cd: Add missing unit name to /soc node ARM: dts: berlin2q: Add missing unit name to /soc node ARM: dts: berlin2: Remove skeleton.dtsi inclusion ARM: dts: berlin2cd: Remove skeleton.dtsi inclusion ARM: dts: berlin2q: Remove skeleton.dtsi inclusion arm: dts: berlin2q: enable all wdt nodes unconditionally arm: dts: berlin2: enable all wdt nodes unconditionally Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Коммит
adff807988
|
@ -49,7 +49,7 @@
|
|||
stdout-path = "serial0:115200n8";
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x40000000>; /* 1 GB */
|
||||
};
|
||||
|
|
|
@ -39,13 +39,14 @@
|
|||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "skeleton.dtsi"
|
||||
#include <dt-bindings/clock/berlin2.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
|
||||
/ {
|
||||
model = "Marvell Armada 1500 (BG2) SoC";
|
||||
compatible = "marvell,berlin2", "marvell,berlin";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
aliases {
|
||||
serial0 = &uart0;
|
||||
|
@ -89,7 +90,7 @@
|
|||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
soc {
|
||||
soc@f7000000 {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
@ -447,7 +448,6 @@
|
|||
reg = <0x2000 0x100>;
|
||||
clocks = <&refclk>;
|
||||
interrupts = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
wdt2: watchdog@3000 {
|
||||
|
@ -455,7 +455,6 @@
|
|||
reg = <0x3000 0x100>;
|
||||
clocks = <&refclk>;
|
||||
interrupts = <2>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sm_gpio1: gpio@5000 {
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
stdout-path = "serial0:115200n8";
|
||||
};
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x20000000>; /* 512 MB */
|
||||
};
|
||||
|
|
|
@ -39,13 +39,14 @@
|
|||
* OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include "skeleton.dtsi"
|
||||
#include <dt-bindings/clock/berlin2.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
|
||||
/ {
|
||||
model = "Marvell Armada 1500-mini (BG2CD) SoC";
|
||||
compatible = "marvell,berlin2cd", "marvell,berlin";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
aliases {
|
||||
serial0 = &uart0;
|
||||
|
@ -78,7 +79,7 @@
|
|||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
soc {
|
||||
soc@f7000000 {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
model = "Marvell BG2-Q DMP";
|
||||
compatible = "marvell,berlin2q-dmp", "marvell,berlin2q", "marvell,berlin";
|
||||
|
||||
memory {
|
||||
memory@0 {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x80000000>;
|
||||
};
|
||||
|
|
|
@ -37,11 +37,11 @@
|
|||
#include <dt-bindings/clock/berlin2q.h>
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
|
||||
#include "skeleton.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Marvell Armada 1500 pro (BG2-Q) SoC";
|
||||
compatible = "marvell,berlin2q", "marvell,berlin";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
aliases {
|
||||
serial0 = &uart0;
|
||||
|
@ -99,7 +99,7 @@
|
|||
clock-frequency = <25000000>;
|
||||
};
|
||||
|
||||
soc {
|
||||
soc@f7000000 {
|
||||
compatible = "simple-bus";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
@ -525,7 +525,6 @@
|
|||
reg = <0x2000 0x100>;
|
||||
clocks = <&refclk>;
|
||||
interrupts = <1>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
wdt2: watchdog@3000 {
|
||||
|
@ -533,7 +532,6 @@
|
|||
reg = <0x3000 0x100>;
|
||||
clocks = <&refclk>;
|
||||
interrupts = <2>;
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
sm_gpio1: gpio@5000 {
|
||||
|
|
Загрузка…
Ссылка в новой задаче