Unverified Commit 9f8f2642 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'at91-dt-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt 

AT91 device tree updates for 6.6

It contains:
- TCB timer nodes adition for at91-sama5d3_ksz9477_evb board
- device tee cleanups

* tag 'at91-dt-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: dts: at91: remove duplicated entries
  ARM: dts: microchip: split interrupts per cells
  ARM: dts: at91: ksz9477_evb: Add tx-internal-delay-ps property for port5
  ARM: dts: at91: ksz9477_evb: Add missing timer nodes
  ARM: dts: at91-vinco: Fix "status" values
  ARM: dts: microchip: add missing space before {
  ARM: dts: microchip: minor whitespace cleanup around '='

Link: https://lore.kernel.org/r/20230804044102.231448-1-claudiu.beznea@tuxon.dev


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a3265be8 2ad41a98

arch/arm/boot/dts/microchip/Makefile

+1 −14
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# Enables support for device-tree overlays

DTC_FLAGS_at91-sam9x60_curiosity := -@

DTC_FLAGS_at91-sam9x60ek := -@

DTC_FLAGS_at91-sama5d27_som1_ek := -@
@@ -54,21 +55,9 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ 
	at91sam9g35ek.dtb \

	at91sam9x25ek.dtb \

	at91sam9x35ek.dtb

# Enables support for device-tree overlays

DTC_FLAGS_at91-sam9x60_curiosity := -@

DTC_FLAGS_at91-sam9x60ek := -@

dtb-$(CONFIG_SOC_SAM9X60) += \

	at91-sam9x60_curiosity.dtb \

	at91-sam9x60ek.dtb

# Enables support for device-tree overlays

DTC_FLAGS_at91-sama5d27_som1_ek := -@

DTC_FLAGS_at91-sama5d27_wlsom1_ek := -@

DTC_FLAGS_at91-sama5d2_icp := -@

DTC_FLAGS_at91-sama5d2_ptc_ek := -@

DTC_FLAGS_at91-sama5d2_xplained := -@

DTC_FLAGS_at91-sama5d3_eds := -@

DTC_FLAGS_at91-sama5d3_xplained := -@

DTC_FLAGS_at91-sama5d4_xplained := -@

dtb-$(CONFIG_SOC_SAM_V7) += \

	at91-kizbox2-2.dtb \

	at91-kizbox3-hs.dtb \
@@ -95,8 +84,6 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ 
	at91-sama5d4_xplained.dtb \

	at91-sama5d4ek.dtb \

	at91-vinco.dtb

# Enables support for device-tree overlays

DTC_FLAGS_at91-sama7g5ek := -@

dtb-$(CONFIG_SOC_SAMA7G5) += \

	at91-sama7g5ek.dtb

arch/arm/boot/dts/microchip/at91-sama5d3_ksz9477_evb.dts

+13 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ port@5 { 
				label = "cpu";

				ethernet = <&macb0>;

				phy-mode = "rgmii-txid";

				tx-internal-delay-ps = <2000>;



				fixed-link {

					speed = <1000>;
@@ -162,6 +163,18 @@ fixed-link { 
	};

};



&tcb0 {

	timer0: timer@0 {

		compatible = "atmel,tcb-timer";

		reg = <0>;

	};



	timer1: timer@1 {

		compatible = "atmel,tcb-timer";

		reg = <1>;

	};

};



&usb0 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usba_vbus>;

arch/arm/boot/dts/microchip/at91-vinco.dts

+2 −2
Original line number Diff line number Diff line
@@ -159,7 +159,7 @@ usb0: gadget@400000 { 
			atmel,vbus-gpio = <&pioE 31 GPIO_ACTIVE_HIGH>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_usba_vbus>;

			status = "disable";

			status = "disabled";

		};



		usb1: ohci@500000 {
@@ -168,7 +168,7 @@ usb1: ohci@500000 { 
					   &pioE 11 GPIO_ACTIVE_LOW

					   &pioE 12 GPIO_ACTIVE_LOW

					  >;

			status = "disable";

			status = "disabled";

		};



		usb2: ehci@600000 {

arch/arm/boot/dts/microchip/at91rm9200.dtsi

+6 −6
Original line number Diff line number Diff line
@@ -135,9 +135,9 @@ tcb0: timer@fffa0000 { 
				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0xfffa0000 0x100>;

				interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0

					      18 IRQ_TYPE_LEVEL_HIGH 0

					      19 IRQ_TYPE_LEVEL_HIGH 0>;

				interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>,

					     <18 IRQ_TYPE_LEVEL_HIGH 0>,

					     <19 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 17>, <&pmc PMC_TYPE_PERIPHERAL 18>, <&pmc PMC_TYPE_PERIPHERAL 19>, <&slow_xtal>;

				clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";

			};
@@ -147,9 +147,9 @@ tcb1: timer@fffa4000 { 
				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0xfffa4000 0x100>;

				interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0

					      21 IRQ_TYPE_LEVEL_HIGH 0

					      22 IRQ_TYPE_LEVEL_HIGH 0>;

				interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>,

					     <21 IRQ_TYPE_LEVEL_HIGH 0>,

					     <22 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 20>, <&pmc PMC_TYPE_PERIPHERAL 21>, <&pmc PMC_TYPE_PERIPHERAL 22>, <&slow_xtal>;

				clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";

			};

arch/arm/boot/dts/microchip/at91sam9260.dtsi

+7 −7
Original line number Diff line number Diff line
@@ -148,9 +148,9 @@ tcb0: timer@fffa0000 { 
				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0xfffa0000 0x100>;

				interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0

					      18 IRQ_TYPE_LEVEL_HIGH 0

					      19 IRQ_TYPE_LEVEL_HIGH 0>;

				interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>,

					     <18 IRQ_TYPE_LEVEL_HIGH 0>,

					     <19 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 17>, <&pmc PMC_TYPE_PERIPHERAL 18>, <&pmc PMC_TYPE_PERIPHERAL 19>, <&pmc PMC_TYPE_CORE PMC_SLOW>;

				clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";

			};
@@ -160,9 +160,9 @@ tcb1: timer@fffdc000 { 
				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0xfffdc000 0x100>;

				interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0

					      27 IRQ_TYPE_LEVEL_HIGH 0

					      28 IRQ_TYPE_LEVEL_HIGH 0>;

				interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>,

					     <27 IRQ_TYPE_LEVEL_HIGH 0>,

					     <28 IRQ_TYPE_LEVEL_HIGH 0>;

				clocks = <&pmc PMC_TYPE_PERIPHERAL 26>, <&pmc PMC_TYPE_PERIPHERAL 27>, <&pmc PMC_TYPE_PERIPHERAL 28>, <&pmc PMC_TYPE_CORE PMC_SLOW>;

				clock-names = "t0_clk", "t1_clk", "t2_clk", "slow_clk";

			};