diff options
author | Claudiu Beznea <claudiu.beznea@microchip.com> | 2021-10-11 11:47:21 +0300 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-10-24 18:52:06 +0200 |
commit | 7bd0fba3dfefb4c4a7c0b4db65feedf3d7a13f5e (patch) | |
tree | 8c4a8ec8458f6e44e911c425e5f8d4712902344f /target/linux/at91/files/arch/arm | |
parent | 05a7af9ca0dd9c42eafbca5aa988b141e0e06053 (diff) | |
download | upstream-7bd0fba3dfefb4c4a7c0b4db65feedf3d7a13f5e.tar.gz upstream-7bd0fba3dfefb4c4a7c0b4db65feedf3d7a13f5e.tar.bz2 upstream-7bd0fba3dfefb4c4a7c0b4db65feedf3d7a13f5e.zip |
at91: kernel: bump to 5.10
Bump at91 targets to kernel v5.10. With this patches and files for
wb45n and wb50n were removed as they are now included in upstream
kernel. Along with:
- this the kernel config for sama5d2 and sam9x targets has been
refreshed (with make kernel_menuconfig + save);
- CONFIG_ARCH_AT91 and specific sam9x SoCs (AT91RM9200, AT91SAM9,
SAM9X60) has been enabled such that sam9x SoCs to be able to boot.
Signed-off-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Diffstat (limited to 'target/linux/at91/files/arch/arm')
-rw-r--r-- | target/linux/at91/files/arch/arm/boot/dts/wb45n.dts | 220 | ||||
-rw-r--r-- | target/linux/at91/files/arch/arm/boot/dts/wb50n.dts | 113 | ||||
-rw-r--r-- | target/linux/at91/files/arch/arm/boot/dts/wb50n.dtsi | 205 |
3 files changed, 0 insertions, 538 deletions
diff --git a/target/linux/at91/files/arch/arm/boot/dts/wb45n.dts b/target/linux/at91/files/arch/arm/boot/dts/wb45n.dts deleted file mode 100644 index fd9d260f2a..0000000000 --- a/target/linux/at91/files/arch/arm/boot/dts/wb45n.dts +++ /dev/null @@ -1,220 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * wb45n.dts - Device Tree file for WB45NBT board - * - * Copyright (C) 2015 Laird - */ - -/dts-v1/; -#include "at91sam9g25.dtsi" - -/ { - model = "Laird Workgroup Bridge 45N - Atmel AT91SAM (dt)"; - compatible = "laird,wb45n", "laird,wbxx", "atmel,at91sam9x5", "atmel,at91sam9"; - - chosen { - bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=ubifs ubi.mtd=1 root=ubi0:rootfs"; - }; - - memory { - reg = <0x20000000 0x4000000>; - }; - - clocks { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - main_clock: clock@0 { - compatible = "atmel,osc", "fixed-clock"; - clock-frequency = <12000000>; - }; - - slow_xtal { - clock-frequency = <32768>; - }; - - main_xtal { - clock-frequency = <12000000>; - }; - }; - - ahb { - apb { - - rstc@fffffe00 { - compatible = "atmel,sama5d3-rstc"; - }; - - pinctrl@fffff400 { - nand { - pinctrl_nand: nand-0 { - atmel,pins = - <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD0 periph A Read Enable */ - AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD1 periph A Write Enable */ - AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD2 periph A Address Latch Enable */ - AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD3 periph A Command Latch Enable */ - AT91_PIOD 4 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP /* PD4 gpio Chip Enable pin pull_up */ - AT91_PIOD 5 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP>; /* PD5 gpio RDY/BUSY pin pull_up */ - }; - }; - - usb2 { - pinctrl_board_usb2: usb2-board { - atmel,pins = - <AT91_PIOB 11 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PB11 gpio vbus sense, deglitch */ - }; - }; - }; - - dbgu: serial@fffff200 { - status = "okay"; - }; - - usart0: serial@f801c000 { - status = "okay"; - }; - - usart3: serial@f8028000 { - status = "okay"; - }; - - spi0: spi@f0000000 { - status = "okay"; - cs-gpios = <&pioA 14 0>, <&pioA 7 0>, <0>, <0>; - }; - - mmc0: mmc@f0008000 { - pinctrl-0 = < - &pinctrl_mmc0_slot0_clk_cmd_dat0 - &pinctrl_mmc0_slot0_dat1_3>; - status = "okay"; - /delete-property/dmas; - /delete-property/dma-names; - slot@0 { - reg = <0>; - bus-width = <4>; - }; - }; - - macb0: ethernet@f802c000 { - phy-mode = "rmii"; - status = "okay"; - }; - - usb2: gadget@f803c000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_board_usb2>; - atmel,vbus-gpio = <&pioB 11 GPIO_ACTIVE_HIGH>; - status = "okay"; - }; - - i2c1: i2c@f8014000 { - status = "okay"; - }; - - watchdog@fffffe40 { - status = "okay"; - }; - - shdwc@fffffe10 { - atmel,wakeup-mode = "low"; - }; - - rtc@fffffeb0 { - status = "okay"; - }; - }; - - usb0: ohci@00600000 { - status = "okay"; - num-ports = <2>; - atmel,vbus-gpio = < - &pioB 12 GPIO_ACTIVE_HIGH - &pioA 31 GPIO_ACTIVE_HIGH - >; - atmel,oc-gpio = <&pioB 13 GPIO_ACTIVE_LOW>; - }; - - usb1: ehci@00700000 { - status = "okay"; - }; - - nand0: nand@40000000 { - nand-bus-width = <8>; - nand-ecc-mode = "hw"; - atmel,has-pmecc; /* Enable PMECC */ - atmel,pmecc-cap = <4>; - atmel,pmecc-sector-size = <512>; - nand-on-flash-bbt; - status = "okay"; - - at91bootstrap@0 { - label = "at91bs"; - reg = <0x0 0x20000>; - }; - - uboot@20000 { - label = "u-boot"; - reg = <0x20000 0x80000>; - }; - - ubootenv@a0000 { - label = "u-boot-env"; - reg = <0xa0000 0x20000>; - }; - - ubootenv@c0000 { - label = "redund-env"; - reg = <0xc0000 0x20000>; - }; - - kernel-a@e0000 { - label = "kernel-a"; - reg = <0xe0000 0x280000>; - }; - - kernel-b@360000 { - label = "kernel-b"; - reg = <0x360000 0x280000>; - }; - - rootfs-a@5e0000 { - label = "rootfs-a"; - reg = <0x5e0000 0x2600000>; - }; - - rootfs-b@2be0000 { - label = "rootfs-b"; - reg = <0x2be0000 0x2600000>; - }; - - user@51e0000 { - label = "user"; - reg = <0x51e0000 0x2dc0000>; - }; - - logs@7fa0000 { - label = "logs"; - reg = <0x7fa0000 0x60000>; - }; - }; - }; - - atheros { - compatible = "atheros,ath6kl"; - atheros,board-id = "SD32"; - }; - - keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - irqbtn@pb18 { - label = "IRQBTN"; - linux,code = <99>; - gpios = <&pioB 18 GPIO_ACTIVE_LOW>; - gpio-key,wakeup = <1>; - }; - }; -}; diff --git a/target/linux/at91/files/arch/arm/boot/dts/wb50n.dts b/target/linux/at91/files/arch/arm/boot/dts/wb50n.dts deleted file mode 100644 index 15b10a8b06..0000000000 --- a/target/linux/at91/files/arch/arm/boot/dts/wb50n.dts +++ /dev/null @@ -1,113 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * wb50n.dts - Device Tree file for wb50n board - * - * Copyright (C) 2015 Laird - */ - -/dts-v1/; -#include "wb50n.dtsi" - -/ { - model = "Laird Workgroup Bridge 50N - Atmel SAMA5D"; - compatible = "laird,wb50n", "atmel,sama5d31ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; - - chosen { - bootargs = "console=ttyS0,115200 earlyprintk loglevel=4 mem=64M"; - }; - - ahb { - - apb { - mmc0: mmc@f0000000 { - status = "okay"; - }; - - macb1: ethernet@f802c000 { - status = "okay"; - }; - - dbgu: serial@ffffee00 { - status = "okay"; - }; - - /* On BB40 this port is labeled UART1 */ - usart0: serial@f001c000 { - status = "okay"; - }; - - /* On BB40 this port is labeled UART0 */ - usart1: serial@f0020000 { - status = "okay"; - }; - - i2c0: i2c@f0014000 { - status = "okay"; - }; - - spi1: spi@f8008000 { - status = "okay"; - - spidev@0 { - compatible = "spidev"; - reg = <0>; - spi-max-frequency = <8000000>; - }; - }; - - watchdog@fffffe40 { - status = "okay"; - }; - }; - - usb0: gadget@00500000 { - status = "okay"; - }; - - usb1: ohci@00600000 { - status = "okay"; - }; - - usb2: ehci@00700000 { - status = "okay"; - }; - }; - - keys { - compatible = "gpio-keys"; - #address-cells = <1>; - #size-cells = <0>; - btn0@pa10 { - label = "BTNESC"; - linux,code = <1>; /* ESC button */ - gpios = <&pioA 10 GPIO_ACTIVE_LOW>; - gpio-key,wakeup = <1>; - }; - - irqbtn@pe31 { - label = "IRQBTN"; - linux,code = <99>; /* SysReq button */ - gpios = <&pioE 31 GPIO_ACTIVE_LOW>; - gpio-key,wakeup = <1>; - }; - }; - - leds { - compatible = "gpio-leds"; - - led0 { - label = "wb50n:blue:led0"; - gpios = <&pioA 12 GPIO_ACTIVE_LOW>; - }; - - led1 { - label = "wb50n:green:led1"; - gpios = <&pioA 24 GPIO_ACTIVE_LOW>; - }; - - led2 { - label = "wb50n:red:led2"; - gpios = <&pioA 26 GPIO_ACTIVE_LOW>; - }; - }; -}; diff --git a/target/linux/at91/files/arch/arm/boot/dts/wb50n.dtsi b/target/linux/at91/files/arch/arm/boot/dts/wb50n.dtsi deleted file mode 100644 index 936cce39ed..0000000000 --- a/target/linux/at91/files/arch/arm/boot/dts/wb50n.dtsi +++ /dev/null @@ -1,205 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-or-later -/* - * wb50n.dts - Device Tree file for wb50n board - * - * Copyright (C) 2015 Laird - */ - -#include "sama5d31.dtsi" - -/ { - model = "Laird Workgroup Bridge 50N - Atmel SAMA5D"; - compatible = "laird,wb50n", "atmel,sama5d31ek", "atmel,sama5d3xmb", "atmel,sama5d3xcm", "atmel,sama5d31", "atmel,sama5d3", "atmel,sama5"; - - chosen { - bootargs = "console=ttyS0,115200 earlyprintk loglevel=4 mem=64M"; - }; - - memory { - reg = <0x20000000 0x4000000>; - }; - - clocks { - slow_xtal { - clock-frequency = <32768>; - }; - - main_xtal { - clock-frequency = <12000000>; - }; - }; - - ahb { - - apb { - pmc: pmc@fffffc00 { - main: mainck { - clock-frequency = <12000000>; - }; - - periphck { - usart1_clk: usart1_clk { - #clock-cells = <0>; - reg = <13>; - atmel,clk-output-range = <0 132000000>; - }; - }; - }; - - pinctrl@fffff200 { - board { - pinctrl_mmc0_cd: mmc0_cd { - atmel,pins = - <AT91_PIOC 26 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>; /* PC26 GPIO with pullup deglitch */ - }; - - pinctrl_usba_vbus: usba_vbus { - atmel,pins = - <AT91_PIOB 13 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PB13 GPIO with deglitch */ - }; - }; - }; - - mmc0: mmc@f0000000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_cd>; - cd-gpios = <&pioC 26 GPIO_ACTIVE_LOW>; - slot@0 { - reg = <0>; - bus-width = <4>; - }; - }; - - mmc1: mmc@f8000000 { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>; - status = "okay"; - slot@0 { - reg = <0>; - bus-width = <4>; - }; - }; - - macb1: ethernet@f802c000 { - phy-mode = "rmii"; - }; - - - dbgu: serial@ffffee00 { - dmas = <0>, <0>; /* Do not use DMA for dbgu */ - }; - - /* On BB40 this port is labeled UART1 */ - usart0: serial@f001c000 { - atmel,use-dma-rx; - atmel,use-dma-tx; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usart0 &pinctrl_usart0_rts_cts>; - }; - - /* On BB40 this port is labeled UART0 */ - usart1: serial@f0020000 { - atmel,use-dma-rx; - atmel,use-dma-tx; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usart1 &pinctrl_usart1_rts_cts>; - dtr-gpios = <&pioD 13 GPIO_ACTIVE_LOW>; - dsr-gpios = <&pioD 11 GPIO_ACTIVE_LOW>; - dcd-gpios = <&pioD 7 GPIO_ACTIVE_LOW>; - rng-gpios = <&pioD 8 GPIO_ACTIVE_LOW>; - }; - - /* USART3 is direct-connect to the Bluetooth UART on the radio SIP */ - usart3: serial@f8024000 { - atmel,use-dma-rx; - atmel,use-dma-tx; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usart3 &pinctrl_usart3_rts_cts>; - status = "okay"; - }; - - spi1: spi@f8008000 { - cs-gpios = <&pioC 25 0>, <0>, <0>, <0>; - }; - - sckc@fffffe50 { - slow_osc: slow_osc { - atmel,osc-bypass; - }; - }; - }; - - nand0: nand@60000000 { - nand-bus-width = <8>; - nand-ecc-mode = "hw"; - atmel,has-pmecc; - atmel,pmecc-cap = <8>; - atmel,pmecc-sector-size = <512>; - nand-on-flash-bbt; - status = "okay"; - - at91bootstrap@0 { - label = "at91bs"; - reg = <0x0 0x20000>; - }; - - uboot@20000 { - label = "u-boot"; - reg = <0x20000 0x80000>; - }; - - ubootenv@a0000 { - label = "u-boot-env"; - reg = <0xa0000 0x20000>; - }; - - ubootenv@c0000 { - label = "u-boot-env"; - reg = <0xc0000 0x20000>; - }; - - kernel-a@e0000 { - label = "kernel-a"; - reg = <0xe0000 0x500000>; - }; - - kernel-b@5e0000 { - label = "kernel-b"; - reg = <0x5e0000 0x500000>; - }; - - rootfs-a@ae0000 { - label = "rootfs-a"; - reg = <0xae0000 0x3000000>; - }; - - rootfs-b@3ae0000 { - label = "rootfs-b"; - reg = <0x3ae0000 0x3000000>; - }; - - user@6ae0000 { - label = "user"; - reg = <0x6ae0000 0x14e0000>; - }; - - }; - - usb0: gadget@00500000 { - atmel,vbus-gpio = <&pioB 13 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usba_vbus>; - }; - - usb1: ohci@00600000 { - num-ports = <3>; - atmel,vbus-gpio = <&pioA 2 GPIO_ACTIVE_LOW>; - atmel,oc-gpio = <&pioA 4 GPIO_ACTIVE_LOW>; - }; - }; - - atheros { - compatible = "atheros,ath6kl"; - atheros,board-id = "SD32"; - }; -}; |