Unverified Commit 1a110d77 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.19-next-dts32' of... 

Merge tag 'v5.19-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt

Airoha EN7523:
- Add clock and PCIe support

Several style fixes to comply with DT spec.

* tag 'v5.19-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux:
  ARM: dts: mediatek: align gpio-key node names with dtschema
  ARM: dts: mediatek: adjust whitespace around '='
  ARM: dts: Add PCIe support for Airoha EN7523
  ARM: dts: add clock support for Airoha EN7523

Link: https://lore.kernel.org/r/63536da6-fbe4-2d96-ab91-ae756cd580c4@gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents b83c4293 4da8b5e9

arch/arm/boot/dts/en7523-evb.dts

+8 −0
Original line number Diff line number Diff line
@@ -33,3 +33,11 @@ &gpio0 { 
&gpio1 {

	status = "okay";

};



&pcie0 {

	status = "okay";

};



&pcie1 {

	status = "okay";

};

arch/arm/boot/dts/en7523.dtsi

+66 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <dt-bindings/interrupt-controller/irq.h>

#include <dt-bindings/interrupt-controller/arm-gic.h>

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/clock/en7523-clk.h>



/ {

	interrupt-parent = <&gic>;
@@ -83,6 +84,13 @@ L2_0: l2-cache0 { 
		};

	};



	scu: system-controller@1fa20000 {

		compatible = "airoha,en7523-scu";

		reg = <0x1fa20000 0x400>,

		      <0x1fb00000 0x1000>;

		#clock-cells = <1>;

	};



	gic: interrupt-controller@9000000 {

		compatible = "arm,gic-v3";

		interrupt-controller;
@@ -135,4 +143,62 @@ gpio1: gpio@1fbf0270 { 
		gpio-controller;

		#gpio-cells = <2>;

	};



	pcie0: pcie@1fa91000 {

		compatible = "airoha,en7523-pcie", "mediatek,mt7622-pcie";

		device_type = "pci";

		reg = <0x1fa91000 0x1000>;

		reg-names = "port0";

		linux,pci-domain = <0>;

		#address-cells = <3>;

		#size-cells = <2>;

		interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "pcie_irq";

		clocks = <&scu EN7523_CLK_PCIE>;

		clock-names = "sys_ck0";

		bus-range = <0x00 0xff>;

		ranges = <0x82000000 0 0x20000000  0x20000000  0 0x8000000>;

		status = "disabled";



		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 7>;

		interrupt-map = <0 0 0 1 &pcie_intc0 0>,

				<0 0 0 2 &pcie_intc0 1>,

				<0 0 0 3 &pcie_intc0 2>,

				<0 0 0 4 &pcie_intc0 3>;

		pcie_intc0: interrupt-controller {

			interrupt-controller;

			#address-cells = <0>;

			#interrupt-cells = <1>;

		};

	};



	pcie1: pcie@1fa92000 {

		compatible = "airoha,en7523-pcie", "mediatek,mt7622-pcie";

		device_type = "pci";

		reg = <0x1fa92000 0x1000>;

		reg-names = "port1";

		linux,pci-domain = <1>;

		#address-cells = <3>;

		#size-cells = <2>;

		interrupts = <GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "pcie_irq";

		clocks = <&scu EN7523_CLK_PCIE>;

		clock-names = "sys_ck1";

		bus-range = <0x00 0xff>;

		ranges = <0x82000000 0 0x28000000  0x28000000  0 0x8000000>;

		status = "disabled";



		#interrupt-cells = <1>;

		interrupt-map-mask = <0 0 0 7>;

		interrupt-map = <0 0 0 1 &pcie_intc1 0>,

				<0 0 0 2 &pcie_intc1 1>,

				<0 0 0 3 &pcie_intc1 2>,

				<0 0 0 4 &pcie_intc1 3>;

		pcie_intc1: interrupt-controller {

			interrupt-controller;

			#address-cells = <0>;

			#interrupt-cells = <1>;

		};

	};

};

arch/arm/boot/dts/mt7623a-rfb-emmc.dts

+2 −2
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&key_pins_a>;



		factory {

		button-factory {

			label = "factory";

			linux,code = <BTN_0>;

			gpios = <&pio 256 GPIO_ACTIVE_LOW>;

		};



		wps {

		button-wps {

			label = "wps";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&pio 257 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/mt7623a-rfb-nand.dts

+2 −2
Original line number Diff line number Diff line
@@ -45,13 +45,13 @@ gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&key_pins_a>;



		factory {

		button-factory {

			label = "factory";

			linux,code = <BTN_0>;

			gpios = <&pio 256 GPIO_ACTIVE_LOW>;

		};



		wps {

		button-wps {

			label = "wps";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&pio 257 GPIO_ACTIVE_HIGH>;

arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts

+2 −2
Original line number Diff line number Diff line
@@ -91,13 +91,13 @@ gpio-keys { 
		pinctrl-names = "default";

		pinctrl-0 = <&key_pins_a>;



		factory {

		button-factory {

			label = "factory";

			linux,code = <BTN_0>;

			gpios = <&pio 256 GPIO_ACTIVE_LOW>;

		};



		wps {

		button-wps {

			label = "wps";

			linux,code = <KEY_WPS_BUTTON>;

			gpios = <&pio 257 GPIO_ACTIVE_HIGH>;