Commit 79b7bc0a authored by Martin Kepplinger's avatar Martin Kepplinger

Merge tag 'v5.7.7' into stable/5.7.7

Linux 5.7.7
parents 5438cc63 fb6c7905
# SPDX-License-Identifier: GPL-2.0 # SPDX-License-Identifier: GPL-2.0
VERSION = 5 VERSION = 5
PATCHLEVEL = 7 PATCHLEVEL = 7
SUBLEVEL = 5 SUBLEVEL = 7
EXTRAVERSION = EXTRAVERSION =
NAME = Kleptomaniac Octopus NAME = Kleptomaniac Octopus
......
...@@ -88,7 +88,6 @@ AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0) ...@@ -88,7 +88,6 @@ AM33XX_PADCONF(AM335X_PIN_MMC0_DAT2, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_MMC0_DAT3, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_MMC0_CMD, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0) AM33XX_PADCONF(AM335X_PIN_MMC0_CLK, PIN_INPUT_PULLUP, MUX_MODE0)
AM33XX_PADCONF(AM335X_PIN_MCASP0_ACLKR, PIN_INPUT, MUX_MODE4) /* (B12) mcasp0_aclkr.mmc0_sdwp */
>; >;
}; };
......
...@@ -335,7 +335,7 @@ usb: target-module@47400000 { ...@@ -335,7 +335,7 @@ usb: target-module@47400000 {
<0x47400010 0x4>; <0x47400010 0x4>;
reg-names = "rev", "sysc"; reg-names = "rev", "sysc";
ti,sysc-mask = <(SYSC_OMAP4_FREEEMU | ti,sysc-mask = <(SYSC_OMAP4_FREEEMU |
SYSC_OMAP2_SOFTRESET)>; SYSC_OMAP4_SOFTRESET)>;
ti,sysc-midle = <SYSC_IDLE_FORCE>, ti,sysc-midle = <SYSC_IDLE_FORCE>,
<SYSC_IDLE_NO>, <SYSC_IDLE_NO>,
<SYSC_IDLE_SMART>; <SYSC_IDLE_SMART>;
...@@ -347,7 +347,7 @@ usb: target-module@47400000 { ...@@ -347,7 +347,7 @@ usb: target-module@47400000 {
clock-names = "fck"; clock-names = "fck";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x47400000 0x5000>; ranges = <0x0 0x47400000 0x8000>;
usb0_phy: usb-phy@1300 { usb0_phy: usb-phy@1300 {
compatible = "ti,am335x-usb-phy"; compatible = "ti,am335x-usb-phy";
......
...@@ -112,13 +112,13 @@ &uart5 { ...@@ -112,13 +112,13 @@ &uart5 {
&kcs2 { &kcs2 {
// BMC KCS channel 2 // BMC KCS channel 2
status = "okay"; status = "okay";
kcs_addr = <0xca8>; aspeed,lpc-io-reg = <0xca8>;
}; };
&kcs3 { &kcs3 {
// BMC KCS channel 3 // BMC KCS channel 3
status = "okay"; status = "okay";
kcs_addr = <0xca2>; aspeed,lpc-io-reg = <0xca2>;
}; };
&mac0 { &mac0 {
......
...@@ -426,22 +426,22 @@ lpc_bmc: lpc-bmc@0 { ...@@ -426,22 +426,22 @@ lpc_bmc: lpc-bmc@0 {
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x0 0x80>; ranges = <0x0 0x0 0x80>;
kcs1: kcs1@0 { kcs1: kcs@24 {
compatible = "aspeed,ast2500-kcs-bmc"; compatible = "aspeed,ast2500-kcs-bmc-v2";
reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>;
interrupts = <8>; interrupts = <8>;
kcs_chan = <1>;
status = "disabled"; status = "disabled";
}; };
kcs2: kcs2@0 { kcs2: kcs@28 {
compatible = "aspeed,ast2500-kcs-bmc"; compatible = "aspeed,ast2500-kcs-bmc-v2";
reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>;
interrupts = <8>; interrupts = <8>;
kcs_chan = <2>;
status = "disabled"; status = "disabled";
}; };
kcs3: kcs3@0 { kcs3: kcs@2c {
compatible = "aspeed,ast2500-kcs-bmc"; compatible = "aspeed,ast2500-kcs-bmc-v2";
reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>;
interrupts = <8>; interrupts = <8>;
kcs_chan = <3>;
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -455,10 +455,10 @@ lpc_host: lpc-host@80 { ...@@ -455,10 +455,10 @@ lpc_host: lpc-host@80 {
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x80 0x1e0>; ranges = <0x0 0x80 0x1e0>;
kcs4: kcs4@0 { kcs4: kcs@94 {
compatible = "aspeed,ast2500-kcs-bmc"; compatible = "aspeed,ast2500-kcs-bmc-v2";
reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>;
interrupts = <8>; interrupts = <8>;
kcs_chan = <4>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -65,6 +65,7 @@ timer { ...@@ -65,6 +65,7 @@ timer {
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
clocks = <&syscon ASPEED_CLK_HPLL>; clocks = <&syscon ASPEED_CLK_HPLL>;
arm,cpu-registers-not-fw-configured; arm,cpu-registers-not-fw-configured;
always-on;
}; };
ahb { ahb {
...@@ -368,6 +369,7 @@ timer: timer@1e782000 { ...@@ -368,6 +369,7 @@ timer: timer@1e782000 {
<&gic GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>; <&gic GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&syscon ASPEED_CLK_APB1>; clocks = <&syscon ASPEED_CLK_APB1>;
clock-names = "PCLK"; clock-names = "PCLK";
status = "disabled";
}; };
uart1: serial@1e783000 { uart1: serial@1e783000 {
...@@ -433,22 +435,23 @@ lpc_bmc: lpc-bmc@0 { ...@@ -433,22 +435,23 @@ lpc_bmc: lpc-bmc@0 {
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x0 0x80>; ranges = <0x0 0x0 0x80>;
kcs1: kcs1@0 { kcs1: kcs@24 {
compatible = "aspeed,ast2600-kcs-bmc"; compatible = "aspeed,ast2500-kcs-bmc-v2";
reg = <0x24 0x1>, <0x30 0x1>, <0x3c 0x1>;
interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 138 IRQ_TYPE_LEVEL_HIGH>;
kcs_chan = <1>; kcs_chan = <1>;
status = "disabled"; status = "disabled";
}; };
kcs2: kcs2@0 { kcs2: kcs@28 {
compatible = "aspeed,ast2600-kcs-bmc"; compatible = "aspeed,ast2500-kcs-bmc-v2";
reg = <0x28 0x1>, <0x34 0x1>, <0x40 0x1>;
interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
kcs_chan = <2>;
status = "disabled"; status = "disabled";
}; };
kcs3: kcs3@0 { kcs3: kcs@2c {
compatible = "aspeed,ast2600-kcs-bmc"; compatible = "aspeed,ast2500-kcs-bmc-v2";
reg = <0x2c 0x1>, <0x38 0x1>, <0x44 0x1>;
interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 140 IRQ_TYPE_LEVEL_HIGH>;
kcs_chan = <3>;
status = "disabled"; status = "disabled";
}; };
}; };
...@@ -462,10 +465,10 @@ lpc_host: lpc-host@80 { ...@@ -462,10 +465,10 @@ lpc_host: lpc-host@80 {
#size-cells = <1>; #size-cells = <1>;
ranges = <0x0 0x80 0x1e0>; ranges = <0x0 0x80 0x1e0>;
kcs4: kcs4@0 { kcs4: kcs@94 {
compatible = "aspeed,ast2600-kcs-bmc"; compatible = "aspeed,ast2500-kcs-bmc-v2";
reg = <0x94 0x1>, <0x98 0x1>, <0x9c 0x1>;
interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;
kcs_chan = <4>;
status = "disabled"; status = "disabled";
}; };
......
...@@ -200,7 +200,7 @@ uart1: serial@400 { ...@@ -200,7 +200,7 @@ uart1: serial@400 {
status = "disabled"; status = "disabled";
}; };
dma@20000 { dma: dma@20000 {
compatible = "arm,pl330", "arm,primecell"; compatible = "arm,pl330", "arm,primecell";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>,
...@@ -215,6 +215,8 @@ dma@20000 { ...@@ -215,6 +215,8 @@ dma@20000 {
clocks = <&iprocslow>; clocks = <&iprocslow>;
clock-names = "apb_pclk"; clock-names = "apb_pclk";
#dma-cells = <1>; #dma-cells = <1>;
dma-coherent;
status = "disabled";
}; };
sdio: sdhci@21000 { sdio: sdhci@21000 {
...@@ -257,10 +259,10 @@ amac2: ethernet@24000 { ...@@ -257,10 +259,10 @@ amac2: ethernet@24000 {
status = "disabled"; status = "disabled";
}; };
mailbox: mailbox@25000 { mailbox: mailbox@25c00 {
compatible = "brcm,iproc-fa2-mbox"; compatible = "brcm,iproc-fa2-mbox";
reg = <0x25000 0x445>; reg = <0x25c00 0x400>;
interrupts = <GIC_SPI 150 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 151 IRQ_TYPE_LEVEL_HIGH>;
#mbox-cells = <1>; #mbox-cells = <1>;
brcm,rx-status-len = <32>; brcm,rx-status-len = <32>;
brcm,use-bcm-hdr; brcm,use-bcm-hdr;
......
...@@ -130,7 +130,6 @@ v3d: v3d@7ec00000 { ...@@ -130,7 +130,6 @@ v3d: v3d@7ec00000 {
compatible = "brcm,bcm2835-v3d"; compatible = "brcm,bcm2835-v3d";
reg = <0x7ec00000 0x1000>; reg = <0x7ec00000 0x1000>;
interrupts = <1 10>; interrupts = <1 10>;
power-domains = <&pm BCM2835_POWER_DOMAIN_GRAFX_V3D>;
}; };
vc4: gpu { vc4: gpu {
......
// SPDX-License-Identifier: GPL-2.0
/*
* This include file covers the common peripherals and configuration between
* bcm2835, bcm2836 and bcm2837 implementations that interact with RPi's
* firmware interface.
*/
#include <dt-bindings/power/raspberrypi-power.h>
&v3d {
power-domains = <&power RPI_POWER_DOMAIN_V3D>;
};
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "bcm283x.dtsi" #include "bcm283x.dtsi"
#include "bcm2835-common.dtsi" #include "bcm2835-common.dtsi"
#include "bcm2835-rpi-common.dtsi"
/ { / {
compatible = "brcm,bcm2835"; compatible = "brcm,bcm2835";
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "bcm283x.dtsi" #include "bcm283x.dtsi"
#include "bcm2835-common.dtsi" #include "bcm2835-common.dtsi"
#include "bcm2835-rpi-common.dtsi"
/ { / {
compatible = "brcm,bcm2836"; compatible = "brcm,bcm2836";
......
#include "bcm283x.dtsi" #include "bcm283x.dtsi"
#include "bcm2835-common.dtsi" #include "bcm2835-common.dtsi"
#include "bcm2835-rpi-common.dtsi"
/ { / {
compatible = "brcm,bcm2837"; compatible = "brcm,bcm2837";
......
...@@ -17,6 +17,7 @@ chosen { ...@@ -17,6 +17,7 @@ chosen {
}; };
memory { memory {
device_type = "memory";
reg = <0x00000000 0x08000000 reg = <0x00000000 0x08000000
0x88000000 0x18000000>; 0x88000000 0x18000000>;
}; };
......
...@@ -58,6 +58,10 @@ gpio-restart { ...@@ -58,6 +58,10 @@ gpio-restart {
/* USB 3 support needed to be complete */ /* USB 3 support needed to be complete */
&dma {
status = "okay";
};
&amac0 { &amac0 {
status = "okay"; status = "okay";
}