openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Device Tree clean up for LPC18xx platform 

* Removal of skeleton.dtsi from the common armv7-m dtsi together
   with lpc18xx and efm32 platforms.
 
 * Fix for unit address warnings from the dtc on lpc18xx/efm32.
   That is made possible with skeleton.dtsi gone.
 -----BEGIN PGP SIGNATURE-----
 
 iQEwBAABCAAaBQJXzyBlExxtYW5hYmlhbkBnbWFpbC5jb20ACgkQXnNIfj7+P9rV
 UwgAvfI2Lv75gqxfLhbIeKeY5Mxms8KGTmGJFX/xAIb9vUynAuVPhDnoie+bvDtA
 9lvJCAwL2pyrb5cyeofjq1lMscX8Ng6mSyrUZ+nhzZNXgNzPK0Z169gcLhugnNW5
 mk4TACKstfiCVQxlB1xa4JHa4/8r8EJ2ouB3Fwd6Zi1OJfC9bU9FFIgjOxfIRhWn
 W8swy5c1sufbUHnQbZeVCweCN4P6tAQN+bxaKgKawmWaVpCz/6jF/dRsD0zj8UHb
 J2nBSjo1Vac25ET9bz5K0jjNOK9BdOcvgbxD/EDDYTwQCbouRpnv+uQctVSyY98n
 2GIiX1Bk1W02NmKvXXQ/6RRz7g==
 =uht9
 -----END PGP SIGNATURE-----

Merge tag 'lpc18xx_dts_for_4.9_part2' of https://github.com/manabian/linux-lpc into next/dt

Pull "Device Tree clean up for LPC18xx platform" from Joachim Eastwood:

* Removal of skeleton.dtsi from the common armv7-m dtsi together
  with lpc18xx and efm32 platforms.

* Fix for unit address warnings from the dtc on lpc18xx/efm32.
  That is made possible with skeleton.dtsi gone.

* tag 'lpc18xx_dts_for_4.9_part2' of https://github.com/manabian/linux-lpc:
  ARM: dts: efm32: remove skeleton.dtsi include and fix unit address warnings
  ARM: dts: lpc18xx: remove skeleton.dtsi include and fix unit address warnings
  ARM: dts: armv7-m: remove skeleton.dtsi include
This commit is contained in:
Arnd Bergmann 2016-09-13 17:32:51 +02:00
parent 72f61d2e92 8364074622
commit 29b48f9860
10 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/armv7-m.dtsi
View File

@ -1,5 +1,3 @@
#include "skeleton.dtsi"
/ {
nvic: interrupt-controller@e000e100 {
compatible = "arm,armv7m-nvic";

5
arch/arm/boot/dts/efm32gg-dk3750.dts
View File

@ -16,7 +16,8 @@ chosen {
bootargs = "console=ttyefm4,115200 init=/linuxrc ignore_loglevel ihash_entries=64 dhash_entries=64 earlyprintk uclinux.physaddr=0x8c400000 root=/dev/mtdblock0";
};
memory {
memory@88000000 {
device_type = "memory";
reg = <0x88000000 0x400000>;
};
@ -74,7 +75,7 @@ uart4: uart@4000e400 { /* UART1 */
status = "ok";
};
boardfpga: boardfpga {
boardfpga: boardfpga@80000000 {
compatible = "efm32board";
reg = <0x80000000 0x400>;
irq-gpios = <&gpio 64 1>;

4
arch/arm/boot/dts/efm32gg.dtsi
View File

@ -4,10 +4,14 @@
* Documentation available from
* http://www.silabs.com/Support%20Documents/TechnicalDocs/EFM32GG-RM.pdf
*/
#include "armv7-m.dtsi"
#include "dt-bindings/clock/efm32-cmu.h"
/ {
#address-cells = <1>;
#size-cells = <1>;
aliases {
i2c0 = &i2c0;
i2c1 = &i2c1;

3
arch/arm/boot/dts/lpc18xx.dtsi
View File

@ -20,6 +20,9 @@
#define LPC_GPIO(port, pin) (port * 32 + pin)
/ {
#address-cells = <1>;
#size-cells = <1>;
cpus {
#address-cells = <1>;
#size-cells = <0>;

2
arch/arm/boot/dts/lpc4337-ciaa.dts
View File

@ -30,7 +30,7 @@ chosen {
stdout-path = &uart2;
};
memory {
memory@28000000 {
device_type = "memory";
reg = <0x28000000 0x0800000>; /* 8 MB */
};

2
arch/arm/boot/dts/lpc4350-hitex-eval.dts
View File

@ -33,7 +33,7 @@ chosen {
stdout-path = &uart0;
};
memory {
memory@28000000 {
device_type = "memory";
reg = <0x28000000 0x800000>; /* 8 MB */
};

2
arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
View File

@ -33,7 +33,7 @@ chosen {
stdout-path = &uart0;
};
memory {
memory@28000000 {
device_type = "memory";
reg = <0x28000000 0x2000000>; /* 32 MB */
};

1
arch/arm/boot/dts/mps2.dtsi
View File

@ -42,6 +42,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "skeleton.dtsi"
#include "armv7-m.dtsi"
/ {

1
arch/arm/boot/dts/stm32f429.dtsi
View File

@ -45,6 +45,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include <dt-bindings/pinctrl/stm32f429-pinfunc.h>

1
arch/arm/boot/dts/vf610m4.dtsi
View File

@ -42,6 +42,7 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
#include "skeleton.dtsi"
#include "armv7-m.dtsi"
#include "vfxxx.dtsi"