korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-24 03:24:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

ASPEED device tree updates for 5.2

Browse Source 
- RTC and GFX DRM driver went upstream this cycle
 
  - Miscellaneous board updates for Facebook and IBM BMCs
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAlymzi4ACgkQa3ZZB4FH
 cJ5H0xAAux7RzhzYpVx6ErdbwNkwRqbK7i/X0t+BvfdJKH4yd9KyxRI873mTgFHm
 Um8M58Jc7VCAQ5xrat6uD9cCHQu7LQGH2sTeQhI+nEP1v8+/Hkz9Vk5imjn5fMSg
 7LY3EITHkmdV3ggCz+7VMp9XWAkduQ2kX9uhamsWLAH6rR+QF17JBmjNIXmIBGke
 0G4MHBDeVmXQ5DTmj0oIl2IJ60ZQhupf3LqPIrRymcvEaBEJICSrtmFtj6woHFJe
 q4WHLHp7NoXOF/zuI52NPads+zRcM4p9DeeGLuM6sKdFNcpluGL1oBsjsNGaaG+E
 wdgx0+NH/ZVrUoM6/f9klWmaK8v/eDB42DeX7D+uP20HufgY+W60DvKkzJgZVndT
 l6XVXI+l/Z3s6qHEAdDBgUpgu+0kyjT41NABt7Re5r2RpvR03K25MiHb6jqz62zG
 hPxpb2MBifPRnoo+xgFXNiPx2onxb9JkW9HEQo9JRhjdWVXgtf/ExeuYb4aJVgFJ
 hwZrKkTKw9ORF4B2YnObW6ZVshM8xcbcg+Tmvf+n9xCVucA9u721cCwWGlu87nJ0
 9TysbMJDl9fI2YEk43kFaPJoJxzNq4Pm4huO/88xX0yS31gznENu2Vzp5hWFR4Or
 +sCpEW7aw6Zs47I0j2lbGlHp4s3wH+t65yNcLRexgWPGcal0Zro=
 =8l6l
 -----END PGP SIGNATURE-----

Merge tag 'aspeed-5.2-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed into arm/dt

ASPEED device tree updates for 5.2

 - RTC and GFX DRM driver went upstream this cycle

 - Miscellaneous board updates for Facebook and IBM BMCs

* tag 'aspeed-5.2-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: Add RTC node
  ARM: dts: aspeed: witherspoon: Update BMC partitioning
  ARM: dts: aspeed: cmm: enable iio-hwmon-adc
  ARM: dts: aspeed: tiogapass: Enable VUART
  ARM: dts: aspeed-g5: Add video engine
  ARM: dts: aspeed: Enable the GFX IP
  ARM: dts: aspeed-g5: Add resets and clocks to GFX node
  ARM: dts: aspeed: witherspoon: Enable vhub
  ARM: dts: aspeed: palmetto: Fix flash_memory region
  ARM: dts: aspeed: ast2500: Update flash layout

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2019-04-28 12:16:56 -07:00
commit bbf7499dc0
8 changed files with 117 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/boot/dts/aspeed-ast2500-evb.dts
View File

@ -13,12 +13,25 @@
chosen {
stdout-path = &uart5;
bootargs = "console=ttyS4,115200 earlyprintk";
bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
};
memory@80000000 {
reg = <0x80000000 0x20000000>;
};
reserved-memory {
#address-cells = <1>;
#size-cells = <1>;
ranges;
gfx_memory: framebuffer {
size = <0x01000000>;
alignment = <0x01000000>;
compatible = "shared-dma-pool";
reusable;
};
};
};
&fmc {
@ -27,6 +40,7 @@
status = "okay";
m25p,fast-read;
label = "bmc";
#include "openbmc-flash-layout.dtsi"
};
};
@ -97,3 +111,8 @@
&uhci {
status = "okay";
};
&gfx {
status = "okay";
memory-region = <&gfx_memory>;
};

6
arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts
View File

@ -56,6 +56,12 @@
memory@80000000 {
reg = <0x80000000 0x20000000>;
};
ast-adc-hwmon {
compatible = "iio-hwmon";
io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
<&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>;
};
};
&pinctrl {

5
arch/arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts
View File

@ -64,6 +64,11 @@
status = "okay";
};
&vuart {
// VUART Host Console
status = "okay";
};
&uart1 {
// Host Console
status = "okay";

4
arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
View File

@ -32,9 +32,9 @@
no-map;
};
flash_memory: region@98000000 {
flash_memory: region@5c000000 {
no-map;
reg = <0x98000000 0x01000000>; /* 16MB */
reg = <0x5C000000 0x02000000>; /* 32MB */
};
};

