github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-01 03:59:40 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

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

Browse Source 
for 6.17, please pull the following:
 
 - Linus makes a number of updates to the BCMBCA SoCs Device Tree files
   to correct UART interrupt numbers, add interrupts to the RNG block,
   and leverage the fact that all SoCs have the same peripherals at the
   same aperture
 
 - Uwe corrects the Merakia MX6X DTS file to have #pwm-cells = 3 as per
   the binding
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEm+Rq3+YGJdiR9yuFh9CWnEQHBwQFAmhi3g0ACgkQh9CWnEQH
 BwTprRAAjBMdwFKJoEVj0NhioKTRT3D3w5qzZAucwJEtp8vZzWmjGEhk0fPT5CkP
 uSNwRtvkXTeBpe2wlIAtj82/+ITaVJRUJtEqHjQlE1ohiJZvhx7HdOqNIuYuzBBY
 U1q3IgJ2d7jx5WZK+QY0cT2wPaD2Oc+YAszjquQjbSWIldBUCC+YjvWi7UehK5qg
 8mG6dvM3d3ZwnqA5+YHp49QxoOnfYUzuYdkOo/r19WetY1pUWEVoKbH8vtnNThO3
 2LEj9JgePre8iUaChtvEXfOyUG+c/zL67qxMZ1EFSAe1n33EP+YykIV547t4S503
 eoIeLe7e3Yul+hyutTfR9FPWs6pUwSBMPc3ZofLKqN+HJs1zA6jxYwGo64d07yxj
 6oV23vbkT3SuUgEHn/5G0OjS5XjoY2JuwtbFXmfivKYiEUwXu570TbJWxToXJo5w
 9vCMLhObL786nlu/eMU9yoTE1FcC65XAzOuDxd+BjnAmNQts1X6+DzwpXTIZSfPA
 0kOOQ4mhzQRK0t0Mb59hxVS+kwpm8IKTTSHWhw6W+kr1AntukTKu4S8q7JGJ/bOx
 Eiv7mTOF+OyX4uVE0dSZxxv1lCVSzc9upNfc2oICX0aDQavEcl5XONpOiaWm0XEW
 zoIn0Coj1YJP8iKriJaSvEvXNMwo0bdvOEgUk2q4se9XKUf5DuY=
 =ns2p
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmhmnJMACgkQmmx57+YA
 GNla/g//TMk8c8LF/srTHoGO2ZHgB9x0JEEO7XbIi/+ku9kmjSWTeigQesTwlvkD
 r00CJq6t4Hy1bKnwHoNxNnV5HJT+2Kdy7LoD6EZ539Z7ES/gPr/S85u0WgorN3lX
 jhYNCpThtsdGIlvGaODUTXX+gzlCctG9miC4mvF+Vzqanb3Ti6412ZKy67p53uTP
 hDM7P+TnlPn8O8Kzba2Zg+fi003F/GVT6QhlgV//fWC7/+6UHC4Mjw47xgfOra7+
 hSz9fm48FTpslhhnkvNX5DB8br3+ouvY6Zol4pdxVZ/8m3DUnNCDz+vxHz4a4zUp
 reW4mT3J6bL/0Bu6GlD1x/+WfiiMAV5cYAr+u2Eub9vajEbjuTI+7RMAH4s2J/wo
 dSZvNCAdtKILTRqBx1lUF/aIOiz+DJetVjY4oqbtB4PYAPmHgvl78FovMMNVT9ZM
 Za2ZH5F9lbq8ObRKegac3kkM5ibGUtb0lqLJzXlwfhv40nCZ6M+ito+e+IBkdGq0
 6WEPKJJW78CuJlVG64lnyAt+eDGEL0v5M40xnFFod+AJeIJ5p9UiKEyc1S5EYejB
 fGhyt3l2L9B1zzXaO7olkLeTUq1fkAw+cs7rfOtEzlW6MGcLYR4lZHP1BHxYF7Od
 /czqi7/vxmPtSDfWRD8kjrvwYkGFjUkwLfQS/wTQps+6bTiE364=
 =ido4
 -----END PGP SIGNATURE-----

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

