diff options
Diffstat (limited to 'arch/arm/dts')
73 files changed, 1359 insertions, 5539 deletions
| diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index d81a9f95977..12edd2ac22e 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -190,7 +190,8 @@ dtb-$(CONFIG_ARCH_MVEBU) +=			\  	cn9130-crb-A.dtb			\  	cn9130-crb-B.dtb			\  	ac5-98dx35xx-rd.dtb			\ -	ac5-98dx35xx-atl-x240.dtb +	ac5-98dx35xx-atl-x240.dtb		\ +	cn9130-atl-x250.dtb  endif  dtb-$(CONFIG_ARCH_SYNQUACER) += synquacer-sc2a11-developerbox.dtb @@ -274,6 +275,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += \  	zynqmp-mini-qspi-x1-stacked.dtb		\  	zynqmp-mini-qspi-x2-single.dtb		\  	zynqmp-mini-qspi-x2-stacked.dtb		\ +	zynqmp-binman-mini.dtb			\  	zynqmp-sc-revB.dtb			\  	zynqmp-sc-revC.dtb			\  	zynqmp-sm-k24-revA.dtb			\ @@ -319,6 +321,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-02-revA.dtb  dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-03-revA.dtb  dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-04-revA.dtb  dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-p-a2197-00-revA-x-prc-05-revA.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-binman.dtb  zynqmp-sc-vek280-revA-dtbs := zynqmp-sc-revB.dtb zynqmp-sc-vek280-revA.dtbo  zynqmp-sc-vek280-revB-dtbs := zynqmp-sc-revC.dtb zynqmp-sc-vek280-revB.dtbo @@ -369,6 +372,7 @@ dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kv-g-revB.dtb  dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kv-g-revB.dtb  dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-sm-k24-revA-sck-kr-g-revB.dtb  dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-smk-k24-revA-sck-kr-g-revB.dtb +dtb-$(CONFIG_ARCH_ZYNQMP) += zynqmp-binman-som.dtb  dtb-$(CONFIG_ARCH_VERSAL) += \  	versal-mini.dtb \ @@ -1155,9 +1159,7 @@ dtb-$(CONFIG_STM32MP25X) += \  	stm32mp257f-ev1.dtb  dtb-$(CONFIG_SOC_K3_AM654) += \ -	k3-am654-base-board.dtb \ -	k3-am654-r5-base-board.dtb \ -	k3-am654-icssg2.dtbo +	k3-am654-r5-base-board.dtb  dtb-$(CONFIG_SOC_K3_J721E) += k3-j721e-r5-common-proc-board.dtb \  			      k3-j7200-r5-common-proc-board.dtb \ diff --git a/arch/arm/dts/bcm47622.dtsi b/arch/arm/dts/bcm47622.dtsi deleted file mode 100644 index c016e12b737..00000000000 --- a/arch/arm/dts/bcm47622.dtsi +++ /dev/null @@ -1,126 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> - -/ { -	compatible = "brcm,bcm47622", "brcm,bcmbca"; -	#address-cells = <1>; -	#size-cells = <1>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <1>; -		#size-cells = <0>; - -		CA7_0: cpu@0 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_1: cpu@1 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; -		CA7_2: cpu@2 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x2>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; -		CA7_3: cpu@3 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x3>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv7-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; -		arm,cpu-registers-not-fw-configured; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a7-pmu"; -		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&CA7_0>, <&CA7_1>, -			<&CA7_2>, <&CA7_3>; -	}; - -	clocks: clocks { -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -		cpu_off = <1>; -		cpu_on = <2>; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0x81000000 0x818000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,cortex-a7-gic"; -			#interrupt-cells = <3>; -			#address-cells = <0>; -			interrupt-controller; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0xff800000 0x800000>; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm4912.dtsi b/arch/arm/dts/bcm4912.dtsi deleted file mode 100644 index 3d016c2ce67..00000000000 --- a/arch/arm/dts/bcm4912.dtsi +++ /dev/null @@ -1,128 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/interrupt-controller/arm-gic.h> - -/ { -	compatible = "brcm,bcm4912", "brcm,bcmbca"; -	#address-cells = <2>; -	#size-cells = <2>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <2>; -		#size-cells = <0>; - -		B53_0: cpu@0 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_1: cpu@1 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_2: cpu@2 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x2>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_3: cpu@3 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x3>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv8-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a53-pmu"; -		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&B53_0>, <&B53_1>, -			<&B53_2>, <&B53_3>; -	}; - -	clocks: clocks { -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,gic-400"; -			#interrupt-cells = <3>; -			interrupt-controller; -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>, -				<0x4000 0x2000>, -				<0x6000 0x2000>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0xff800000 0x800000>; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm63146.dtsi b/arch/arm/dts/bcm63146.dtsi deleted file mode 100644 index 04de96bd0a0..00000000000 --- a/arch/arm/dts/bcm63146.dtsi +++ /dev/null @@ -1,110 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/interrupt-controller/arm-gic.h> - -/ { -	compatible = "brcm,bcm63146", "brcm,bcmbca"; -	#address-cells = <2>; -	#size-cells = <2>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <2>; -		#size-cells = <0>; - -		B53_0: cpu@0 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_1: cpu@1 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv8-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a53-pmu"; -		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&B53_0>, <&B53_1>; -	}; - -	clocks: clocks { -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,gic-400"; -			#interrupt-cells = <3>; -			interrupt-controller; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>, -				<0x4000 0x2000>, -				<0x6000 0x2000>; -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | -					IRQ_TYPE_LEVEL_HIGH)>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0xff800000 0x800000>; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm63158.dtsi b/arch/arm/dts/bcm63158.dtsi deleted file mode 100644 index 4bed1f914a9..00000000000 --- a/arch/arm/dts/bcm63158.dtsi +++ /dev/null @@ -1,278 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2019 Philippe Reynes <philippe.reynes@softathome.com> - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/interrupt-controller/arm-gic.h> - -/ { -	compatible = "brcm,bcm63158", "brcm,bcmbca"; -	#address-cells = <2>; -	#size-cells = <2>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <2>; -		#size-cells = <0>; - -		B53_0: cpu@0 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_1: cpu@1 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_2: cpu@2 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x2>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_3: cpu@3 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x3>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv8-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a53-pmu"; -		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&B53_0>, <&B53_1>, -			<&B53_2>, <&B53_3>; -	}; - -	clocks { -		bootph-all; -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; - -		hsspi_pll: hsspi-pll { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-mult = <2>; -			clock-div = <1>; -		}; - -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; - -		wdt_clk: wdt-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,gic-400"; -			#interrupt-cells = <3>; -			interrupt-controller; -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>, -				<0x4000 0x2000>, -				<0x6000 0x2000>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0xff800000 0x800000>; -		bootph-all; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; - -		leds: led-controller@800 { -			compatible = "brcm,bcm6858-leds"; -			reg = <0x800 0xe4>; - -			status = "disabled"; -		}; - -		wdt1: watchdog@480 { -			compatible = "brcm,bcm6345-wdt"; -			reg = <0x480 0x14>; -			clocks = <&wdt_clk>; -		}; - -		wdt2: watchdog@4c0 { -			compatible = "brcm,bcm6345-wdt"; -			reg = <0x4c0 0x14>; -			clocks = <&wdt_clk>; -		}; - -		wdt-reboot { -			compatible = "wdt-reboot"; -			wdt = <&wdt1>; -		}; - -		gpio0: gpio-controller@500 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x500 0x4>, -			      <0x520 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio1: gpio-controller@504 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x504 0x4>, -			      <0x524 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio2: gpio-controller@508 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x508 0x4>, -			      <0x528 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio3: gpio-controller@50c { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x50c 0x4>, -			      <0x52c 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio4: gpio-controller@510 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x510 0x4>, -			      <0x530 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio5: gpio-controller@514 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x514 0x4>, -			      <0x534 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio6: gpio-controller@518 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x518 0x4>, -			      <0x538 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio7: gpio-controller@51c { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x51c 0x4>, -			      <0x53c 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		hsspi: spi-controller@1000 { -			compatible = "brcm,bcm6328-hsspi"; -			#address-cells = <1>; -			#size-cells = <0>; -			reg = <0x1000 0x600>; -			clocks = <&hsspi_pll>, <&hsspi_pll>; -			clock-names = "hsspi", "pll"; -			spi-max-frequency = <100000000>; -			num-cs = <8>; - -			status = "disabled"; -		}; - -		nand: nand-controller@1800 { -			compatible = "brcm,nand-bcm63158", -				     "brcm,brcmnand-v5.0", -				     "brcm,brcmnand"; -			reg-names = "nand", "nand-int-base", "nand-cache"; -			reg = <0x1800 0x180>, -			      <0x2000 0x10>, -			      <0x1c00 0x200>; -			parameter-page-big-endian = <0>; - -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm63178.dtsi b/arch/arm/dts/bcm63178.dtsi deleted file mode 100644 index cbd094dde6d..00000000000 --- a/arch/arm/dts/bcm63178.dtsi +++ /dev/null @@ -1,120 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> - -/ { -	compatible = "brcm,bcm63178", "brcm,bcmbca"; -	#address-cells = <1>; -	#size-cells = <1>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <1>; -		#size-cells = <0>; - -		CA7_0: cpu@0 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_1: cpu@1 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_2: cpu@2 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x2>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv7-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>; -		arm,cpu-registers-not-fw-configured; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a7-pmu"; -		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&CA7_0>, <&CA7_1>, -			<&CA7_2>; -	}; - -	clocks: clocks { -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,cortex-a7-gic"; -			#interrupt-cells = <3>; -			interrupt-controller; -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_HIGH)>; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>, -				<0x4000 0x2000>, -				<0x6000 0x2000>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0xff800000 0x800000>; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm6756.dtsi b/arch/arm/dts/bcm6756.dtsi deleted file mode 100644 index ce1b59faf80..00000000000 --- a/arch/arm/dts/bcm6756.dtsi +++ /dev/null @@ -1,130 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> - -/ { -	compatible = "brcm,bcm6756", "brcm,bcmbca"; -	#address-cells = <1>; -	#size-cells = <1>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <1>; -		#size-cells = <0>; - -		CA7_0: cpu@0 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_1: cpu@1 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_2: cpu@2 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x2>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_3: cpu@3 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x3>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv7-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; -		arm,cpu-registers-not-fw-configured; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a7-pmu"; -		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&CA7_0>, <&CA7_1>, -			<&CA7_2>, <&CA7_3>; -	}; - -	clocks: clocks { -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; - -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,cortex-a7-gic"; -			#interrupt-cells = <3>; -			interrupt-controller; -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>, -				<0x4000 0x2000>, -				<0x6000 0x2000>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0xff800000 0x800000>; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm6813.dtsi b/arch/arm/dts/bcm6813.dtsi deleted file mode 100644 index c3e6197be80..00000000000 --- a/arch/arm/dts/bcm6813.dtsi +++ /dev/null @@ -1,128 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/interrupt-controller/arm-gic.h> - -/ { -	compatible = "brcm,bcm6813", "brcm,bcmbca"; -	#address-cells = <2>; -	#size-cells = <2>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <2>; -		#size-cells = <0>; - -		B53_0: cpu@0 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_1: cpu@1 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_2: cpu@2 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x2>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_3: cpu@3 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x3>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv8-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a53-pmu"; -		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&B53_0>, <&B53_1>, -			<&B53_2>, <&B53_3>; -	}; - -	clocks: clocks { -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,gic-400"; -			#interrupt-cells = <3>; -			interrupt-controller; -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>, -				<0x4000 0x2000>, -				<0x6000 0x2000>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0xff800000 0x800000>; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm6855.dtsi b/arch/arm/dts/bcm6855.dtsi deleted file mode 100644 index 10c003a57c9..00000000000 --- a/arch/arm/dts/bcm6855.dtsi +++ /dev/null @@ -1,257 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2022 Philippe Reynes <philippe.reynes@softathome.com> - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> - -/ { -	compatible = "brcm,bcm6855", "brcm,bcmbca"; -	#address-cells = <1>; -	#size-cells = <1>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <1>; -		#size-cells = <0>; - -		CA7_0: cpu@0 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_1: cpu@1 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_2: cpu@2 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x2>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv7-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_LOW)>; -		arm,cpu-registers-not-fw-configured; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a7-pmu"; -		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&CA7_0>, <&CA7_1>, <&CA7_2>; -	}; - -	clocks: clocks { -		bootph-all; - -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; - -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; - -		hsspi_pll: hsspi-pll { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-mult = <2>; -			clock-div = <1>; -		}; - -		wdt_clk: wdt-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,cortex-a7-gic"; -			#interrupt-cells = <3>; -			interrupt-controller; -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(3) | IRQ_TYPE_LEVEL_HIGH)>; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>, -				<0x4000 0x2000>, -				<0x6000 0x2000>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0xff800000 0x800000>; -		bootph-all; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; - -		wdt1: watchdog@480 { -			compatible = "brcm,bcm6345-wdt"; -			reg = <0x480 0x14>; -			clocks = <&wdt_clk>; -		}; - -		wdt2: watchdog@4c0 { -			compatible = "brcm,bcm6345-wdt"; -			reg = <0x4c0 0x14>; -			clocks = <&wdt_clk>; -		}; - -		wdt-reboot { -			compatible = "wdt-reboot"; -			wdt = <&wdt1>; -		}; - -		gpio0: gpio-controller@500 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x500 0x4>, -			      <0x520 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio1: gpio-controller@504 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x504 0x4>, -			      <0x524 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio2: gpio-controller@508 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x508 0x4>, -			      <0x528 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio3: gpio-controller@50c { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x50c 0x4>, -			      <0x52c 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio4: gpio-controller@510 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x510 0x4>, -			      <0x530 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio5: gpio-controller@514 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x514 0x4>, -			      <0x534 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio6: gpio-controller@518 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x518 0x4>, -			      <0x538 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio7: gpio-controller@51c { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x51c 0x4>, -			      <0x53c 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		nand: nand-controller@1800 { -			compatible = "brcm,nand-bcm6753", -				     "brcm,brcmnand-v5.0", -				     "brcm,brcmnand"; -			reg-names = "nand", "nand-int-base", "nand-cache"; -			reg = <0x1800 0x180>, -			      <0x2000 0x10>, -			      <0x1c00 0x200>; -			parameter-page-big-endian = <0>; - -			status = "disabled"; -		}; - -		leds: led-controller@3000 { -			compatible = "brcm,bcm6753-leds"; -			reg = <0x3000 0x3480>; - -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm6856.dtsi b/arch/arm/dts/bcm6856.dtsi deleted file mode 100644 index 38c88f8399b..00000000000 --- a/arch/arm/dts/bcm6856.dtsi +++ /dev/null @@ -1,253 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright (C) 2020 Philippe Reynes <philippe.reynes@softathome.com> - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/interrupt-controller/arm-gic.h> - -/ { -	compatible = "brcm,bcm6856", "brcm,bcmbca"; -	#address-cells = <2>; -	#size-cells = <2>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <2>; -		#size-cells = <0>; - -		B53_0: cpu@0 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_1: cpu@1 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv8-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a53-pmu"; -		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&B53_0>, <&B53_1>; -	}; - -	clocks: clocks { -		bootph-all; - -		periph_clk:periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; - -		hsspi_pll: hsspi-pll { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-mult = <2>; -			clock-div = <1>; -		}; - -		wdt_clk: wdt-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,gic-400"; -			#interrupt-cells = <3>; -			interrupt-controller; -			reg = <0x1000 0x1000>, /* GICD */ -				<0x2000 0x2000>, /* GICC */ -				<0x4000 0x2000>, /* GICH */ -				<0x6000 0x2000>; /* GICV */ -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | -					IRQ_TYPE_LEVEL_HIGH)>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0xff800000 0x800000>; -		bootph-all; - -		uart0: serial@640 { -			compatible = "brcm,bcm6345-uart"; -			reg = <0x640 0x18>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&periph_clk>; -			clock-names = "refclk"; -			status = "disabled"; -		}; - -		wdt1: watchdog@480 { -			compatible = "brcm,bcm6345-wdt"; -			reg = <0x480 0x14>; -			clocks = <&wdt_clk>; -		}; - -		wdt2: watchdog@4c0 { -			compatible = "brcm,bcm6345-wdt"; -			reg = <0x4c0 0x14>; -			clocks = <&wdt_clk>; -		}; - -		wdt-reboot { -			compatible = "wdt-reboot"; -			wdt = <&wdt1>; -		}; - -		leds: led-controller@800 { -			compatible = "brcm,bcm6858-leds"; -			reg = <0x800 0xe4>; - -			status = "disabled"; -		}; - -		gpio0: gpio-controller@500 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x500 0x4>, -			      <0x520 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio1: gpio-controller@504 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x504 0x4>, -			      <0x524 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio2: gpio-controller@508 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x508 0x4>, -			      <0x528 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio3: gpio-controller@50c { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x50c 0x4>, -			      <0x52c 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio4: gpio-controller@510 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x510 0x4>, -			      <0x530 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio5: gpio-controller@514 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x514 0x4>, -			      <0x534 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio6: gpio-controller@518 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x518 0x4>, -			      <0x538 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio7: gpio-controller@51c { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x51c 0x4>, -			      <0x53c 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		hsspi: spi-controller@1000 { -			compatible = "brcm,bcm6328-hsspi"; -			#address-cells = <1>; -			#size-cells = <0>; -			reg = <0x1000 0x600>; -			clocks = <&hsspi_pll>, <&hsspi_pll>; -			clock-names = "hsspi", "pll"; -			spi-max-frequency = <100000000>; -			num-cs = <8>; - -			status = "disabled"; -		}; - -		nand: nand-controller@1800 { -			compatible = "brcm,nand-bcm68360", -				     "brcm,brcmnand-v5.0", -				     "brcm,brcmnand"; -			reg-names = "nand", "nand-int-base", "nand-cache"; -			reg = <0x1800 0x180>, -			      <0x2000 0x10>, -			      <0x1c00 0x200>; -			parameter-page-big-endian = <0>; - -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm6858.dtsi b/arch/arm/dts/bcm6858.dtsi deleted file mode 100644 index dc95047a265..00000000000 --- a/arch/arm/dts/bcm6858.dtsi +++ /dev/null @@ -1,272 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0+ -/* - * Copyright (C) 2018 Philippe Reynes <philippe.reynes@softathome.com> - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/interrupt-controller/arm-gic.h> - -/ { -	compatible = "brcm,bcm6858", "brcm,bcmbca"; -	#address-cells = <2>; -	#size-cells = <2>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <2>; -		#size-cells = <0>; - -		B53_0: cpu@0 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_1: cpu@1 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_2: cpu@2 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x2>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		B53_3: cpu@3 { -			compatible = "brcm,brahma-b53"; -			device_type = "cpu"; -			reg = <0x0 0x3>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv8-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; -	}; - -	pmu: pmu { -		compatible = "arm,armv8-pmuv3"; -		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&B53_0>, <&B53_1>, -			<&B53_2>, <&B53_3>; -	}; - -	clocks { -		bootph-all; - -		periph_clk: periph_clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; - -		hsspi_pll: hsspi-pll { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-mult = <2>; -			clock-div = <1>; -		}; - -		wdt_clk: wdt-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,gic-400"; -			#interrupt-cells = <3>; -			interrupt-controller; -			reg = <0x1000 0x1000>, /* GICD */ -				<0x2000 0x2000>, /* GICC */ -				<0x4000 0x2000>, /* GICH */ -				<0x6000 0x2000>; /* GICV */ -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) | -					IRQ_TYPE_LEVEL_HIGH)>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0xff800000 0x800000>; -		bootph-all; - -		uart0: serial@640 { -			compatible = "brcm,bcm6345-uart"; -			reg = <0x640 0x18>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&periph_clk>; -			clock-names = "refclk"; -			status = "disabled"; -		}; - -		leds: led-controller@800 { -			compatible = "brcm,bcm6858-leds"; -			reg = <0x800 0xe4>; - -			status = "disabled"; -		}; - -		wdt1: watchdog@2780 { -			compatible = "brcm,bcm6345-wdt"; -			reg = <0x2780 0x14>; -			clocks = <&wdt_clk>; -		}; - -		wdt2: watchdog@27c0 { -			compatible = "brcm,bcm6345-wdt"; -			reg = <0x27c0 0x14>; -			clocks = <&wdt_clk>; -		}; - -		wdt-reboot { -			compatible = "wdt-reboot"; -			wdt = <&wdt1>; -		}; - -		gpio0: gpio-controller@500 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x500 0x4>, -			      <0x520 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio1: gpio-controller@504 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x504 0x4>, -			      <0x524 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio2: gpio-controller@508 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x508 0x4>, -			      <0x528 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio3: gpio-controller@50c { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x50c 0x4>, -			      <0x52c 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio4: gpio-controller@510 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x510 0x4>, -			      <0x530 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio5: gpio-controller@514 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x514 0x4>, -			      <0x534 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio6: gpio-controller@518 { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x518 0x4>, -			      <0x538 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		gpio7: gpio-controller@51c { -			compatible = "brcm,bcm6345-gpio"; -			reg = <0x51c 0x4>, -			      <0x53c 0x4>; -			gpio-controller; -			#gpio-cells = <2>; - -			status = "disabled"; -		}; - -		hsspi: spi-controller@1000 { -			compatible = "brcm,bcm6328-hsspi"; -			#address-cells = <1>; -			#size-cells = <0>; -			reg = <0x1000 0x600>; -			clocks = <&hsspi_pll>, <&hsspi_pll>; -			clock-names = "hsspi", "pll"; -			spi-max-frequency = <100000000>; -			num-cs = <8>; - -			status = "disabled"; -		}; - -		nand: nand-controller@1800 { -			compatible = "brcm,nand-bcm6858", -				     "brcm,brcmnand-v5.0", -				     "brcm,brcmnand"; -			reg-names = "nand", "nand-int-base", "nand-cache"; -			reg = <0x1800 0x180>, -			      <0x2000 0x10>, -			      <0x1c00 0x200>; -			parameter-page-big-endian = <0>; - -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm6878.dtsi b/arch/arm/dts/bcm6878.dtsi deleted file mode 100644 index 1e8b5fa96c2..00000000000 --- a/arch/arm/dts/bcm6878.dtsi +++ /dev/null @@ -1,111 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -#include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/interrupt-controller/irq.h> - -/ { -	compatible = "brcm,bcm6878", "brcm,bcmbca"; -	#address-cells = <1>; -	#size-cells = <1>; - -	interrupt-parent = <&gic>; - -	cpus { -		#address-cells = <1>; -		#size-cells = <0>; - -		CA7_0: cpu@0 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x0>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		CA7_1: cpu@1 { -			device_type = "cpu"; -			compatible = "arm,cortex-a7"; -			reg = <0x1>; -			next-level-cache = <&L2_0>; -			enable-method = "psci"; -		}; - -		L2_0: l2-cache0 { -			compatible = "cache"; -		}; -	}; - -	timer { -		compatible = "arm,armv7-timer"; -		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, -			<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; -		arm,cpu-registers-not-fw-configured; -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a7-pmu"; -		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, -			<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-affinity = <&CA7_0>, <&CA7_1>; -	}; - -	clocks: clocks { -		periph_clk: periph-clk { -			compatible = "fixed-clock"; -			#clock-cells = <0>; -			clock-frequency = <200000000>; -		}; -		uart_clk: uart-clk { -			compatible = "fixed-factor-clock"; -			#clock-cells = <0>; -			clocks = <&periph_clk>; -			clock-div = <4>; -			clock-mult = <1>; -		}; -	}; - -	psci { -		compatible = "arm,psci-0.2"; -		method = "smc"; -	}; - -	axi@81000000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0x81000000 0x8000>; - -		gic: interrupt-controller@1000 { -			compatible = "arm,cortex-a7-gic"; -			#interrupt-cells = <3>; -			interrupt-controller; -			reg = <0x1000 0x1000>, -				<0x2000 0x2000>, -				<0x4000 0x2000>, -				<0x6000 0x2000>; -			interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(2) | -					IRQ_TYPE_LEVEL_HIGH)>; -		}; -	}; - -	bus@ff800000 { -		compatible = "simple-bus"; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0 0xff800000 0x800000>; - -		uart0: serial@12000 { -			compatible = "arm,pl011", "arm,primecell"; -			reg = <0x12000 0x1000>; -			interrupts = <GIC_SPI 32 IRQ_TYPE_LEVEL_HIGH>; -			clocks = <&uart_clk>, <&uart_clk>; -			clock-names = "uartclk", "apb_pclk"; -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/bcm947622.dts b/arch/arm/dts/bcm947622.dts deleted file mode 100644 index 6f083724ab8..00000000000 --- a/arch/arm/dts/bcm947622.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2019 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm47622.dtsi" - -/ { -	model = "Broadcom BCM947622 Reference Board"; -	compatible = "brcm,bcm947622", "brcm,bcm47622", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm94912.dts b/arch/arm/dts/bcm94912.dts deleted file mode 100644 index a3623e6f691..00000000000 --- a/arch/arm/dts/bcm94912.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm4912.dtsi" - -/ { -	model = "Broadcom BCM94912 Reference Board"; -	compatible = "brcm,bcm94912", "brcm,bcm4912", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x0 0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm963146.dts b/arch/arm/dts/bcm963146.dts deleted file mode 100644 index e39f1e6d477..00000000000 --- a/arch/arm/dts/bcm963146.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm63146.dtsi" - -/ { -	model = "Broadcom BCM963146 Reference Board"; -	compatible = "brcm,bcm963146", "brcm,bcm63146", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x0 0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm963158.dts b/arch/arm/dts/bcm963158.dts deleted file mode 100644 index eba07e0b1ca..00000000000 --- a/arch/arm/dts/bcm963158.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm63158.dtsi" - -/ { -	model = "Broadcom BCM963158 Reference Board"; -	compatible = "brcm,bcm963158", "brcm,bcm63158", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x0 0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm963178.dts b/arch/arm/dts/bcm963178.dts deleted file mode 100644 index fa096e9cde2..00000000000 --- a/arch/arm/dts/bcm963178.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2019 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm63178.dtsi" - -/ { -	model = "Broadcom BCM963178 Reference Board"; -	compatible = "brcm,bcm963178", "brcm,bcm63178", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm96756.dts b/arch/arm/dts/bcm96756.dts deleted file mode 100644 index 9a4a87ba9c8..00000000000 --- a/arch/arm/dts/bcm96756.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2019 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm6756.dtsi" - -/ { -	model = "Broadcom BCM96756 Reference Board"; -	compatible = "brcm,bcm96756", "brcm,bcm6756", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm96813.dts b/arch/arm/dts/bcm96813.dts deleted file mode 100644 index af17091ae76..00000000000 --- a/arch/arm/dts/bcm96813.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm6813.dtsi" - -/ { -	model = "Broadcom BCM96813 Reference Board"; -	compatible = "brcm,bcm96813", "brcm,bcm6813", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x0 0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm96855.dts b/arch/arm/dts/bcm96855.dts deleted file mode 100644 index e4e740c73e9..00000000000 --- a/arch/arm/dts/bcm96855.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm6855.dtsi" - -/ { -	model = "Broadcom BCM96855 Reference Board"; -	compatible = "brcm,bcm96855", "brcm,bcm6855", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm96856.dts b/arch/arm/dts/bcm96856.dts deleted file mode 100644 index 032aeb75c98..00000000000 --- a/arch/arm/dts/bcm96856.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm6856.dtsi" - -/ { -	model = "Broadcom BCM96856 Reference Board"; -	compatible = "brcm,bcm96856", "brcm,bcm6856", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x0 0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm96858.dts b/arch/arm/dts/bcm96858.dts deleted file mode 100644 index 0cbf582f5d5..00000000000 --- a/arch/arm/dts/bcm96858.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2022 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm6858.dtsi" - -/ { -	model = "Broadcom BCM96858 Reference Board"; -	compatible = "brcm,bcm96858", "brcm,bcm6858", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x0 0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/bcm96878.dts b/arch/arm/dts/bcm96878.dts deleted file mode 100644 index 8fbc175cb45..00000000000 --- a/arch/arm/dts/bcm96878.dts +++ /dev/null @@ -1,30 +0,0 @@ -// SPDX-License-Identifier: (GPL-2.0+ OR MIT) -/* - * Copyright 2019 Broadcom Ltd. - */ - -/dts-v1/; - -#include "bcm6878.dtsi" - -/ { -	model = "Broadcom BCM96878 Reference Board"; -	compatible = "brcm,bcm96878", "brcm,bcm6878", "brcm,bcmbca"; - -	aliases { -		serial0 = &uart0; -	}; - -	chosen { -		stdout-path = "serial0:115200n8"; -	}; - -	memory@0 { -		device_type = "memory"; -		reg = <0x0 0x08000000>; -	}; -}; - -&uart0 { -	status = "okay"; -}; diff --git a/arch/arm/dts/cn9130-atl-x250.dts b/arch/arm/dts/cn9130-atl-x250.dts new file mode 100644 index 00000000000..f2c82da9d14 --- /dev/null +++ b/arch/arm/dts/cn9130-atl-x250.dts @@ -0,0 +1,274 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2024 Allied Telesis Labs + */ + +#include "cn9130.dtsi" + +/ { +	model = "Allied Telesis x250"; +	compatible = "alliedtelesis,x250", +		"marvell,cn9130", +		"marvell,armada-ap806-quad", +		"marvell,armada-ap806"; + +	aliases { +		serial0 = &uart0; +		i2c0 = &cp0_i2c0; +		i2c1 = &cp0_i2c1; +	}; + +	chosen { +		stdout-path = "serial0:115200n8"; +	}; + +	gpio-leds { +		compatible = "gpio-leds"; + +		fault { +			label = "fault:red"; +			gpios = <&cp0_gpio1 9 GPIO_ACTIVE_LOW>; +			default-state = "on"; +		}; +	}; +}; + +/* + * AP related configuration + */ +&ap_pinctl { +	/* AP_MPP Pins: +	 * GPIO & NC [0-6,9-10,12] +	 * UART0 [11,19] +	 * UART1 [7,8] +	 * Note: The x250-28XTm PT1 units has the console port wired +	 *       to the second uart pins (UART1). This was fixed in all +	 *       subsequent models. +	 *       Here we choose to configure the pin control for both +	 *       uarts to cater for either unit. +	 */ +		/*   0 1 2 3 4 5 6 7 8 9 */ +	pin-func = < 0 0 0 0 0 0 0 3 3 0 +		     0 3 0 0 0 0 0 0 0 3 >; +}; + +&ap_gpio0 { +	pp-reset { +		gpio-hog; +		gpios = <0 GPIO_ACTIVE_LOW>; +		output-high; +		line-name = "pp-reset"; +	}; +}; + +/* + * CP related configuration + */ +&cp0_pinctl { +	/* MPP Bus: +	 *	[0-1]	DEV +	 *	[2-8]	GPIO +	 *	[9]	DEV +	 *	[10-12]	GPIO +	 *	[13]	ND_RB +	 *	[14]	GPIO +	 *	[15-28]	DEV +	 *	[29-30]	GPIO +	 *	[31]	DEV +	 *	[32-34]	GPIO +	 *	[35-36]	I2C1 +	 *	[37-38]	I2C0 +	 *	[39-55]	GPIO +	 *	[56-60]	SPI +	 *	[61-62]	GPIO +	 */ +		/*   0   1   2   3   4   5   6   7   8   9 */ +	pin-func = < 1   1   0   0   0   0   0   0   0   1 +		     0   0   0   2   0   1   1   1   1   1 +		     1   1   1   1   1   1   1   1   1   0 +		     0   1   0   0   0   2   2   2   2   0 +		     0   0   0   0   0   0   0   0   0   0 +		     0   0   0   0   0   0   6   6   6   6 +		     6   0   0>; + +	cp0_i2c0_pins: cp0-i2c-pins-0 { +		marvell,pins = <37 38>; +		marvell,function = <2>; +	}; + +	cp0_i2c0_gpio_pins: cp0-i2c-gpio-pins-0 { +		marvell,pins = <37 38>; +		marvell,function = <0>; +	}; + +	cp0_i2c1_pins: cp0-i2c-pins-1 { +		marvell,pins = <35 36>; +		marvell,function = <2>; +	}; + +	cp0_nand_pins: cp0-nand-pins { +		marvell,pins = <0 1 9 15 16 17 18 19 20 21 22 23 24 25 26 27 28 31>; +		marvell,function = <1>; +	}; + +	cp0_nand_rb: cp0-nand-rb { +		marvell,pins = <13>; +		marvell,function = <2>; +	}; + +	cp0_spi0_pins: cp0-spi-pins-0 { +		marvell,pins = <56 57 58 59 60>; +		marvell,function = <6>; +	}; +}; + +&cp0_comphy { +	phy0 { +		phy-type = <COMPHY_TYPE_PEX0>; +	}; + +	phy1 { +		phy-type = <COMPHY_TYPE_IGNORE>; +	}; + +	phy2 { +		phy-type = <COMPHY_TYPE_IGNORE>; +	}; + +	phy3 { +		phy-type = <COMPHY_TYPE_IGNORE>; +	}; + +	phy4 { +		phy-type = <COMPHY_TYPE_IGNORE>; +	}; + +	phy5 { +		phy-type = <COMPHY_TYPE_IGNORE>; +	}; +}; + +&cp0_pcie0 { +	num-lanes = <1>; +		/* non-prefetchable memory */ +	ranges =<0x82000000 0 0xc0000000 0 0xc0000000 0 0x2000000>; +	status = "disabled"; +}; + +&uart0 { +	status = "okay"; +}; + +&uart1 { +	clock-frequency = <200000000>; +}; + +&cp0_utmi0 { +	status = "okay"; +}; + +&cp0_usb3_0 { +	status = "okay"; +}; + +&cp0_spi0 { +	status = "okay"; +	pinctrl-names = "default"; +	pinctrl-0 = <&cp0_spi0_pins>; + +	spi-flash@0 { +		#address-cells = <1>; +		#size-cells = <1>; +		compatible = "jedec,spi-nor"; +		reg = <0>; /* Chip select 0 */ +		spi-max-frequency = <50000000>; +		m25p,fast-read; +	}; +}; + +&cp0_nand { +	status = "okay"; +	pinctrl-names = "default"; +	pinctrl-0 = <&cp0_nand_pins &cp0_nand_rb>; +	nand-ecc-strength = <4>; +	nand-ecc-step-size = <512>; +	nand-timing-mode = <4>; + +	partitions { +		compatible = "fixed-partitions"; +		#address-cells = <1>; +		#size-cells = <1>; + +		partition@user { +			reg = <0x00000000 0x10000000>; +			label = "user"; +		}; +	}; +}; + +&cp0_gpio0 +{ +	nand-protect { +		gpio-hog; +		gpios = <29 GPIO_ACTIVE_LOW>; +		output-low; +		line-name = "nand-protect"; +	}; +}; + +&cp0_gpio1 +{ +	usb-en { +		gpio-hog; +		gpios = <0 GPIO_ACTIVE_HIGH>; +		output-high; +		line-name = "usb-en"; +	}; + +	phy-reset { +		gpio-hog; +		gpios = <21 GPIO_ACTIVE_LOW>; +		output-high; +		line-name = "phy-reset"; +	}; +}; + +&cp0_i2c0 { +	status = "okay"; +	pinctrl-names = "default", "gpio"; +	pinctrl-0 = <&cp0_i2c0_pins>; +	pinctrl-1 = <&cp0_i2c0_gpio_pins>; +	scl-gpios = <&cp0_gpio1 5 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; +	sda-gpios = <&cp0_gpio1 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + +	mux@71 { +		#address-cells = <1>; +		#size-cells = <0>; +		compatible = "nxp,pca9546"; +		reg = <0x71>; +		i2c-mux-idle-disconnect; +		reset-gpios = <&cp0_gpio1 19 GPIO_ACTIVE_LOW>; + +		i2c@0 { +			#address-cells = <1>; +			#size-cells = <0>; +			reg = <0>; + +			hwmon@2e { +				compatible = "adi,adt7476"; +				reg = <0x2e>; +			}; + +			rtc@68 { +				compatible = "adi,max31331"; +				reg = <0x68>; +			}; +		}; +	}; +}; + +&cp0_i2c1 { +	status = "okay"; +	pinctrl-names = "default"; +	pinctrl-0 = <&cp0_i2c1_pins>; +}; diff --git a/arch/arm/dts/exynos850-e850-96-u-boot.dtsi b/arch/arm/dts/exynos850-e850-96-u-boot.dtsi index 3aa5d8bb10d..6d7148f7264 100644 --- a/arch/arm/dts/exynos850-e850-96-u-boot.dtsi +++ b/arch/arm/dts/exynos850-e850-96-u-boot.dtsi @@ -3,17 +3,6 @@   * Copyright (c) 2023 Linaro Ltd.   */ -&soc { -	/* TODO: Remove this node once it appears in upstream dts */ -	trng: rng@12081400 { -		compatible = "samsung,exynos850-trng"; -		reg = <0x12081400 0x100>; -		clocks = <&cmu_core CLK_GOUT_SSS_ACLK>, -			 <&cmu_core CLK_GOUT_SSS_PCLK>; -		clock-names = "secss", "pclk"; -	}; -}; -  &pmu_system_controller {  	bootph-all;  	samsung,uart-debug-1; diff --git a/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi b/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi index a235e088fa4..3a4f7d01b9e 100644 --- a/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi +++ b/arch/arm/dts/imx8mm-data-modul-edm-sbc-u-boot.dtsi @@ -16,6 +16,12 @@  		dmo,ram-coding-gpios = <&gpio2 8 0>, <&gpio2 1 0>, <&gpio2 0 0>;  	}; +	clk_pcie100: clk-pcie100 { +		compatible = "fixed-clock"; +		#clock-cells = <0>; +		clock-frequency = <100000000>; +	}; +  	wdt-reboot {  		compatible = "wdt-reboot";  		wdt = <&wdog1>; @@ -35,6 +41,15 @@  	bootph-pre-ram;  }; +&pcie_phy { +	clocks = <&clk_pcie100>; +}; + +&pcie0 { +	clocks = <&clk IMX8MM_CLK_PCIE1_ROOT>, <&clk IMX8MM_CLK_PCIE1_AUX>, +		 <&clk_pcie100>; +}; +  &pinctrl_hog_sbc {  	bootph-pre-ram;  }; @@ -77,6 +92,7 @@  &gpio2 {  	bootph-pre-ram; +	bootph-some-ram;  	dsi-reset-hog {  		bootph-pre-ram; @@ -144,8 +160,17 @@  	bootph-pre-ram;  }; +&usbmisc1 { +	bootph-pre-ram; +}; + +&usbphynop1 { +	bootph-pre-ram; +}; +  &usbotg1 {  	dr_mode = "peripheral"; +	bootph-pre-ram;  };  &usdhc2 { diff --git a/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi b/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi index 805b5f57955..1e82e718b8f 100644 --- a/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-data-modul-edm-sbc-u-boot.dtsi @@ -64,6 +64,7 @@  &gpio3 {  	bootph-pre-ram; +	bootph-some-ram;  	bl-enable-hog {  		bootph-pre-ram; @@ -92,6 +93,7 @@  &gpio4 {  	bootph-pre-ram; +	bootph-some-ram;  	dsi-reset-hog {  		bootph-pre-ram; diff --git a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi index c065fb82994..546490a4a81 100644 --- a/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-dhcom-u-boot.dtsi @@ -9,6 +9,8 @@  	aliases {  		eeprom0 = &eeprom0;  		eeprom1 = &eeprom1; +		eeprom0wl = &eeprom0wl; +		eeprom1wl = &eeprom1wl;  		mmc0 = &usdhc2;	/* MicroSD */  		mmc1 = &usdhc3;	/* eMMC */  		mmc2 = &usdhc1;	/* SDIO */ diff --git a/arch/arm/dts/imx91-11x11-evk-u-boot.dtsi b/arch/arm/dts/imx91-11x11-evk-u-boot.dtsi new file mode 100644 index 00000000000..54b4d0aa3b6 --- /dev/null +++ b/arch/arm/dts/imx91-11x11-evk-u-boot.dtsi @@ -0,0 +1,195 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2024 NXP + */ + +#include "imx91-u-boot.dtsi" + +/ { +	wdt-reboot { +		compatible = "wdt-reboot"; +		wdt = <&wdog3>; +		bootph-pre-ram; +		bootph-some-ram; +	}; + +	firmware { +		optee { +			compatible = "linaro,optee-tz"; +			method = "smc"; +		}; +	}; +}; + +&{/soc@0} { +	bootph-all; +	bootph-pre-ram; +}; + +&aips1 { +	bootph-pre-ram; +	bootph-all; +}; + +&aips2 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&aips3 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&iomuxc { +	bootph-pre-ram; +	bootph-some-ram; +}; + +®_usdhc2_vmmc { +	u-boot,off-on-delay-us = <20000>; +	bootph-pre-ram; +	bootph-some-ram; +}; + +&pinctrl_reg_usdhc2_vmmc { +	bootph-pre-ram; +}; + +&pinctrl_uart1 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&pinctrl_usdhc1 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&pinctrl_usdhc2_gpio { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&pinctrl_usdhc2 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&gpio1 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&gpio2 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&gpio3 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&gpio4 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&lpuart1 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&usdhc1 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&usdhc2 { +	bootph-pre-ram; +	bootph-some-ram; +	fsl,signal-voltage-switch-extra-delay-ms = <8>; +}; + +&lpi2c1 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&lpi2c2 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&lpi2c3 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&{/soc@0/bus@44000000/i2c@44350000/pmic@25} { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&{/soc@0/bus@44000000/i2c@44350000/pmic@25/regulators} { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&pinctrl_lpi2c1 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&pinctrl_lpi2c2 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&pinctrl_lpi2c3 { +	bootph-pre-ram; +	bootph-some-ram; +}; + +&fec { +	compatible = "fsl,imx91-fec", "fsl,imx93-fec", "fsl,imx8mq-fec"; +	phy-reset-gpios = <&pcal6524 16 GPIO_ACTIVE_LOW>; +	phy-reset-duration = <15>; +	phy-reset-post-delay = <100>; +}; + +ðphy1 { +	reset-gpios = <&pcal6524 15 GPIO_ACTIVE_LOW>; +	reset-assert-us = <15000>; +	reset-deassert-us = <100000>; +}; + +&s4muap { +	bootph-pre-ram; +	bootph-some-ram; +	status = "okay"; +}; + +&clk { +	bootph-all; +	bootph-pre-ram; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-rates; +	/delete-property/ assigned-clock-parents; +}; + +&osc_32k { +	bootph-all; +	bootph-pre-ram; +}; + +&osc_24m { +	bootph-all; +	bootph-pre-ram; +}; + +&clk_ext1 { +	bootph-all; +	bootph-pre-ram; +}; diff --git a/arch/arm/dts/imx91-u-boot.dtsi b/arch/arm/dts/imx91-u-boot.dtsi new file mode 100644 index 00000000000..5b639c965d6 --- /dev/null +++ b/arch/arm/dts/imx91-u-boot.dtsi @@ -0,0 +1,92 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2023 Mathieu Othacehe <m.othacehe@gmail.com> + */ + +/ { +	binman: binman { +		multiple-images; +	}; +}; + +&A55_0 { +	clocks = <&clk IMX93_CLK_A55_SEL>; +}; + +&binman { +	u-boot-spl-ddr { +		align = <4>; +		align-size = <4>; +		filename = "u-boot-spl-ddr.bin"; +		pad-byte = <0xff>; + +		u-boot-spl { +			align-end = <4>; +			filename = "u-boot-spl.bin"; +		}; + +		ddr-1d-imem-fw { +			filename = "lpddr4_imem_1d_v202201.bin"; +			align-end = <4>; +			type = "blob-ext"; +		}; + +		ddr-1d-dmem-fw { +			filename = "lpddr4_dmem_1d_v202201.bin"; +			align-end = <4>; +			type = "blob-ext"; +		}; + +		ddr-2d-imem-fw { +			filename = "lpddr4_imem_2d_v202201.bin"; +			align-end = <4>; +			type = "blob-ext"; +		}; + +		ddr-2d-dmem-fw { +			filename = "lpddr4_dmem_2d_v202201.bin"; +			align-end = <4>; +			type = "blob-ext"; +		}; +	}; + +	spl { +		filename = "spl.bin"; + +		mkimage { +			args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x204A0000"; + +			blob { +				filename = "u-boot-spl-ddr.bin"; +			}; +		}; +	}; + +	u-boot-container { +		filename = "u-boot-container.bin"; + +		mkimage { +			args = "-n u-boot-container.cfgout -T imx8image -e 0x0"; + +			blob { +				filename = "u-boot.bin"; +			}; +		}; +	}; + +	imx-boot { +		filename = "flash.bin"; +		pad-byte = <0x00>; + +		spl: blob-ext@1 { +			filename = "spl.bin"; +			offset = <0x0>; +			align-size = <0x400>; +			align = <0x400>; +		}; + +		uboot: blob-ext@2 { +			filename = "u-boot-container.bin"; +		}; +	}; +}; diff --git a/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi b/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi index cbcc7f3bb45..848bc350698 100644 --- a/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am62-lp-sk-u-boot.dtsi @@ -5,13 +5,3 @@   */  #include "k3-am62-lp-sk-binman.dtsi" - -/ { -	chosen { -		tick-timer = &main_timer0; -	}; -}; - -&main_timer0 { -	clock-frequency = <25000000>; -}; diff --git a/arch/arm/dts/k3-am62-r5-lp-sk.dts b/arch/arm/dts/k3-am62-r5-lp-sk.dts index b8e5f49a1fc..135e8d49b91 100644 --- a/arch/arm/dts/k3-am62-r5-lp-sk.dts +++ b/arch/arm/dts/k3-am62-r5-lp-sk.dts @@ -12,6 +12,7 @@  / {  	aliases { +		tick-timer = &main_timer0;  		remoteproc0 = &sysctrler;  		remoteproc1 = &a53_0;  		serial0 = &wkup_uart0; @@ -72,6 +73,14 @@  	};  }; +&main_timer0 { +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents; +	clock-frequency = <25000000>; +}; +  /* WKUP UART0 is used for DM firmware logs */  &wkup_uart0 {  	status = "okay"; diff --git a/arch/arm/dts/k3-am625-r5-sk.dts b/arch/arm/dts/k3-am625-r5-sk.dts index d2dd75469c1..34c501dd51b 100644 --- a/arch/arm/dts/k3-am625-r5-sk.dts +++ b/arch/arm/dts/k3-am625-r5-sk.dts @@ -12,6 +12,7 @@  / {  	aliases { +		tick-timer = &main_timer0;  		remoteproc0 = &sysctrler;  		remoteproc1 = &a53_0;  		serial0 = &wkup_uart0; @@ -70,6 +71,14 @@  	};  }; +&main_timer0 { +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents; +	clock-frequency = <25000000>; +}; +  /* WKUP UART0 is used for DM firmware logs */  &wkup_uart0 {  	status = "okay"; diff --git a/arch/arm/dts/k3-am625-sk-u-boot.dtsi b/arch/arm/dts/k3-am625-sk-u-boot.dtsi index 1fc0d407cbf..487ccf04b55 100644 --- a/arch/arm/dts/k3-am625-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am625-sk-u-boot.dtsi @@ -6,16 +6,6 @@  #include "k3-am625-sk-binman.dtsi" -/ { -	chosen { -		tick-timer = &main_timer0; -	}; -}; - -&main_timer0 { -	clock-frequency = <25000000>; -}; -  &main_bcdma {  	reg = <0x00 0x485c0100 0x00 0x100>,  	      <0x00 0x4c000000 0x00 0x20000>, diff --git a/arch/arm/dts/k3-am62a7-r5-sk.dts b/arch/arm/dts/k3-am62a7-r5-sk.dts index 464227b3b25..49e62533a95 100644 --- a/arch/arm/dts/k3-am62a7-r5-sk.dts +++ b/arch/arm/dts/k3-am62a7-r5-sk.dts @@ -12,6 +12,7 @@  / {  	aliases { +		tick-timer = &main_timer0;  		remoteproc0 = &sysctrler;  		remoteproc1 = &a53_0;  	}; @@ -71,6 +72,15 @@  	};  }; +&main_timer0 { +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents; +	clock-frequency = <25000000>; +	bootph-pre-ram; +}; +  &wkup_uart0_pins_default {  	bootph-pre-ram;  }; diff --git a/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi b/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi index c42dec16194..7dfbeb10c32 100644 --- a/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi +++ b/arch/arm/dts/k3-am62a7-sk-u-boot.dtsi @@ -9,7 +9,6 @@  / {  	chosen {  		stdout-path = "serial2:115200n8"; -		tick-timer = &main_timer0;  	};  	memory@80000000 { @@ -17,10 +16,6 @@  	};  }; -&main_timer0 { -	bootph-all; -}; -  &cbass_main {  	bootph-all;  }; diff --git a/arch/arm/dts/k3-am62p5-r5-sk.dts b/arch/arm/dts/k3-am62p5-r5-sk.dts index baf1a83dc12..b18b4ce1272 100644 --- a/arch/arm/dts/k3-am62p5-r5-sk.dts +++ b/arch/arm/dts/k3-am62p5-r5-sk.dts @@ -78,6 +78,14 @@  	};  }; +&main_timer0 { +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents; +	clock-frequency = <25000000>; +}; +  /* WKUP UART0 is used for DM firmware logs */  &wkup_uart0 {  	status = "okay"; diff --git a/arch/arm/dts/k3-am65-main.dtsi b/arch/arm/dts/k3-am65-main.dtsi deleted file mode 100644 index 5ebb87f467d..00000000000 --- a/arch/arm/dts/k3-am65-main.dtsi +++ /dev/null @@ -1,1568 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for AM6 SoC Family Main Domain peripherals - * - * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ - */ -#include <dt-bindings/phy/phy-am654-serdes.h> - -&cbass_main { -	msmc_ram: sram@70000000 { -		compatible = "mmio-sram"; -		reg = <0x0 0x70000000 0x0 0x200000>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x70000000 0x200000>; - -		atf-sram@0 { -			reg = <0x0 0x20000>; -		}; - -		sysfw-sram@f0000 { -			reg = <0xf0000 0x10000>; -		}; - -		l3cache-sram@100000 { -			reg = <0x100000 0x100000>; -		}; -	}; - -	gic500: interrupt-controller@1800000 { -		compatible = "arm,gic-v3"; -		#address-cells = <2>; -		#size-cells = <2>; -		ranges; -		#interrupt-cells = <3>; -		interrupt-controller; -		reg = <0x00 0x01800000 0x00 0x10000>,	/* GICD */ -		      <0x00 0x01880000 0x00 0x90000>,	/* GICR */ -		      <0x00 0x6f000000 0x00 0x2000>,	/* GICC */ -		      <0x00 0x6f010000 0x00 0x1000>,	/* GICH */ -		      <0x00 0x6f020000 0x00 0x2000>;	/* GICV */ -		/* -		 * vcpumntirq: -		 * virtual CPU interface maintenance interrupt -		 */ -		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; - -		gic_its: msi-controller@1820000 { -			compatible = "arm,gic-v3-its"; -			reg = <0x00 0x01820000 0x00 0x10000>; -			socionext,synquacer-pre-its = <0x1000000 0x400000>; -			msi-controller; -			#msi-cells = <1>; -		}; -	}; - -	serdes0: serdes@900000 { -		compatible = "ti,phy-am654-serdes"; -		reg = <0x0 0x900000 0x0 0x2000>; -		reg-names = "serdes"; -		#phy-cells = <2>; -		power-domains = <&k3_pds 153 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&k3_clks 153 4>, <&k3_clks 153 1>, <&serdes1 AM654_SERDES_LO_REFCLK>; -		clock-output-names = "serdes0_cmu_refclk", "serdes0_lo_refclk", "serdes0_ro_refclk"; -		assigned-clocks = <&k3_clks 153 4>, <&serdes0 AM654_SERDES_CMU_REFCLK>; -		assigned-clock-parents = <&k3_clks 153 8>, <&k3_clks 153 4>; -		ti,serdes-clk = <&serdes0_clk>; -		#clock-cells = <1>; -		mux-controls = <&serdes_mux 0>; -	}; - -	serdes1: serdes@910000 { -		compatible = "ti,phy-am654-serdes"; -		reg = <0x0 0x910000 0x0 0x2000>; -		reg-names = "serdes"; -		#phy-cells = <2>; -		power-domains = <&k3_pds 154 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&serdes0 AM654_SERDES_RO_REFCLK>, <&k3_clks 154 1>, <&k3_clks 154 5>; -		clock-output-names = "serdes1_cmu_refclk", "serdes1_lo_refclk", "serdes1_ro_refclk"; -		assigned-clocks = <&k3_clks 154 5>, <&serdes1 AM654_SERDES_CMU_REFCLK>; -		assigned-clock-parents = <&k3_clks 154 9>, <&k3_clks 154 5>; -		ti,serdes-clk = <&serdes1_clk>; -		#clock-cells = <1>; -		mux-controls = <&serdes_mux 1>; -	}; - -	main_uart0: serial@2800000 { -		compatible = "ti,am654-uart"; -		reg = <0x00 0x02800000 0x00 0x100>; -		interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>; -		clock-frequency = <48000000>; -		current-speed = <115200>; -		power-domains = <&k3_pds 146 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	main_uart1: serial@2810000 { -		compatible = "ti,am654-uart"; -		reg = <0x00 0x02810000 0x00 0x100>; -		interrupts = <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>; -		clock-frequency = <48000000>; -		power-domains = <&k3_pds 147 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	main_uart2: serial@2820000 { -		compatible = "ti,am654-uart"; -		reg = <0x00 0x02820000 0x00 0x100>; -		interrupts = <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>; -		clock-frequency = <48000000>; -		power-domains = <&k3_pds 148 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	crypto: crypto@4e00000 { -		compatible = "ti,am654-sa2ul"; -		reg = <0x0 0x4e00000 0x0 0x1200>; -		power-domains = <&k3_pds 136 TI_SCI_PD_SHARED>; -		#address-cells = <2>; -		#size-cells = <2>; -		ranges = <0x0 0x04e00000 0x00 0x04e00000 0x0 0x30000>; - -		dmas = <&main_udmap 0xc001>, <&main_udmap 0x4002>, -				<&main_udmap 0x4003>; -		dma-names = "tx", "rx1", "rx2"; - -		rng: rng@4e10000 { -			compatible = "inside-secure,safexcel-eip76"; -			reg = <0x0 0x4e10000 0x0 0x7d>; -			interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; -			status = "disabled"; /* Used by OP-TEE */ -		}; -	}; - -	/* TIMERIO pad input CTRLMMR_TIMER*_CTRL registers */ -	main_timerio_input: pinctrl@104200 { -		compatible = "pinctrl-single"; -		reg = <0x0 0x104200 0x0 0x30>; -		#pinctrl-cells = <1>; -		pinctrl-single,register-width = <32>; -		pinctrl-single,function-mask = <0x0000001ff>; -	}; - -	/* TIMERIO pad output CTCTRLMMR_TIMERIO*_CTRL registers */ -	main_timerio_output: pinctrl@104280 { -		compatible = "pinctrl-single"; -		reg = <0x0 0x104280 0x0 0x20>; -		#pinctrl-cells = <1>; -		pinctrl-single,register-width = <32>; -		pinctrl-single,function-mask = <0x0000000f>; -	}; - -	main_pmx0: pinctrl@11c000 { -		compatible = "pinctrl-single"; -		reg = <0x0 0x11c000 0x0 0x2e4>; -		#pinctrl-cells = <1>; -		pinctrl-single,register-width = <32>; -		pinctrl-single,function-mask = <0xffffffff>; -	}; - -	main_pmx1: pinctrl@11c2e8 { -		compatible = "pinctrl-single"; -		reg = <0x0 0x11c2e8 0x0 0x24>; -		#pinctrl-cells = <1>; -		pinctrl-single,register-width = <32>; -		pinctrl-single,function-mask = <0xffffffff>; -	}; - -	main_i2c0: i2c@2000000 { -		compatible = "ti,am654-i2c", "ti,omap4-i2c"; -		reg = <0x0 0x2000000 0x0 0x100>; -		interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>; -		#address-cells = <1>; -		#size-cells = <0>; -		clock-names = "fck"; -		clocks = <&k3_clks 110 1>; -		power-domains = <&k3_pds 110 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	main_i2c1: i2c@2010000 { -		compatible = "ti,am654-i2c", "ti,omap4-i2c"; -		reg = <0x0 0x2010000 0x0 0x100>; -		interrupts = <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>; -		#address-cells = <1>; -		#size-cells = <0>; -		clock-names = "fck"; -		clocks = <&k3_clks 111 1>; -		power-domains = <&k3_pds 111 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	main_i2c2: i2c@2020000 { -		compatible = "ti,am654-i2c", "ti,omap4-i2c"; -		reg = <0x0 0x2020000 0x0 0x100>; -		interrupts = <GIC_SPI 202 IRQ_TYPE_LEVEL_HIGH>; -		#address-cells = <1>; -		#size-cells = <0>; -		clock-names = "fck"; -		clocks = <&k3_clks 112 1>; -		power-domains = <&k3_pds 112 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	main_i2c3: i2c@2030000 { -		compatible = "ti,am654-i2c", "ti,omap4-i2c"; -		reg = <0x0 0x2030000 0x0 0x100>; -		interrupts = <GIC_SPI 203 IRQ_TYPE_LEVEL_HIGH>; -		#address-cells = <1>; -		#size-cells = <0>; -		clock-names = "fck"; -		clocks = <&k3_clks 113 1>; -		power-domains = <&k3_pds 113 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	ecap0: pwm@3100000 { -		compatible = "ti,am654-ecap", "ti,am3352-ecap"; -		#pwm-cells = <3>; -		reg = <0x0 0x03100000 0x0 0x60>; -		power-domains = <&k3_pds 39 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&k3_clks 39 0>; -		clock-names = "fck"; -		status = "disabled"; -	}; - -	main_spi0: spi@2100000 { -		compatible = "ti,am654-mcspi","ti,omap4-mcspi"; -		reg = <0x0 0x2100000 0x0 0x400>; -		interrupts = <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 137 1>; -		power-domains = <&k3_pds 137 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <0>; -		dmas = <&main_udmap 0xc500>, <&main_udmap 0x4500>; -		dma-names = "tx0", "rx0"; -		status = "disabled"; -	}; - -	main_spi1: spi@2110000 { -		compatible = "ti,am654-mcspi","ti,omap4-mcspi"; -		reg = <0x0 0x2110000 0x0 0x400>; -		interrupts = <GIC_SPI 185 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 138 1>; -		power-domains = <&k3_pds 138 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <0>; -		assigned-clocks = <&k3_clks 137 1>; -		assigned-clock-rates = <48000000>; -		status = "disabled"; -	}; - -	main_spi2: spi@2120000 { -		compatible = "ti,am654-mcspi","ti,omap4-mcspi"; -		reg = <0x0 0x2120000 0x0 0x400>; -		interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 139 1>; -		power-domains = <&k3_pds 139 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <0>; -		status = "disabled"; -	}; - -	main_spi3: spi@2130000 { -		compatible = "ti,am654-mcspi","ti,omap4-mcspi"; -		reg = <0x0 0x2130000 0x0 0x400>; -		interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 140 1>; -		power-domains = <&k3_pds 140 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <0>; -		status = "disabled"; -	}; - -	main_spi4: spi@2140000 { -		compatible = "ti,am654-mcspi","ti,omap4-mcspi"; -		reg = <0x0 0x2140000 0x0 0x400>; -		interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 141 1>; -		power-domains = <&k3_pds 141 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <0>; -		status = "disabled"; -	}; - -	main_timer0: timer@2400000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2400000 0x00 0x400>; -		interrupts = <GIC_SPI 224 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 23 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 23 0>; -		assigned-clock-parents = <&k3_clks 23 1>; -		power-domains = <&k3_pds 23 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer1: timer@2410000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2410000 0x00 0x400>; -		interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 24 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 24 0>; -		assigned-clock-parents = <&k3_clks 24 1>; -		power-domains = <&k3_pds 24 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer2: timer@2420000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2420000 0x00 0x400>; -		interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 27 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 27 0>; -		assigned-clock-parents = <&k3_clks 27 1>; -		power-domains = <&k3_pds 27 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer3: timer@2430000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2430000 0x00 0x400>; -		interrupts = <GIC_SPI 227 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 28 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 28 0>; -		assigned-clock-parents = <&k3_clks 28 1>; -		power-domains = <&k3_pds 28 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer4: timer@2440000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2440000 0x00 0x400>; -		interrupts = <GIC_SPI 228 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 29 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 29 0>; -		assigned-clock-parents = <&k3_clks 29 1>; -		power-domains = <&k3_pds 29 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer5: timer@2450000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2450000 0x00 0x400>; -		interrupts = <GIC_SPI 229 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 30 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 30 0>; -		assigned-clock-parents = <&k3_clks 30 1>; -		power-domains = <&k3_pds 30 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer6: timer@2460000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2460000 0x00 0x400>; -		interrupts = <GIC_SPI 230 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 31 0>; -		assigned-clocks = <&k3_clks 31 0>; -		assigned-clock-parents = <&k3_clks 31 1>; -		clock-names = "fck"; -		power-domains = <&k3_pds 31 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer7: timer@2470000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2470000 0x00 0x400>; -		interrupts = <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 32 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 32 0>; -		assigned-clock-parents = <&k3_clks 32 1>; -		power-domains = <&k3_pds 32 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer8: timer@2480000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2480000 0x00 0x400>; -		interrupts = <GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 33 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 33 0>; -		assigned-clock-parents = <&k3_clks 33 1>; -		power-domains = <&k3_pds 33 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer9: timer@2490000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x2490000 0x00 0x400>; -		interrupts = <GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 34 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 34 0>; -		assigned-clock-parents = <&k3_clks 34 1>; -		power-domains = <&k3_pds 34 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer10: timer@24a0000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x24a0000 0x00 0x400>; -		interrupts = <GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 25 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 25 0>; -		assigned-clock-parents = <&k3_clks 25 1>; -		power-domains = <&k3_pds 25 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	main_timer11: timer@24b0000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x24b0000 0x00 0x400>; -		interrupts = <GIC_SPI 235 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 26 0>; -		clock-names = "fck"; -		assigned-clocks = <&k3_clks 26 0>; -		assigned-clock-parents = <&k3_clks 26 1>; -		power-domains = <&k3_pds 26 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -	}; - -	sdhci0: mmc@4f80000 { -		compatible = "ti,am654-sdhci-5.1"; -		reg = <0x0 0x4f80000 0x0 0x260>, <0x0 0x4f90000 0x0 0x134>; -		power-domains = <&k3_pds 47 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&k3_clks 47 0>, <&k3_clks 47 1>; -		clock-names = "clk_ahb", "clk_xin"; -		interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>; -		mmc-ddr-1_8v; -		mmc-hs200-1_8v; -		ti,otap-del-sel-legacy = <0x0>; -		ti,otap-del-sel-mmc-hs = <0x0>; -		ti,otap-del-sel-sd-hs = <0x0>; -		ti,otap-del-sel-sdr12 = <0x0>; -		ti,otap-del-sel-sdr25 = <0x0>; -		ti,otap-del-sel-sdr50 = <0x8>; -		ti,otap-del-sel-sdr104 = <0x7>; -		ti,otap-del-sel-ddr50 = <0x5>; -		ti,otap-del-sel-ddr52 = <0x5>; -		ti,otap-del-sel-hs200 = <0x5>; -		ti,otap-del-sel-hs400 = <0x0>; -		ti,trm-icp = <0x8>; -		dma-coherent; -	}; - -	sdhci1: mmc@4fa0000 { -		compatible = "ti,am654-sdhci-5.1"; -		reg = <0x0 0x4fa0000 0x0 0x260>, <0x0 0x4fb0000 0x0 0x134>; -		power-domains = <&k3_pds 48 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&k3_clks 48 0>, <&k3_clks 48 1>; -		clock-names = "clk_ahb", "clk_xin"; -		interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>; -		ti,otap-del-sel-legacy = <0x0>; -		ti,otap-del-sel-mmc-hs = <0x0>; -		ti,otap-del-sel-sd-hs = <0x0>; -		ti,otap-del-sel-sdr12 = <0x0>; -		ti,otap-del-sel-sdr25 = <0x0>; -		ti,otap-del-sel-sdr50 = <0x8>; -		ti,otap-del-sel-sdr104 = <0x7>; -		ti,otap-del-sel-ddr50 = <0x4>; -		ti,otap-del-sel-ddr52 = <0x4>; -		ti,otap-del-sel-hs200 = <0x7>; -		ti,clkbuf-sel = <0x7>; -		ti,trm-icp = <0x8>; -		dma-coherent; -	}; - -	scm_conf: scm-conf@100000 { -		compatible = "syscon", "simple-mfd"; -		reg = <0 0x00100000 0 0x1c000>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x00100000 0x1c000>; - -		serdes0_clk: clock@4080 { -			compatible = "syscon"; -			reg = <0x00004080 0x4>; -		}; - -		serdes1_clk: clock@4090 { -			compatible = "syscon"; -			reg = <0x00004090 0x4>; -		}; - -		serdes_mux: mux-controller { -			compatible = "mmio-mux"; -			#mux-control-cells = <1>; -			mux-reg-masks = <0x4080 0x3>, /* SERDES0 lane select */ -					<0x4090 0x3>; /* SERDES1 lane select */ -		}; - -		dss_oldi_io_ctrl: dss-oldi-io-ctrl@41e0 { -			compatible = "syscon"; -			reg = <0x000041e0 0x14>; -		}; - -		ehrpwm_tbclk: clock-controller@4140 { -			compatible = "ti,am654-ehrpwm-tbclk"; -			reg = <0x4140 0x18>; -			#clock-cells = <1>; -		}; -	}; - -	dwc3_0: dwc3@4000000 { -		compatible = "ti,am654-dwc3"; -		reg = <0x0 0x4000000 0x0 0x4000>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x4000000 0x20000>; -		interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>; -		dma-coherent; -		power-domains = <&k3_pds 151 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&k3_clks 151 2>, <&k3_clks 151 7>; -		assigned-clocks = <&k3_clks 151 2>, <&k3_clks 151 7>; -		assigned-clock-parents = <&k3_clks 151 4>,	/* set REF_CLK to 20MHz i.e. PER0_PLL/48 */ -					 <&k3_clks 151 9>;	/* set PIPE3_TXB_CLK to CLK_12M_RC/256 (for HS only) */ - -		usb0: usb@10000 { -			compatible = "snps,dwc3"; -			reg = <0x10000 0x10000>; -			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>; -			interrupt-names = "peripheral", -					  "host", -					  "otg"; -			maximum-speed = "high-speed"; -			dr_mode = "otg"; -			phys = <&usb0_phy>; -			phy-names = "usb2-phy"; -			snps,dis_u3_susphy_quirk; -		}; -	}; - -	usb0_phy: phy@4100000 { -		compatible = "ti,am654-usb2", "ti,omap-usb2"; -		reg = <0x0 0x4100000 0x0 0x54>; -		syscon-phy-power = <&scm_conf 0x4000>; -		clocks = <&k3_clks 151 0>, <&k3_clks 151 1>; -		clock-names = "wkupclk", "refclk"; -		#phy-cells = <0>; -	}; - -	dwc3_1: dwc3@4020000 { -		compatible = "ti,am654-dwc3"; -		reg = <0x0 0x4020000 0x0 0x4000>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x4020000 0x20000>; -		interrupts = <GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>; -		dma-coherent; -		power-domains = <&k3_pds 152 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&k3_clks 152 2>; -		assigned-clocks = <&k3_clks 152 2>; -		assigned-clock-parents = <&k3_clks 152 4>;	/* set REF_CLK to 20MHz i.e. PER0_PLL/48 */ - -		usb1: usb@10000 { -			compatible = "snps,dwc3"; -			reg = <0x10000 0x10000>; -			interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>; -			interrupt-names = "peripheral", -					  "host", -					  "otg"; -			maximum-speed = "high-speed"; -			dr_mode = "otg"; -			phys = <&usb1_phy>; -			phy-names = "usb2-phy"; -		}; -	}; - -	usb1_phy: phy@4110000 { -		compatible = "ti,am654-usb2", "ti,omap-usb2"; -		reg = <0x0 0x4110000 0x0 0x54>; -		syscon-phy-power = <&scm_conf 0x4020>; -		clocks = <&k3_clks 152 0>, <&k3_clks 152 1>; -		clock-names = "wkupclk", "refclk"; -		#phy-cells = <0>; -	}; - -	intr_main_gpio: interrupt-controller@a00000 { -		compatible = "ti,sci-intr"; -		reg = <0x0 0x00a00000 0x0 0x400>; -		ti,intr-trigger-type = <1>; -		interrupt-controller; -		interrupt-parent = <&gic500>; -		#interrupt-cells = <1>; -		ti,sci = <&dmsc>; -		ti,sci-dev-id = <100>; -		ti,interrupt-ranges = <0 392 32>; -	}; - -	main_navss: bus@30800000 { -		compatible = "simple-bus"; -		#address-cells = <2>; -		#size-cells = <2>; -		ranges = <0x0 0x30800000 0x0 0x30800000 0x0 0xbc00000>; -		dma-coherent; -		dma-ranges; - -		ti,sci-dev-id = <118>; - -		intr_main_navss: interrupt-controller@310e0000 { -			compatible = "ti,sci-intr"; -			reg = <0x0 0x310e0000 0x0 0x2000>; -			ti,intr-trigger-type = <4>; -			interrupt-controller; -			interrupt-parent = <&gic500>; -			#interrupt-cells = <1>; -			ti,sci = <&dmsc>; -			ti,sci-dev-id = <182>; -			ti,interrupt-ranges = <0 64 64>, -					      <64 448 64>; -		}; - -		inta_main_udmass: interrupt-controller@33d00000 { -			compatible = "ti,sci-inta"; -			reg = <0x0 0x33d00000 0x0 0x100000>; -			interrupt-controller; -			interrupt-parent = <&intr_main_navss>; -			msi-controller; -			#interrupt-cells = <0>; -			ti,sci = <&dmsc>; -			ti,sci-dev-id = <179>; -			ti,interrupt-ranges = <0 0 256>; -		}; - -		secure_proxy_main: mailbox@32c00000 { -			compatible = "ti,am654-secure-proxy"; -			#mbox-cells = <1>; -			reg-names = "target_data", "rt", "scfg"; -			reg = <0x00 0x32c00000 0x00 0x100000>, -			      <0x00 0x32400000 0x00 0x100000>, -			      <0x00 0x32800000 0x00 0x100000>; -			interrupt-names = "rx_011"; -			interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>; -		}; - -		hwspinlock: spinlock@30e00000 { -			compatible = "ti,am654-hwspinlock"; -			reg = <0x00 0x30e00000 0x00 0x1000>; -			#hwlock-cells = <1>; -		}; - -		mailbox0_cluster0: mailbox@31f80000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f80000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster1: mailbox@31f81000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f81000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster2: mailbox@31f82000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f82000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster3: mailbox@31f83000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f83000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster4: mailbox@31f84000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f84000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster5: mailbox@31f85000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f85000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster6: mailbox@31f86000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f86000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster7: mailbox@31f87000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f87000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster8: mailbox@31f88000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f88000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster9: mailbox@31f89000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f89000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster10: mailbox@31f8a000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f8a000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		mailbox0_cluster11: mailbox@31f8b000 { -			compatible = "ti,am654-mailbox"; -			reg = <0x00 0x31f8b000 0x00 0x200>; -			#mbox-cells = <1>; -			ti,mbox-num-users = <4>; -			ti,mbox-num-fifos = <16>; -			interrupt-parent = <&intr_main_navss>; -			status = "disabled"; -		}; - -		ringacc: ringacc@3c000000 { -			compatible = "ti,am654-navss-ringacc"; -			reg = <0x0 0x3c000000 0x0 0x400000>, -			      <0x0 0x38000000 0x0 0x400000>, -			      <0x0 0x31120000 0x0 0x100>, -			      <0x0 0x33000000 0x0 0x40000>, -			      <0x0 0x31080000 0x0 0x40000>; -			reg-names = "rt", "fifos", "proxy_gcfg", "proxy_target", "cfg"; -			ti,num-rings = <818>; -			ti,sci-rm-range-gp-rings = <0x1>; /* GP ring range */ -			ti,sci = <&dmsc>; -			ti,sci-dev-id = <187>; -			msi-parent = <&inta_main_udmass>; -		}; - -		main_udmap: dma-controller@31150000 { -			compatible = "ti,am654-navss-main-udmap"; -			reg = <0x0 0x31150000 0x0 0x100>, -			      <0x0 0x34000000 0x0 0x100000>, -			      <0x0 0x35000000 0x0 0x100000>; -			reg-names = "gcfg", "rchanrt", "tchanrt"; -			msi-parent = <&inta_main_udmass>; -			#dma-cells = <1>; - -			ti,sci = <&dmsc>; -			ti,sci-dev-id = <188>; -			ti,ringacc = <&ringacc>; - -			ti,sci-rm-range-tchan = <0xf>, /* TX_HCHAN */ -						<0xd>; /* TX_CHAN */ -			ti,sci-rm-range-rchan = <0xb>, /* RX_HCHAN */ -						<0xa>; /* RX_CHAN */ -			ti,sci-rm-range-rflow = <0x0>; /* GP RFLOW */ -		}; - -		cpts@310d0000 { -			compatible = "ti,am65-cpts"; -			reg = <0x0 0x310d0000 0x0 0x400>; -			reg-names = "cpts"; -			clocks = <&main_cpts_mux>; -			clock-names = "cpts"; -			interrupts-extended = <&intr_main_navss 391>; -			interrupt-names = "cpts"; -			ti,cpts-periodic-outputs = <6>; -			ti,cpts-ext-ts-inputs = <8>; - -			main_cpts_mux: refclk-mux { -				#clock-cells = <0>; -				clocks = <&k3_clks 118 5>, <&k3_clks 118 11>, -					<&k3_clks 118 6>, <&k3_clks 118 3>, -					<&k3_clks 118 8>, <&k3_clks 118 14>, -					<&k3_clks 120 3>, <&k3_clks 121 3>; -				assigned-clocks = <&main_cpts_mux>; -				assigned-clock-parents = <&k3_clks 118 5>; -			}; -		}; -	}; - -	main_gpio0: gpio@600000 { -		compatible = "ti,am654-gpio", "ti,keystone-gpio"; -		reg = <0x0 0x600000 0x0 0x100>; -		gpio-controller; -		#gpio-cells = <2>; -		interrupt-parent = <&intr_main_gpio>; -		interrupts = <192>, <193>, <194>, <195>, <196>, <197>; -		interrupt-controller; -		#interrupt-cells = <2>; -		ti,ngpio = <96>; -		ti,davinci-gpio-unbanked = <0>; -		clocks = <&k3_clks 57 0>; -		clock-names = "gpio"; -	}; - -	main_gpio1: gpio@601000 { -		compatible = "ti,am654-gpio", "ti,keystone-gpio"; -		reg = <0x0 0x601000 0x0 0x100>; -		gpio-controller; -		#gpio-cells = <2>; -		interrupt-parent = <&intr_main_gpio>; -		interrupts = <200>, <201>, <202>, <203>, <204>, <205>; -		interrupt-controller; -		#interrupt-cells = <2>; -		ti,ngpio = <90>; -		ti,davinci-gpio-unbanked = <0>; -		clocks = <&k3_clks 58 0>; -		clock-names = "gpio"; -	}; - -	pcie0_rc: pcie@5500000 { -		compatible = "ti,am654-pcie-rc"; -		reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x2000>, <0x0 0x5506000 0x0 0x1000>; -		reg-names = "app", "dbics", "config", "atu"; -		power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <3>; -		#size-cells = <2>; -		ranges = <0x81000000 0 0          0x0 0x10020000 0 0x00010000>, -			 <0x82000000 0 0x10030000 0x0 0x10030000 0 0x07FD0000>; -		ti,syscon-pcie-id = <&scm_conf 0x210>; -		ti,syscon-pcie-mode = <&scm_conf 0x4060>; -		bus-range = <0x0 0xff>; -		num-viewport = <16>; -		max-link-speed = <2>; -		dma-coherent; -		interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>; -		msi-map = <0x0 &gic_its 0x0 0x10000>; -		device_type = "pci"; -		status = "disabled"; -	}; - -	pcie0_ep: pcie-ep@5500000 { -		compatible = "ti,am654-pcie-ep"; -		reg = <0x0 0x5500000 0x0 0x1000>, <0x0 0x5501000 0x0 0x1000>, <0x0 0x10000000 0x0 0x8000000>, <0x0 0x5506000 0x0 0x1000>; -		reg-names = "app", "dbics", "addr_space", "atu"; -		power-domains = <&k3_pds 120 TI_SCI_PD_EXCLUSIVE>; -		ti,syscon-pcie-mode = <&scm_conf 0x4060>; -		num-ib-windows = <16>; -		num-ob-windows = <16>; -		max-link-speed = <2>; -		dma-coherent; -		interrupts = <GIC_SPI 340 IRQ_TYPE_EDGE_RISING>; -		status = "disabled"; -	}; - -	pcie1_rc: pcie@5600000 { -		compatible = "ti,am654-pcie-rc"; -		reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x2000>, <0x0 0x5606000 0x0 0x1000>; -		reg-names = "app", "dbics", "config", "atu"; -		power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <3>; -		#size-cells = <2>; -		ranges = <0x81000000 0 0          0x0   0x18020000 0 0x00010000>, -			 <0x82000000 0 0x18030000 0x0   0x18030000 0 0x07FD0000>; -		ti,syscon-pcie-id = <&scm_conf 0x210>; -		ti,syscon-pcie-mode = <&scm_conf 0x4070>; -		bus-range = <0x0 0xff>; -		num-viewport = <16>; -		max-link-speed = <2>; -		dma-coherent; -		interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>; -		msi-map = <0x0 &gic_its 0x10000 0x10000>; -		device_type = "pci"; -		status = "disabled"; -	}; - -	pcie1_ep: pcie-ep@5600000 { -		compatible = "ti,am654-pcie-ep"; -		reg = <0x0 0x5600000 0x0 0x1000>, <0x0 0x5601000 0x0 0x1000>, <0x0 0x18000000 0x0 0x4000000>, <0x0 0x5606000 0x0 0x1000>; -		reg-names = "app", "dbics", "addr_space", "atu"; -		power-domains = <&k3_pds 121 TI_SCI_PD_EXCLUSIVE>; -		ti,syscon-pcie-mode = <&scm_conf 0x4070>; -		num-ib-windows = <16>; -		num-ob-windows = <16>; -		max-link-speed = <2>; -		dma-coherent; -		interrupts = <GIC_SPI 355 IRQ_TYPE_EDGE_RISING>; -		status = "disabled"; -	}; - -	mcasp0: mcasp@2b00000 { -		compatible = "ti,am33xx-mcasp-audio"; -		reg = <0x0 0x02b00000 0x0 0x2000>, -			<0x0 0x02b08000 0x0 0x1000>; -		reg-names = "mpu","dat"; -		interrupts = <GIC_SPI 208 IRQ_TYPE_LEVEL_HIGH>, -				<GIC_SPI 209 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-names = "tx", "rx"; - -		dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>; -		dma-names = "tx", "rx"; - -		clocks = <&k3_clks 104 0>; -		clock-names = "fck"; -		power-domains = <&k3_pds 104 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	mcasp1: mcasp@2b10000 { -		compatible = "ti,am33xx-mcasp-audio"; -		reg = <0x0 0x02b10000 0x0 0x2000>, -			<0x0 0x02b18000 0x0 0x1000>; -		reg-names = "mpu","dat"; -		interrupts = <GIC_SPI 210 IRQ_TYPE_LEVEL_HIGH>, -				<GIC_SPI 211 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-names = "tx", "rx"; - -		dmas = <&main_udmap 0xc401>, <&main_udmap 0x4401>; -		dma-names = "tx", "rx"; - -		clocks = <&k3_clks 105 0>; -		clock-names = "fck"; -		power-domains = <&k3_pds 105 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	mcasp2: mcasp@2b20000 { -		compatible = "ti,am33xx-mcasp-audio"; -		reg = <0x0 0x02b20000 0x0 0x2000>, -			<0x0 0x02b28000 0x0 0x1000>; -		reg-names = "mpu","dat"; -		interrupts = <GIC_SPI 212 IRQ_TYPE_LEVEL_HIGH>, -				<GIC_SPI 213 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-names = "tx", "rx"; - -		dmas = <&main_udmap 0xc402>, <&main_udmap 0x4402>; -		dma-names = "tx", "rx"; - -		clocks = <&k3_clks 106 0>; -		clock-names = "fck"; -		power-domains = <&k3_pds 106 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	cal: cal@6f03000 { -		compatible = "ti,am654-cal"; -		reg = <0x0 0x06f03000 0x0 0x400>, -		      <0x0 0x06f03800 0x0 0x40>; -		reg-names = "cal_top", -			    "cal_rx_core0"; -		interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_HIGH>; -		ti,camerrx-control = <&scm_conf 0x40c0>; -		clock-names = "fck"; -		clocks = <&k3_clks 2 0>; -		power-domains = <&k3_pds 2 TI_SCI_PD_EXCLUSIVE>; - -		ports { -			#address-cells = <1>; -			#size-cells = <0>; - -			csi2_0: port@0 { -				reg = <0>; -			}; -		}; -	}; - -	dss: dss@4a00000 { -		compatible = "ti,am65x-dss"; -		reg = <0x0 0x04a00000 0x0 0x1000>, /* common */ -		      <0x0 0x04a02000 0x0 0x1000>, /* vidl1 */ -		      <0x0 0x04a06000 0x0 0x1000>, /* vid */ -		      <0x0 0x04a07000 0x0 0x1000>, /* ovr1 */ -		      <0x0 0x04a08000 0x0 0x1000>, /* ovr2 */ -		      <0x0 0x04a0a000 0x0 0x1000>, /* vp1 */ -		      <0x0 0x04a0b000 0x0 0x1000>; /* vp2 */ -		reg-names = "common", "vidl1", "vid", -			"ovr1", "ovr2", "vp1", "vp2"; - -		ti,am65x-oldi-io-ctrl = <&dss_oldi_io_ctrl>; - -		power-domains = <&k3_pds 67 TI_SCI_PD_EXCLUSIVE>; - -		clocks = <&k3_clks 67 1>, -			 <&k3_clks 216 1>, -			 <&k3_clks 67 2>; -		clock-names = "fck", "vp1", "vp2"; - -		/* -		 * Set vp2 clk (DPI_1_IN_CLK) mux to PLL4 via -		 * DIV1. See "Figure 12-3365. DSS Integration" -		 * in AM65x TRM for details. -		 */ -		assigned-clocks = <&k3_clks 67 2>; -		assigned-clock-parents = <&k3_clks 67 5>; - -		interrupts = <GIC_SPI 166 IRQ_TYPE_EDGE_RISING>; - -		dma-coherent; - -		dss_ports: ports { -			#address-cells = <1>; -			#size-cells = <0>; -		}; -	}; - -	ehrpwm0: pwm@3000000 { -		compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm"; -		#pwm-cells = <3>; -		reg = <0x0 0x3000000 0x0 0x100>; -		power-domains = <&k3_pds 40 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&ehrpwm_tbclk 0>, <&k3_clks 40 0>; -		clock-names = "tbclk", "fck"; -		status = "disabled"; -	}; - -	ehrpwm1: pwm@3010000 { -		compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm"; -		#pwm-cells = <3>; -		reg = <0x0 0x3010000 0x0 0x100>; -		power-domains = <&k3_pds 41 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&ehrpwm_tbclk 1>, <&k3_clks 41 0>; -		clock-names = "tbclk", "fck"; -		status = "disabled"; -	}; - -	ehrpwm2: pwm@3020000 { -		compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm"; -		#pwm-cells = <3>; -		reg = <0x0 0x3020000 0x0 0x100>; -		power-domains = <&k3_pds 42 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&ehrpwm_tbclk 2>, <&k3_clks 42 0>; -		clock-names = "tbclk", "fck"; -		status = "disabled"; -	}; - -	ehrpwm3: pwm@3030000 { -		compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm"; -		#pwm-cells = <3>; -		reg = <0x0 0x3030000 0x0 0x100>; -		power-domains = <&k3_pds 43 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&ehrpwm_tbclk 3>, <&k3_clks 43 0>; -		clock-names = "tbclk", "fck"; -		status = "disabled"; -	}; - -	ehrpwm4: pwm@3040000 { -		compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm"; -		#pwm-cells = <3>; -		reg = <0x0 0x3040000 0x0 0x100>; -		power-domains = <&k3_pds 44 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&ehrpwm_tbclk 4>, <&k3_clks 44 0>; -		clock-names = "tbclk", "fck"; -		status = "disabled"; -	}; - -	ehrpwm5: pwm@3050000 { -		compatible = "ti,am654-ehrpwm", "ti,am3352-ehrpwm"; -		#pwm-cells = <3>; -		reg = <0x0 0x3050000 0x0 0x100>; -		power-domains = <&k3_pds 45 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&ehrpwm_tbclk 5>, <&k3_clks 45 0>; -		clock-names = "tbclk", "fck"; -		status = "disabled"; -	}; - -	icssg0: icssg@b000000 { -		compatible = "ti,am654-icssg"; -		reg = <0x00 0xb000000 0x00 0x80000>; -		power-domains = <&k3_pds 62 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x00 0xb000000 0x80000>; - -		icssg0_mem: memories@0 { -			reg = <0x0 0x2000>, -			      <0x2000 0x2000>, -			      <0x10000 0x10000>; -			reg-names = "dram0", "dram1", -				    "shrdram2"; -		}; - -		icssg0_cfg: cfg@26000 { -			compatible = "ti,pruss-cfg", "syscon"; -			reg = <0x26000 0x200>; -			#address-cells = <1>; -			#size-cells = <1>; -			ranges = <0x0 0x26000 0x2000>; - -			clocks { -				#address-cells = <1>; -				#size-cells = <0>; - -				icssg0_coreclk_mux: coreclk-mux@3c { -					reg = <0x3c>; -					#clock-cells = <0>; -					clocks = <&k3_clks 62 19>, /* icssg0_core_clk */ -						 <&k3_clks 62 3>;  /* icssg0_iclk */ -					assigned-clocks = <&icssg0_coreclk_mux>; -					assigned-clock-parents = <&k3_clks 62 3>; -				}; - -				icssg0_iepclk_mux: iepclk-mux@30 { -					reg = <0x30>; -					#clock-cells = <0>; -					clocks = <&k3_clks 62 10>,	/* icssg0_iep_clk */ -						 <&icssg0_coreclk_mux>;	/* core_clk */ -					assigned-clocks = <&icssg0_iepclk_mux>; -					assigned-clock-parents = <&icssg0_coreclk_mux>; -				}; -			}; -		}; - -		icssg0_iep0: iep@2e000 { -			compatible = "ti,am654-icss-iep"; -			reg = <0x2e000 0x1000>; -			clocks = <&icssg0_iepclk_mux>; -		}; - -		icssg0_iep1: iep@2f000 { -			compatible = "ti,am654-icss-iep"; -			reg = <0x2f000 0x1000>; -			clocks = <&icssg0_iepclk_mux>; -		}; - -		icssg0_mii_rt: mii-rt@32000 { -			compatible = "ti,pruss-mii", "syscon"; -			reg = <0x32000 0x100>; -		}; - -		icssg0_mii_g_rt: mii-g-rt@33000 { -			compatible = "ti,pruss-mii-g", "syscon"; -			reg = <0x33000 0x1000>; -		}; - -		icssg0_intc: interrupt-controller@20000 { -			compatible = "ti,icssg-intc"; -			reg = <0x20000 0x2000>; -			interrupt-controller; -			#interrupt-cells = <3>; -			interrupts = <GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 256 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 258 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 259 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 260 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>; -			interrupt-names = "host_intr0", "host_intr1", -					  "host_intr2", "host_intr3", -					  "host_intr4", "host_intr5", -					  "host_intr6", "host_intr7"; -		}; - -		pru0_0: pru@34000 { -			compatible = "ti,am654-pru"; -			reg = <0x34000 0x4000>, -			      <0x22000 0x100>, -			      <0x22400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-pru0_0-fw"; -		}; - -		rtu0_0: rtu@4000 { -			compatible = "ti,am654-rtu"; -			reg = <0x4000 0x2000>, -			      <0x23000 0x100>, -			      <0x23400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-rtu0_0-fw"; -		}; - -		tx_pru0_0: txpru@a000 { -			compatible = "ti,am654-tx-pru"; -			reg = <0xa000 0x1800>, -			      <0x25000 0x100>, -			      <0x25400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-txpru0_0-fw"; -		}; - -		pru0_1: pru@38000 { -			compatible = "ti,am654-pru"; -			reg = <0x38000 0x4000>, -			      <0x24000 0x100>, -			      <0x24400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-pru0_1-fw"; -		}; - -		rtu0_1: rtu@6000 { -			compatible = "ti,am654-rtu"; -			reg = <0x6000 0x2000>, -			      <0x23800 0x100>, -			      <0x23c00 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-rtu0_1-fw"; -		}; - -		tx_pru0_1: txpru@c000 { -			compatible = "ti,am654-tx-pru"; -			reg = <0xc000 0x1800>, -			      <0x25800 0x100>, -			      <0x25c00 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-txpru0_1-fw"; -		}; - -		icssg0_mdio: mdio@32400 { -			compatible = "ti,davinci_mdio"; -			reg = <0x32400 0x100>; -			clocks = <&k3_clks 62 3>; -			clock-names = "fck"; -			#address-cells = <1>; -			#size-cells = <0>; -			bus_freq = <1000000>; -			status = "disabled"; -		}; -	}; - -	icssg1: icssg@b100000 { -		compatible = "ti,am654-icssg"; -		reg = <0x00 0xb100000 0x00 0x80000>; -		power-domains = <&k3_pds 63 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x00 0xb100000 0x80000>; - -		icssg1_mem: memories@0 { -			reg = <0x0 0x2000>, -			      <0x2000 0x2000>, -			      <0x10000 0x10000>; -			reg-names = "dram0", "dram1", -				    "shrdram2"; -		}; - -		icssg1_cfg: cfg@26000 { -			compatible = "ti,pruss-cfg", "syscon"; -			reg = <0x26000 0x200>; -			#address-cells = <1>; -			#size-cells = <1>; -			ranges = <0x0 0x26000 0x2000>; - -			clocks { -				#address-cells = <1>; -				#size-cells = <0>; - -				icssg1_coreclk_mux: coreclk-mux@3c { -					reg = <0x3c>; -					#clock-cells = <0>; -					clocks = <&k3_clks 63 19>, /* icssg1_core_clk */ -						 <&k3_clks 63 3>;  /* icssg1_iclk */ -					assigned-clocks = <&icssg1_coreclk_mux>; -					assigned-clock-parents = <&k3_clks 63 3>; -				}; - -				icssg1_iepclk_mux: iepclk-mux@30 { -					reg = <0x30>; -					#clock-cells = <0>; -					clocks = <&k3_clks 63 10>,	/* icssg1_iep_clk */ -						 <&icssg1_coreclk_mux>;	/* core_clk */ -					assigned-clocks = <&icssg1_iepclk_mux>; -					assigned-clock-parents = <&icssg1_coreclk_mux>; -				}; -			}; -		}; - -		icssg1_iep0: iep@2e000 { -			compatible = "ti,am654-icss-iep"; -			reg = <0x2e000 0x1000>; -			clocks = <&icssg1_iepclk_mux>; -		}; - -		icssg1_iep1: iep@2f000 { -			compatible = "ti,am654-icss-iep"; -			reg = <0x2f000 0x1000>; -			clocks = <&icssg1_iepclk_mux>; -		}; - -		icssg1_mii_rt: mii-rt@32000 { -			compatible = "ti,pruss-mii", "syscon"; -			reg = <0x32000 0x100>; -		}; - -		icssg1_mii_g_rt: mii-g-rt@33000 { -			compatible = "ti,pruss-mii-g", "syscon"; -			reg = <0x33000 0x1000>; -		}; - -		icssg1_intc: interrupt-controller@20000 { -			compatible = "ti,icssg-intc"; -			reg = <0x20000 0x2000>; -			interrupt-controller; -			#interrupt-cells = <3>; -			interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 264 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 269 IRQ_TYPE_LEVEL_HIGH>; -			interrupt-names = "host_intr0", "host_intr1", -					  "host_intr2", "host_intr3", -					  "host_intr4", "host_intr5", -					  "host_intr6", "host_intr7"; -		}; - -		pru1_0: pru@34000 { -			compatible = "ti,am654-pru"; -			reg = <0x34000 0x4000>, -			      <0x22000 0x100>, -			      <0x22400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-pru1_0-fw"; -		}; - -		rtu1_0: rtu@4000 { -			compatible = "ti,am654-rtu"; -			reg = <0x4000 0x2000>, -			      <0x23000 0x100>, -			      <0x23400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-rtu1_0-fw"; -		}; - -		tx_pru1_0: txpru@a000 { -			compatible = "ti,am654-tx-pru"; -			reg = <0xa000 0x1800>, -			      <0x25000 0x100>, -			      <0x25400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-txpru1_0-fw"; -		}; - -		pru1_1: pru@38000 { -			compatible = "ti,am654-pru"; -			reg = <0x38000 0x4000>, -			      <0x24000 0x100>, -			      <0x24400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-pru1_1-fw"; -		}; - -		rtu1_1: rtu@6000 { -			compatible = "ti,am654-rtu"; -			reg = <0x6000 0x2000>, -			      <0x23800 0x100>, -			      <0x23c00 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-rtu1_1-fw"; -		}; - -		tx_pru1_1: txpru@c000 { -			compatible = "ti,am654-tx-pru"; -			reg = <0xc000 0x1800>, -			      <0x25800 0x100>, -			      <0x25c00 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-txpru1_1-fw"; -		}; - -		icssg1_mdio: mdio@32400 { -			compatible = "ti,davinci_mdio"; -			reg = <0x32400 0x100>; -			clocks = <&k3_clks 63 3>; -			clock-names = "fck"; -			#address-cells = <1>; -			#size-cells = <0>; -			bus_freq = <1000000>; -			status = "disabled"; -		}; -	}; - -	icssg2: icssg@b200000 { -		compatible = "ti,am654-icssg"; -		reg = <0x00 0xb200000 0x00 0x80000>; -		power-domains = <&k3_pds 64 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x00 0xb200000 0x80000>; - -		icssg2_mem: memories@0 { -			reg = <0x0 0x2000>, -			      <0x2000 0x2000>, -			      <0x10000 0x10000>; -			reg-names = "dram0", "dram1", -				    "shrdram2"; -		}; - -		icssg2_cfg: cfg@26000 { -			compatible = "ti,pruss-cfg", "syscon"; -			reg = <0x26000 0x200>; -			#address-cells = <1>; -			#size-cells = <1>; -			ranges = <0x0 0x26000 0x2000>; - -			clocks { -				#address-cells = <1>; -				#size-cells = <0>; - -				icssg2_coreclk_mux: coreclk-mux@3c { -					reg = <0x3c>; -					#clock-cells = <0>; -					clocks = <&k3_clks 64 19>, /* icssg1_core_clk */ -						 <&k3_clks 64 3>;  /* icssg1_iclk */ -					assigned-clocks = <&icssg2_coreclk_mux>; -					assigned-clock-parents = <&k3_clks 64 3>; -				}; - -				icssg2_iepclk_mux: iepclk-mux@30 { -					reg = <0x30>; -					#clock-cells = <0>; -					clocks = <&k3_clks 64 10>,	/* icssg1_iep_clk */ -						 <&icssg2_coreclk_mux>;	/* core_clk */ -					assigned-clocks = <&icssg2_iepclk_mux>; -					assigned-clock-parents = <&icssg2_coreclk_mux>; -				}; -			}; -		}; - -		icssg2_iep0: iep@2e000 { -			compatible = "ti,am654-icss-iep"; -			reg = <0x2e000 0x1000>; -			clocks = <&icssg2_iepclk_mux>; -		}; - -		icssg2_iep1: iep@2f000 { -			compatible = "ti,am654-icss-iep"; -			reg = <0x2f000 0x1000>; -			clocks = <&icssg2_iepclk_mux>; -		}; - -		icssg2_mii_rt: mii-rt@32000 { -			compatible = "ti,pruss-mii", "syscon"; -			reg = <0x32000 0x100>; -		}; - -		icssg2_mii_g_rt: mii-g-rt@33000 { -			compatible = "ti,pruss-mii-g", "syscon"; -			reg = <0x33000 0x1000>; -		}; - -		icssg2_intc: interrupt-controller@20000 { -			compatible = "ti,icssg-intc"; -			reg = <0x20000 0x2000>; -			interrupt-controller; -			#interrupt-cells = <3>; -			interrupts = <GIC_SPI 270 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 271 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 272 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 273 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 274 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 275 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 276 IRQ_TYPE_LEVEL_HIGH>, -				     <GIC_SPI 277 IRQ_TYPE_LEVEL_HIGH>; -			interrupt-names = "host_intr0", "host_intr1", -					  "host_intr2", "host_intr3", -					  "host_intr4", "host_intr5", -					  "host_intr6", "host_intr7"; -		}; - -		pru2_0: pru@34000 { -			compatible = "ti,am654-pru"; -			reg = <0x34000 0x4000>, -			      <0x22000 0x100>, -			      <0x22400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-pru2_0-fw"; -		}; - -		rtu2_0: rtu@4000 { -			compatible = "ti,am654-rtu"; -			reg = <0x4000 0x2000>, -			      <0x23000 0x100>, -			      <0x23400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-rtu2_0-fw"; -		}; - -		tx_pru2_0: txpru@a000 { -			compatible = "ti,am654-tx-pru"; -			reg = <0xa000 0x1800>, -			      <0x25000 0x100>, -			      <0x25400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-txpru2_0-fw"; -		}; - -		pru2_1: pru@38000 { -			compatible = "ti,am654-pru"; -			reg = <0x38000 0x4000>, -			      <0x24000 0x100>, -			      <0x24400 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-pru2_1-fw"; -		}; - -		rtu2_1: rtu@6000 { -			compatible = "ti,am654-rtu"; -			reg = <0x6000 0x2000>, -			      <0x23800 0x100>, -			      <0x23c00 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-rtu2_1-fw"; -		}; - -		tx_pru2_1: txpru@c000 { -			compatible = "ti,am654-tx-pru"; -			reg = <0xc000 0x1800>, -			      <0x25800 0x100>, -			      <0x25c00 0x100>; -			reg-names = "iram", "control", "debug"; -			firmware-name = "am65x-txpru2_1-fw"; -		}; - -		icssg2_mdio: mdio@32400 { -			compatible = "ti,davinci_mdio"; -			reg = <0x32400 0x100>; -			clocks = <&k3_clks 64 3>; -			clock-names = "fck"; -			#address-cells = <1>; -			#size-cells = <0>; -			bus_freq = <1000000>; -			status = "disabled"; -		}; -	}; -}; diff --git a/arch/arm/dts/k3-am65-mcu.dtsi b/arch/arm/dts/k3-am65-mcu.dtsi deleted file mode 100644 index edd5cfbec40..00000000000 --- a/arch/arm/dts/k3-am65-mcu.dtsi +++ /dev/null @@ -1,440 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for AM6 SoC Family MCU Domain peripherals - * - * Copyright (C) 2016-2020 Texas Instruments Incorporated - https://www.ti.com/ - */ - -&cbass_mcu { -	mcu_conf: scm-conf@40f00000 { -		compatible = "syscon", "simple-mfd"; -		reg = <0x0 0x40f00000 0x0 0x20000>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x0 0x0 0x40f00000 0x20000>; - -		phy_gmii_sel: phy@4040 { -			compatible = "ti,am654-phy-gmii-sel"; -			reg = <0x4040 0x4>; -			#phy-cells = <1>; -		}; -	}; - -	/* MCU_TIMERIO pad input CTRLMMR_MCU_TIMER*_CTRL registers */ -	mcu_timerio_input: pinctrl@40f04200 { -		compatible = "pinctrl-single"; -		reg = <0x0 0x40f04200 0x0 0x10>; -		#pinctrl-cells = <1>; -		pinctrl-single,register-width = <32>; -		pinctrl-single,function-mask = <0x00000101>; -	}; - -	/* MCU_TIMERIO pad output CTRLMMR_MCU_TIMERIO*_CTRL registers */ -	mcu_timerio_output: pinctrl@40f04280 { -		compatible = "pinctrl-single"; -		reg = <0x0 0x40f04280 0x0 0x8>; -		#pinctrl-cells = <1>; -		pinctrl-single,register-width = <32>; -		pinctrl-single,function-mask = <0x00000003>; -	}; - -	mcu_uart0: serial@40a00000 { -		compatible = "ti,am654-uart"; -		reg = <0x00 0x40a00000 0x00 0x100>; -		interrupts = <GIC_SPI 565 IRQ_TYPE_LEVEL_HIGH>; -		clock-frequency = <96000000>; -		current-speed = <115200>; -		power-domains = <&k3_pds 149 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	mcu_ram: sram@41c00000 { -		compatible = "mmio-sram"; -		reg = <0x00 0x41c00000 0x00 0x80000>; -		ranges = <0x0 0x00 0x41c00000 0x80000>; -		#address-cells = <1>; -		#size-cells = <1>; -	}; - -	mcu_i2c0: i2c@40b00000 { -		compatible = "ti,am654-i2c", "ti,omap4-i2c"; -		reg = <0x0 0x40b00000 0x0 0x100>; -		interrupts = <GIC_SPI 564 IRQ_TYPE_LEVEL_HIGH>; -		#address-cells = <1>; -		#size-cells = <0>; -		clock-names = "fck"; -		clocks = <&k3_clks 114 1>; -		power-domains = <&k3_pds 114 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	mcu_spi0: spi@40300000 { -		compatible = "ti,am654-mcspi","ti,omap4-mcspi"; -		reg = <0x0 0x40300000 0x0 0x400>; -		interrupts = <GIC_SPI 560 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 142 1>; -		power-domains = <&k3_pds 142 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <0>; -		status = "disabled"; -	}; - -	mcu_spi1: spi@40310000 { -		compatible = "ti,am654-mcspi","ti,omap4-mcspi"; -		reg = <0x0 0x40310000 0x0 0x400>; -		interrupts = <GIC_SPI 561 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 143 1>; -		power-domains = <&k3_pds 143 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <0>; -		status = "disabled"; -	}; - -	mcu_spi2: spi@40320000 { -		compatible = "ti,am654-mcspi","ti,omap4-mcspi"; -		reg = <0x0 0x40320000 0x0 0x400>; -		interrupts = <GIC_SPI 562 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 144 1>; -		power-domains = <&k3_pds 144 TI_SCI_PD_EXCLUSIVE>; -		#address-cells = <1>; -		#size-cells = <0>; -		status = "disabled"; -	}; - -	tscadc0: tscadc@40200000 { -		compatible = "ti,am654-tscadc", "ti,am3359-tscadc"; -		reg = <0x0 0x40200000 0x0 0x1000>; -		interrupts = <GIC_SPI 580 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 0 2>; -		assigned-clocks = <&k3_clks 0 2>; -		assigned-clock-rates = <60000000>; -		clock-names = "fck"; -		dmas = <&mcu_udmap 0x7100>, -			<&mcu_udmap 0x7101 >; -		dma-names = "fifo0", "fifo1"; -		status = "disabled"; - -		adc { -			#io-channel-cells = <1>; -			compatible = "ti,am654-adc", "ti,am3359-adc"; -		}; -	}; - -	tscadc1: tscadc@40210000 { -		compatible = "ti,am654-tscadc", "ti,am3359-tscadc"; -		reg = <0x0 0x40210000 0x0 0x1000>; -		interrupts = <GIC_SPI 581 IRQ_TYPE_LEVEL_HIGH>; -		clocks = <&k3_clks 1 2>; -		assigned-clocks = <&k3_clks 1 2>; -		assigned-clock-rates = <60000000>; -		clock-names = "fck"; -		dmas = <&mcu_udmap 0x7102>, -			<&mcu_udmap 0x7103>; -		dma-names = "fifo0", "fifo1"; -		status = "disabled"; - -		adc { -			#io-channel-cells = <1>; -			compatible = "ti,am654-adc", "ti,am3359-adc"; -		}; -	}; - -	/* -	 * The MCU domain timer interrupts are routed only to the ESM module, -	 * and not currently available for Linux. The MCU domain timers are -	 * of limited use without interrupts, and likely reserved by the ESM. -	 */ -	mcu_timer0: timer@40400000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x40400000 0x00 0x400>; -		clocks = <&k3_clks 35 0>; -		clock-names = "fck"; -		power-domains = <&k3_pds 35 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -		status = "reserved"; -	}; - -	mcu_timer1: timer@40410000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x40410000 0x00 0x400>; -		clocks = <&k3_clks 36 0>; -		clock-names = "fck"; -		power-domains = <&k3_pds 36 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -		status = "reserved"; -	}; - -	mcu_timer2: timer@40420000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x40420000 0x00 0x400>; -		clocks = <&k3_clks 37 0>; -		clock-names = "fck"; -		power-domains = <&k3_pds 37 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -		status = "reserved"; -	}; - -	mcu_timer3: timer@40430000 { -		compatible = "ti,am654-timer"; -		reg = <0x00 0x40430000 0x00 0x400>; -		clocks = <&k3_clks 38 0>; -		clock-names = "fck"; -		power-domains = <&k3_pds 38 TI_SCI_PD_EXCLUSIVE>; -		ti,timer-pwm; -		status = "reserved"; -	}; - -	mcu_navss: bus@28380000 { -		compatible = "simple-bus"; -		#address-cells = <2>; -		#size-cells = <2>; -		ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>; -		dma-coherent; -		dma-ranges; - -		ti,sci-dev-id = <119>; - -		mcu_ringacc: ringacc@2b800000 { -			compatible = "ti,am654-navss-ringacc"; -			reg = <0x0 0x2b800000 0x0 0x400000>, -			      <0x0 0x2b000000 0x0 0x400000>, -			      <0x0 0x28590000 0x0 0x100>, -			      <0x0 0x2a500000 0x0 0x40000>, -			      <0x0 0x28440000 0x0 0x40000>; -			reg-names = "rt", "fifos", "proxy_gcfg", -				    "proxy_target", "cfg"; -			ti,num-rings = <286>; -			ti,sci-rm-range-gp-rings = <0x1>; /* GP ring range */ -			ti,sci = <&dmsc>; -			ti,sci-dev-id = <195>; -			msi-parent = <&inta_main_udmass>; -		}; - -		mcu_udmap: dma-controller@285c0000 { -			compatible = "ti,am654-navss-mcu-udmap"; -			reg = <0x0 0x285c0000 0x0 0x100>, -			      <0x0 0x2a800000 0x0 0x40000>, -			      <0x0 0x2aa00000 0x0 0x40000>; -			reg-names = "gcfg", "rchanrt", "tchanrt"; -			msi-parent = <&inta_main_udmass>; -			#dma-cells = <1>; - -			ti,sci = <&dmsc>; -			ti,sci-dev-id = <194>; -			ti,ringacc = <&mcu_ringacc>; - -			ti,sci-rm-range-tchan = <0xf>, /* TX_HCHAN */ -						<0xd>; /* TX_CHAN */ -			ti,sci-rm-range-rchan = <0xb>, /* RX_HCHAN */ -						<0xa>; /* RX_CHAN */ -			ti,sci-rm-range-rflow = <0x0>; /* GP RFLOW */ -		}; -	}; - -	secure_proxy_mcu: mailbox@2a480000 { -		compatible = "ti,am654-secure-proxy"; -		#mbox-cells = <1>; -		reg-names = "target_data", "rt", "scfg"; -		reg = <0x0 0x2a480000 0x0 0x80000>, -		      <0x0 0x2a380000 0x0 0x80000>, -		      <0x0 0x2a400000 0x0 0x80000>; -		/* -		 * Marked Disabled: -		 * Node is incomplete as it is meant for bootloaders and -		 * firmware on non-MPU processors -		 */ -		status = "disabled"; -	}; - -	m_can0: can@40528000 { -		compatible = "bosch,m_can"; -		reg = <0x0 0x40528000 0x0 0x400>, -		      <0x0 0x40500000 0x0 0x4400>; -		reg-names = "m_can", "message_ram"; -		power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&k3_clks 102 5>, <&k3_clks 102 0>; -		clock-names = "hclk", "cclk"; -		interrupt-parent = <&gic500>; -		interrupts = <GIC_SPI 544 IRQ_TYPE_LEVEL_HIGH>, -			     <GIC_SPI 545 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-names = "int0", "int1"; -		bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; -		status = "disabled"; -	}; - -	m_can1: can@40568000 { -		compatible = "bosch,m_can"; -		reg = <0x0 0x40568000 0x0 0x400>, -		      <0x0 0x40540000 0x0 0x4400>; -		reg-names = "m_can", "message_ram"; -		power-domains = <&k3_pds 103 TI_SCI_PD_EXCLUSIVE>; -		clocks = <&k3_clks 103 5>, <&k3_clks 103 0>; -		clock-names = "hclk", "cclk"; -		interrupt-parent = <&gic500>; -		interrupts = <GIC_SPI 547 IRQ_TYPE_LEVEL_HIGH>, -			     <GIC_SPI 548 IRQ_TYPE_LEVEL_HIGH>; -		interrupt-names = "int0", "int1"; -		bosch,mram-cfg = <0x0 128 64 64 64 64 32 32>; -		status = "disabled"; -	}; - -	fss: bus@47000000 { -		compatible = "simple-bus"; -		#address-cells = <2>; -		#size-cells = <2>; -		ranges; - -		ospi0: spi@47040000 { -			compatible = "ti,am654-ospi", "cdns,qspi-nor"; -			reg = <0x0 0x47040000 0x0 0x100>, -				<0x5 0x00000000 0x1 0x0000000>; -			interrupts = <GIC_SPI 552 IRQ_TYPE_LEVEL_HIGH>; -			cdns,fifo-depth = <256>; -			cdns,fifo-width = <4>; -			cdns,trigger-address = <0x0>; -			clocks = <&k3_clks 248 0>; -			assigned-clocks = <&k3_clks 248 0>; -			assigned-clock-parents = <&k3_clks 248 2>; -			assigned-clock-rates = <166666666>; -			power-domains = <&k3_pds 248 TI_SCI_PD_EXCLUSIVE>; -			#address-cells = <1>; -			#size-cells = <0>; -			status = "disabled"; -		}; - -		ospi1: spi@47050000 { -			compatible = "ti,am654-ospi", "cdns,qspi-nor"; -			reg = <0x0 0x47050000 0x0 0x100>, -				<0x7 0x00000000 0x1 0x00000000>; -			interrupts = <GIC_SPI 553 IRQ_TYPE_LEVEL_HIGH>; -			cdns,fifo-depth = <256>; -			cdns,fifo-width = <4>; -			cdns,trigger-address = <0x0>; -			clocks = <&k3_clks 249 6>; -			power-domains = <&k3_pds 249 TI_SCI_PD_EXCLUSIVE>; -			#address-cells = <1>; -			#size-cells = <0>; -			status = "disabled"; -		}; -	}; - -	mcu_cpsw: ethernet@46000000 { -		compatible = "ti,am654-cpsw-nuss"; -		#address-cells = <2>; -		#size-cells = <2>; -		reg = <0x0 0x46000000 0x0 0x200000>; -		reg-names = "cpsw_nuss"; -		ranges = <0x0 0x0 0x0 0x46000000 0x0 0x200000>; -		dma-coherent; -		clocks = <&k3_clks 5 10>; -		clock-names = "fck"; -		power-domains = <&k3_pds 5 TI_SCI_PD_EXCLUSIVE>; - -		dmas = <&mcu_udmap 0xf000>, -		       <&mcu_udmap 0xf001>, -		       <&mcu_udmap 0xf002>, -		       <&mcu_udmap 0xf003>, -		       <&mcu_udmap 0xf004>, -		       <&mcu_udmap 0xf005>, -		       <&mcu_udmap 0xf006>, -		       <&mcu_udmap 0xf007>, -		       <&mcu_udmap 0x7000>; -		dma-names = "tx0", "tx1", "tx2", "tx3", -			    "tx4", "tx5", "tx6", "tx7", -			    "rx"; - -		ethernet-ports { -			#address-cells = <1>; -			#size-cells = <0>; - -			cpsw_port1: port@1 { -				reg = <1>; -				ti,mac-only; -				label = "port1"; -				ti,syscon-efuse = <&mcu_conf 0x200>; -				phys = <&phy_gmii_sel 1>; -			}; -		}; - -		davinci_mdio: mdio@f00 { -			compatible = "ti,cpsw-mdio","ti,davinci_mdio"; -			reg = <0x0 0xf00 0x0 0x100>; -			#address-cells = <1>; -			#size-cells = <0>; -			clocks = <&k3_clks 5 10>; -			clock-names = "fck"; -			bus_freq = <1000000>; -			status = "disabled"; -		}; - -		cpts@3d000 { -			compatible = "ti,am65-cpts"; -			reg = <0x0 0x3d000 0x0 0x400>; -			clocks = <&mcu_cpsw_cpts_mux>; -			clock-names = "cpts"; -			interrupts-extended = <&gic500 GIC_SPI 570 IRQ_TYPE_LEVEL_HIGH>; -			interrupt-names = "cpts"; -			ti,cpts-ext-ts-inputs = <4>; -			ti,cpts-periodic-outputs = <2>; - -			mcu_cpsw_cpts_mux: refclk-mux { -				#clock-cells = <0>; -				clocks = <&k3_clks 118 5>, <&k3_clks 118 11>, -					<&k3_clks 118 6>, <&k3_clks 118 3>, -					<&k3_clks 118 8>, <&k3_clks 118 14>, -					<&k3_clks 120 3>, <&k3_clks 121 3>; -				assigned-clocks = <&mcu_cpsw_cpts_mux>; -				assigned-clock-parents = <&k3_clks 118 5>; -			}; -		}; -	}; - -	mcu_r5fss0: r5fss@41000000 { -		compatible = "ti,am654-r5fss"; -		ti,cluster-mode = <1>; -		#address-cells = <1>; -		#size-cells = <1>; -		ranges = <0x41000000 0x00 0x41000000 0x20000>, -			 <0x41400000 0x00 0x41400000 0x20000>; -		power-domains = <&k3_pds 129 TI_SCI_PD_EXCLUSIVE>; - -		mcu_r5fss0_core0: r5f@41000000 { -			compatible = "ti,am654-r5f"; -			reg = <0x41000000 0x00008000>, -			      <0x41010000 0x00008000>; -			reg-names = "atcm", "btcm"; -			ti,sci = <&dmsc>; -			ti,sci-dev-id = <159>; -			ti,sci-proc-ids = <0x01 0xff>; -			resets = <&k3_reset 159 1>; -			firmware-name = "am65x-mcu-r5f0_0-fw"; -			ti,atcm-enable = <1>; -			ti,btcm-enable = <1>; -			ti,loczrama = <1>; -		}; - -		mcu_r5fss0_core1: r5f@41400000 { -			compatible = "ti,am654-r5f"; -			reg = <0x41400000 0x00008000>, -			      <0x41410000 0x00008000>; -			reg-names = "atcm", "btcm"; -			ti,sci = <&dmsc>; -			ti,sci-dev-id = <245>; -			ti,sci-proc-ids = <0x02 0xff>; -			resets = <&k3_reset 245 1>; -			firmware-name = "am65x-mcu-r5f0_1-fw"; -			ti,atcm-enable = <1>; -			ti,btcm-enable = <1>; -			ti,loczrama = <1>; -		}; -	}; - -	mcu_rti1: watchdog@40610000 { -		compatible = "ti,j7-rti-wdt"; -		reg = <0x0 0x40610000 0x0 0x100>; -		clocks = <&k3_clks 135 0>; -		power-domains = <&k3_pds 135 TI_SCI_PD_SHARED>; -		assigned-clocks = <&k3_clks 135 0>; -		assigned-clock-parents = <&k3_clks 135 4>; -	}; -}; diff --git a/arch/arm/dts/k3-am65-wakeup.dtsi b/arch/arm/dts/k3-am65-wakeup.dtsi deleted file mode 100644 index fd2b998ebdd..00000000000 --- a/arch/arm/dts/k3-am65-wakeup.dtsi +++ /dev/null @@ -1,105 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for AM6 SoC Family Wakeup Domain peripherals - * - * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ - */ - -&cbass_wakeup { -	dmsc: system-controller@44083000 { -		compatible = "ti,am654-sci"; -		ti,host-id = <12>; - -		mbox-names = "rx", "tx"; - -		mboxes = <&secure_proxy_main 11>, -			 <&secure_proxy_main 13>; - -		reg-names = "debug_messages"; -		reg = <0x44083000 0x1000>; - -		k3_pds: power-controller { -			compatible = "ti,sci-pm-domain"; -			#power-domain-cells = <2>; -		}; - -		k3_clks: clock-controller { -			compatible = "ti,k2g-sci-clk"; -			#clock-cells = <2>; -		}; - -		k3_reset: reset-controller { -			compatible = "ti,sci-reset"; -			#reset-cells = <2>; -		}; -	}; - -	chipid@43000014 { -		compatible = "ti,am654-chipid"; -		reg = <0x43000014 0x4>; -	}; - -	wkup_pmx0: pinctrl@4301c000 { -		compatible = "pinctrl-single"; -		reg = <0x4301c000 0x118>; -		#pinctrl-cells = <1>; -		pinctrl-single,register-width = <32>; -		pinctrl-single,function-mask = <0xffffffff>; -	}; - -	wkup_uart0: serial@42300000 { -		compatible = "ti,am654-uart"; -		reg = <0x42300000 0x100>; -		interrupts = <GIC_SPI 697 IRQ_TYPE_LEVEL_HIGH>; -		clock-frequency = <48000000>; -		current-speed = <115200>; -		power-domains = <&k3_pds 150 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	wkup_i2c0: i2c@42120000 { -		compatible = "ti,am654-i2c", "ti,omap4-i2c"; -		reg = <0x42120000 0x100>; -		interrupts = <GIC_SPI 696 IRQ_TYPE_LEVEL_HIGH>; -		#address-cells = <1>; -		#size-cells = <0>; -		clock-names = "fck"; -		clocks = <&k3_clks 115 1>; -		power-domains = <&k3_pds 115 TI_SCI_PD_EXCLUSIVE>; -		status = "disabled"; -	}; - -	intr_wkup_gpio: interrupt-controller@42200000 { -		compatible = "ti,sci-intr"; -		reg = <0x42200000 0x200>; -		ti,intr-trigger-type = <1>; -		interrupt-controller; -		interrupt-parent = <&gic500>; -		#interrupt-cells = <1>; -		ti,sci = <&dmsc>; -		ti,sci-dev-id = <156>; -		ti,interrupt-ranges = <0 712 16>; -	}; - -	wkup_gpio0: gpio@42110000 { -		compatible = "ti,am654-gpio", "ti,keystone-gpio"; -		reg = <0x42110000 0x100>; -		gpio-controller; -		#gpio-cells = <2>; -		interrupt-parent = <&intr_wkup_gpio>; -		interrupts = <60>, <61>, <62>, <63>; -		interrupt-controller; -		#interrupt-cells = <2>; -		ti,ngpio = <56>; -		ti,davinci-gpio-unbanked = <0>; -		clocks = <&k3_clks 59 0>; -		clock-names = "gpio"; -	}; - -	wkup_vtm0: temperature-sensor@42050000 { -		compatible = "ti,am654-vtm"; -		reg = <0x42050000 0x25c>; -		power-domains = <&k3_pds 80 TI_SCI_PD_EXCLUSIVE>; -		#thermal-sensor-cells = <1>; -	}; -}; diff --git a/arch/arm/dts/k3-am65.dtsi b/arch/arm/dts/k3-am65.dtsi deleted file mode 100644 index 4d7b6155a76..00000000000 --- a/arch/arm/dts/k3-am65.dtsi +++ /dev/null @@ -1,110 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for AM6 SoC Family - * - * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ - */ - -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/interrupt-controller/arm-gic.h> -#include <dt-bindings/soc/ti,sci_pm_domain.h> - -#include "k3-pinctrl.h" - -/ { -	model = "Texas Instruments K3 AM654 SoC"; -	compatible = "ti,am654"; -	interrupt-parent = <&gic500>; -	#address-cells = <2>; -	#size-cells = <2>; - -	chosen { }; - -	firmware { -		optee { -			compatible = "linaro,optee-tz"; -			method = "smc"; -		}; - -		psci: psci { -			compatible = "arm,psci-1.0"; -			method = "smc"; -		}; -	}; - -	a53_timer0: timer-cl0-cpu0 { -		compatible = "arm,armv8-timer"; -		interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, /* cntpsirq */ -			     <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, /* cntpnsirq */ -			     <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, /* cntvirq */ -			     <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; /* cnthpirq */ -	}; - -	pmu: pmu { -		compatible = "arm,cortex-a53-pmu"; -		/* Recommendation from GIC500 TRM Table A.3 */ -		interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>; -	}; - -	cbass_main: bus@100000 { -		compatible = "simple-bus"; -		#address-cells = <2>; -		#size-cells = <2>; -		ranges = <0x00 0x00100000 0x00 0x00100000 0x00 0x00020000>, /* ctrl mmr */ -			 <0x00 0x00600000 0x00 0x00600000 0x00 0x00001100>, /* GPIO */ -			 <0x00 0x00900000 0x00 0x00900000 0x00 0x00012000>, /* serdes */ -			 <0x00 0x01000000 0x00 0x01000000 0x00 0x0af02400>, /* Most peripherals */ -			 <0x00 0x30800000 0x00 0x30800000 0x00 0x0bc00000>, /* MAIN NAVSS */ -			 <0x00 0x70000000 0x00 0x70000000 0x00 0x00200000>, /* MSMC SRAM */ -			 <0x00 0x10000000 0x00 0x10000000 0x00 0x10000000>, /* PCIe DAT */ -			 /* MCUSS Range */ -			 <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>, -			 <0x00 0x40200000 0x00 0x40200000 0x00 0x00900100>, -			 <0x00 0x40f00000 0x00 0x40f00000 0x00 0x00020000>, /* CTRL_MMR0 */ -			 <0x00 0x41000000 0x00 0x41000000 0x00 0x00020000>, -			 <0x00 0x41400000 0x00 0x41400000 0x00 0x00020000>, -			 <0x00 0x41c00000 0x00 0x41c00000 0x00 0x00080000>, -			 <0x00 0x42040000 0x00 0x42040000 0x00 0x03ac2400>, -			 <0x00 0x45100000 0x00 0x45100000 0x00 0x00c24000>, -			 <0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>, -			 <0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>, -			 <0x00 0x50000000 0x00 0x50000000 0x00 0x8000000>, -			 <0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A53 PERIPHBASE */ -			 <0x00 0x70000000 0x00 0x70000000 0x00 0x200000>, -			 <0x05 0x00000000 0x05 0x00000000 0x01 0x0000000>, -			 <0x07 0x00000000 0x07 0x00000000 0x01 0x0000000>; - -		cbass_mcu: bus@28380000 { -			compatible = "simple-bus"; -			#address-cells = <2>; -			#size-cells = <2>; -			ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>, /* MCU NAVSS*/ -				 <0x00 0x40200000 0x00 0x40200000 0x00 0x00900100>, /* First peripheral window */ -				 <0x00 0x40f00000 0x00 0x40f00000 0x00 0x00020000>, /* CTRL_MMR0 */ -				 <0x00 0x41000000 0x00 0x41000000 0x00 0x00020000>, /* MCU R5F Core0 */ -				 <0x00 0x41400000 0x00 0x41400000 0x00 0x00020000>, /* MCU R5F Core1 */ -				 <0x00 0x41c00000 0x00 0x41c00000 0x00 0x00080000>, /* MCU SRAM */ -				 <0x00 0x42040000 0x00 0x42040000 0x00 0x03ac2400>, /* WKUP */ -				 <0x00 0x45100000 0x00 0x45100000 0x00 0x00c24000>, /* MMRs, remaining NAVSS */ -				 <0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>, /* CPSW */ -				 <0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>, /* OSPI space 1 */ -				 <0x00 0x50000000 0x00 0x50000000 0x00 0x8000000>, /*  FSS OSPI0 data region 1 */ -				 <0x05 0x00000000 0x05 0x00000000 0x01 0x0000000>, /* FSS OSPI0 data region 3*/ -				 <0x07 0x00000000 0x07 0x00000000 0x01 0x0000000>; /* FSS OSPI1 data region 3*/ - -			cbass_wakeup: bus@42040000 { -				compatible = "simple-bus"; -				#address-cells = <1>; -				#size-cells = <1>; -				/* WKUP  Basic peripherals */ -				ranges = <0x42040000 0x00 0x42040000 0x03ac2400>; -			}; -		}; -	}; -}; - -/* Now include the peripherals for each bus segments */ -#include "k3-am65-main.dtsi" -#include "k3-am65-mcu.dtsi" -#include "k3-am65-wakeup.dtsi" diff --git a/arch/arm/dts/k3-am654-base-board.dts b/arch/arm/dts/k3-am654-base-board.dts deleted file mode 100644 index 1637ec5ab5e..00000000000 --- a/arch/arm/dts/k3-am654-base-board.dts +++ /dev/null @@ -1,630 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Copyright (C) 2016-2020 Texas Instruments Incorporated - https://www.ti.com/ - */ - -/dts-v1/; - -#include "k3-am654.dtsi" -#include <dt-bindings/input/input.h> -#include <dt-bindings/net/ti-dp83867.h> - -/ { -	compatible = "ti,am654-evm", "ti,am654"; -	model = "Texas Instruments AM654 Base Board"; - -	aliases { -		serial0 = &wkup_uart0; -		serial1 = &mcu_uart0; -		serial2 = &main_uart0; -		i2c0 = &wkup_i2c0; -		i2c1 = &mcu_i2c0; -		i2c2 = &main_i2c0; -		i2c3 = &main_i2c1; -		i2c4 = &main_i2c2; -		ethernet0 = &cpsw_port1; -		mmc0 = &sdhci0; -		mmc1 = &sdhci1; -	}; - -	chosen { -		stdout-path = "serial2:115200n8"; -	}; - -	memory@80000000 { -		device_type = "memory"; -		/* 4G RAM */ -		reg = <0x00000000 0x80000000 0x00000000 0x80000000>, -		      <0x00000008 0x80000000 0x00000000 0x80000000>; -	}; - -	reserved-memory { -		#address-cells = <2>; -		#size-cells = <2>; -		ranges; - -		secure_ddr: secure-ddr@9e800000 { -			reg = <0 0x9e800000 0 0x01800000>; /* for OP-TEE */ -			alignment = <0x1000>; -			no-map; -		}; - -		mcu_r5fss0_core0_dma_memory_region: r5f-dma-memory@a0000000 { -			compatible = "shared-dma-pool"; -			reg = <0 0xa0000000 0 0x100000>; -			no-map; -		}; - -		mcu_r5fss0_core0_memory_region: r5f-memory@a0100000 { -			compatible = "shared-dma-pool"; -			reg = <0 0xa0100000 0 0xf00000>; -			no-map; -		}; - -		mcu_r5fss0_core1_dma_memory_region: r5f-dma-memory@a1000000 { -			compatible = "shared-dma-pool"; -			reg = <0 0xa1000000 0 0x100000>; -			no-map; -		}; - -		mcu_r5fss0_core1_memory_region: r5f-memory@a1100000 { -			compatible = "shared-dma-pool"; -			reg = <0 0xa1100000 0 0xf00000>; -			no-map; -		}; - -		rtos_ipc_memory_region: ipc-memories@a2000000 { -			reg = <0x00 0xa2000000 0x00 0x00100000>; -			alignment = <0x1000>; -			no-map; -		}; -	}; - -	gpio-keys { -		compatible = "gpio-keys"; -		autorepeat; -		pinctrl-names = "default"; -		pinctrl-0 = <&push_button_pins_default>; - -		switch-5 { -			label = "GPIO Key USER1"; -			linux,code = <BTN_0>; -			gpios = <&wkup_gpio0 24 GPIO_ACTIVE_LOW>; -		}; - -		switch-6 { -			label = "GPIO Key USER2"; -			linux,code = <BTN_1>; -			gpios = <&wkup_gpio0 27 GPIO_ACTIVE_LOW>; -		}; -	}; - -	evm_12v0: regulator-0 { -		/* main supply */ -		compatible = "regulator-fixed"; -		regulator-name = "evm_12v0"; -		regulator-min-microvolt = <12000000>; -		regulator-max-microvolt = <12000000>; -		regulator-always-on; -		regulator-boot-on; -	}; - -	vcc3v3_io: regulator-1 { -		/* Output of TPS54334 */ -		compatible = "regulator-fixed"; -		regulator-name = "vcc3v3_io"; -		regulator-min-microvolt = <3300000>; -		regulator-max-microvolt = <3300000>; -		regulator-always-on; -		regulator-boot-on; -		vin-supply = <&evm_12v0>; -	}; - -	vdd_mmc1_sd: regulator-2 { -		compatible = "regulator-fixed"; -		regulator-name = "vdd_mmc1_sd"; -		regulator-min-microvolt = <3300000>; -		regulator-max-microvolt = <3300000>; -		regulator-boot-on; -		enable-active-high; -		vin-supply = <&vcc3v3_io>; -		gpio = <&pca9554 4 GPIO_ACTIVE_HIGH>; -	}; - -	vtt_supply: regulator-3 { -		compatible = "regulator-fixed"; -		regulator-name = "vtt"; -		pinctrl-names = "default"; -		pinctrl-0 = <&ddr_vtt_pins_default>; -		regulator-min-microvolt = <3300000>; -		regulator-max-microvolt = <3300000>; -		enable-active-high; -		regulator-always-on; -		regulator-boot-on; -		vin-supply = <&vcc3v3_io>; -		gpio = <&wkup_gpio0 28 GPIO_ACTIVE_HIGH>; -	}; -}; - -&wkup_pmx0 { -	wkup_uart0_pins_default: wkup-uart0-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x00a0, PIN_INPUT, 0)	/* (AB1) WKUP_UART0_RXD */ -			AM65X_WKUP_IOPAD(0x00a4, PIN_OUTPUT, 0)	/* (AB5) WKUP_UART0_TXD */ -			AM65X_WKUP_IOPAD(0x00c8, PIN_INPUT, 1)	/* (AC2) WKUP_GPIO0_6.WKUP_UART0_CTSn */ -			AM65X_WKUP_IOPAD(0x00cc, PIN_OUTPUT, 1)	/* (AC1) WKUP_GPIO0_7.WKUP_UART0_RTSn */ -		>; -	}; - -	ddr_vtt_pins_default: ddr-vtt-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x0040, PIN_OUTPUT_PULLUP, 7)	/* WKUP_GPIO0_28 */ -		>; -	}; - -	wkup_i2c0_pins_default: wkup-i2c0-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x00e0, PIN_INPUT, 0) /* (AC7) WKUP_I2C0_SCL */ -			AM65X_WKUP_IOPAD(0x00e4, PIN_INPUT, 0) /* (AD6) WKUP_I2C0_SDA */ -		>; -	}; - -	push_button_pins_default: push-button-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x0030, PIN_INPUT, 7) /* (R5) WKUP_GPIO0_24 */ -			AM65X_WKUP_IOPAD(0x003c, PIN_INPUT, 7) /* (P2) WKUP_GPIO0_27 */ -		>; -	}; - -	mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x0000, PIN_OUTPUT, 0) /* (V1) MCU_OSPI0_CLK */ -			AM65X_WKUP_IOPAD(0x0008, PIN_INPUT, 0)	 /* (U2) MCU_OSPI0_DQS */ -			AM65X_WKUP_IOPAD(0x000c, PIN_INPUT, 0)  /* (U4) MCU_OSPI0_D0 */ -			AM65X_WKUP_IOPAD(0x0010, PIN_INPUT, 0)  /* (U5) MCU_OSPI0_D1 */ -			AM65X_WKUP_IOPAD(0x0014, PIN_INPUT, 0)  /* (T2) MCU_OSPI0_D2 */ -			AM65X_WKUP_IOPAD(0x0018, PIN_INPUT, 0)  /* (T3) MCU_OSPI0_D3 */ -			AM65X_WKUP_IOPAD(0x001c, PIN_INPUT, 0)  /* (T4) MCU_OSPI0_D4 */ -			AM65X_WKUP_IOPAD(0x0020, PIN_INPUT, 0)  /* (T5) MCU_OSPI0_D5 */ -			AM65X_WKUP_IOPAD(0x0024, PIN_INPUT, 0)  /* (R2) MCU_OSPI0_D6 */ -			AM65X_WKUP_IOPAD(0x0028, PIN_INPUT, 0)  /* (R3) MCU_OSPI0_D7 */ -			AM65X_WKUP_IOPAD(0x002c, PIN_OUTPUT, 0) /* (R4) MCU_OSPI0_CSn0 */ -		>; -	}; - -	wkup_pca554_default: wkup-pca554-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x0034, PIN_INPUT, 7) /* (T1) MCU_OSPI1_CLK.WKUP_GPIO0_25 */ -		>; -	}; - -	mcu_uart0_pins_default: mcu-uart0-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x0044, PIN_INPUT, 4)	/* (P4) MCU_OSPI1_D1.MCU_UART0_RXD */ -			AM65X_WKUP_IOPAD(0x0048, PIN_OUTPUT, 4)	/* (P5) MCU_OSPI1_D2.MCU_UART0_TXD */ -			AM65X_WKUP_IOPAD(0x004C, PIN_INPUT, 4)	/* (P1) MCU_OSPI1_D3.MCU_UART0_CTSn */ -			AM65X_WKUP_IOPAD(0x0054, PIN_OUTPUT, 4)	/* (N3) MCU_OSPI1_CSn1.MCU_UART0_RTSn */ -		>; -	}; - -	mcu_cpsw_pins_default: mcu-cpsw-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x0058, PIN_OUTPUT, 0) /* (N4) MCU_RGMII1_TX_CTL */ -			AM65X_WKUP_IOPAD(0x005c, PIN_INPUT, 0) /* (N5) MCU_RGMII1_RX_CTL */ -			AM65X_WKUP_IOPAD(0x0060, PIN_OUTPUT, 0) /* (M2) MCU_RGMII1_TD3 */ -			AM65X_WKUP_IOPAD(0x0064, PIN_OUTPUT, 0) /* (M3) MCU_RGMII1_TD2 */ -			AM65X_WKUP_IOPAD(0x0068, PIN_OUTPUT, 0) /* (M4) MCU_RGMII1_TD1 */ -			AM65X_WKUP_IOPAD(0x006c, PIN_OUTPUT, 0) /* (M5) MCU_RGMII1_TD0 */ -			AM65X_WKUP_IOPAD(0x0078, PIN_INPUT, 0) /* (L2) MCU_RGMII1_RD3 */ -			AM65X_WKUP_IOPAD(0x007c, PIN_INPUT, 0) /* (L5) MCU_RGMII1_RD2 */ -			AM65X_WKUP_IOPAD(0x0080, PIN_INPUT, 0) /* (M6) MCU_RGMII1_RD1 */ -			AM65X_WKUP_IOPAD(0x0084, PIN_INPUT, 0) /* (L6) MCU_RGMII1_RD0 */ -			AM65X_WKUP_IOPAD(0x0070, PIN_OUTPUT, 0) /* (N1) MCU_RGMII1_TXC */ -			AM65X_WKUP_IOPAD(0x0074, PIN_INPUT, 0) /* (M1) MCU_RGMII1_RXC */ -		>; -	}; - -	mcu_mdio_pins_default: mcu-mdio1-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x008c, PIN_OUTPUT, 0) /* (L1) MCU_MDIO0_MDC */ -			AM65X_WKUP_IOPAD(0x0088, PIN_INPUT, 0) /* (L4) MCU_MDIO0_MDIO */ -		>; -	}; - -	mcu_i2c0_pins_default: mcu-i2c0-default-pins { -		pinctrl-single,pins = < -			AM65X_WKUP_IOPAD(0x00e8, PIN_INPUT,  0) /* (AD8) MCU_I2C0_SCL */ -			AM65X_WKUP_IOPAD(0x00ec, PIN_INPUT,  0) /* (AD7) MCU_I2C0_SDA */ -		>; -	}; -}; - -&main_pmx0 { -	main_uart0_pins_default: main-uart0-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x01e4, PIN_INPUT, 0)	/* (AF11) UART0_RXD */ -			AM65X_IOPAD(0x01e8, PIN_OUTPUT, 0)	/* (AE11) UART0_TXD */ -			AM65X_IOPAD(0x01ec, PIN_INPUT, 0)	/* (AG11) UART0_CTSn */ -			AM65X_IOPAD(0x01f0, PIN_OUTPUT, 0)	/* (AD11) UART0_RTSn */ -		>; -	}; - -	main_i2c2_pins_default: main-i2c2-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x0074, PIN_INPUT, 5) /* (T27) GPMC0_CSn3.I2C2_SCL */ -			AM65X_IOPAD(0x0070, PIN_INPUT, 5) /* (R25) GPMC0_CSn2.I2C2_SDA */ -		>; -	}; - -	main_spi0_pins_default: main-spi0-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x01c4, PIN_INPUT, 0) /* (AH13) SPI0_CLK */ -			AM65X_IOPAD(0x01c8, PIN_INPUT, 0) /* (AE13) SPI0_D0 */ -			AM65X_IOPAD(0x01cc, PIN_INPUT, 0) /* (AD13) SPI0_D1 */ -			AM65X_IOPAD(0x01bc, PIN_OUTPUT, 0) /* (AG13) SPI0_CS0 */ -		>; -	}; - -	main_mmc0_pins_default: main-mmc0-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x01a8, PIN_INPUT_PULLDOWN, 0) /* (B25) MMC0_CLK */ -			AM65X_IOPAD(0x01ac, PIN_INPUT_PULLUP, 0) /* (B27) MMC0_CMD */ -			AM65X_IOPAD(0x01a4, PIN_INPUT_PULLUP, 0) /* (A26) MMC0_DAT0 */ -			AM65X_IOPAD(0x01a0, PIN_INPUT_PULLUP, 0) /* (E25) MMC0_DAT1 */ -			AM65X_IOPAD(0x019c, PIN_INPUT_PULLUP, 0) /* (C26) MMC0_DAT2 */ -			AM65X_IOPAD(0x0198, PIN_INPUT_PULLUP, 0) /* (A25) MMC0_DAT3 */ -			AM65X_IOPAD(0x0194, PIN_INPUT_PULLUP, 0) /* (E24) MMC0_DAT4 */ -			AM65X_IOPAD(0x0190, PIN_INPUT_PULLUP, 0) /* (A24) MMC0_DAT5 */ -			AM65X_IOPAD(0x018c, PIN_INPUT_PULLUP, 0) /* (B26) MMC0_DAT6 */ -			AM65X_IOPAD(0x0188, PIN_INPUT_PULLUP, 0) /* (D25) MMC0_DAT7 */ -			AM65X_IOPAD(0x01b4, PIN_INPUT_PULLUP, 0) /* (A23) MMC0_SDCD */ -			AM65X_IOPAD(0x01b0, PIN_INPUT, 0) /* (C25) MMC0_DS */ -		>; -	}; - -	main_mmc1_pins_default: main-mmc1-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x02d4, PIN_INPUT_PULLDOWN, 0) /* (C27) MMC1_CLK */ -			AM65X_IOPAD(0x02d8, PIN_INPUT_PULLUP, 0) /* (C28) MMC1_CMD */ -			AM65X_IOPAD(0x02d0, PIN_INPUT_PULLUP, 0) /* (D28) MMC1_DAT0 */ -			AM65X_IOPAD(0x02cc, PIN_INPUT_PULLUP, 0) /* (E27) MMC1_DAT1 */ -			AM65X_IOPAD(0x02c8, PIN_INPUT_PULLUP, 0) /* (D26) MMC1_DAT2 */ -			AM65X_IOPAD(0x02c4, PIN_INPUT_PULLUP, 0) /* (D27) MMC1_DAT3 */ -			AM65X_IOPAD(0x02dc, PIN_INPUT_PULLUP, 0) /* (B24) MMC1_SDCD */ -			AM65X_IOPAD(0x02e0, PIN_INPUT, 0) /* (C24) MMC1_SDWP */ -		>; -	}; - -	usb1_pins_default: usb1-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x02c0, PIN_OUTPUT, 0) /* (AC8) USB1_DRVVBUS */ -		>; -	}; -}; - -&main_pmx1 { -	main_i2c0_pins_default: main-i2c0-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x0000, PIN_INPUT, 0) /* (D20) I2C0_SCL */ -			AM65X_IOPAD(0x0004, PIN_INPUT, 0) /* (C21) I2C0_SDA */ -		>; -	}; - -	main_i2c1_pins_default: main-i2c1-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x0008, PIN_INPUT, 0) /* (B21) I2C1_SCL */ -			AM65X_IOPAD(0x000c, PIN_INPUT, 0) /* (E21) I2C1_SDA */ -		>; -	}; - -	ecap0_pins_default: ecap0-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x0010, PIN_INPUT, 0) /* (D21) ECAP0_IN_APWM_OUT */ -		>; -	}; -}; - -&wkup_uart0 { -	/* Wakeup UART is used by System firmware */ -	status = "reserved"; -	pinctrl-names = "default"; -	pinctrl-0 = <&wkup_uart0_pins_default>; -}; - -&mcu_uart0 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&mcu_uart0_pins_default>; -}; - -&main_uart0 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&main_uart0_pins_default>; -	power-domains = <&k3_pds 146 TI_SCI_PD_SHARED>; -}; - -&wkup_i2c0 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&wkup_i2c0_pins_default>; -	clock-frequency = <400000>; - -	eeprom@50 { -		/* AT24CM01 */ -		compatible = "atmel,24c1024"; -		reg = <0x50>; -	}; - -	vdd_mpu: regulator@60 { -		compatible = "ti,tps62363"; -		reg = <0x60>; -		regulator-name = "VDD_MPU"; -		regulator-min-microvolt = <500000>; -		regulator-max-microvolt = <1770000>; -		regulator-always-on; -		regulator-boot-on; -		ti,vsel0-state-high; -		ti,vsel1-state-high; -		ti,enable-vout-discharge; -	}; - -	gpio@38 { -		compatible = "nxp,pca9554"; -		reg = <0x38>; -		gpio-controller; -		#gpio-cells = <2>; -	}; - -	pca9554: gpio@39 { -		compatible = "nxp,pca9554"; -		reg = <0x39>; -		gpio-controller; -		#gpio-cells = <2>; -		pinctrl-names = "default"; -		pinctrl-0 = <&wkup_pca554_default>; -		interrupt-parent = <&wkup_gpio0>; -		interrupts = <25 IRQ_TYPE_EDGE_FALLING>; -		interrupt-controller; -		#interrupt-cells = <2>; -	}; -}; - -&mcu_i2c0 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&mcu_i2c0_pins_default>; -	clock-frequency = <400000>; -}; - -&main_i2c0 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&main_i2c0_pins_default>; -	clock-frequency = <400000>; - -	pca9555: gpio@21 { -		compatible = "nxp,pca9555"; -		reg = <0x21>; -		gpio-controller; -		#gpio-cells = <2>; -	}; -}; - -&main_i2c1 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&main_i2c1_pins_default>; -	clock-frequency = <400000>; -}; - -&main_i2c2 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&main_i2c2_pins_default>; -	clock-frequency = <400000>; -}; - -&ecap0 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&ecap0_pins_default>; -}; - -&main_spi0 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&main_spi0_pins_default>; -	#address-cells = <1>; -	#size-cells = <0>; -	ti,pindir-d0-out-d1-in; - -	flash@0 { -		compatible = "jedec,spi-nor"; -		reg = <0x0>; -		spi-tx-bus-width = <1>; -		spi-rx-bus-width = <1>; -		spi-max-frequency = <48000000>; -	}; -}; - -&sdhci0 { -	pinctrl-names = "default"; -	pinctrl-0 = <&main_mmc0_pins_default>; -	bus-width = <8>; -	non-removable; -	ti,driver-strength-ohm = <50>; -	disable-wp; -}; - -/* - * Because of erratas i2025 and i2026 for silicon revision 1.0, the - * SD card interface might fail. Boards with sr1.0 are recommended to - * disable sdhci1 - */ -&sdhci1 { -	vmmc-supply = <&vdd_mmc1_sd>; -	pinctrl-names = "default"; -	pinctrl-0 = <&main_mmc1_pins_default>; -	ti,driver-strength-ohm = <50>; -	disable-wp; -}; - -&usb1 { -	pinctrl-names = "default"; -	pinctrl-0 = <&usb1_pins_default>; -	dr_mode = "otg"; -}; - -&dwc3_0 { -	status = "disabled"; -}; - -&usb0_phy { -	status = "disabled"; -}; - -&tscadc0 { -	status = "okay"; -	adc { -		ti,adc-channels = <0 1 2 3 4 5 6 7>; -	}; -}; - -&tscadc1 { -	status = "okay"; -	adc { -		ti,adc-channels = <0 1 2 3 4 5 6 7>; -	}; -}; - -&serdes0 { -	status = "disabled"; -}; - -&serdes1 { -	status = "disabled"; -}; - -&mailbox0_cluster0 { -	status = "okay"; -	interrupts = <436>; - -	mbox_mcu_r5fss0_core0: mbox-mcu-r5fss0-core0 { -		ti,mbox-tx = <1 0 0>; -		ti,mbox-rx = <0 0 0>; -	}; -}; - -&mailbox0_cluster1 { -	status = "okay"; -	interrupts = <432>; - -	mbox_mcu_r5fss0_core1: mbox-mcu-r5fss0-core1 { -		ti,mbox-tx = <1 0 0>; -		ti,mbox-rx = <0 0 0>; -	}; -}; - -&mcu_r5fss0_core0 { -	memory-region = <&mcu_r5fss0_core0_dma_memory_region>, -			<&mcu_r5fss0_core0_memory_region>; -	mboxes = <&mailbox0_cluster0>, <&mbox_mcu_r5fss0_core0>; -}; - -&mcu_r5fss0_core1 { -	memory-region = <&mcu_r5fss0_core1_dma_memory_region>, -			<&mcu_r5fss0_core1_memory_region>; -	mboxes = <&mailbox0_cluster1>, <&mbox_mcu_r5fss0_core1>; -}; - -&ospi0 { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&mcu_fss0_ospi0_pins_default>; - -	flash@0 { -		compatible = "jedec,spi-nor"; -		reg = <0x0>; -		spi-tx-bus-width = <8>; -		spi-rx-bus-width = <8>; -		spi-max-frequency = <25000000>; -		cdns,tshsl-ns = <60>; -		cdns,tsd2d-ns = <60>; -		cdns,tchsh-ns = <60>; -		cdns,tslch-ns = <60>; -		cdns,read-delay = <0>; - -		partitions { -			compatible = "fixed-partitions"; -			#address-cells = <1>; -			#size-cells = <1>; - -			partition@0 { -				label = "ospi.tiboot3"; -				reg = <0x0 0x80000>; -			}; - -			partition@80000 { -				label = "ospi.tispl"; -				reg = <0x80000 0x200000>; -			}; - -			partition@280000 { -				label = "ospi.u-boot"; -				reg = <0x280000 0x400000>; -			}; - -			partition@680000 { -				label = "ospi.env"; -				reg = <0x680000 0x20000>; -			}; - -			partition@6a0000 { -				label = "ospi.env.backup"; -				reg = <0x6a0000 0x20000>; -			}; - -			partition@6c0000 { -				label = "ospi.sysfw"; -				reg = <0x6c0000 0x100000>; -			}; - -			partition@800000 { -				label = "ospi.rootfs"; -				reg = <0x800000 0x37c0000>; -			}; - -			partition@3fe0000 { -				label = "ospi.phypattern"; -				reg = <0x3fe0000 0x20000>; -			}; -		}; -	}; -}; - -&mcu_cpsw { -	pinctrl-names = "default"; -	pinctrl-0 = <&mcu_cpsw_pins_default>; -}; - -&davinci_mdio { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&mcu_mdio_pins_default>; - -	phy0: ethernet-phy@0 { -		reg = <0>; -		ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>; -		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; -	}; -}; - -&cpsw_port1 { -	phy-mode = "rgmii-rxid"; -	phy-handle = <&phy0>; -}; - -&dss { -	status = "disabled"; -}; diff --git a/arch/arm/dts/k3-am654-icssg2.dtso b/arch/arm/dts/k3-am654-icssg2.dtso deleted file mode 100644 index faefa2febcf..00000000000 --- a/arch/arm/dts/k3-am654-icssg2.dtso +++ /dev/null @@ -1,145 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/** - * DT overlay for enabling ICSSG2 on AM654 EVM - * - * Copyright (C) 2018-2023 Texas Instruments Incorporated - https://www.ti.com/ - */ - -/dts-v1/; -/plugin/; - -#include <dt-bindings/net/ti-dp83867.h> -#include "k3-pinctrl.h" - -&{/} { -	aliases { -		ethernet1 = "/icssg2-eth/ethernet-ports/port@0"; -		ethernet2 = "/icssg2-eth/ethernet-ports/port@1"; -	}; - -	/* Ethernet node on PRU-ICSSG2 */ -	icssg2_eth: icssg2-eth { -		compatible = "ti,am654-icssg-prueth"; -		pinctrl-names = "default"; -		pinctrl-0 = <&icssg2_rgmii_pins_default>; -		sram = <&msmc_ram>; -		ti,prus = <&pru2_0>, <&rtu2_0>, <&tx_pru2_0>, -			<&pru2_1>, <&rtu2_1>, <&tx_pru2_1>; -		firmware-name = "ti-pruss/am65x-sr2-pru0-prueth-fw.elf", -				"ti-pruss/am65x-sr2-rtu0-prueth-fw.elf", -				"ti-pruss/am65x-sr2-txpru0-prueth-fw.elf", -				"ti-pruss/am65x-sr2-pru1-prueth-fw.elf", -				"ti-pruss/am65x-sr2-rtu1-prueth-fw.elf", -				"ti-pruss/am65x-sr2-txpru1-prueth-fw.elf"; - -		ti,pruss-gp-mux-sel = <2>,      /* MII mode */ -				      <2>, -				      <2>, -				      <2>,	/* MII mode */ -				      <2>, -				      <2>; - -		ti,mii-g-rt = <&icssg2_mii_g_rt>; -		ti,mii-rt = <&icssg2_mii_rt>; -		ti,iep = <&icssg2_iep0>, <&icssg2_iep1>; - -		interrupt-parent = <&icssg2_intc>; -		interrupts = <24 0 2>, <25 1 3>; -		interrupt-names = "tx_ts0", "tx_ts1"; - -		dmas = <&main_udmap 0xc300>, /* egress slice 0 */ -		       <&main_udmap 0xc301>, /* egress slice 0 */ -		       <&main_udmap 0xc302>, /* egress slice 0 */ -		       <&main_udmap 0xc303>, /* egress slice 0 */ -		       <&main_udmap 0xc304>, /* egress slice 1 */ -		       <&main_udmap 0xc305>, /* egress slice 1 */ -		       <&main_udmap 0xc306>, /* egress slice 1 */ -		       <&main_udmap 0xc307>, /* egress slice 1 */ -		       <&main_udmap 0x4300>, /* ingress slice 0 */ -		       <&main_udmap 0x4301>; /* ingress slice 1 */ - -		dma-names = "tx0-0", "tx0-1", "tx0-2", "tx0-3", -			    "tx1-0", "tx1-1", "tx1-2", "tx1-3", -			    "rx0", "rx1"; -		ethernet-ports { -			#address-cells = <1>; -			#size-cells = <0>; -			icssg2_emac0: port@0 { -				reg = <0>; -				phy-handle = <&icssg2_phy0>; -				phy-mode = "rgmii-id"; -				ti,syscon-rgmii-delay = <&scm_conf 0x4120>; -				/* Filled in by bootloader */ -				local-mac-address = [00 00 00 00 00 00]; -			}; -			icssg2_emac1: port@1 { -				reg = <1>; -				phy-handle = <&icssg2_phy1>; -				phy-mode = "rgmii-id"; -				ti,syscon-rgmii-delay = <&scm_conf 0x4124>; -				/* Filled in by bootloader */ -				local-mac-address = [00 00 00 00 00 00]; -			}; -		}; -	}; -}; - -&main_pmx0 { - -	icssg2_mdio_pins_default: icssg2-mdio-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x0094, PIN_INPUT, 2) /* (AC19) PRG2_PRU0_GPO7.PRG2_MDIO0_MDIO */ -			AM65X_IOPAD(0x00c8, PIN_OUTPUT, 2) /* (AE15) PRG2_PRU1_GPO7.PRG2_MDIO0_MDC */ -		>; -	}; - -	icssg2_rgmii_pins_default: icssg2-rgmii-default-pins { -		pinctrl-single,pins = < -			AM65X_IOPAD(0x00ac, PIN_INPUT, 2) /* (AH15) PRG2_PRU1_GPO0.PRG2_RGMII2_RD0 */ -			AM65X_IOPAD(0x00b0, PIN_INPUT, 2) /* (AC16) PRG2_PRU1_GPO1.PRG2_RGMII2_RD1 */ -			AM65X_IOPAD(0x00b4, PIN_INPUT, 2) /* (AD17) PRG2_PRU1_GPO2.PRG2_RGMII2_RD2 */ -			AM65X_IOPAD(0x00b8, PIN_INPUT, 2) /* (AH14) PRG2_PRU1_GPO3.PRG2_RGMII2_RD3 */ -			AM65X_IOPAD(0x00cc, PIN_OUTPUT, 2) /* (AD15) PRG2_PRU1_GPO8.PRG2_RGMII2_TD0 */ -			AM65X_IOPAD(0x00d0, PIN_OUTPUT, 2) /* (AF14) PRG2_PRU1_GPO9.PRG2_RGMII2_TD1 */ -			AM65X_IOPAD(0x00d4, PIN_OUTPUT, 2) /* (AC15) PRG2_PRU1_GPO10.PRG2_RGMII2_TD2 */ -			AM65X_IOPAD(0x00d8, PIN_OUTPUT, 2) /* (AD14) PRG2_PRU1_GPO11.PRG2_RGMII2_TD3 */ -			AM65X_IOPAD(0x00dc, PIN_INPUT, 2) /* (AE14) PRG2_PRU1_GPO16.PRG2_RGMII2_TXC */ -			AM65X_IOPAD(0x00c4, PIN_OUTPUT, 2) /* (AC17) PRG2_PRU1_GPO6.PRG2_RGMII2_TX_CTL */ -			AM65X_IOPAD(0x00c0, PIN_INPUT, 2) /* (AG15) PRG2_PRU1_GPO5.PRG2_RGMII2_RXC */ -			AM65X_IOPAD(0x00bc, PIN_INPUT, 2) /* (AG14) PRG2_PRU1_GPO4.PRG2_RGMII2_RX_CTL */ - -			AM65X_IOPAD(0x0078, PIN_INPUT, 2) /* (AF18) PRG2_PRU0_GPO0.PRG2_RGMII1_RD0 */ -			AM65X_IOPAD(0x007c, PIN_INPUT, 2) /* (AE18) PRG2_PRU0_GPO1.PRG2_RGMII1_RD1 */ -			AM65X_IOPAD(0x0080, PIN_INPUT, 2) /* (AH17) PRG2_PRU0_GPO2.PRG2_RGMII1_RD2 */ -			AM65X_IOPAD(0x0084, PIN_INPUT, 2) /* (AG18) PRG2_PRU0_GPO3.PRG2_RGMII1_RD3 */ -			AM65X_IOPAD(0x0098, PIN_OUTPUT, 2) /* (AH16) PRG2_PRU0_GPO8.PRG2_RGMII1_TD0 */ -			AM65X_IOPAD(0x009c, PIN_OUTPUT, 2) /* (AG16) PRG2_PRU0_GPO9.PRG2_RGMII1_TD1 */ -			AM65X_IOPAD(0x00a0, PIN_OUTPUT, 2) /* (AF16) PRG2_PRU0_GPO10.PRG2_RGMII1_TD2 */ -			AM65X_IOPAD(0x00a4, PIN_OUTPUT, 2) /* (AE16) PRG2_PRU0_GPO11.PRG2_RGMII1_TD3 */ -			AM65X_IOPAD(0x00a8, PIN_INPUT, 2) /* (AD16) PRG2_PRU0_GPO16.PRG2_RGMII1_TXC */ -			AM65X_IOPAD(0x0090, PIN_OUTPUT, 2) /* (AE17) PRG2_PRU0_GPO6.PRG2_RGMII1_TX_CTL */ -			AM65X_IOPAD(0x008c, PIN_INPUT, 2) /* (AF17) PRG2_PRU0_GPO5.PRG2_RGMII1_RXC */ -			AM65X_IOPAD(0x0088, PIN_INPUT, 2) /* (AG17) PRG2_PRU0_GPO4.PRG2_RGMII1_RX_CTL */ -		>; -	}; -}; - -&icssg2_mdio { -	status = "okay"; -	pinctrl-names = "default"; -	pinctrl-0 = <&icssg2_mdio_pins_default>; -	#address-cells = <1>; -	#size-cells = <0>; - -	icssg2_phy0: ethernet-phy@0 { -		reg = <0>; -		ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>; -		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; -	}; - -	icssg2_phy1: ethernet-phy@3 { -		reg = <3>; -		ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>; -		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>; -	}; -}; diff --git a/arch/arm/dts/k3-am654-industrial-thermal.dtsi b/arch/arm/dts/k3-am654-industrial-thermal.dtsi deleted file mode 100644 index 9021c738056..00000000000 --- a/arch/arm/dts/k3-am654-industrial-thermal.dtsi +++ /dev/null @@ -1,45 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 - -#include <dt-bindings/thermal/thermal.h> - -mpu0_thermal: mpu0-thermal { -	polling-delay-passive = <250>; /* milliseconds */ -	polling-delay = <500>; /* milliseconds */ -	thermal-sensors = <&wkup_vtm0 0>; - -	trips { -		mpu0_crit: mpu0-crit { -			temperature = <125000>; /* milliCelsius */ -			hysteresis = <2000>; /* milliCelsius */ -			type = "critical"; -		}; -	}; -}; - -mpu1_thermal: mpu1-thermal { -	polling-delay-passive = <250>; /* milliseconds */ -	polling-delay = <500>; /* milliseconds */ -	thermal-sensors = <&wkup_vtm0 1>; - -	trips { -		mpu1_crit: mpu1-crit { -			temperature = <125000>; /* milliCelsius */ -			hysteresis = <2000>; /* milliCelsius */ -			type = "critical"; -		}; -	}; -}; - -mcu_thermal: mcu-thermal { -	polling-delay-passive = <250>; /* milliseconds */ -	polling-delay = <500>; /* milliseconds */ -	thermal-sensors = <&wkup_vtm0 2>; - -	trips { -		mcu_crit: mcu-crit { -			temperature = <125000>; /* milliCelsius */ -			hysteresis = <2000>; /* milliCelsius */ -			type = "critical"; -		}; -	}; -}; diff --git a/arch/arm/dts/k3-am654.dtsi b/arch/arm/dts/k3-am654.dtsi deleted file mode 100644 index 888567b921f..00000000000 --- a/arch/arm/dts/k3-am654.dtsi +++ /dev/null @@ -1,122 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Device Tree Source for AM6 SoC family in Quad core configuration - * - * Copyright (C) 2016-2018 Texas Instruments Incorporated - https://www.ti.com/ - */ - -#include "k3-am65.dtsi" - -/ { -	cpus { -		#address-cells = <1>; -		#size-cells = <0>; -		cpu-map { -			cluster0: cluster0 { -				core0 { -					cpu = <&cpu0>; -				}; - -				core1 { -					cpu = <&cpu1>; -				}; -			}; - -			cluster1: cluster1 { -				core0 { -					cpu = <&cpu2>; -				}; - -				core1 { -					cpu = <&cpu3>; -				}; -			}; -		}; - -		cpu0: cpu@0 { -			compatible = "arm,cortex-a53"; -			reg = <0x000>; -			device_type = "cpu"; -			enable-method = "psci"; -			i-cache-size = <0x8000>; -			i-cache-line-size = <64>; -			i-cache-sets = <256>; -			d-cache-size = <0x8000>; -			d-cache-line-size = <64>; -			d-cache-sets = <128>; -			next-level-cache = <&L2_0>; -		}; - -		cpu1: cpu@1 { -			compatible = "arm,cortex-a53"; -			reg = <0x001>; -			device_type = "cpu"; -			enable-method = "psci"; -			i-cache-size = <0x8000>; -			i-cache-line-size = <64>; -			i-cache-sets = <256>; -			d-cache-size = <0x8000>; -			d-cache-line-size = <64>; -			d-cache-sets = <128>; -			next-level-cache = <&L2_0>; -		}; - -		cpu2: cpu@100 { -			compatible = "arm,cortex-a53"; -			reg = <0x100>; -			device_type = "cpu"; -			enable-method = "psci"; -			i-cache-size = <0x8000>; -			i-cache-line-size = <64>; -			i-cache-sets = <256>; -			d-cache-size = <0x8000>; -			d-cache-line-size = <64>; -			d-cache-sets = <128>; -			next-level-cache = <&L2_1>; -		}; - -		cpu3: cpu@101 { -			compatible = "arm,cortex-a53"; -			reg = <0x101>; -			device_type = "cpu"; -			enable-method = "psci"; -			i-cache-size = <0x8000>; -			i-cache-line-size = <64>; -			i-cache-sets = <256>; -			d-cache-size = <0x8000>; -			d-cache-line-size = <64>; -			d-cache-sets = <128>; -			next-level-cache = <&L2_1>; -		}; -	}; - -	L2_0: l2-cache0 { -		compatible = "cache"; -		cache-level = <2>; -		cache-unified; -		cache-size = <0x80000>; -		cache-line-size = <64>; -		cache-sets = <512>; -		next-level-cache = <&msmc_l3>; -	}; - -	L2_1: l2-cache1 { -		compatible = "cache"; -		cache-level = <2>; -		cache-unified; -		cache-size = <0x80000>; -		cache-line-size = <64>; -		cache-sets = <512>; -		next-level-cache = <&msmc_l3>; -	}; - -	msmc_l3: l3-cache0 { -		compatible = "cache"; -		cache-level = <3>; -		cache-unified; -	}; - -	thermal_zones: thermal-zones { -		#include "k3-am654-industrial-thermal.dtsi" -	}; -}; diff --git a/arch/arm/dts/k3-am65x-binman.dtsi b/arch/arm/dts/k3-am65x-binman.dtsi index d0cd4889cde..350775e42c2 100644 --- a/arch/arm/dts/k3-am65x-binman.dtsi +++ b/arch/arm/dts/k3-am65x-binman.dtsi @@ -95,10 +95,10 @@  #ifdef CONFIG_TARGET_AM654_A53_EVM -#define SPL_AM654_EVM_DTB "spl/dts/k3-am654-base-board.dtb" +#define SPL_AM654_EVM_DTB "spl/dts/ti/k3-am654-base-board.dtb"  #define AM654_EVM_DTB "u-boot.dtb" -#define AM654_EVM_ICSSG2_DTBO "arch/arm/dts/k3-am654-icssg2.dtbo" +#define AM654_EVM_ICSSG2_DTBO "ti/k3-am654-icssg2.dtbo"  &binman {  	ti-spl { diff --git a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi index 4b8d73a92d6..4ca05f32f0b 100644 --- a/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi +++ b/arch/arm/dts/k3-am68-sk-base-board-u-boot.dtsi @@ -109,10 +109,6 @@  	bootph-all;  }; -&ospi0 { -	status = "disabled"; -}; -  &ospi1 {  	status = "disabled";  }; diff --git a/arch/arm/dts/k3-am68-sk-r5-base-board.dts b/arch/arm/dts/k3-am68-sk-r5-base-board.dts index 3b2d7af2e52..b61d22b3b4b 100644 --- a/arch/arm/dts/k3-am68-sk-r5-base-board.dts +++ b/arch/arm/dts/k3-am68-sk-r5-base-board.dts @@ -10,3 +10,8 @@  #include "k3-j721s2-ddr.dtsi"  #include "k3-am68-sk-base-board-u-boot.dtsi"  #include "k3-j721s2-r5.dtsi" + +&wkup_vtm0 { +	bootph-pre-ram; +	vdd-supply-2 = <&tps62873a>; +}; diff --git a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts index f096b102793..5fc4a39c8c4 100644 --- a/arch/arm/dts/k3-j7200-r5-common-proc-board.dts +++ b/arch/arm/dts/k3-j7200-r5-common-proc-board.dts @@ -23,11 +23,12 @@  				<&k3_pds 202 TI_SCI_PD_EXCLUSIVE>,  				<&k3_pds 4 TI_SCI_PD_EXCLUSIVE>;  		resets = <&k3_reset 202 0>; -		clocks = <&k3_clks 61 1>, <&k3_clks 202 2>; -		clock-names = "gtc", "core"; -		assigned-clocks = <&k3_clks 202 2>, <&k3_clks 61 1>, <&k3_clks 323 0>; -		assigned-clock-parents= <0>, <0>, <&k3_clks 323 2>; -		assigned-clock-rates = <2000000000>, <200000000>; +		clocks = <&k3_clks 61 1>, <&k3_clks 202 2>, <&k3_clks 4 1> ; +		clock-names = "gtc", "core", "msmc"; +		assigned-clocks = <&k3_clks 202 2>, <&k3_clks 61 1>, <&k3_clks 4 1>, +						  <&k3_clks 323 0>; +		assigned-clock-parents= <0>, <0>, <0>, <&k3_clks 323 2>; +		assigned-clock-rates = <2000000000>, <200000000>, <1000000000>;  		ti,sci = <&dmsc>;  		ti,sci-proc-id = <32>;  		ti,sci-host-id = <10>; @@ -53,6 +54,10 @@  };  &mcu_timer0 { +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents;  	clock-frequency = <250000000>;  	bootph-pre-ram;  }; diff --git a/arch/arm/dts/k3-j721e-r5.dtsi b/arch/arm/dts/k3-j721e-r5.dtsi index 688a6cf4089..786a41c5e90 100644 --- a/arch/arm/dts/k3-j721e-r5.dtsi +++ b/arch/arm/dts/k3-j721e-r5.dtsi @@ -42,7 +42,11 @@  };  &mcu_timer0 { -	status = "okay"; +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents; +	clock-frequency = <166666666>;  	bootph-pre-ram;  }; diff --git a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts index 506ad9b7910..09afdf3954a 100644 --- a/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts +++ b/arch/arm/dts/k3-j721s2-r5-common-proc-board.dts @@ -13,6 +13,10 @@  &tps659411 {  	bootph-pre-ram; +	esm: esm { +		compatible = "ti,tps659413-esm"; +		bootph-pre-ram; +	};  };  &wkup_vtm0 { diff --git a/arch/arm/dts/k3-j721s2-r5.dtsi b/arch/arm/dts/k3-j721s2-r5.dtsi index 634676c8491..a820f516015 100644 --- a/arch/arm/dts/k3-j721s2-r5.dtsi +++ b/arch/arm/dts/k3-j721s2-r5.dtsi @@ -43,6 +43,10 @@  };  &mcu_timer0 { +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents;  	clock-frequency = <250000000>;  	bootph-pre-ram;  }; diff --git a/arch/arm/dts/k3-j722s-r5-evm.dts b/arch/arm/dts/k3-j722s-r5-evm.dts index 5e5c2e3111e..08286ed792d 100644 --- a/arch/arm/dts/k3-j722s-r5-evm.dts +++ b/arch/arm/dts/k3-j722s-r5-evm.dts @@ -77,6 +77,14 @@  	};  }; +&main_timer0 { +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents; +	clock-frequency = <25000000>; +}; +  /* WKUP UART0 is used for DM firmware logs */  &wkup_uart0 {  	status = "okay"; diff --git a/arch/arm/dts/k3-j784s4-r5.dtsi b/arch/arm/dts/k3-j784s4-r5.dtsi index 0cd0ccc2dea..a1394115b8b 100644 --- a/arch/arm/dts/k3-j784s4-r5.dtsi +++ b/arch/arm/dts/k3-j784s4-r5.dtsi @@ -41,7 +41,10 @@  };  &mcu_timer0 { -	status = "okay"; +	/delete-property/ clocks; +	/delete-property/ clocks-names; +	/delete-property/ assigned-clocks; +	/delete-property/ assigned-clock-parents;  	clock-frequency = <250000000>;  	bootph-pre-ram;  }; @@ -104,3 +107,9 @@  &mcu_udmap {  	ti,sci = <&dm_tifs>;  }; + +&wkup_vtm0 { +	bootph-pre-ram; +	vdd-supply-2 = <&tps62873a>; +}; + diff --git a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi index c3704d789e8..531767cfdb2 100644 --- a/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi +++ b/arch/arm/dts/r8a779g0-white-hawk-u-boot.dtsi @@ -13,6 +13,14 @@  	};  }; +&avb1 { +	status = "disabled"; +}; + +&avb2 { +	status = "disabled"; +}; +  &rpc {  	flash@0 {  		spi-tx-bus-width = <1>; diff --git a/arch/arm/dts/socfpga_stratix10.dtsi b/arch/arm/dts/socfpga_stratix10.dtsi index eb82d663204..eb82d663204 100755..100644 --- a/arch/arm/dts/socfpga_stratix10.dtsi +++ b/arch/arm/dts/socfpga_stratix10.dtsi diff --git a/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi b/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi index ef0df769762..ef0df769762 100755..100644 --- a/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi +++ b/arch/arm/dts/socfpga_stratix10_socdk-u-boot.dtsi diff --git a/arch/arm/dts/socfpga_stratix10_socdk.dts b/arch/arm/dts/socfpga_stratix10_socdk.dts index e6d8fe6a907..e6d8fe6a907 100755..100644 --- a/arch/arm/dts/socfpga_stratix10_socdk.dts +++ b/arch/arm/dts/socfpga_stratix10_socdk.dts diff --git a/arch/arm/dts/zynqmp-binman-mini.dts b/arch/arm/dts/zynqmp-binman-mini.dts new file mode 100644 index 00000000000..8f3d18ef394 --- /dev/null +++ b/arch/arm/dts/zynqmp-binman-mini.dts @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) Copyright 2024, Advanced Micro Devices, Inc. + * + * Michal Simek <michal.simek@amd.com> + */ + +/dts-v1/; + +#include "zynqmp-u-boot.dtsi" diff --git a/arch/arm/dts/zynqmp-binman-som.dts b/arch/arm/dts/zynqmp-binman-som.dts new file mode 100644 index 00000000000..3d9d8476c98 --- /dev/null +++ b/arch/arm/dts/zynqmp-binman-som.dts @@ -0,0 +1,225 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for Xilinx ZynqMP SOMs (k24/k26) + * + * (C) Copyright 2024, Advanced Micro Devices, Inc. + * + * Michal Simek <michal.simek@amd.com> + */ + +#include <config.h> + +/dts-v1/; +/ { +	binman: binman { +		multiple-images; +		fit-dtb.blob { +			filename = "fit-dtb.blob"; +			pad-byte = <0>; +			fit { +				fit,align = <0x8>; +				fit,external-offset = <0x0>; +				description = "DTBs for SOMs+CCs"; +				fit,fdt-list-val = "zynqmp-smk-k26-revA", "zynqmp-smk-k26-revA-sck-kr-g-revA", +						"zynqmp-smk-k26-revA-sck-kr-g-revB", "zynqmp-smk-k26-revA-sck-kv-g-revA", +						"zynqmp-smk-k26-revA-sck-kv-g-revB", "zynqmp-sm-k26-revA-sck-kv-g-revA", +						"zynqmp-sm-k26-revA-sck-kv-g-revB", "zynqmp-sm-k26-revA-sck-kr-g-revB", +						"zynqmp-smk-k24-revA-sck-kd-g-revA", "zynqmp-smk-k24-revA-sck-kv-g-revB", +						"zynqmp-smk-k24-revA-sck-kr-g-revB", "zynqmp-sm-k24-revA-sck-kd-g-revA", +						"zynqmp-sm-k24-revA-sck-kv-g-revB", "zynqmp-sm-k24-revA-sck-kr-g-revB"; + +				images { +					@fdt-SEQ { +						description = "NAME"; +						type = "flat_dt"; +						arch = "arm64"; +						compression = "none"; +						hash-1 { +							algo = "md5"; +						}; +					}; +				}; +				configurations { +					default = "conf-1"; +					conf-1 { +						description = "SOM itself"; +						fdt = "fdt-1"; +					}; +					conf-2 { +						description = "zynqmp-smk-k26-.*-sck-kr-g-revA"; +						fdt = "fdt-2"; +					}; +					conf-3 { +						description = "zynqmp-smk-k26-.*-sck-kr-g-.*"; +						fdt = "fdt-3"; +					}; +					conf-4 { +						description = "zynqmp-smk-k26-.*-sck-kv-g-rev[AZ]"; +						fdt = "fdt-4"; +					}; +					conf-5 { +						description = "zynqmp-smk-k26-.*-sck-kv-g-.*"; +						fdt = "fdt-5"; +					}; +					conf-6 { +						description = "zynqmp-sm-k26-.*-sck-kv-g-rev[AZ]"; +						fdt = "fdt-6"; +					}; +					conf-7 { +						description = "zynqmp-sm-k26-.*-sck-kv-g-.*"; +						fdt = "fdt-7"; +					}; +					conf-8 { +						description = "zynqmp-sm-k26-.*-sck-kr-g-.*"; +						fdt = "fdt-8"; +					}; +					conf-9 { +						description = "zynqmp-smk-k24-.*-sck-kd-g-.*"; +						fdt = "fdt-9"; +					}; +					conf-10 { +						description = "zynqmp-smk-k24-.*-sck-kv-g-.*"; +						fdt = "fdt-10"; +					}; +					conf-11 { +						description = "zynqmp-smk-k24-.*-sck-kr-g-.*"; +						fdt = "fdt-11"; +					}; +					conf-12 { +						description = "zynqmp-sm-k24-.*-sck-kd-g-.*"; +						fdt = "fdt-12"; +					}; +					conf-13 { +						description = "zynqmp-sm-k24-.*-sck-kv-g-.*"; +						fdt = "fdt-13"; +					}; +					conf-14 { +						description = "zynqmp-sm-k24-.*-sck-kr-g-.*"; +						fdt = "fdt-14"; +					}; +				}; +			}; +		}; + +		/* u-boot.itb generation in a static way */ +		itb { +			filename = "u-boot.itb"; +			pad-byte = <0>; + +			fit { +				description = "Configuration for Xilinx ZynqMP SoC"; +				fit,align = <0x8>; +				fit,external-offset = <0x0>; +				images { +					uboot { +						description = "U-Boot (64-bit)"; +						type = "firmware"; +						os = "u-boot"; +						arch = "arm64"; +						compression = "none"; +						load = /bits/ 64 <CONFIG_TEXT_BASE>; +						entry = /bits/ 64 <CONFIG_TEXT_BASE>; +						hash { +							algo = "md5"; +						}; +						u-boot-nodtb { +						}; +					}; +					atf { +						description = "Trusted Firmware-A"; +						type = "firmware"; +						os = "arm-trusted-firmware"; +						arch = "arm64"; +						compression = "none"; +						load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						hash { +							algo = "md5"; +						}; +						atf-bl31 { +							optional; +						}; +					}; +					tee { +						description = "OP-TEE"; +						type = "tee"; +						arch = "arm64"; +						compression = "none"; +						os = "tee"; +						load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						tee-os { +							optional; +						}; +					}; +					fdt { +						description = "Multi DTB fit image"; +						type = "flat_dt"; +						arch = "arm64"; +						compression = "none"; +						load = <0x0 0x100000>; +						hash { +							algo = "md5"; +						}; +						fdt-blob { +							filename = "fit-dtb.blob"; +							type = "blob-ext"; +						}; +					}; +				}; +				configurations { +					default = "conf-1"; +					conf-1 { +						description = "Multi DTB with TF-A/TEE"; +						firmware = "atf"; +						loadables = "tee", "uboot", "fdt"; +					}; +				}; +			}; +		}; + +		/* boot.bin generated with version string inside */ +		bootimage { +			filename = "boot.bin"; +			pad-byte = <0>; + +			blob-ext@1 { +				offset = <0x0>; +				filename = "spl/boot.bin"; +			}; +			/* Optional version string at offset 0x70 */ +			blob-ext@2 { +				offset = <0x70>; +				filename = "version.bin"; +				overlap; +				optional; +			}; +			/* Optional version string at offset 0x94 */ +			blob-ext@3 { +				offset = <0x94>; +				filename = "version.bin"; +				overlap; +				optional; +			}; +		}; + +#ifdef CONFIG_SYS_SPI_U_BOOT_OFFS +		/* Full QSPI image for recovery app */ +		image { +			filename = "qspi.bin"; +			pad-byte = <0>; + +			blob-ext@1 { +				offset = <0x0>; +				filename = "boot.bin"; +			}; +			blob-ext@2 { +				offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>; +				filename = "u-boot.itb"; +			}; +			fdtmap { +			}; +		}; +#endif +	}; +}; diff --git a/arch/arm/dts/zynqmp-binman.dts b/arch/arm/dts/zynqmp-binman.dts new file mode 100644 index 00000000000..675f6bf51eb --- /dev/null +++ b/arch/arm/dts/zynqmp-binman.dts @@ -0,0 +1,206 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * dts file for Xilinx ZynqMP platforms + * + * (C) Copyright 2024, Advanced Micro Devices, Inc. + * + * Michal Simek <michal.simek@amd.com> + */ + +#include <config.h> + +/dts-v1/; +/ { +	binman: binman { +		multiple-images; + +		/* u-boot.itb generation in a static way */ +		itb { +			filename = "u-boot.itb"; +			pad-byte = <0>; + +			fit { +				description = "Configuration for Xilinx ZynqMP SoC"; +				fit,align = <0x8>; +				fit,external-offset = <0x0>; +				fit,fdt-list = "of-list"; +				images { +					uboot { +						description = "U-Boot (64-bit)"; +						type = "firmware"; +						os = "u-boot"; +						arch = "arm64"; +						compression = "none"; +						load = /bits/ 64 <CONFIG_TEXT_BASE>; +						entry = /bits/ 64 <CONFIG_TEXT_BASE>; +						hash { +							algo = "md5"; +						}; +						u-boot-nodtb { +						}; +					}; +					atf { +						description = "Trusted Firmware-A"; +						type = "firmware"; +						os = "arm-trusted-firmware"; +						arch = "arm64"; +						compression = "none"; +						load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						hash { +							algo = "md5"; +						}; +						atf-bl31 { +							optional; +						}; +					}; +					tee { +						description = "OP-TEE"; +						type = "tee"; +						arch = "arm64"; +						compression = "none"; +						os = "tee"; +						load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						tee-os { +							optional; +						}; +					}; +					@fdt-SEQ { +						description = "NAME"; +						type = "flat_dt"; +						arch = "arm64"; +						compression = "none"; +						load = <0x0 0x100000>; +						hash-1 { +							algo = "md5"; +						}; +					}; +				}; +				configurations { +					default = "@conf-DEFAULT-SEQ"; +					@conf-SEQ { +						description = "NAME"; +						firmware = "atf"; +						loadables = "tee", "uboot"; +						fdt = "fdt-SEQ"; +					}; +				}; +			}; +		}; + +		itb-single { +			filename = "u-boot-single.itb"; +			pad-byte = <0>; + +			fit { +				description = "Configuration for Xilinx ZynqMP SoC"; +				fit,align = <0x8>; +				fit,external-offset = <0x0>; +				fit,fdt-list = "of-list"; +				images { +					uboot { +						description = "U-Boot (64-bit)"; +						type = "firmware"; +						os = "u-boot"; +						arch = "arm64"; +						compression = "none"; +						load = /bits/ 64 <CONFIG_TEXT_BASE>; +						entry = /bits/ 64 <CONFIG_TEXT_BASE>; +						hash { +							algo = "md5"; +						}; +						u-boot-nodtb { +						}; +					}; +					atf { +						description = "Trusted Firmware-A"; +						type = "firmware"; +						os = "arm-trusted-firmware"; +						arch = "arm64"; +						compression = "none"; +						load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						hash { +							algo = "md5"; +						}; +						atf-bl31 { +							optional; +						}; +					}; +					tee { +						description = "OP-TEE"; +						type = "tee"; +						arch = "arm64"; +						compression = "none"; +						os = "tee"; +						load = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						entry = /bits/ 64 <CONFIG_BL31_LOAD_ADDR>; +						tee-os { +							optional; +						}; +					}; +					fdt { +						description = "DT"; +						type = "flat_dt"; +						arch = "arm64"; +						compression = "none"; +						load = <0x0 0x100000>; +						uboot-fdt-blob { +							filename = "u-boot.dtb"; +							type = "blob-ext"; +						}; +						hash-1 { +							algo = "md5"; +						}; + +					}; +				}; +				configurations { +					default = "conf-1"; +					conf-1 { +						description = "Single DT"; +						firmware = "atf"; +						loadables = "tee", "uboot"; +						fdt = "fdt"; +					}; +				}; +			}; +		}; + +#ifdef CONFIG_SYS_SPI_U_BOOT_OFFS +		/* QSPI image for testing QSPI boot mode */ +		image { +			filename = "qspi.bin"; +			pad-byte = <0>; + +			blob-ext@1 { +				offset = <0x0>; +				filename = "spl/boot.bin"; +			}; +			blob-ext@2 { +				offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>; +				filename = "u-boot.itb"; +			}; +			fdtmap { +			}; +		}; + +		image-single { +			filename = "qspi-single.bin"; +			pad-byte = <0>; + +			blob-ext@1 { +				offset = <0x0>; +				filename = "spl/boot.bin"; +			}; +			blob-ext@2 { +				offset = <CONFIG_SYS_SPI_U_BOOT_OFFS>; +				filename = "u-boot-single.itb"; +			}; +			fdtmap { +			}; +		}; +#endif +	}; +}; diff --git a/arch/arm/dts/zynqmp-clk-ccf.dtsi b/arch/arm/dts/zynqmp-clk-ccf.dtsi index dd4569e7bd9..60d1b1acf9a 100644 --- a/arch/arm/dts/zynqmp-clk-ccf.dtsi +++ b/arch/arm/dts/zynqmp-clk-ccf.dtsi @@ -70,6 +70,22 @@  	clocks = <&zynqmp_clk ACPU>;  }; +&cpu0_debug { +	clocks = <&zynqmp_clk DBF_FPD>; +}; + +&cpu1_debug { +	clocks = <&zynqmp_clk DBF_FPD>; +}; + +&cpu2_debug { +	clocks = <&zynqmp_clk DBF_FPD>; +}; + +&cpu3_debug { +	clocks = <&zynqmp_clk DBF_FPD>; +}; +  &fpd_dma_chan1 {  	clocks = <&zynqmp_clk GDMA_REF>, <&zynqmp_clk LPD_LSBUS>;  }; diff --git a/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso index 4de29d5d3ff..d56e863ce1c 100644 --- a/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso +++ b/arch/arm/dts/zynqmp-sck-kd-g-revA.dtso @@ -80,7 +80,10 @@  				  "", "";  	}; -	/* usb5744@2d */ +	hub: usb-hub@2d { /* u36 */ +		compatible = "microchip,usb5744"; +		reg = <0x2d>; +	};  };  /* USB 3.0 */ @@ -99,18 +102,6 @@  	phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;  	reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;  	assigned-clock-rates = <250000000>, <20000000>; -#if 0 -	usbhub0: usb-hub { /* u36 */ -		i2c-bus = <&i2c1>; -		compatible = "microchip,usb5744"; -		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; -	}; - -	usb2244: usb-sd { /* u41 */ -		compatible = "microchip,usb2244"; -		reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>; -	}; -#endif  };  &dwc3_0 { @@ -118,6 +109,26 @@  	dr_mode = "host";  	snps,usb3_lpm_capable;  	maximum-speed = "super-speed"; +	#address-cells = <1>; +	#size-cells = <0>; + +	/* 2.0 hub on port 1 */ +	hub_2_0: hub@1 { +		compatible = "usb424,2744"; +		reg = <1>; +		peer-hub = <&hub_3_0>; +		i2c-bus = <&hub>; +		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; +	}; + +	/* 3.0 hub on port 2 */ +	hub_3_0: hub@2 { +		compatible = "usb424,5744"; +		reg = <2>; +		peer-hub = <&hub_2_0>; +		i2c-bus = <&hub>; +		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; +	};  };  &gem1 { /* mdio mio50/51 */ diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso index 6349a0e1087..9d0c0c2885d 100644 --- a/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso +++ b/arch/arm/dts/zynqmp-sck-kr-g-revA.dtso @@ -105,11 +105,19 @@  			#address-cells = <1>;  			#size-cells = <0>;  			reg = <0>; +			hub_1: usb-hub@2d { +				compatible = "microchip,usb5744"; +				reg = <0x2d>; +			};  		};  		usbhub_i2c1: i2c@1 {  			#address-cells = <1>;  			#size-cells = <0>;  			reg = <1>; +			hub_2: usb-hub@2d { +				compatible = "microchip,usb5744"; +				reg = <0x2d>; +			};  		};  		/* Bus 2/3 are not connected */  	}; @@ -145,18 +153,6 @@  	phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;  	reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;  	assigned-clock-rates = <250000000>, <20000000>; -#if 0 -	usbhub0: usb-hub { /* u43 */ -		i2c-bus = <&usbhub_i2c0>; -		compatible = "microchip,usb5744"; -		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; -	}; - -	usb2244: usb-sd { /* u38 */ -		compatible = "microchip,usb2244"; -		reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>; -	}; -#endif  };  &dwc3_0 { @@ -164,6 +160,26 @@  	dr_mode = "host";  	snps,usb3_lpm_capable;  	maximum-speed = "super-speed"; +	#address-cells = <1>; +	#size-cells = <0>; + +	/* 2.0 hub on port 1 */ +	hub_2_0: hub@1 { +		compatible = "usb424,2744"; +		reg = <1>; +		peer-hub = <&hub_3_0>; +		i2c-bus = <&hub_1>; +		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; +	}; + +	/* 3.0 hub on port 2 */ +	hub_3_0: hub@2 { +		compatible = "usb424,5744"; +		reg = <2>; +		peer-hub = <&hub_2_0>; +		i2c-bus = <&hub_1>; +		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; +	};  };  &usb1 { /* mio64 - mio75 */ @@ -174,13 +190,6 @@  	phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;  	reset-gpios = <&slg7xl45106 1 GPIO_ACTIVE_LOW>;  	assigned-clock-rates = <250000000>, <20000000>; -#if 0 -	usbhub1: usb-hub { /* u84 */ -		i2c-bus = <&usbhub_i2c1>; -		compatible = "microchip,usb5744"; -		reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>; -	}; -#endif  };  &dwc3_1 { @@ -188,6 +197,26 @@  	dr_mode = "host";  	snps,usb3_lpm_capable;  	maximum-speed = "super-speed"; +	#address-cells = <1>; +	#size-cells = <0>; + +	/* 2.0 hub on port 1 */ +	hub1_2_0: hub@1 { +		compatible = "usb424,2744"; +		reg = <1>; +		peer-hub = <&hub1_3_0>; +		i2c-bus = <&hub_2>; +		reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>; +	}; + +	/* 3.0 hub on port 2 */ +	hub1_3_0: hub@2 { +		compatible = "usb424,5744"; +		reg = <2>; +		peer-hub = <&hub1_2_0>; +		i2c-bus = <&hub_2>; +		reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>; +	};  };  &gem0 { /* mdio mio50/51 */ diff --git a/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso index b0d737d3caf..0d915d496ca 100644 --- a/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso +++ b/arch/arm/dts/zynqmp-sck-kr-g-revB.dtso @@ -117,11 +117,19 @@  			#address-cells = <1>;  			#size-cells = <0>;  			reg = <0>; +			hub_1: usb-hub@2d { +				compatible = "microchip,usb5744"; +				reg = <0x2d>; +			};  		};  		usbhub_i2c1: i2c@1 {  			#address-cells = <1>;  			#size-cells = <0>;  			reg = <1>; +			hub_2: usb-hub@2d { +				compatible = "microchip,usb5744"; +				reg = <0x2d>; +			};  		};  		/* Bus 2/3 are not connected */  	}; @@ -165,18 +173,6 @@  	phys = <&psgtr 2 PHY_TYPE_USB3 0 2>;  	reset-gpios = <&slg7xl45106 0 GPIO_ACTIVE_LOW>;  	assigned-clock-rates = <250000000>, <20000000>; -#if 0 -	usbhub0: usb-hub { /* u43 */ -		i2c-bus = <&usbhub_i2c0>; -		compatible = "microchip,usb5744"; -		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; -	}; - -	usb2244: usb-sd { /* u38 */ -		compatible = "microchip,usb2244"; -		reset-gpios = <&slg7xl45106 2 GPIO_ACTIVE_LOW>; -	}; -#endif  };  &dwc3_0 { @@ -184,6 +180,26 @@  	dr_mode = "host";  	snps,usb3_lpm_capable;  	maximum-speed = "super-speed"; +	#address-cells = <1>; +	#size-cells = <0>; + +	/* 2.0 hub on port 1 */ +	hub_2_0: hub@1 { +		compatible = "usb424,2744"; +		reg = <1>; +		peer-hub = <&hub_3_0>; +		i2c-bus = <&hub_1>; +		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; +	}; + +	/* 3.0 hub on port 2 */ +	hub_3_0: hub@2 { +		compatible = "usb424,5744"; +		reg = <2>; +		peer-hub = <&hub_2_0>; +		i2c-bus = <&hub_1>; +		reset-gpios = <&slg7xl45106 3 GPIO_ACTIVE_LOW>; +	};  };  &usb1 { /* mio64 - mio75 */ @@ -194,14 +210,6 @@  	phys = <&psgtr 3 PHY_TYPE_USB3 1 2>;  	reset-gpios = <&slg7xl45106 1 GPIO_ACTIVE_LOW>;  	assigned-clock-rates = <250000000>, <20000000>; - -#if 0 -	usbhub1: usb-hub { /* u84 */ -		i2c-bus = <&usbhub_i2c1>; -		compatible = "microchip,usb5744"; -		reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>; -	}; -#endif  };  &dwc3_1 { @@ -209,6 +217,26 @@  	dr_mode = "host";  	snps,usb3_lpm_capable;  	maximum-speed = "super-speed"; +	#address-cells = <1>; +	#size-cells = <0>; + +	/* 2.0 hub on port 1 */ +	hub1_2_0: hub@1 { +		compatible = "usb424,2744"; +		reg = <1>; +		peer-hub = <&hub1_3_0>; +		i2c-bus = <&hub_2>; +		reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>; +	}; + +	/* 3.0 hub on port 2 */ +	hub1_3_0: hub@2 { +		compatible = "usb424,5744"; +		reg = <2>; +		peer-hub = <&hub1_2_0>; +		i2c-bus = <&hub_2>; +		reset-gpios = <&slg7xl45106 4 GPIO_ACTIVE_LOW>; +	};  };  &gem0 { /* mdio mio50/51 */ diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso index 561b546e37f..a98a888d138 100644 --- a/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso +++ b/arch/arm/dts/zynqmp-sck-kv-g-revA.dtso @@ -129,12 +129,6 @@  	pinctrl-0 = <&pinctrl_usb0_default>;  	phy-names = "usb3-phy";  	phys = <&psgtr 2 PHY_TYPE_USB3 0 1>; -#if 0 -	usbhub: usb5744 { /* u43 */ -		compatible = "microchip,usb5744"; -		reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>; -	}; -#endif  };  &dwc3_0 { @@ -142,6 +136,24 @@  	dr_mode = "host";  	snps,usb3_lpm_capable;  	maximum-speed = "super-speed"; +	#address-cells = <1>; +	#size-cells = <0>; + +	/* 2.0 hub on port 1 */ +	hub_2_0: hub@1 { +		compatible = "usb424,2744"; +		reg = <1>; +		peer-hub = <&hub_3_0>; +		reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>; +	}; + +	/* 3.0 hub on port 2 */ +	hub_3_0: hub@2 { +		compatible = "usb424,5744"; +		reg = <2>; +		peer-hub = <&hub_2_0>; +		reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>; +	};  };  &sdhci1 { /* on CC with tuned parameters */ diff --git a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso index 64683e0ccbb..7490efea98b 100644 --- a/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso +++ b/arch/arm/dts/zynqmp-sck-kv-g-revB.dtso @@ -92,7 +92,10 @@  		label = "ina260-u14";  		reg = <0x40>;  	}; -	/* u43 - 0x2d - USB hub */ +	hub: usb-hub@2d { +		compatible = "microchip,usb5744"; +		reg = <0x2d>; +	};  	/* u27 - 0xe0 - STDP4320 DP/HDMI splitter */  }; @@ -131,14 +134,6 @@  	phy-names = "usb3-phy";  	phys = <&psgtr 2 PHY_TYPE_USB3 0 1>;  	assigned-clock-rates = <250000000>, <20000000>; -#if 0 -	usb5744: usb-hub { /* u43 */ -		status = "okay"; -		compatible = "microchip,usb5744"; -		i2c-bus = <&i2c1>; -		reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>; -	}; -#endif  };  &dwc3_0 { @@ -146,6 +141,26 @@  	dr_mode = "host";  	snps,usb3_lpm_capable;  	maximum-speed = "super-speed"; +	#address-cells = <1>; +	#size-cells = <0>; + +	/* 2.0 hub on port 1 */ +	hub_2_0: hub@1 { +		compatible = "usb424,2744"; +		reg = <1>; +		peer-hub = <&hub_3_0>; +		i2c-bus = <&hub>; +		reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>; +	}; + +	/* 3.0 hub on port 2 */ +	hub_3_0: hub@2 { +		compatible = "usb424,5744"; +		reg = <2>; +		peer-hub = <&hub_2_0>; +		i2c-bus = <&hub>; +		reset-gpios = <&gpio 44 GPIO_ACTIVE_LOW>; +	};  };  &sdhci1 { /* on CC with tuned parameters */ diff --git a/arch/arm/dts/zynqmp-sm-k26-revA.dts b/arch/arm/dts/zynqmp-sm-k26-revA.dts index 8c43ade9405..620f5185cc4 100644 --- a/arch/arm/dts/zynqmp-sm-k26-revA.dts +++ b/arch/arm/dts/zynqmp-sm-k26-revA.dts @@ -3,7 +3,7 @@   * dts file for Xilinx ZynqMP SM-K26 rev2/1/B/A   *   * (C) Copyright 2020 - 2021, Xilinx, Inc. - * (C) Copyright 2023, Advanced Micro Devices, Inc. + * (C) Copyright 2023 - 2024, Advanced Micro Devices, Inc.   *   * Michal Simek <michal.simek@amd.com>   */ diff --git a/arch/arm/dts/zynqmp-smk-k26-revA.dts b/arch/arm/dts/zynqmp-smk-k26-revA.dts index 719a4e49b57..b804abe89d1 100644 --- a/arch/arm/dts/zynqmp-smk-k26-revA.dts +++ b/arch/arm/dts/zynqmp-smk-k26-revA.dts @@ -3,7 +3,7 @@   * dts file for Xilinx ZynqMP SMK-K26 rev2/1/B/A   *   * (C) Copyright 2020 - 2021, Xilinx, Inc. - * (C) Copyright 2023, Advanced Micro Devices, Inc. + * (C) Copyright 2023 - 2024, Advanced Micro Devices, Inc.   *   * Michal Simek <michal.simek@amd.com>   */ diff --git a/arch/arm/dts/zynqmp-u-boot.dtsi b/arch/arm/dts/zynqmp-u-boot.dtsi new file mode 100644 index 00000000000..9a7527ed5a1 --- /dev/null +++ b/arch/arm/dts/zynqmp-u-boot.dtsi @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * (C) Copyright 2024, Advanced Micro Devices, Inc. + * + * Michal Simek <michal.simek@amd.com> + */ + +/ { +	binman: binman { +	}; +}; diff --git a/arch/arm/dts/zynqmp-zcu102-revA.dts b/arch/arm/dts/zynqmp-zcu102-revA.dts index 3132fa533b8..dd63d22f45e 100644 --- a/arch/arm/dts/zynqmp-zcu102-revA.dts +++ b/arch/arm/dts/zynqmp-zcu102-revA.dts @@ -960,6 +960,7 @@  &pcie {  	status = "okay"; +	phys = <&psgtr 0 PHY_TYPE_PCIE 0 0>;  };  &psgtr { diff --git a/arch/arm/dts/zynqmp-zcu1275-revA.dts b/arch/arm/dts/zynqmp-zcu1275-revA.dts index 095c972f132..b75b2a796eb 100644 --- a/arch/arm/dts/zynqmp-zcu1275-revA.dts +++ b/arch/arm/dts/zynqmp-zcu1275-revA.dts @@ -15,8 +15,7 @@  / {  	model = "ZynqMP ZCU1275 RevA"; -	compatible = "xlnx,zynqmp-zcu1275-revA", "xlnx,zynqmp-zcu1275", -		     "xlnx,zynqmp"; +	compatible = "xlnx,zynqmp-zcu1275-revA", "xlnx,zynqmp-zcu1275", "xlnx,zynqmp";  	aliases {  		serial0 = &uart0; diff --git a/arch/arm/dts/zynqmp.dtsi b/arch/arm/dts/zynqmp.dtsi index 6a29f610153..70ca5e6379f 100644 --- a/arch/arm/dts/zynqmp.dtsi +++ b/arch/arm/dts/zynqmp.dtsi @@ -168,8 +168,8 @@  		bootph-all;  	}; -	pmu: pmu { -		compatible = "arm,armv8-pmuv3"; +	pmu { +		compatible = "arm,cortex-a53-pmu";  		interrupt-parent = <&gic>;  		interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>,  			     <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>, @@ -441,6 +441,34 @@  			};  		}; +		cpu0_debug: debug@fec10000 { +			compatible = "arm,coresight-cpu-debug", "arm,primecell"; +			reg = <0x0 0xfec10000 0x0 0x1000>; +			clock-names = "apb_pclk"; +			cpu = <&cpu0>; +		}; + +		cpu1_debug: debug@fed10000 { +			compatible = "arm,coresight-cpu-debug", "arm,primecell"; +			reg = <0x0 0xfed10000 0x0 0x1000>; +			clock-names = "apb_pclk"; +			cpu = <&cpu1>; +		}; + +		cpu2_debug: debug@fee10000 { +			compatible = "arm,coresight-cpu-debug", "arm,primecell"; +			reg = <0x0 0xfee10000 0x0 0x1000>; +			clock-names = "apb_pclk"; +			cpu = <&cpu2>; +		}; + +		cpu3_debug: debug@fef10000 { +			compatible = "arm,coresight-cpu-debug", "arm,primecell"; +			reg = <0x0 0xfef10000 0x0 0x1000>; +			clock-names = "apb_pclk"; +			cpu = <&cpu3>; +		}; +  		/* GDMA */  		fpd_dma_chan1: dma-controller@fd500000 {  			status = "disabled"; @@ -885,7 +913,6 @@  			power-domains = <&zynqmp_firmware PD_SATA>;  			resets = <&zynqmp_reset ZYNQMP_RESET_SATA>;  			/* iommus = <&smmu 0x4c0>, <&smmu 0x4c1>, <&smmu 0x4c2>, <&smmu 0x4c3>; */ -			/* dma-coherent; */  		};  		sdhci0: mmc@ff160000 { @@ -1065,9 +1092,9 @@  					     <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>,  					     <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>,  					     <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>; +				clock-names = "ref";  				/* iommus = <&smmu 0x860>; */  				snps,quirk-frame-length-adjustment = <0x20>; -				clock-names = "ref";  				snps,resume-hs-terminations;  				/* dma-coherent; */  			}; @@ -1097,9 +1124,9 @@  					     <GIC_SPI 70 IRQ_TYPE_LEVEL_HIGH>,  					     <GIC_SPI 74 IRQ_TYPE_LEVEL_HIGH>,  					     <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>; +				clock-names = "ref";  				/* iommus = <&smmu 0x861>; */  				snps,quirk-frame-length-adjustment = <0x20>; -				clock-names = "ref";  				snps,resume-hs-terminations;  				/* dma-coherent; */  			}; @@ -1176,11 +1203,14 @@  				      "dp_vtc_pixel_clk_in";  			power-domains = <&zynqmp_firmware PD_DP>;  			resets = <&zynqmp_reset ZYNQMP_RESET_DP>; -			dma-names = "vid0", "vid1", "vid2", "gfx0"; +			dma-names = "vid0", "vid1", "vid2", "gfx0", +				    "aud0", "aud1";  			dmas = <&zynqmp_dpdma ZYNQMP_DPDMA_VIDEO0>,  			       <&zynqmp_dpdma ZYNQMP_DPDMA_VIDEO1>,  			       <&zynqmp_dpdma ZYNQMP_DPDMA_VIDEO2>, -			       <&zynqmp_dpdma ZYNQMP_DPDMA_GRAPHICS>; +			       <&zynqmp_dpdma ZYNQMP_DPDMA_GRAPHICS>, +			       <&zynqmp_dpdma ZYNQMP_DPDMA_AUDIO0>, +			       <&zynqmp_dpdma ZYNQMP_DPDMA_AUDIO1>;  			ports {  				#address-cells = <1>; | 