8
arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts
View File

@ -35,6 +35,13 @@
reg = <0x9ef00000 0x00100000>;
no-map;
};
gfx_memory: framebuffer {
size = <0x01000000>;
alignment = <0x01000000>;
compatible = "shared-dma-pool";
reusable;
};
};
leds {
@ -238,6 +245,7 @@
&gfx {
status = "okay";
memory-region = <&gfx_memory>;
};
&pinctrl {

52
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
View File

@ -26,6 +26,13 @@
no-map;
reg = <0x98000000 0x04000000>; /* 64M */
};
gfx_memory: framebuffer {
size = <0x01000000>;
alignment = <0x01000000>;
compatible = "shared-dma-pool";
reusable;
};
};
gpio-keys {
@ -186,13 +193,49 @@
status = "okay";
label = "bmc";
m25p,fast-read;
#include "openbmc-flash-layout.dtsi"
partitions {
#address-cells = < 1 >;
#size-cells = < 1 >;
compatible = "fixed-partitions";
u-boot@0 {
reg = < 0 0x60000 >;
label = "u-boot";
};
u-boot-env@60000 {
reg = < 0x60000 0x20000 >;
label = "u-boot-env";
};
obmc-ubi@80000 {
reg = < 0x80000 0x1F80000 >;
label = "obmc-ubi";
};
};
};
flash@1 {
status = "okay";
label = "alt";
label = "alt-bmc";
m25p,fast-read;
partitions {
#address-cells = < 1 >;
#size-cells = < 1 >;
compatible = "fixed-partitions";
u-boot@0 {
reg = < 0 0x60000 >;
label = "alt-u-boot";
};
u-boot-env@60000 {
reg = < 0x60000 0x20000 >;
label = "alt-u-boot-env";
};
obmc-ubi@80000 {
reg = < 0x80000 0x1F80000 >;
label = "alt-obmc-ubi";
};
};
};
};
@ -565,6 +608,7 @@
&gfx {
status = "okay";
memory-region = <&gfx_memory>;
};
&pinctrl {
@ -592,3 +636,7 @@
&adc {
status = "okay";
};
&vhub {
status = "okay";
};

6
arch/arm/boot/dts/aspeed-g4.dtsi
View File

@ -209,6 +209,12 @@
clock-names = "PCLK";
};
rtc: rtc@1e781000 {
compatible = "aspeed,ast2400-rtc";
reg = <0x1e781000 0x18>;
status = "disabled";
};
uart1: serial@1e783000 {
compatible = "ns16550a";
reg = <0x1e783000 0x20>;

20
arch/arm/boot/dts/aspeed-g5.dtsi
View File

@ -232,6 +232,10 @@
compatible = "aspeed,ast2500-gfx", "syscon";
reg = <0x1e6e6000 0x1000>;
reg-io-width = <4>;
clocks = <&syscon ASPEED_CLK_GATE_D1CLK>;
resets = <&syscon ASPEED_RESET_CRT1>;
status = "disabled";
interrupts = <0x19>;
};
adc: adc@1e6e9000 {
@ -243,6 +247,16 @@
status = "disabled";
};
video: video@1e700000 {
compatible = "aspeed,ast2500-video-engine";
reg = <0x1e700000 0x1000>;
clocks = <&syscon ASPEED_CLK_GATE_VCLK>,
<&syscon ASPEED_CLK_GATE_ECLK>;
clock-names = "vclk", "eclk";
interrupts = <7>;
status = "disabled";
};
sram: sram@1e720000 {
compatible = "mmio-sram";
reg = <0x1e720000 0x9000>; // 36K
@ -260,6 +274,12 @@
#interrupt-cells = <2>;
};
rtc: rtc@1e781000 {
compatible = "aspeed,ast2500-rtc";
reg = <0x1e781000 0x18>;
status = "disabled";
};
timer: timer@1e782000 {
/* This timer is a Faraday FTTMR010 derivative */
compatible = "aspeed,ast2400-timer";