projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-next-2020-12-24' of git://anongit.freedesktop.org/drm/drm
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
aspeed-g6.dtsi
diff --git
a/arch/arm/boot/dts/aspeed-g6.dtsi
b/arch/arm/boot/dts/aspeed-g6.dtsi
index
74367ee
..
810b067
100644
(file)
--- a/
arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/
arch/arm/boot/dts/aspeed-g6.dtsi
@@
-317,6
+317,11
@@
compatible = "aspeed,ast2600-pinctrl";
};
compatible = "aspeed,ast2600-pinctrl";
};
+ silicon-id@14 {
+ compatible = "aspeed,ast2600-silicon-id", "aspeed,silicon-id";
+ reg = <0x14 0x4 0x5b0 0x8>;
+ };
+
smp-memram@180 {
compatible = "aspeed,ast2600-smpmem";
reg = <0x180 0x40>;
smp-memram@180 {
compatible = "aspeed,ast2600-smpmem";
reg = <0x180 0x40>;
@@
-363,7
+368,7
@@
#gpio-cells = <2>;
gpio-controller;
compatible = "aspeed,ast2600-gpio";
#gpio-cells = <2>;
gpio-controller;
compatible = "aspeed,ast2600-gpio";
- reg = <0x1e780000 0x
8
00>;
+ reg = <0x1e780000 0x
4
00>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
gpio-ranges = <&pinctrl 0 0 208>;
ngpios = <208>;
interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;
gpio-ranges = <&pinctrl 0 0 208>;
ngpios = <208>;