This pull request contains Broadcom ARM-based SoCs Device Tree updates
for 6.17, please pull the following:

- Linus makes a number of updates to the BCMBCA SoCs Device Tree files
  to correct UART interrupt numbers, add interrupts to the RNG block,
  and leverage the fact that all SoCs have the same peripherals at the
  same aperture

- Uwe corrects the Merakia MX6X DTS file to have #pwm-cells = 3 as per
  the binding

* tag 'arm-soc/for-6.17/devicetree' of https://github.com/Broadcom/stblinux:
  ARM: dts: bcm958625-meraki-mx6x: Use #pwm-cells = <3>
  ARM: dts: bcm63178: Add BCMBCA peripherals
  ARM: dts: bcm63148: Add BCMBCA peripherals
  ARM: dts: bcm63138: Add BCMBCA peripherals
  ARM: dts: bcm6878: Add BCMBCA peripherals
  ARM: dts: bcm6855: Add BCMBCA peripherals
  ARM: dts: bcm6846: Add interrupt to RNG
  dt-bindings: rng: r200: Add interrupt property
  ARM: dts: bcm6878: Correct UART0 IRQ number

Link: https://lore.kernel.org/r/20250630190216.1518354-2-florian.fainelli@broadcom.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2025-07-03 17:06:46 +02:00
commit 7eb5b8d0b2
8 changed files with 510 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/devicetree/bindings/rng/brcm,iproc-rng200.yaml
View File

@ -20,11 +20,17 @@ properties:
reg:
maxItems: 1
interrupts:
maxItems: 1
additionalProperties: false
examples:
- |
#include <dt-bindings/interrupt-controller/arm-gic.h>
rng@18032000 {
compatible = "brcm,iproc-rng200";
reg = <0x18032000 0x28>;
interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
};

79
arch/arm/boot/dts/broadcom/bcm63138.dtsi
View File

