p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Marvell Berlin DT for 4.4 take 1 

- use serial aliases and stdout path
 - add cpufreq properties to all SoCs
 - add pwm nodes for all SoCs
 
 This depends on topic branch berlin-cpuclk-for-4.4-1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJWEr3kAAoJEN2kpao7fSL4aiMP/RZtVig0BWx9ndsht/PNye40
 2AKvH33gnQZTEbS3LVprG19MUmKyOh8g5SEgxPkAtoIdGoEwDwdWgGRXzaFQVPbb
 QGZZ2tyoBnJMWhVWMst/dQx1hpQ7wyI2yanLDLH8wbJ8v7ctC7oAQLlenuntkjjQ
 jakxbaDRwB5cJUS3RWNi+0E35sCXetdmWHRergp1LL77dWGxDgBjEr/9zoSZ6ChH
 vqPX685Cb1pTuADX3Ihm+euRDH2xjF9bMj1qVLjpFVSqq0yNF7bThAuzatQtOC5q
 M7neEcO0p3KVA5YvJBr8qBJgsrVC0KkuRfkcdppw7sJEpObOqi+fw24mXNEys/ze
 rpudmXp9U3oazGrvN6LGK7HHeYRRVMtkgVUjXEhrav/Gn+N6/zg2DZUYZ5zSSUvJ
 guv4BmdO2tbIXZw282gcWLGDxZG/R33QEMBe6GPh5UtjMs9ICpJKaEyGXrNUbnch
 fhg0ZF4Rsh2vI9zc35nCHNm/TBnRjemJ5lVABPq1HtFxclnZRHALz3h8Z5u45lPL
 4PCihtRZugvwrAfDVUJ4Mu9jm2Sc5tIL4xhKJySwJp3GYMO4Mw9aR2LxKUYZYw04
 gojxR+yeghMK5OVA3bBkRtOtzjeQxaOC64hEFwAWyxULoLukMFThuZymy2XUIOmd
 q2sZmkgF+hvHCDzTqyaH
 =3SFe
 -----END PGP SIGNATURE-----

Merge tag 'berlin-dt-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin into next/dt

Merge "Marvell Berlin DT for 4.4 take 1" from Sebastian Hesselbarth:
- use serial aliases and stdout path
- add cpufreq properties to all SoCs
- add pwm nodes for all SoCs

This depends on topic branch berlin-cpuclk-for-4.4-1

* tag 'berlin-dt-for-4.4-1' of git://git.infradead.org/users/hesselba/linux-berlin:
  ARM: berlin: add a PWM node on the BG2CD
  ARM: berlin: add a PWM node on the BG2
  ARM: berlin: add a PWM node on the BG2Q
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2CD
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2
  ARM: berlin: dts: add the cpufreq-dt bindings on the BG2Q
  arm: dts: berlin: use stdout-path
  arm: dts: berlin: add aliases for serial
This commit is contained in:
Arnd Bergmann 2015-10-14 17:42:14 +02:00
parent c85f9235a6 5f5cdc0823
commit f8e6333aba
6 changed files with 72 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts
View File

@ -45,7 +45,8 @@ / {
compatible = "sony,nsz-gs7", "marvell,berlin2", "marvell,berlin";
chosen {
bootargs = "console=ttyS0,115200 earlyprintk";
bootargs = "earlyprintk";
stdout-path = "serial0:115200n8";
};
memory {

23
arch/arm/boot/dts/berlin2.dtsi
View File

@ -47,6 +47,12 @@ / {
model = "Marvell Armada 1500 (BG2) SoC";
compatible = "marvell,berlin2", "marvell,berlin";
aliases {
serial0 = &uart0;
serial1 = &uart1;
serial2 = &uart2;
};
cpus {
#address-cells = <1>;
#size-cells = <0>;
@ -57,6 +63,16 @@ cpu@0 {
device_type = "cpu";
next-level-cache = <&l2>;
reg = <0>;
clocks = <&chip_clk CLKID_CPU>;
clock-latency = <100000>;
operating-points = <
/* kHz uV */
1200000 1200000
1000000 1200000
800000 1200000
600000 1200000
>;
};
cpu@1 {
@ -404,6 +420,13 @@ chip_rst: reset {
};
};
pwm: pwm@f20000 {
compatible = "marvell,berlin-pwm";
reg = <0xf20000 0x40>;
clocks = <&chip_clk CLKID_CFG>;
#pwm-cells = <3>;
};
apb@fc0000 {
compatible = "simple-bus";
#address-cells = <1>;

3
arch/arm/boot/dts/berlin2cd-google-chromecast.dts
View File

@ -46,7 +46,8 @@ / {
compatible = "google,chromecast", "marvell,berlin2cd", "marvell,berlin";
chosen {
bootargs = "console=ttyS0,115200 earlyprintk";
bootargs = "earlyprintk";
stdout-path = "serial0:115200n8";
};
memory {

20
arch/arm/boot/dts/berlin2cd.dtsi
View File

@ -47,6 +47,11 @@ / {
model = "Marvell Armada 1500-mini (BG2CD) SoC";
compatible = "marvell,berlin2cd", "marvell,berlin";
aliases {
serial0 = &uart0;
serial1 = &uart1;
};
cpus {
#address-cells = <1>;
#size-cells = <0>;
@ -56,6 +61,14 @@ cpu@0 {
device_type = "cpu";
next-level-cache = <&l2>;
reg = <0>;
clocks = <&chip_clk CLKID_CPU>;
clock-latency = <100000>;
operating-points = <
/* kHz uV */
800000 1200000
600000 1200000
>;
};
};
@ -368,6 +381,13 @@ usb1: usb@ee0000 {
status = "disabled";
};
pwm: pwm@f20000 {
compatible = "marvell,berlin-pwm";
reg = <0xf20000 0x40>;
clocks = <&chip_clk CLKID_CFG>;
#pwm-cells = <3>;
};
apb@fc0000 {
compatible = "simple-bus";
#address-cells = <1>;

3
arch/arm/boot/dts/berlin2q-marvell-dmp.dts
View File

@ -49,7 +49,8 @@ memory {
};
choosen {
bootargs = "console=ttyS0,115200 earlyprintk";
bootargs = "earlyprintk";
stdout-path = "serial0:115200n8";
};
regulators {

23
arch/arm/boot/dts/berlin2q.dtsi
View File

@ -43,6 +43,11 @@ / {
model = "Marvell Armada 1500 pro (BG2-Q) SoC";
compatible = "marvell,berlin2q", "marvell,berlin";
aliases {
serial0 = &uart0;
serial1 = &uart1;
};
cpus {
#address-cells = <1>;
#size-cells = <0>;
@ -53,6 +58,17 @@ cpu@0 {
device_type = "cpu";
next-level-cache = <&l2>;
reg = <0>;
clocks = <&chip_clk CLKID_CPU>;
clock-latency = <100000>;
/* Can be modified by the bootloader */
operating-points = <
/* kHz uV */
1200000 1200000
1000000 1200000
800000 1200000
600000 1200000
>;
};
cpu@1 {
@ -477,6 +493,13 @@ usb1: usb@ee0000 {
status = "disabled";
};
pwm: pwm@f20000 {
compatible = "marvell,berlin-pwm";
reg = <0xf20000 0x40>;
clocks = <&chip_clk CLKID_CFG>;
#pwm-cells = <3>;
};
apb@fc0000 {
compatible = "simple-bus";
#address-cells = <1>;