Skip to content

L
linux
Commit c14e723e authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'aspeed-5.6-devicetree' of... 

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

ASPEED device tree updates for 5.6

 - Cleanups for dtc warnings

 - Ethernet hardware checksum cleanups. A bug in the driver was fixed so
 machines don't need to specify this anymore.

 - Misc improvements

* tag 'aspeed-5.6-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: rainier: Add UCD90320 power sequencer
  ARM: dts: aspeed: rainier: Switch PSUs to unknown version
  ARM: dts: aspeed: Add SD card for Vesnin
  ARM: dts: aspeed: yamp: Delete no-hw-checksum
  ARM: dts: aspeed: netbmc: Delete no-hw-checksum
  ARM: dts: aspeed: AST2400 disables hw checksum
  ARM: dts: ibm-power9-dual: Add a unit address for OCC nodes
  ARM: dts: aspeed-g6: Cleanup watchdog unit address
  ARM: dts: aspeed-g5: Sort LPC child nodes by unit address
  ARM: dts: aspeed: Add reg hints to syscon children
  ARM: dts: aspeed: Cleanup lpc-ctrl and snoop regs
  ARM: dts: witherspoon: Cleanup gpio-keys-polled properties
  ARM: dts: swift: Cleanup gpio-keys-polled properties
  ARM: dts: fp5280g2: Cleanup gpio-keys-polled properties
  ARM: dts: vesnin: Add unit address for memory node
  ARM: dts: aspeed-g5: Use recommended generic node name for SDMC
  ARM: dts: aspeed-g5: Move EDAC node to APB
  dt-bindings: misc: Document reg for aspeed, p2a-ctrl nodes
  dt-bindings: pinctrl: aspeed: Add reg property as a hint