@ -184,13 +184,69 @@ ubus@fffe8000 {
compatible = "simple-bus";
#address-cells = <1>;
#size-cells = <1>;
ranges = <0 0xfffe8000 0x8100>;
ranges = <0 0xfffe8000 0x10000>;
timer: timer@80 {
compatible = "brcm,bcm6328-timer", "syscon";
reg = <0x80 0x3c>;
};
/* GPIOs 0 .. 31 */
gpio0: gpio@100 {
compatible = "brcm,bcm6345-gpio";
reg = <0x100 0x04>, <0x114 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 32 .. 63 */
gpio1: gpio@104 {
compatible = "brcm,bcm6345-gpio";
reg = <0x104 0x04>, <0x118 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 64 .. 95 */
gpio2: gpio@108 {
compatible = "brcm,bcm6345-gpio";
reg = <0x108 0x04>, <0x11c 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 96 .. 127 */
gpio3: gpio@10c {
compatible = "brcm,bcm6345-gpio";
reg = <0x10c 0x04>, <0x120 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 128 .. 159 */
gpio4: gpio@110 {
compatible = "brcm,bcm6345-gpio";
reg = <0x110 0x04>, <0x124 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
rng@300 {
compatible = "brcm,iproc-rng200";
reg = <0x300 0x28>;
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
};
serial0: serial@600 {
compatible = "brcm,bcm6345-uart";
reg = <0x600 0x1b>;
@ -209,6 +265,14 @@ serial1: serial@620 {
status = "disabled";
};
leds: led-controller@700 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "brcm,bcm63138-leds";
reg = <0x700 0xdc>;
status = "disabled";
};
hsspi: spi@1000 {
#address-cells = <1>;
#size-cells = <0>;
@ -248,6 +312,19 @@ bootlut: bootlut@8000 {
reg = <0x8000 0x50>;
};
pl081_dma: dma-controller@d000 {
compatible = "arm,pl081", "arm,primecell";
// The magic B105F00D info is missing
arm,primecell-periphid = <0x00041081>;
reg = <0xd000 0x1000>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
memcpy-burst-size = <256>;
memcpy-bus-width = <32>;
clocks = <&periph_clk>;
clock-names = "apb_pclk";
#dma-cells = <2>;
};
reboot {
compatible = "syscon-reboot";
regmap = <&timer>;

64
arch/arm/boot/dts/broadcom/bcm63148.dtsi
View File

@ -99,6 +99,62 @@ bus@ff800000 {
#size-cells = <1>;
ranges = <0 0xfffe8000 0x8000>;
/* GPIOs 0 .. 31 */
gpio0: gpio@100 {
compatible = "brcm,bcm6345-gpio";
reg = <0x100 0x04>, <0x114 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 32 .. 63 */
gpio1: gpio@104 {
compatible = "brcm,bcm6345-gpio";
reg = <0x104 0x04>, <0x118 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 64 .. 95 */
gpio2: gpio@108 {
compatible = "brcm,bcm6345-gpio";
reg = <0x108 0x04>, <0x11c 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 96 .. 127 */
gpio3: gpio@10c {
compatible = "brcm,bcm6345-gpio";
reg = <0x10c 0x04>, <0x120 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 128 .. 159 */
gpio4: gpio@110 {
compatible = "brcm,bcm6345-gpio";
reg = <0x110 0x04>, <0x124 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
rng@300 {
compatible = "brcm,iproc-rng200";
reg = <0x300 0x28>;
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
};
uart0: serial@600 {
compatible = "brcm,bcm6345-uart";
reg = <0x600 0x20>;
@ -108,6 +164,14 @@ uart0: serial@600 {
status = "disabled";
};
leds: led-controller@700 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "brcm,bcm63138-leds";
reg = <0x700 0xdc>;
status = "disabled";
};
hsspi: spi@1000 {
#address-cells = <1>;
#size-cells = <0>;

112
arch/arm/boot/dts/broadcom/bcm63178.dtsi
View File

@ -117,6 +117,97 @@ bus@ff800000 {
#size-cells = <1>;
ranges = <0 0xff800000 0x800000>;
watchdog@480 {
compatible = "brcm,bcm6345-wdt";
reg = <0x480 0x10>;
};
/* GPIOs 0 .. 31 */
gpio0: gpio@500 {
compatible = "brcm,bcm6345-gpio";
reg = <0x500 0x04>, <0x520 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 32 .. 63 */
gpio1: gpio@504 {
compatible = "brcm,bcm6345-gpio";
reg = <0x504 0x04>, <0x524 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 64 .. 95 */
gpio2: gpio@508 {
compatible = "brcm,bcm6345-gpio";
reg = <0x508 0x04>, <0x528 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 96 .. 127 */
gpio3: gpio@50c {
compatible = "brcm,bcm6345-gpio";
reg = <0x50c 0x04>, <0x52c 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 128 .. 159 */
gpio4: gpio@510 {
compatible = "brcm,bcm6345-gpio";
reg = <0x510 0x04>, <0x530 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 160 .. 191 */
gpio5: gpio@514 {
compatible = "brcm,bcm6345-gpio";
reg = <0x514 0x04>, <0x534 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 192 .. 223 */
gpio6: gpio@518 {
compatible = "brcm,bcm6345-gpio";
reg = <0x518 0x04>, <0x538 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 224 .. 255 */
gpio7: gpio@51c {
compatible = "brcm,bcm6345-gpio";
reg = <0x51c 0x04>, <0x53c 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
rng@b80 {
compatible = "brcm,iproc-rng200";
reg = <0xb80 0x28>;
interrupts = <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
};
hsspi: spi@1000 {
#address-cells = <1>;
#size-cells = <0>;
@ -143,6 +234,27 @@ nandcs: nand@0 {
};
};
leds: led-controller@3000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "brcm,bcm63138-leds";
reg = <0x3000 0xdc>;
status = "disabled";
};
pl081_dma: dma-controller@11000 {
compatible = "arm,pl081", "arm,primecell";
// The magic B105F00D info is missing
arm,primecell-periphid = <0x00041081>;
reg = <0x11000 0x1000>;
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
memcpy-burst-size = <256>;
memcpy-bus-width = <32>;
clocks = <&periph_clk>;
clock-names = "apb_pclk";
#dma-cells = <2>;
};
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;

1
arch/arm/boot/dts/broadcom/bcm6846.dtsi
View File

@ -196,6 +196,7 @@ uart0: serial@640 {
rng@b80 {
compatible = "brcm,iproc-rng200";
reg = <0xb80 0x28>;
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
};
leds: led-controller@800 {

127
arch/arm/boot/dts/broadcom/bcm6855.dtsi
View File

@ -116,6 +116,103 @@ bus@ff800000 {
#size-cells = <1>;
ranges = <0 0xff800000 0x800000>;
watchdog@480 {
compatible = "brcm,bcm6345-wdt";
reg = <0x480 0x10>;
};
watchdog@4c0 {
compatible = "brcm,bcm6345-wdt";
reg = <0x4c0 0x10>;
status = "disabled";
};
/* GPIOs 0 .. 31 */
gpio0: gpio@500 {
compatible = "brcm,bcm6345-gpio";
reg = <0x500 0x04>, <0x520 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 32 .. 63 */
gpio1: gpio@504 {
compatible = "brcm,bcm6345-gpio";
reg = <0x504 0x04>, <0x524 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 64 .. 95 */
gpio2: gpio@508 {
compatible = "brcm,bcm6345-gpio";
reg = <0x508 0x04>, <0x528 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 96 .. 127 */
gpio3: gpio@50c {
compatible = "brcm,bcm6345-gpio";
reg = <0x50c 0x04>, <0x52c 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 128 .. 159 */
gpio4: gpio@510 {
compatible = "brcm,bcm6345-gpio";
reg = <0x510 0x04>, <0x530 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 160 .. 191 */
gpio5: gpio@514 {
compatible = "brcm,bcm6345-gpio";
reg = <0x514 0x04>, <0x534 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 192 .. 223 */
gpio6: gpio@518 {
compatible = "brcm,bcm6345-gpio";
reg = <0x518 0x04>, <0x538 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 224 .. 255 */
gpio7: gpio@51c {
compatible = "brcm,bcm6345-gpio";
reg = <0x51c 0x04>, <0x53c 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
rng@b80 {
compatible = "brcm,iproc-rng200";
reg = <0xb80 0x28>;
interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
};
hsspi: spi@1000 {
#address-cells = <1>;
#size-cells = <0>;
@ -143,6 +240,27 @@ nandcs: nand@0 {
};
};
leds: led-controller@3000 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "brcm,bcm63138-leds";
reg = <0x3000 0xdc>;
status = "disabled";
};
pl081_dma: dma-controller@11000 {
compatible = "arm,pl081", "arm,primecell";
// The magic B105F00D info is missing
arm,primecell-periphid = <0x00041081>;
reg = <0x11000 0x1000>;
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
memcpy-burst-size = <256>;
memcpy-bus-width = <32>;
clocks = <&periph_clk>;
clock-names = "apb_pclk";
#dma-cells = <2>;
};
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
@ -151,5 +269,14 @@ uart0: serial@12000 {
clock-names = "uartclk", "apb_pclk";
status = "disabled";
};
uart1: serial@13000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x13000 0x1000>;
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&uart_clk>, <&uart_clk>;
clock-names = "uartclk", "apb_pclk";
status = "disabled";
};
};
};

120
arch/arm/boot/dts/broadcom/bcm6878.dtsi
View File

@ -108,6 +108,111 @@ bus@ff800000 {
#size-cells = <1>;
ranges = <0 0xff800000 0x800000>;
watchdog@480 {
compatible = "brcm,bcm6345-wdt";
reg = <0x480 0x10>;
};
watchdog@4c0 {
compatible = "brcm,bcm6345-wdt";
reg = <0x4c0 0x10>;
status = "disabled";
};
/* GPIOs 0 .. 31 */
gpio0: gpio@500 {
compatible = "brcm,bcm6345-gpio";
reg = <0x500 0x04>, <0x520 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 32 .. 63 */
gpio1: gpio@504 {
compatible = "brcm,bcm6345-gpio";
reg = <0x504 0x04>, <0x524 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 64 .. 95 */
gpio2: gpio@508 {
compatible = "brcm,bcm6345-gpio";
reg = <0x508 0x04>, <0x528 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 96 .. 127 */
gpio3: gpio@50c {
compatible = "brcm,bcm6345-gpio";
reg = <0x50c 0x04>, <0x52c 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 128 .. 159 */
gpio4: gpio@510 {
compatible = "brcm,bcm6345-gpio";
reg = <0x510 0x04>, <0x530 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 160 .. 191 */
gpio5: gpio@514 {
compatible = "brcm,bcm6345-gpio";
reg = <0x514 0x04>, <0x534 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 192 .. 223 */
gpio6: gpio@518 {
compatible = "brcm,bcm6345-gpio";
reg = <0x518 0x04>, <0x538 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
/* GPIOs 224 .. 255 */
gpio7: gpio@51c {
compatible = "brcm,bcm6345-gpio";
reg = <0x51c 0x04>, <0x53c 0x04>;
reg-names = "dirout", "dat";
gpio-controller;
#gpio-cells = <2>;
status = "disabled";
};
rng@b80 {
compatible = "brcm,iproc-rng200";
reg = <0xb80 0x28>;
interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
};
leds: led-controller@700 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "brcm,bcm63138-leds";
reg = <0x700 0xdc>;
status = "disabled";
};
hsspi: spi@1000 {
#address-cells = <1>;
#size-cells = <0>;
@ -134,10 +239,23 @@ nandcs: nand@0 {
};
};
pl081_dma: dma-controller@11000 {
compatible = "arm,pl081", "arm,primecell";
// The magic B105F00D info is missing
arm,primecell-periphid = <0x00041081>;
reg = <0x11000 0x1000>;
interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
memcpy-burst-size = <256>;
memcpy-bus-width = <32>;
clocks = <&periph_clk>;
clock-names = "apb_pclk";
#dma-cells = <2>;
};
uart0: serial@12000 {
compatible = "arm,pl011", "arm,primecell";
reg = <0x12000 0x1000>;
interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>;
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&uart_clk>, <&uart_clk>;
clock-names = "uartclk", "apb_pclk";
status = "disabled";

7
arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
View File

@ -17,21 +17,21 @@ pwm-leds {
led-1 {
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_RED>;
pwms = <&pwm 1 50000>;
pwms = <&pwm 1 50000 0>;
max-brightness = <255>;
};
led-2 {
function = LED_FUNCTION_POWER;
color = <LED_COLOR_ID_GREEN>;
pwms = <&pwm 2 50000>;
pwms = <&pwm 2 50000 0>;
max-brightness = <255>;
};
led-3 {
function = LED_FUNCTION_INDICATOR;
color = <LED_COLOR_ID_BLUE>;
pwms = <&pwm 3 50000>;
pwms = <&pwm 3 50000 0>;
max-brightness = <255>;
};
};
@ -132,7 +132,6 @@ pwm_leds: pwm_leds {
&pwm {
status = "okay";
#pwm-cells = <2>;
};
&uart0 {