mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 15:15:47 +00:00
Code Issues Releases Wiki Activity

This pull request contains Broadcom ARM-based SoCs Device Tree changes

Browse source 
intended for 4.19, please pull the following:
 
 - Florian fixes the PPI and SPI interrupts in the BCM63138 (DSL) SoC DTS
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAlupKGwACgkQh9CWnEQH
 BwTgvQ/+KShazu6K/28nduCtvnDCDbro8UYHxweo97UmeeEYIJ9g41ubKxEtWHUF
 s/vNojpv0xlPEDKogHsBfsE6L0S3jNjG5dx1lvJgrJDlaTabtGybM3xRoOkB+xGs
 y7QNTfBcVPOBJjOrUSmh/1CIirBm+yQjSYgg8/YLJWZCy/FRgSd7koTKHAql/Ppw
 xWjG83djIFnWxTs7Hbp0cHQP9Z4kpWo9tuWkyOXeiDR0CMTtFjdKwMPkw4GHOInQ
 68FK75mDROnno9TwtWGylw2op8JRzSqRaX6aDQnXn8xzP7D+ngRRUWlLNOQutuO1
 RX8+qx5ItUMi6vTc3zOm4NJk1WvWSyiiTO2fHLjZ29e+ODy0gi6cZCb8E4gSJK1W
 nS3KFDdqw0hPh4rCOGKe20KqaY0jd/hN1FLjXIA9YRYQJb0aZR1iW+U8PmahNyEb
 9O2zUEUJebFoZWOta4ISnJMKhXNawHGf3f6U24kqMCg/3qJt4NKFn2MjdsXraqij
 nd/biK0M6JhlHwHTV4sVEN7f86anESz1H8T9AB9MWkzlTNvW7narWQEJCiVGp/16
 FDufrM0cNX9mVcBOprzmDpMiY+YiKOP2nrKIlTPaaa/qsxhOr2qZT8KmzlmdRQWU
 Aj/sbaPRPF+882sDSEbLYpl/aE90zYgiLe2S1PfOVRZ5YrJws0E=
 =FoxN
 -----END PGP SIGNATURE-----

Merge tag 'arm-soc/for-4.19/devicetree-fixes' of https://github.com/Broadcom/stblinux into fixes

This pull request contains Broadcom ARM-based SoCs Device Tree changes
intended for 4.19, please pull the following:

- Florian fixes the PPI and SPI interrupts in the BCM63138 (DSL) SoC DTS

* tag 'arm-soc/for-4.19/devicetree-fixes' of https://github.com/Broadcom/stblinux:
  ARM: dts: BCM63xx: Fix incorrect interrupt specifiers

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-09-25 13:51:16 -07:00
commit 1a677ff4ce
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/boot/dts/bcm63138.dtsi
View file

@ -106,21 +106,23 @@ gic: interrupt-controller@1e100 {
global_timer: timer@1e200 {
compatible = "arm,cortex-a9-global-timer";
reg = <0x1e200 0x20>;
interrupts = <GIC_PPI 11 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_PPI 11 IRQ_TYPE_EDGE_RISING>;
clocks = <&axi_clk>;
};
local_timer: local-timer@1e600 {
compatible = "arm,cortex-a9-twd-timer";
reg = <0x1e600 0x20>;
interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_EDGE_RISING)>;
clocks = <&axi_clk>;
};
twd_watchdog: watchdog@1e620 {
compatible = "arm,cortex-a9-twd-wdt";
reg = <0x1e620 0x20>;
interrupts = <GIC_PPI 14 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) |
IRQ_TYPE_LEVEL_HIGH)>;
};
armpll: armpll {
@ -158,7 +160,7 @@ timer: timer@80 {
serial0: serial@600 {
compatible = "brcm,bcm6345-uart";
reg = <0x600 0x1b>;
interrupts = <GIC_SPI 32 0>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&periph_clk>;
clock-names = "periph";
status = "disabled";
@ -167,7 +169,7 @@ serial0: serial@600 {
serial1: serial@620 {
compatible = "brcm,bcm6345-uart";
reg = <0x620 0x1b>;
interrupts = <GIC_SPI 33 0>;
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&periph_clk>;
clock-names = "periph";
status = "disabled";
@ -180,7 +182,7 @@ nand: nand@2000 {
reg = <0x2000 0x600>, <0xf0 0x10>;
reg-names = "nand", "nand-int-base";
status = "disabled";
interrupts = <GIC_SPI 38 0>;
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "nand";
};