From 666aa3d0efab408bc4d7d034f19a8c70ead5030e Mon Sep 17 00:00:00 2001 From: Mieczyslaw Nalewaj Date: Sat, 3 Aug 2024 15:53:04 +0200 Subject: [PATCH] at91: remove unnecessary dts files Remove unnecessary dts files already included in the 6.1 kernel. Signed-off-by: Mieczyslaw Nalewaj Link: https://github.com/openwrt/openwrt/pull/16058 Signed-off-by: Nick Hainke --- .../files/arch/arm/boot/dts/at91-q5xr5.dts | 193 ------------------ .../at91/files/arch/arm/boot/dts/lmu5000.dts | 124 ----------- target/linux/at91/image/sam9x.mk | 1 + 3 files changed, 1 insertion(+), 317 deletions(-) delete mode 100644 target/linux/at91/files/arch/arm/boot/dts/at91-q5xr5.dts delete mode 100644 target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts diff --git a/target/linux/at91/files/arch/arm/boot/dts/at91-q5xr5.dts b/target/linux/at91/files/arch/arm/boot/dts/at91-q5xr5.dts deleted file mode 100644 index 7de05ee749..0000000000 --- a/target/linux/at91/files/arch/arm/boot/dts/at91-q5xr5.dts +++ /dev/null @@ -1,193 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * q5xr5.dts - Device Tree file for Exegin Q5xR5 board - * - * Copyright (C) 2014 Owen Kirby - */ - -/dts-v1/; -#include "at91sam9g20.dtsi" - -/ { - model = "Exegin Q5x (rev5)"; - compatible = "exegin,q5xr5", "atmel,at91sam9g20", "atmel,at91sam9"; - - chosen { - bootargs = "console=ttyS0,115200 rootfstype=squashfs,jffs2"; - }; - - memory { - reg = <0x20000000 0x0>; - }; - - clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <18432000>; - }; - - slow_xtal { - clock-frequency = <32768>; - }; - - main_xtal { - clock-frequency = <18432000>; - }; - }; - - ahb { - apb { - pinctrl@fffff400 { - board { - pinctrl_pck0_as_mck: pck0_as_mck { - atmel,pins = <2 1 0x2 0x0>; /* PC1 periph B */ - }; - pinctrl_spi0_npcs0: spi0_npcs0 { - atmel,pins = <0 3 0x1 0x0>; /* PA3 periph A */ - }; - pinctrl_spi0_npcs1: spi0_npcs1 { - atmel,pins = <2 11 0x2 0x0>; /* PC11 periph B */ - }; - pinctrl_spi1_npcs0: spi1_npcs0 { - atmel,pins = <1 3 0x1 0x0>; /* PB3 periph A */ - }; - pinctrl_spi1_npcs1: spi1_npcs1 { - atmel,pins = <2 5 0x2 0x0>; /* PC5 periph B */ - }; - }; - - spi0 { - pinctrl_spi0: spi0-0 { - atmel,pins = - <0 0 0x1 0x0 /* PA0 periph A SPI0_MISO pin */ - 0 1 0x1 0x0 /* PA1 periph A SPI0_MOSI pin */ - 0 2 0x1 0x0>; /* PA2 periph A SPI0_SPCK pin */ - }; - }; - - spi1 { - pinctrl_spi1: spi1-0 { - atmel,pins = - <1 0 0x1 0x0 /* PB0 periph A SPI1_MISO pin */ - 1 1 0x1 0x0 /* PB1 periph A SPI1_MOSI pin */ - 1 2 0x1 0x0>; /* PB2 periph A SPI1_SPCK pin */ - }; - }; - }; - - dbgu: serial@fffff200 { - status = "okay"; - }; - - usart0: serial@fffb0000 { - pinctrl-0 = - <&pinctrl_usart0 - &pinctrl_usart0_rts - &pinctrl_usart0_cts - &pinctrl_usart0_dtr_dsr - &pinctrl_usart0_dcd - &pinctrl_usart0_ri>; - status = "okay"; - }; - - macb0: ethernet@fffc4000 { - phy-mode = "mii"; - status = "okay"; - }; - - usb1: gadget@fffa4000 { - status = "okay"; - }; - - watchdog@fffffd40 { - status = "okay"; - }; - - spi0: spi@fffc8000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "atmel,at91rm9200-spi"; - reg = <0xfffc8000 0x200>; - interrupts = <12 4 3>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_spi0>; - status = "okay"; - cs-gpios = <&pioA 3 0>, <&pioC 11 1>, <0>, <0>; - - m25p80@0 { - compatible = "sst,sst25vf040b"; - spi-max-frequency = <20000000>; - reg = <0>; - #address-cells = <1>; - #size-cells = <1>; - - at91boot@0 { - label = "at91boot"; - reg = <0x0 0x4000>; - }; - uenv@4000 { - label = "uboot-env"; - reg = <0x4000 0x4000>; - }; - uboot@8000 { - label = "uboot"; - reg = <0x8000 0x3E000>; - }; - }; - spidev@1 { - compatible = "spidev"; - spi-max-frequency = <2000000>; - reg = <1>; - }; - }; - spi1: spi@fffcc000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "atmel,at91rm9200-spi"; - reg = <0xfffcc000 0x200>; - interrupts = <13 4 3>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_spi1>; - cs-gpios = <&pioB 3 0>, <&pioC 5 1>, <0>, <0>; - status = "okay"; - - spidev@0 { - compatible = "spidev"; - spi-max-frequency = <2000000>; - reg = <0>; - }; - spidev@1 { - compatible = "spidev"; - spi-max-frequency = <2000000>; - reg = <1>; - }; - }; - }; - - usb0: ohci@500000 { - num-ports = <2>; - status = "okay"; - }; - }; - - flash@10000000 { - compatible = "cfi-flash"; - bank-width = <2>; - reg = <0x10000000 0x00800000>; - #address-cells = <1>; - #size-cells = <1>; - - kernel@0 { - label = "kernel"; - reg = <0x0 0x200000>; - }; - rootfs@200000 { - label = "rootfs"; - reg = <0x200000 0x600000>; - }; - }; -}; diff --git a/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts b/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts deleted file mode 100644 index d9d7da619a..0000000000 --- a/target/linux/at91/files/arch/arm/boot/dts/lmu5000.dts +++ /dev/null @@ -1,124 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * lmu5000.dst - Device Tree file for CalAmp LMU5000 board - * - * Copyright (C) 2013 Adam Porter - */ - -/dts-v1/; -#include "at91sam9g20.dtsi" - -/ { - model = "CalAmp LMU5000"; - compatible = "calamp,lmu5000", "atmel,at91sam9g20", "atmel,at91sam9"; - - chosen { - bootargs = "mem=64M console=ttyS0,115200 rootfstype=jffs2"; - }; - - memory { - reg = <0x20000000 0x4000000>; - }; - - clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <18432000>; - }; - }; - - ahb { - apb { - pinctrl@fffff400 { - board { - pinctrl_pck0_as_mck: pck0_as_mck { - atmel,pins = - <2 1 0x2 0x0>; /* PC1 periph B */ - }; - }; - }; - - dbgu: serial@fffff200 { - status = "okay"; - }; - - usart0: serial@fffb0000 { - pinctrl-0 = - <&pinctrl_usart0 - &pinctrl_usart0_rts - &pinctrl_usart0_cts - &pinctrl_usart0_dtr_dsr - &pinctrl_usart0_dcd - &pinctrl_usart0_ri>; - status = "okay"; - }; - - usart2: serial@fffb8000 { - status = "okay"; - }; - - uart0: serial@fffd4000 { - status = "okay"; - }; - - uart1: serial@fffd8000 { - status = "okay"; - }; - - macb0: ethernet@fffc4000 { - phy-mode = "mii"; - status = "okay"; - }; - - usb1: gadget@fffa4000 { - atmel,vbus-gpio = <&pioC 5 0>; - status = "okay"; - }; - - ssc0: ssc@fffbc000 { - status = "okay"; - pinctrl-0 = <&pinctrl_ssc0_tx>; - }; - - watchdog@fffffd40 { - status = "okay"; - }; - }; - - nand0: nand@40000000 { - nand-bus-width = <8>; - nand-ecc-mode = "soft"; - nand-on-flash-bbt; - status = "okay"; - - kernel@0 { - label = "kernel"; - reg = <0x0 0x400000>; - }; - - rootfs@400000 { - label = "rootfs"; - reg = <0x400000 0x3C00000>; - }; - - user1@4000000 { - label = "user1"; - reg = <0x4000000 0x2000000>; - }; - - user2@6000000 { - label = "user2"; - reg = <0x6000000 0x2000000>; - }; - }; - - usb0: ohci@500000 { - num-ports = <2>; - status = "okay"; - }; - }; -}; diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk index 409e43ca6e..d0722c5d30 100644 --- a/target/linux/at91/image/sam9x.mk +++ b/target/linux/at91/image/sam9x.mk @@ -125,6 +125,7 @@ define Device/calamp_lmu5000 $(Device/production) DEVICE_VENDOR := CalAmp DEVICE_MODEL := LMU5000 + DEVICE_DTS := at91-lmu5000 DEVICE_PACKAGES := kmod-rtc-pcf2123 kmod-usb-acm \ kmod-usb-serial-option kmod-usb-serial-sierrawireless \ kmod-pinctrl-mcp23s08-spi -- 2.30.2