Link: https://lore.kernel.org/r/CACPK8XepSy6D4CNWjSWDDK0p7Dx_rneWne4t4uyy=di5nx3zmA@mail.gmail.comSigned-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 55a03ac8 39be9e84
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 64 deletions
Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt
View file @ c14e723e
......@@ -18,6 +18,7 @@ Required properties:
Optional properties:
===================
- reg: A hint for the memory regions associated with the P2A controller
- memory-region: A phandle to a reserved_memory region to be used for the PCI
to AHB mapping
......
Documentation/devicetree/bindings/pinctrl/aspeed,ast2400-pinctrl.yaml
View file @ c14e723e
......@@ -22,6 +22,9 @@ description: |+
properties:
compatible:
const: aspeed,ast2400-pinctrl
reg:
description: |
A hint for the memory regions associated with the pin-controller
patternProperties:
'^.*$':
......
Documentation/devicetree/bindings/pinctrl/aspeed,ast2500-pinctrl.yaml
View file @ c14e723e
......@@ -23,6 +23,9 @@ description: |+
properties:
compatible:
const: aspeed,ast2500-pinctrl
reg:
description: |
A hint for the memory regions associated with the pin-controller
aspeed,external-nodes:
minItems: 2
maxItems: 2
......
arch/arm/boot/dts/aspeed-bmc-facebook-wedge100.dts
View file @ c14e723e
......@@ -76,7 +76,6 @@ &uart5 {
&mac1 {
status = "okay";
no-hw-checksum;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
};
......
arch/arm/boot/dts/aspeed-bmc-facebook-wedge40.dts
View file @ c14e723e
......@@ -75,7 +75,6 @@ &uart5 {
&mac1 {
status = "okay";
no-hw-checksum;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
};
......
arch/arm/boot/dts/aspeed-bmc-facebook-yamp.dts
View file @ c14e723e
......@@ -35,7 +35,6 @@ &uart2 {
&mac0 {
status = "okay";
use-ncsi;
no-hw-checksum;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii1_default>;
clocks = <&syscon ASPEED_CLK_GATE_MAC1CLK>,
......
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
View file @ c14e723e
......@@ -97,22 +97,22 @@ &i2c3 {
status = "okay";
power-supply@68 {
compatible = "ibm,cffps2";
compatible = "ibm,cffps";
reg = <0x68>;
};
power-supply@69 {
compatible = "ibm,cffps2";
compatible = "ibm,cffps";
reg = <0x69>;
};
power-supply@6a {
compatible = "ibm,cffps2";
compatible = "ibm,cffps";
reg = <0x6a>;
};
power-supply@6b {
compatible = "ibm,cffps2";
compatible = "ibm,cffps";
reg = <0x6b>;
};
};
......@@ -352,18 +352,8 @@ eeprom@51 {
&i2c8 {
status = "okay";
ucd90320@b {
compatible = "ti,ucd90160";
reg = <0x0b>;
};
ucd90320@c {
compatible = "ti,ucd90160";
reg = <0x0c>;
};
ucd90320@11 {
compatible = "ti,ucd90160";
compatible = "ti,ucd90320";
reg = <0x11>;
};
......
arch/arm/boot/dts/aspeed-bmc-inspur-fp5280g2.dts
View file @ c14e723e
......@@ -94,8 +94,6 @@ ps1-presence {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <1000>;
fan0-presence {
......
arch/arm/boot/dts/aspeed-bmc-opp-swift.dts
View file @ c14e723e
......@@ -82,8 +82,6 @@ iio-hwmon-battery {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <1000>;
scm0-presence {
......
arch/arm/boot/dts/aspeed-bmc-opp-vesnin.dts
View file @ c14e723e
......@@ -14,7 +14,7 @@ chosen {
bootargs = "console=ttyS4,115200 earlyprintk";
};
memory {
memory@40000000 {
reg = <0x40000000 0x20000000>;
};
......@@ -107,10 +107,7 @@ flash@0 {
&mac0 {
status = "okay";
use-ncsi;
no-hw-checksum;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii1_default>;
};
......@@ -236,3 +233,16 @@ &vuart {
&wdt2 {
aspeed,alt-boot;
};
&sdmmc {
status = "okay";
};
&sdhci1 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_sd2_default>;
cd-inverted;
disable-wp;
};
arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts
View file @ c14e723e
......@@ -77,8 +77,6 @@ iio-hwmon-battery {
gpio-keys-polled {
compatible = "gpio-keys-polled";
#address-cells = <1>;
#size-cells = <0>;
poll-interval = <1000>;
fan0-presence {
......
arch/arm/boot/dts/aspeed-g4.dtsi
View file @ c14e723e
......@@ -179,18 +179,21 @@ syscon: syscon@1e6e2000 {
compatible = "aspeed,ast2400-scu", "syscon", "simple-mfd";
reg = <0x1e6e2000 0x1a8>;
#address-cells = <1>;
#size-cells = <0>;
#size-cells = <1>;
ranges = <0 0x1e6e2000 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
pinctrl: pinctrl {
compatible = "aspeed,ast2400-pinctrl";
};
p2a: p2a-control {
p2a: p2a-control@2c {
reg = <0x2c 0x4>;
compatible = "aspeed,ast2400-p2a-ctrl";
status = "disabled";
};
pinctrl: pinctrl@80 {
reg = <0x80 0x18>, <0xa0 0x10>;
compatible = "aspeed,ast2400-pinctrl";
};
};
rng: hwrng@1e6e2078 {
......@@ -346,14 +349,14 @@ lpc_host: lpc-host@80 {
lpc_ctrl: lpc-ctrl@0 {
compatible = "aspeed,ast2400-lpc-ctrl";
reg = <0x0 0x80>;
reg = <0x0 0x10>;
clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
status = "disabled";
};
lpc_snoop: lpc-snoop@0 {
lpc_snoop: lpc-snoop@10 {
compatible = "aspeed,ast2400-lpc-snoop";
reg = <0x0 0x80>;
reg = <0x10 0x8>;
interrupts = <8>;
status = "disabled";
};
......
arch/arm/boot/dts/aspeed-g5.dtsi
View file @ c14e723e
......@@ -47,13 +47,6 @@ memory@80000000 {
reg = <0x80000000 0>;
};
edac: sdram@1e6e0000 {
compatible = "aspeed,ast2500-sdram-edac";
reg = <0x1e6e0000 0x174>;
interrupts = <0>;
status = "disabled";
};
ahb {
compatible = "simple-bus";
#address-cells = <1>;
......@@ -213,24 +206,33 @@ apb {
#size-cells = <1>;
ranges;
edac: memory-controller@1e6e0000 {
compatible = "aspeed,ast2500-sdram-edac";
reg = <0x1e6e0000 0x174>;
interrupts = <0>;
status = "disabled";
};
syscon: syscon@1e6e2000 {
compatible = "aspeed,ast2500-scu", "syscon", "simple-mfd";
reg = <0x1e6e2000 0x1a8>;
#address-cells = <1>;
#size-cells = <0>;
#size-cells = <1>;
ranges = <0 0x1e6e2000 0x1000>;
#clock-cells = <1>;
#reset-cells = <1>;
pinctrl: pinctrl {
compatible = "aspeed,ast2500-pinctrl";
aspeed,external-nodes = <&gfx &lhc>;
};
p2a: p2a-control {
p2a: p2a-control@2c {
compatible = "aspeed,ast2500-p2a-ctrl";
reg = <0x2c 0x4>;
status = "disabled";
};
pinctrl: pinctrl@80 {
compatible = "aspeed,ast2500-pinctrl";
reg = <0x80 0x18>, <0xa0 0x10>;
aspeed,external-nodes = <&gfx>, <&lhc>;
};
};
rng: hwrng@1e6e2078 {
......@@ -460,29 +462,30 @@ kcs4: kcs4@0 {
lpc_ctrl: lpc-ctrl@0 {
compatible = "aspeed,ast2500-lpc-ctrl";
reg = <0x0 0x80>;
reg = <0x0 0x10>;
clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
status = "disabled";
};
lpc_snoop: lpc-snoop@0 {
lpc_snoop: lpc-snoop@10 {
compatible = "aspeed,ast2500-lpc-snoop";
reg = <0x0 0x80>;
reg = <0x10 0x8>;
interrupts = <8>;
status = "disabled";
};
lhc: lhc@20 {
compatible = "aspeed,ast2500-lhc";
reg = <0x20 0x24 0x48 0x8>;
};
lpc_reset: reset-controller@18 {
compatible = "aspeed,ast2500-lpc-reset";
reg = <0x18 0x4>;
#reset-cells = <1>;
};
lhc: lhc@20 {
compatible = "aspeed,ast2500-lhc";
reg = <0x20 0x24 0x48 0x8>;
};
ibt: ibt@c0 {
compatible = "aspeed,ast2500-ibt-bmc";
reg = <0xc0 0x18>;
......
arch/arm/boot/dts/aspeed-g6.dtsi
View file @ c14e723e
......@@ -385,7 +385,7 @@ wdt3: watchdog@1e785080 {
status = "disabled";
};
wdt4: watchdog@1e7850C0 {
wdt4: watchdog@1e7850c0 {
compatible = "aspeed,ast2600-wdt";
reg = <0x1e7850C0 0x40>;
status = "disabled";
......
arch/arm/boot/dts/ast2500-facebook-netbmc-common.dtsi
View file @ c14e723e
......@@ -71,7 +71,6 @@ flash1@0 {
&mac1 {
status = "okay";
no-hw-checksum;
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
};
......
arch/arm/boot/dts/ibm-power9-dual.dtsi
View file @ c14e723e
......@@ -86,7 +86,7 @@ sbefifo@2400 {
#address-cells = <1>;
#size-cells = <0>;
fsi_occ0: occ {
fsi_occ0: occ@1 {
compatible = "ibm,p9-occ";
};
};
......@@ -187,7 +187,7 @@ sbefifo@2400 {
#address-cells = <1>;
#size-cells = <0>;
fsi_occ1: occ {
fsi_occ1: occ@2 {
compatible = "ibm,p9-occ";
};
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7