Unverified Commit 9490ae74 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

- Linus adds support for the D-Link DWL-8610AP which is based upon the
  BCM53016 SoC and the D-Link DIR-890L routers

- Maxime resolves a long standing issue affecting Raspberry Pi devices
  by switching entirely over to the VPU firmware clock provider rather
  than mixing the "bare metal" clock driver and VPU

- Rafal corrects the description of the TP-Link router partitions to
  use the "safeloader" partition parser

- Stefan fixes a number of invalid underscores in the bcm283x DTS files
  and also moves the ACT LED into a separate DTS include file for better
  re-use

- Krzysztof aligns the LEDs DT nodes to the proper schema format

- Pierre adds missing cache properties to various SoCs

* tag 'arm-soc/for-6.2/devicetree' of https://github.com/Broadcom/stblinux:
  arm: dts: Update cache properties for broadcom
  ARM: dts: broadcom: align LED node names with dtschema
  ARM: dts: bcm283x: Move ACT LED into separate dtsi
  ARM: dts: bcm283x: Fix underscores in node names
  ARM: dts: BCM5301X: Correct description of TP-Link partitions
  ARM: dts: bcm47094: Add devicetree for D-Link DIR-890L
  dt-bindings: ARM: add bindings for the D-Link DIR-890L
  ARM: dts: bcm2835-rpi: Use firmware clocks for display
  ARM: dts: bcm283x: Remove bcm2835-rpi-common.dtsi from SoC DTSI
  ARM: dts: bcm53016: Add devicetree for D-Link DWL-8610AP
  dt-bindings: ARM: add bindings for the D-Link DWL-8610AP

Link: https://lore.kernel.org/r/20221129191755.542584-1-f.fainelli@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 33423a8b b2302467

Documentation/devicetree/bindings/arm/bcm/brcm,bcm4708.yaml

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ properties: 
          - enum:

              - asus,rt-ac88u

              - dlink,dir-885l

              - dlink,dir-890l

              - linksys,panamera

              - luxul,abr-4500-v1

              - luxul,xap-1610-v1
@@ -97,6 +98,7 @@ properties: 
      - description: BCM53016 based boards

        items:

          - enum:

              - dlink,dwl-8610ap

              - meraki,mr32

          - const: brcm,bcm53016

          - const: brcm,bcm4708

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm4709-tplink-archer-c9-v1.dtb \

	bcm47094-asus-rt-ac88u.dtb \

	bcm47094-dlink-dir-885l.dtb \

	bcm47094-dlink-dir-890l.dtb \

	bcm47094-linksys-panamera.dtb \

	bcm47094-luxul-abr-4500.dtb \

	bcm47094-luxul-xap-1610.dtb \
@@ -139,6 +140,7 @@ dtb-$(CONFIG_ARCH_BCM_5301X) += \ 
	bcm47094-netgear-r8500.dtb \

	bcm47094-phicomm-k3.dtb \

	bcm53015-meraki-mr26.dtb \

	bcm53016-dlink-dwl-8610ap.dtb \

	bcm53016-meraki-mr32.dtb \

	bcm94708.dtb \

	bcm94709.dtb \

arch/arm/boot/dts/bcm2711-rpi-4-b.dts

+16 −15
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
/dts-v1/;

#include "bcm2711.dtsi"

#include "bcm2711-rpi.dtsi"

#include "bcm283x-rpi-led-deprecated.dtsi"

#include "bcm283x-rpi-usb-peripheral.dtsi"

#include "bcm283x-rpi-wifi-bt.dtsi"
@@ -14,20 +15,7 @@ chosen { 
		stdout-path = "serial1:115200n8";

	};



	leds {

		led-act {

			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;

		};



		led-pwr {

			label = "PWR";

			gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;

			default-state = "keep";

			linux,default-trigger = "default-on";

		};

	};



	sd_io_1v8_reg: sd_io_1v8_reg {

	sd_io_1v8_reg: regulator-sd-io-1v8 {

		compatible = "regulator-gpio";

		regulator-name = "vdd-sd-io";

		regulator-min-microvolt = <1800000>;
@@ -41,7 +29,7 @@ sd_io_1v8_reg: sd_io_1v8_reg { 
		status = "okay";

	};



	sd_vcc_reg: sd_vcc_reg {

	sd_vcc_reg: regulator-sd-vcc {

		compatible = "regulator-fixed";

		regulator-name = "vcc-sd";

		regulator-min-microvolt = <3300000>;
@@ -156,6 +144,19 @@ &hdmi1 { 
	status = "okay";

};



&led_act {

	gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;

};



&leds {

	led_pwr: led-pwr {

		label = "PWR";

		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;

		default-state = "keep";

		linux,default-trigger = "default-on";

	};

};



&pixelvalve0 {

	status = "okay";

};

arch/arm/boot/dts/bcm2711-rpi-400.dts

+8 −8
Original line number Diff line number Diff line
@@ -11,14 +11,6 @@ chosen { 
		stdout-path = "serial1:115200n8";

	};



	leds {

		/delete-node/ led-act;



		led-pwr {

			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;

		};

	};



	gpio-poweroff {

		compatible = "gpio-poweroff";

		gpios = <&expgpio 5 GPIO_ACTIVE_HIGH>;
@@ -40,6 +32,14 @@ &genet_mdio { 
	clock-frequency = <1950000>;

};



&led_pwr {

	gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;

};



&leds {

	/delete-node/ led_act;

};



&pm {

	/delete-property/ system-power-controller;

};

arch/arm/boot/dts/bcm2711-rpi-cm4-io.dts

+14 −13
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/dts-v1/;

#include "bcm2711-rpi-cm4.dtsi"

#include "bcm283x-rpi-led-deprecated.dtsi"

#include "bcm283x-rpi-usb-host.dtsi"



/ {

	model = "Raspberry Pi Compute Module 4 IO Board";



	leds {

		led-act {

			gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;

		};



		led-pwr {

			label = "PWR";

			gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;

			default-state = "keep";

			linux,default-trigger = "default-on";

		};

	};

};



&ddc0 {
@@ -113,6 +101,19 @@ &genet { 
	status = "okay";

};



&led_act {

	gpios = <&gpio 42 GPIO_ACTIVE_HIGH>;

};



&leds {

	led-pwr {

		label = "PWR";

		gpios = <&expgpio 2 GPIO_ACTIVE_LOW>;

		default-state = "keep";

		linux,default-trigger = "default-on";

	};

};



&pixelvalve0 {

	status = "okay";

};