Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
commit
2e7bff994d
@ -1,2 +1,2 @@
|
||||
LINUX_VERSION-5.15 = .136
|
||||
LINUX_KERNEL_HASH-5.15.136 = c624b9fe7ee4708d34cfd0b7ebc58037afac7463338cc498641ea31c55eeacb8
|
||||
LINUX_VERSION-5.15 = .137
|
||||
LINUX_KERNEL_HASH-5.15.137 = 9749b21609f9e7ad9c46160c2c107db823b99cef77fa6cb080b6c2dc685fb2f7
|
||||
|
@ -9,10 +9,6 @@ endif
|
||||
|
||||
INITRAMFS_EXTRA_FILES ?= $(GENERIC_PLATFORM_DIR)/image/initramfs-base-files.txt
|
||||
|
||||
ifneq (,$(KERNEL_CC))
|
||||
KERNEL_MAKEOPTS += CC="$(KERNEL_CC)"
|
||||
endif
|
||||
|
||||
export HOST_EXTRACFLAGS=-I$(STAGING_DIR_HOST)/include
|
||||
|
||||
# defined in quilt.mk
|
||||
|
@ -119,6 +119,10 @@ KERNEL_MAKE_FLAGS = \
|
||||
cmd_syscalls= \
|
||||
$(if $(__package_mk),KBUILD_EXTRA_SYMBOLS="$(wildcard $(PKG_SYMVERS_DIR)/*.symvers)")
|
||||
|
||||
ifneq (,$(KERNEL_CC))
|
||||
KERNEL_MAKE_FLAGS += CC="$(KERNEL_CC)"
|
||||
endif
|
||||
|
||||
KERNEL_NOSTDINC_FLAGS = \
|
||||
-nostdinc $(if $(DUMP),, -isystem $(shell $(TARGET_CC) -print-file-name=include))
|
||||
|
||||
|
@ -11,7 +11,8 @@ case "$board" in
|
||||
dynalink,dl-wrx36|\
|
||||
netgear,rax120v2|\
|
||||
netgear,wax218|\
|
||||
netgear,wax620)
|
||||
netgear,wax620|\
|
||||
netgear,wax630)
|
||||
idx="$(find_mtd_index 0:appsblenv)"
|
||||
[ -n "$idx" ] && \
|
||||
ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000" "2"
|
||||
|
697
package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
Normal file
697
package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
Normal file
@ -0,0 +1,697 @@
|
||||
--- /dev/null
|
||||
+++ b/configs/mt7981_cmcc_rax3000m-emmc_defconfig
|
||||
@@ -0,0 +1,175 @@
|
||||
+CONFIG_ARM=y
|
||||
+CONFIG_POSITION_INDEPENDENT=y
|
||||
+CONFIG_ARCH_MEDIATEK=y
|
||||
+CONFIG_TARGET_MT7981=y
|
||||
+CONFIG_TEXT_BASE=0x41e00000
|
||||
+CONFIG_SYS_MALLOC_F_LEN=0x4000
|
||||
+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
|
||||
+CONFIG_NR_DRAM_BANKS=1
|
||||
+CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000m-emmc"
|
||||
+CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000m-emmc_env"
|
||||
+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-cmcc-rax3000m-emmc.dtb"
|
||||
+CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
+CONFIG_DEBUG_UART_BASE=0x11002000
|
||||
+CONFIG_DEBUG_UART_CLOCK=40000000
|
||||
+CONFIG_DEBUG_UART=y
|
||||
+CONFIG_SYS_LOAD_ADDR=0x46000000
|
||||
+CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||
+CONFIG_AUTOBOOT_KEYED=y
|
||||
+CONFIG_BOOTDELAY=30
|
||||
+CONFIG_AUTOBOOT_MENU_SHOW=y
|
||||
+CONFIG_CFB_CONSOLE_ANSI=y
|
||||
+CONFIG_BOARD_LATE_INIT=y
|
||||
+CONFIG_BUTTON=y
|
||||
+CONFIG_BUTTON_GPIO=y
|
||||
+CONFIG_GPIO_HOG=y
|
||||
+CONFIG_CMD_ENV_FLAGS=y
|
||||
+CONFIG_FIT=y
|
||||
+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
|
||||
+CONFIG_LED=y
|
||||
+CONFIG_LED_BLINK=y
|
||||
+CONFIG_LED_GPIO=y
|
||||
+CONFIG_LOGLEVEL=7
|
||||
+CONFIG_LOG=y
|
||||
+CONFIG_SYS_PROMPT="MT7981> "
|
||||
+CONFIG_CMD_BOOTMENU=y
|
||||
+CONFIG_CMD_BOOTP=y
|
||||
+CONFIG_CMD_BUTTON=y
|
||||
+CONFIG_CMD_CACHE=y
|
||||
+CONFIG_CMD_CDP=y
|
||||
+CONFIG_CMD_CPU=y
|
||||
+CONFIG_CMD_DHCP=y
|
||||
+CONFIG_CMD_DM=y
|
||||
+CONFIG_CMD_DNS=y
|
||||
+CONFIG_CMD_ECHO=y
|
||||
+CONFIG_CMD_ENV_READMEM=y
|
||||
+CONFIG_CMD_ERASEENV=y
|
||||
+CONFIG_CMD_EXT4=y
|
||||
+CONFIG_CMD_FAT=y
|
||||
+CONFIG_CMD_FDT=y
|
||||
+CONFIG_CMD_FS_GENERIC=y
|
||||
+CONFIG_CMD_FS_UUID=y
|
||||
+CONFIG_CMD_GPIO=y
|
||||
+CONFIG_CMD_GPT=y
|
||||
+CONFIG_CMD_HASH=y
|
||||
+CONFIG_CMD_ITEST=y
|
||||
+CONFIG_CMD_LED=y
|
||||
+CONFIG_CMD_LICENSE=y
|
||||
+CONFIG_CMD_LINK_LOCAL=y
|
||||
+# CONFIG_CMD_MBR is not set
|
||||
+CONFIG_CMD_MMC=y
|
||||
+CONFIG_CMD_PCI=y
|
||||
+CONFIG_CMD_PSTORE=y
|
||||
+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
|
||||
+CONFIG_CMD_SF_TEST=y
|
||||
+CONFIG_CMD_PING=y
|
||||
+CONFIG_CMD_PXE=y
|
||||
+CONFIG_CMD_PWM=y
|
||||
+CONFIG_CMD_SMC=y
|
||||
+CONFIG_CMD_TFTPBOOT=y
|
||||
+CONFIG_CMD_TFTPSRV=y
|
||||
+CONFIG_CMD_ASKENV=y
|
||||
+CONFIG_CMD_PART=y
|
||||
+CONFIG_CMD_RARP=y
|
||||
+CONFIG_CMD_SETEXPR=y
|
||||
+CONFIG_CMD_SLEEP=y
|
||||
+CONFIG_CMD_SNTP=y
|
||||
+CONFIG_CMD_SOURCE=y
|
||||
+CONFIG_CMD_STRINGS=y
|
||||
+CONFIG_CMD_USB=y
|
||||
+CONFIG_CMD_UUID=y
|
||||
+CONFIG_DISPLAY_CPUINFO=y
|
||||
+CONFIG_DM_MMC=y
|
||||
+CONFIG_DM_REGULATOR=y
|
||||
+CONFIG_DM_REGULATOR_FIXED=y
|
||||
+CONFIG_DM_REGULATOR_GPIO=y
|
||||
+CONFIG_DM_USB=y
|
||||
+CONFIG_DM_PWM=y
|
||||
+CONFIG_PWM_MTK=y
|
||||
+CONFIG_HUSH_PARSER=y
|
||||
+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
||||
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
+CONFIG_VERSION_VARIABLE=y
|
||||
+CONFIG_PARTITION_UUIDS=y
|
||||
+CONFIG_NETCONSOLE=y
|
||||
+CONFIG_REGMAP=y
|
||||
+CONFIG_SYSCON=y
|
||||
+CONFIG_CLK=y
|
||||
+CONFIG_DM_GPIO=y
|
||||
+CONFIG_DM_SCSI=y
|
||||
+CONFIG_AHCI=y
|
||||
+CONFIG_AHCI_PCI=y
|
||||
+CONFIG_SCSI_AHCI=y
|
||||
+CONFIG_SCSI=y
|
||||
+CONFIG_CMD_SCSI=y
|
||||
+CONFIG_PHY=y
|
||||
+CONFIG_PHY_MTK_TPHY=y
|
||||
+CONFIG_PHY_FIXED=y
|
||||
+CONFIG_MTK_AHCI=y
|
||||
+CONFIG_DM_ETH=y
|
||||
+CONFIG_MEDIATEK_ETH=y
|
||||
+CONFIG_PCI=y
|
||||
+CONFIG_DM_PCI=y
|
||||
+CONFIG_PCIE_MEDIATEK=y
|
||||
+CONFIG_PINCTRL=y
|
||||
+CONFIG_PINCONF=y
|
||||
+CONFIG_PINCTRL_MT7622=y
|
||||
+CONFIG_POWER_DOMAIN=y
|
||||
+CONFIG_PRE_CONSOLE_BUFFER=y
|
||||
+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
|
||||
+CONFIG_MTK_POWER_DOMAIN=y
|
||||
+CONFIG_RAM=y
|
||||
+CONFIG_DM_SERIAL=y
|
||||
+CONFIG_MTK_SERIAL=y
|
||||
+CONFIG_MMC=y
|
||||
+CONFIG_MMC_DEFAULT_DEV=1
|
||||
+CONFIG_MMC_HS200_SUPPORT=y
|
||||
+CONFIG_MMC_MTK=y
|
||||
+CONFIG_MMC_SUPPORTS_TUNING=y
|
||||
+CONFIG_SUPPORT_EMMC_BOOT=y
|
||||
+CONFIG_SPI=y
|
||||
+CONFIG_SYSRESET_WATCHDOG=y
|
||||
+CONFIG_WDT_MTK=y
|
||||
+CONFIG_LZO=y
|
||||
+CONFIG_ZSTD=y
|
||||
+CONFIG_HEXDUMP=y
|
||||
+CONFIG_RANDOM_UUID=y
|
||||
+CONFIG_REGEX=y
|
||||
+CONFIG_USB=y
|
||||
+CONFIG_USB_HOST=y
|
||||
+CONFIG_USB_XHCI_HCD=y
|
||||
+CONFIG_USB_XHCI_MTK=y
|
||||
+CONFIG_USB_STORAGE=y
|
||||
+CONFIG_OF_EMBED=y
|
||||
+CONFIG_ENV_OVERWRITE=y
|
||||
+CONFIG_ENV_IS_IN_MMC=y
|
||||
+CONFIG_ENV_OFFSET=0x400000
|
||||
+CONFIG_ENV_OFFSET_REDUND=0x440000
|
||||
+CONFIG_ENV_SIZE=0x40000
|
||||
+CONFIG_ENV_SIZE_REDUND=0x40000
|
||||
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||
+CONFIG_NET_RANDOM_ETHADDR=y
|
||||
+CONFIG_REGMAP=y
|
||||
+CONFIG_SYSCON=y
|
||||
+CONFIG_CLK=y
|
||||
+CONFIG_SUPPORT_EMMC_BOOT=y
|
||||
+CONFIG_PHY_FIXED=y
|
||||
+CONFIG_DM_ETH=y
|
||||
+CONFIG_MEDIATEK_ETH=y
|
||||
+CONFIG_PINCTRL=y
|
||||
+CONFIG_PINCONF=y
|
||||
+CONFIG_PINCTRL_MT7981=y
|
||||
+CONFIG_POWER_DOMAIN=y
|
||||
+CONFIG_MTK_POWER_DOMAIN=y
|
||||
+CONFIG_DM_REGULATOR=y
|
||||
+CONFIG_DM_REGULATOR_FIXED=y
|
||||
+CONFIG_DM_SERIAL=y
|
||||
+CONFIG_MTK_SERIAL=y
|
||||
+CONFIG_HEXDUMP=y
|
||||
+CONFIG_USE_DEFAULT_ENV_FILE=y
|
||||
+CONFIG_CMD_SF=y
|
||||
+CONFIG_LMB_MAX_REGIONS=64
|
||||
+CONFIG_USE_IPADDR=y
|
||||
+CONFIG_IPADDR="192.168.1.1"
|
||||
+CONFIG_USE_SERVERIP=y
|
||||
+CONFIG_SERVERIP="192.168.1.254"
|
||||
--- /dev/null
|
||||
+++ b/configs/mt7981_cmcc_rax3000m-nand_defconfig
|
||||
@@ -0,0 +1,175 @@
|
||||
+CONFIG_ARM=y
|
||||
+CONFIG_POSITION_INDEPENDENT=y
|
||||
+CONFIG_ARCH_MEDIATEK=y
|
||||
+CONFIG_TARGET_MT7981=y
|
||||
+CONFIG_TEXT_BASE=0x41e00000
|
||||
+CONFIG_SYS_MALLOC_F_LEN=0x4000
|
||||
+CONFIG_SYS_HAS_NONCACHED_MEMORY=y
|
||||
+CONFIG_NR_DRAM_BANKS=1
|
||||
+CONFIG_DEFAULT_DEVICE_TREE="mt7981-cmcc-rax3000m-nand"
|
||||
+CONFIG_DEFAULT_ENV_FILE="cmcc_rax3000m-nand_env"
|
||||
+CONFIG_DEFAULT_FDT_FILE="mediatek/mt7981-cmcc-rax3000m-nand.dtb"
|
||||
+CONFIG_OF_LIBFDT_OVERLAY=y
|
||||
+CONFIG_DEBUG_UART_BASE=0x11002000
|
||||
+CONFIG_DEBUG_UART_CLOCK=40000000
|
||||
+CONFIG_DEBUG_UART=y
|
||||
+CONFIG_SYS_LOAD_ADDR=0x46000000
|
||||
+CONFIG_SMBIOS_PRODUCT_NAME=""
|
||||
+CONFIG_AUTOBOOT_KEYED=y
|
||||
+CONFIG_BOOTDELAY=30
|
||||
+CONFIG_AUTOBOOT_MENU_SHOW=y
|
||||
+CONFIG_CFB_CONSOLE_ANSI=y
|
||||
+CONFIG_BOARD_LATE_INIT=y
|
||||
+CONFIG_BUTTON=y
|
||||
+CONFIG_BUTTON_GPIO=y
|
||||
+CONFIG_GPIO_HOG=y
|
||||
+CONFIG_CMD_ENV_FLAGS=y
|
||||
+CONFIG_FIT=y
|
||||
+CONFIG_FIT_ENABLE_SHA256_SUPPORT=y
|
||||
+CONFIG_LED=y
|
||||
+CONFIG_LED_BLINK=y
|
||||
+CONFIG_LED_GPIO=y
|
||||
+CONFIG_LOGLEVEL=7
|
||||
+CONFIG_LOG=y
|
||||
+CONFIG_SYS_PROMPT="MT7981> "
|
||||
+CONFIG_CMD_BOOTMENU=y
|
||||
+CONFIG_CMD_BOOTP=y
|
||||
+CONFIG_CMD_BUTTON=y
|
||||
+CONFIG_CMD_CACHE=y
|
||||
+CONFIG_CMD_CDP=y
|
||||
+CONFIG_CMD_CPU=y
|
||||
+CONFIG_CMD_DHCP=y
|
||||
+CONFIG_CMD_DM=y
|
||||
+CONFIG_CMD_DNS=y
|
||||
+CONFIG_CMD_ECHO=y
|
||||
+CONFIG_CMD_ENV_READMEM=y
|
||||
+CONFIG_CMD_ERASEENV=y
|
||||
+CONFIG_CMD_EXT4=y
|
||||
+CONFIG_CMD_FAT=y
|
||||
+CONFIG_CMD_FDT=y
|
||||
+CONFIG_CMD_FS_GENERIC=y
|
||||
+CONFIG_CMD_FS_UUID=y
|
||||
+CONFIG_CMD_GPIO=y
|
||||
+CONFIG_CMD_GPT=y
|
||||
+CONFIG_CMD_HASH=y
|
||||
+CONFIG_CMD_ITEST=y
|
||||
+CONFIG_CMD_LED=y
|
||||
+CONFIG_CMD_LICENSE=y
|
||||
+CONFIG_CMD_LINK_LOCAL=y
|
||||
+# CONFIG_CMD_MBR is not set
|
||||
+CONFIG_CMD_PCI=y
|
||||
+CONFIG_CMD_PSTORE=y
|
||||
+CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
|
||||
+CONFIG_CMD_SF_TEST=y
|
||||
+CONFIG_CMD_PING=y
|
||||
+CONFIG_CMD_PXE=y
|
||||
+CONFIG_CMD_PWM=y
|
||||
+CONFIG_CMD_SMC=y
|
||||
+CONFIG_CMD_TFTPBOOT=y
|
||||
+CONFIG_CMD_TFTPSRV=y
|
||||
+CONFIG_CMD_UBI=y
|
||||
+CONFIG_CMD_UBI_RENAME=y
|
||||
+CONFIG_CMD_UBIFS=y
|
||||
+CONFIG_CMD_ASKENV=y
|
||||
+CONFIG_CMD_PART=y
|
||||
+CONFIG_CMD_RARP=y
|
||||
+CONFIG_CMD_SETEXPR=y
|
||||
+CONFIG_CMD_SLEEP=y
|
||||
+CONFIG_CMD_SNTP=y
|
||||
+CONFIG_CMD_SOURCE=y
|
||||
+CONFIG_CMD_STRINGS=y
|
||||
+CONFIG_CMD_UUID=y
|
||||
+CONFIG_DISPLAY_CPUINFO=y
|
||||
+CONFIG_DM_MTD=y
|
||||
+CONFIG_DM_REGULATOR=y
|
||||
+CONFIG_DM_REGULATOR_FIXED=y
|
||||
+CONFIG_DM_REGULATOR_GPIO=y
|
||||
+CONFIG_DM_PWM=y
|
||||
+CONFIG_PWM_MTK=y
|
||||
+CONFIG_HUSH_PARSER=y
|
||||
+CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
|
||||
+CONFIG_SYS_RELOC_GD_ENV_ADDR=y
|
||||
+CONFIG_VERSION_VARIABLE=y
|
||||
+CONFIG_PARTITION_UUIDS=y
|
||||
+CONFIG_NETCONSOLE=y
|
||||
+CONFIG_REGMAP=y
|
||||
+CONFIG_SYSCON=y
|
||||
+CONFIG_CLK=y
|
||||
+CONFIG_DM_GPIO=y
|
||||
+CONFIG_DM_SCSI=y
|
||||
+CONFIG_AHCI=y
|
||||
+CONFIG_AHCI_PCI=y
|
||||
+CONFIG_SCSI_AHCI=y
|
||||
+CONFIG_SCSI=y
|
||||
+CONFIG_CMD_SCSI=y
|
||||
+CONFIG_PHY=y
|
||||
+CONFIG_PHY_MTK_TPHY=y
|
||||
+CONFIG_PHY_FIXED=y
|
||||
+CONFIG_MTK_AHCI=y
|
||||
+CONFIG_DM_ETH=y
|
||||
+CONFIG_MEDIATEK_ETH=y
|
||||
+CONFIG_PCI=y
|
||||
+# CONFIG_MMC is not set
|
||||
+# CONFIG_DM_MMC is not set
|
||||
+CONFIG_MTD=y
|
||||
+CONFIG_MTD_UBI_FASTMAP=y
|
||||
+CONFIG_DM_PCI=y
|
||||
+CONFIG_PCIE_MEDIATEK=y
|
||||
+CONFIG_PINCTRL=y
|
||||
+CONFIG_PINCONF=y
|
||||
+CONFIG_PINCTRL_MT7622=y
|
||||
+CONFIG_POWER_DOMAIN=y
|
||||
+CONFIG_PRE_CONSOLE_BUFFER=y
|
||||
+CONFIG_PRE_CON_BUF_ADDR=0x4007EF00
|
||||
+CONFIG_MTK_POWER_DOMAIN=y
|
||||
+CONFIG_RAM=y
|
||||
+CONFIG_DM_SERIAL=y
|
||||
+CONFIG_MTK_SERIAL=y
|
||||
+CONFIG_SPI=y
|
||||
+CONFIG_DM_SPI=y
|
||||
+CONFIG_MTK_SPI_NAND=y
|
||||
+CONFIG_MTK_SPI_NAND_MTD=y
|
||||
+CONFIG_SYSRESET_WATCHDOG=y
|
||||
+CONFIG_WDT_MTK=y
|
||||
+CONFIG_LZO=y
|
||||
+CONFIG_ZSTD=y
|
||||
+CONFIG_HEXDUMP=y
|
||||
+CONFIG_RANDOM_UUID=y
|
||||
+CONFIG_REGEX=y
|
||||
+CONFIG_OF_EMBED=y
|
||||
+CONFIG_ENV_OVERWRITE=y
|
||||
+CONFIG_ENV_IS_IN_UBI=y
|
||||
+CONFIG_ENV_UBI_PART="ubi"
|
||||
+CONFIG_ENV_SIZE=0x1f000
|
||||
+CONFIG_ENV_SIZE_REDUND=0x1f000
|
||||
+CONFIG_ENV_UBI_VOLUME="ubootenv"
|
||||
+CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
|
||||
+CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
|
||||
+CONFIG_NET_RANDOM_ETHADDR=y
|
||||
+CONFIG_REGMAP=y
|
||||
+CONFIG_SYSCON=y
|
||||
+CONFIG_CLK=y
|
||||
+CONFIG_PHY_FIXED=y
|
||||
+CONFIG_DM_ETH=y
|
||||
+CONFIG_MEDIATEK_ETH=y
|
||||
+CONFIG_PINCTRL=y
|
||||
+CONFIG_PINCONF=y
|
||||
+CONFIG_PINCTRL_MT7981=y
|
||||
+CONFIG_POWER_DOMAIN=y
|
||||
+CONFIG_MTK_POWER_DOMAIN=y
|
||||
+CONFIG_DM_REGULATOR=y
|
||||
+CONFIG_DM_REGULATOR_FIXED=y
|
||||
+CONFIG_DM_SERIAL=y
|
||||
+CONFIG_MTK_SERIAL=y
|
||||
+CONFIG_HEXDUMP=y
|
||||
+CONFIG_USE_DEFAULT_ENV_FILE=y
|
||||
+CONFIG_MTD_SPI_NAND=y
|
||||
+CONFIG_MTK_SPIM=y
|
||||
+CONFIG_CMD_MTD=y
|
||||
+CONFIG_CMD_NAND=y
|
||||
+CONFIG_CMD_NAND_TRIMFFS=y
|
||||
+CONFIG_LMB_MAX_REGIONS=64
|
||||
+CONFIG_USE_IPADDR=y
|
||||
+CONFIG_IPADDR="192.168.1.1"
|
||||
+CONFIG_USE_SERVERIP=y
|
||||
+CONFIG_SERVERIP="192.168.1.254"
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/dts/mt7981-cmcc-rax3000m.dtsi
|
||||
@@ -0,0 +1,85 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-only
|
||||
+/*
|
||||
+ * Copyright (c) 2022 MediaTek Inc.
|
||||
+ * Author: Sam Shih <sam.shih@mediatek.com>
|
||||
+ */
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "mt7981.dtsi"
|
||||
+#include <dt-bindings/gpio/gpio.h>
|
||||
+#include <dt-bindings/input/linux-event-codes.h>
|
||||
+
|
||||
+/ {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+ model = "CMCC RAX3000M";
|
||||
+ compatible = "mediatek,mt7981", "mediatek,mt7981-rfb";
|
||||
+
|
||||
+ chosen {
|
||||
+ stdout-path = &uart0;
|
||||
+ tick-timer = &timer0;
|
||||
+ };
|
||||
+
|
||||
+ memory@40000000 {
|
||||
+ device_type = "memory";
|
||||
+ reg = <0x40000000 0x20000000>;
|
||||
+ };
|
||||
+
|
||||
+ keys {
|
||||
+ compatible = "gpio-keys";
|
||||
+
|
||||
+ button-reset {
|
||||
+ label = "reset";
|
||||
+ linux,code = <KEY_RESTART>;
|
||||
+ gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ button-mesh {
|
||||
+ label = "mesh";
|
||||
+ linux,code = <BTN_9>;
|
||||
+ linux,input-type = <EV_SW>;
|
||||
+ gpios = <&gpio 0 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+
|
||||
+ led-0 {
|
||||
+ label = "green:status";
|
||||
+ gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ led-1 {
|
||||
+ label = "blue:status";
|
||||
+ gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ led-2 {
|
||||
+ label = "red:status";
|
||||
+ gpios = <&gpio 35 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+ð {
|
||||
+ status = "okay";
|
||||
+ mediatek,gmac-id = <0>;
|
||||
+ phy-mode = "2500base-x";
|
||||
+ mediatek,switch = "mt7531";
|
||||
+ reset-gpios = <&gpio 39 GPIO_ACTIVE_HIGH>;
|
||||
+
|
||||
+ fixed-link {
|
||||
+ speed = <2500>;
|
||||
+ full-duplex;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&uart0 {
|
||||
+ mediatek,force-highspeed;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&watchdog {
|
||||
+ status = "disabled";
|
||||
+};
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/dts/mt7981-cmcc-rax3000m-emmc.dts
|
||||
@@ -0,0 +1,53 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-only
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "mt7981-cmcc-rax3000m.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ reg_3p3v: regulator-3p3v {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "fixed-3.3V";
|
||||
+ regulator-min-microvolt = <3300000>;
|
||||
+ regulator-max-microvolt = <3300000>;
|
||||
+ regulator-boot-on;
|
||||
+ regulator-always-on;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&mmc0 {
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&mmc0_pins_default>;
|
||||
+ max-frequency = <26000000>;
|
||||
+ bus-width = <8>;
|
||||
+ cap-mmc-hw-reset;
|
||||
+ vmmc-supply = <®_3p3v>;
|
||||
+ non-removable;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&pinctrl {
|
||||
+ mmc0_pins_default: mmc0default {
|
||||
+ mux {
|
||||
+ function = "flash";
|
||||
+ groups = "emmc_45";
|
||||
+ };
|
||||
+ conf-cmd-dat {
|
||||
+ pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO",
|
||||
+ "SPI0_CS", "SPI0_HOLD", "SPI0_WP",
|
||||
+ "SPI1_CLK", "SPI1_MOSI", "SPI1_MISO";
|
||||
+ input-enable;
|
||||
+ drive-strength = <MTK_DRIVE_4mA>;
|
||||
+ bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
|
||||
+ };
|
||||
+ conf-clk {
|
||||
+ pins = "SPI1_CS";
|
||||
+ drive-strength = <MTK_DRIVE_6mA>;
|
||||
+ bias-pull-down = <MTK_PUPD_SET_R1R0_10>;
|
||||
+ };
|
||||
+ conf-rst {
|
||||
+ pins = "PWM0";
|
||||
+ drive-strength = <MTK_DRIVE_4mA>;
|
||||
+ bias-pull-up = <MTK_PUPD_SET_R1R0_01>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
--- /dev/null
|
||||
+++ b/arch/arm/dts/mt7981-cmcc-rax3000m-nand.dts
|
||||
@@ -0,0 +1,77 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-only
|
||||
+
|
||||
+/dts-v1/;
|
||||
+#include "mt7981-cmcc-rax3000m.dtsi"
|
||||
+
|
||||
+&pinctrl {
|
||||
+ spi_flash_pins: spi0-pins-func-1 {
|
||||
+ mux {
|
||||
+ function = "flash";
|
||||
+ groups = "spi0", "spi0_wp_hold";
|
||||
+ };
|
||||
+
|
||||
+ conf-pu {
|
||||
+ pins = "SPI0_CS", "SPI0_HOLD", "SPI0_WP";
|
||||
+ drive-strength = <MTK_DRIVE_8mA>;
|
||||
+ bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
|
||||
+ };
|
||||
+
|
||||
+ conf-pd {
|
||||
+ pins = "SPI0_CLK", "SPI0_MOSI", "SPI0_MISO";
|
||||
+ drive-strength = <MTK_DRIVE_8mA>;
|
||||
+ bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&spi0 {
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&spi_flash_pins>;
|
||||
+ status = "okay";
|
||||
+ must_tx;
|
||||
+ enhance_timing;
|
||||
+ dma_ext;
|
||||
+ ipm_design;
|
||||
+ support_quad;
|
||||
+ tick_dly = <2>;
|
||||
+ sample_sel = <0>;
|
||||
+
|
||||
+ spi_nand@0 {
|
||||
+ compatible = "spi-nand";
|
||||
+ reg = <0>;
|
||||
+ spi-max-frequency = <52000000>;
|
||||
+
|
||||
+ partitions {
|
||||
+ compatible = "fixed-partitions";
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <1>;
|
||||
+
|
||||
+ partition@0 {
|
||||
+ label = "bl2";
|
||||
+ reg = <0x0 0x100000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@100000 {
|
||||
+ label = "orig-env";
|
||||
+ reg = <0x100000 0x80000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@160000 {
|
||||
+ label = "factory";
|
||||
+ reg = <0x180000 0x200000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@380000 {
|
||||
+ label = "fip";
|
||||
+ reg = <0x380000 0x200000>;
|
||||
+ };
|
||||
+
|
||||
+ partition@580000 {
|
||||
+ label = "ubi";
|
||||
+ reg = <0x580000 0x7200000>;
|
||||
+ };
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
--- /dev/null
|
||||
+++ b/cmcc_rax3000m-emmc_env
|
||||
@@ -0,0 +1,55 @@
|
||||
+ipaddr=192.168.1.1
|
||||
+serverip=192.168.1.254
|
||||
+loadaddr=0x46000000
|
||||
+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
|
||||
+bootargs=root=/dev/mmcblk0p65
|
||||
+bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
|
||||
+bootconf=config-1#mt7981b-cmcc-rax3000m-emmc
|
||||
+bootdelay=0
|
||||
+bootfile=openwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb
|
||||
+bootfile_bl2=openwrt-mediatek-filogic-cmcc_rax3000m-emmc-preloader.bin
|
||||
+bootfile_fip=openwrt-mediatek-filogic-cmcc_rax3000m-emmc-bl31-uboot.fip
|
||||
+bootfile_upg=openwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb
|
||||
+bootled_pwr=red:status
|
||||
+bootled_rec=blue:status
|
||||
+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
|
||||
+bootmenu_default=0
|
||||
+bootmenu_delay=0
|
||||
+bootmenu_title= [0;34m( ( ( [1;39mOpenWrt[0;34m ) ) ) [0;36m[eMMC][0m
|
||||
+bootmenu_0=Initialize environment.=run _firstboot
|
||||
+bootmenu_0d=Run default boot command.=run boot_default
|
||||
+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
|
||||
+bootmenu_2=Boot production system from eMMC.=run boot_production ; run bootmenu_confirm_return
|
||||
+bootmenu_3=Boot recovery system from eMMC.=run boot_recovery ; run bootmenu_confirm_return
|
||||
+bootmenu_4=Load production system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
|
||||
+bootmenu_5=Load recovery system via TFTP then write to eMMC.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
|
||||
+bootmenu_6=[31mLoad BL31+U-Boot FIP via TFTP then write to eMMC.[0m=run boot_tftp_write_fip ; run bootmenu_confirm_return
|
||||
+bootmenu_7=[31mLoad BL2 preloader via TFTP then write to eMMC.[0m=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
|
||||
+bootmenu_8=Reboot.=reset
|
||||
+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
|
||||
+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
|
||||
+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
|
||||
+boot_production=led $bootled_pwr on ; run emmc_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
|
||||
+boot_recovery=led $bootled_rec on ; run emmc_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
|
||||
+boot_emmc=run boot_production ; run boot_recovery
|
||||
+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
|
||||
+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run emmc_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
|
||||
+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run emmc_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
|
||||
+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run emmc_write_fip
|
||||
+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run emmc_write_bl2
|
||||
+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
|
||||
+mmc_write_vol=imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc erase 0x$part_addr 0x$image_size && mmc write $loadaddr 0x$part_addr 0x$image_size
|
||||
+mmc_read_vol=mmc read $loadaddr $part_addr 0x100 && imszb $loadaddr image_size && test 0x$image_size -le 0x$part_size && mmc read $loadaddr 0x$part_addr 0x$image_size && setexpr filesize $image_size * 0x200
|
||||
+part_default=production
|
||||
+part_recovery=recovery
|
||||
+reset_factory=eraseenv && reset
|
||||
+emmc_read_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_read_vol
|
||||
+emmc_read_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_read_vol
|
||||
+emmc_write_bl2=mmc partconf 0 1 1 1 && mmc erase 0x0 0x400 && mmc write $fileaddr 0x0 0x400 ; mmc partconf 0 1 1 0
|
||||
+emmc_write_fip=mmc erase 0x3400 0x2000 && mmc write $fileaddr 0x3400 0x2000 && mmc erase 0x2000 0x800
|
||||
+emmc_write_production=part start mmc 0 $part_default part_addr && part size mmc 0 $part_default part_size && run mmc_write_vol
|
||||
+emmc_write_recovery=part start mmc 0 $part_recovery part_addr && part size mmc 0 $part_recovery part_size && run mmc_write_vol
|
||||
+_init_env=setenv _init_env ; setenv _create_env ; saveenv ; saveenv
|
||||
+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
|
||||
+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
|
||||
+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title [33m$ver[0m"
|
||||
--- /dev/null
|
||||
+++ b/cmcc_rax3000m-nand_env
|
||||
@@ -0,0 +1,56 @@
|
||||
+ipaddr=192.168.1.1
|
||||
+serverip=192.168.1.254
|
||||
+loadaddr=0x46000000
|
||||
+console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
|
||||
+bootconf=config-1#mt7981b-cmcc-rax3000m-nand
|
||||
+bootcmd=if pstore check ; then run boot_recovery ; else run boot_ubi ; fi
|
||||
+bootdelay=0
|
||||
+bootfile=openwrt-mediatek-filogic-cmcc_rax3000m-initramfs-recovery.itb
|
||||
+bootfile_bl2=openwrt-mediatek-filogic-cmcc_rax3000m-nand-preloader.bin
|
||||
+bootfile_fip=openwrt-mediatek-filogic-cmcc_rax3000m-nand-bl31-uboot.fip
|
||||
+bootfile_upg=openwrt-mediatek-filogic-cmcc_rax3000m-squashfs-sysupgrade.itb
|
||||
+bootled_pwr=red:status
|
||||
+bootled_rec=blue:status
|
||||
+bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
|
||||
+bootmenu_default=0
|
||||
+bootmenu_delay=0
|
||||
+bootmenu_title= [0;34m( ( ( [1;39mOpenWrt[0;34m ) ) ) [0;36m[SPI-NAND][0m
|
||||
+bootmenu_0=Initialize environment.=run _firstboot
|
||||
+bootmenu_0d=Run default boot command.=run boot_default
|
||||
+bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
|
||||
+bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
|
||||
+bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
|
||||
+bootmenu_4=Load production system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_production ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
|
||||
+bootmenu_5=Load recovery system via TFTP then write to NAND.=setenv noboot 1 ; setenv replacevol 1 ; run boot_tftp_recovery ; setenv noboot ; setenv replacevol ; run bootmenu_confirm_return
|
||||
+bootmenu_6=[31mLoad BL31+U-Boot FIP via TFTP then write to NAND.[0m=run boot_tftp_write_fip ; run bootmenu_confirm_return
|
||||
+bootmenu_7=[31mLoad BL2 preloader via TFTP then write to NAND.[0m=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
|
||||
+bootmenu_8=Reboot.=reset
|
||||
+bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
|
||||
+boot_first=if button reset ; then led $bootled_rec on ; run boot_tftp_recovery ; setenv flag_recover 1 ; run boot_default ; fi ; bootmenu
|
||||
+boot_default=if env exists flag_recover ; then else run bootcmd ; fi ; run boot_recovery ; setenv replacevol 1 ; run boot_tftp_forever
|
||||
+boot_production=led $bootled_pwr on ; run ubi_read_production && bootm $loadaddr#$bootconf ; led $bootled_pwr off
|
||||
+boot_recovery=led $bootled_rec on ; run ubi_read_recovery && bootm $loadaddr#$bootconf ; led $bootled_rec off
|
||||
+boot_ubi=run boot_production ; run boot_recovery ; run boot_tftp_forever
|
||||
+boot_tftp_forever=led $bootled_rec on ; while true ; do run boot_tftp_recovery ; sleep 1 ; done
|
||||
+boot_tftp_production=tftpboot $loadaddr $bootfile_upg && env exists replacevol && iminfo $loadaddr && run ubi_write_production ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
|
||||
+boot_tftp_recovery=tftpboot $loadaddr $bootfile && env exists replacevol && iminfo $loadaddr && run ubi_write_recovery ; if env exists noboot ; then else bootm $loadaddr#$bootconf ; fi
|
||||
+boot_tftp=tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
|
||||
+boot_tftp_write_fip=tftpboot $loadaddr $bootfile_fip && run mtd_write_fip && run reset_factory
|
||||
+boot_tftp_write_bl2=tftpboot $loadaddr $bootfile_bl2 && run mtd_write_bl2
|
||||
+part_default=production
|
||||
+part_recovery=recovery
|
||||
+reset_factory=ubi part ubi ; mw $loadaddr 0x0 0x800 ; ubi write $loadaddr ubootenv 0x800 ; ubi write $loadaddr ubootenv2 0x800
|
||||
+mtd_write_fip=mtd erase fip && mtd write fip $loadaddr
|
||||
+mtd_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr
|
||||
+ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x100000 dynamic 0 || run ubi_format ; ubi check ubootenv2 || ubi create ubootenv2 0x100000 dynamic 1 || run ubi_format
|
||||
+ubi_format=ubi detach ; mtd erase ubi && ubi part ubi ; reset
|
||||
+ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
|
||||
+ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
|
||||
+ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
|
||||
+ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
|
||||
+ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic 2 && ubi write $loadaddr fit $filesize
|
||||
+ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic 3 && ubi write $loadaddr recovery $filesize
|
||||
+_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
|
||||
+_firstboot=setenv _firstboot ; run _switch_to_menu ; run _init_env ; run boot_first
|
||||
+_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
|
||||
+_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title [33m$ver[0m"
|
@ -6,9 +6,9 @@ PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/firmware/qca-wireless.git
|
||||
PKG_SOURCE_DATE:=2023-09-16
|
||||
PKG_SOURCE_VERSION:=57aa1b1562ac60f11a6bec8be02cd3b68b12b3fa
|
||||
PKG_MIRROR_HASH:=f8f9ab78ae85180a6e601d7c911d6c350b0cc132172d4baefc8f9fe07566ce0f
|
||||
PKG_SOURCE_DATE:=2023-10-12
|
||||
PKG_SOURCE_VERSION:=cd04ab7f984fe28613276c01fd0ac7afbe5516d5
|
||||
PKG_MIRROR_HASH:=857ae436fd09785749411a665b31c82cec84b68b1e096f69ebb6c2a0efb5583f
|
||||
|
||||
PKG_FLAGS:=nonshared
|
||||
|
||||
@ -36,6 +36,7 @@ ALLWIFIBOARDS:= \
|
||||
netgear_rax120v2 \
|
||||
netgear_wax218 \
|
||||
netgear_wax620 \
|
||||
netgear_wax630 \
|
||||
prpl_haze \
|
||||
qnap_301w \
|
||||
redmi_ax6 \
|
||||
@ -143,6 +144,7 @@ $(eval $(call generate-ipq-wifi-package,edimax_cax1800,Edimax CAX1800))
|
||||
$(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2))
|
||||
$(eval $(call generate-ipq-wifi-package,netgear_wax218,Netgear WAX218))
|
||||
$(eval $(call generate-ipq-wifi-package,netgear_wax620,Netgear WAX620))
|
||||
$(eval $(call generate-ipq-wifi-package,netgear_wax630,Netgear WAX630))
|
||||
$(eval $(call generate-ipq-wifi-package,qnap_301w,QNAP 301w))
|
||||
$(eval $(call generate-ipq-wifi-package,prpl_haze,prpl Haze))
|
||||
$(eval $(call generate-ipq-wifi-package,redmi_ax6,Redmi AX6))
|
||||
|
@ -0,0 +1,47 @@
|
||||
--- a/Makefile.real
|
||||
+++ b/Makefile.real
|
||||
@@ -6,6 +6,18 @@ else
|
||||
export BACKPORTS_GIT_TRACKER_DEF=
|
||||
endif
|
||||
|
||||
+ifneq ($(LLVM),)
|
||||
+ifneq ($(filter %/,$(LLVM)),)
|
||||
+LLVM_PREFIX := $(LLVM)
|
||||
+else ifneq ($(filter -%,$(LLVM)),)
|
||||
+LLVM_SUFFIX := $(LLVM)
|
||||
+endif
|
||||
+
|
||||
+HOSTCC = $(LLVM_PREFIX)clang$(LLVM_SUFFIX)
|
||||
+else
|
||||
+HOSTCC = gcc
|
||||
+endif
|
||||
+
|
||||
# disable built-in rules for this file
|
||||
.SUFFIXES:
|
||||
|
||||
@@ -24,21 +36,21 @@ listnewconfig oldaskconfig oldconfig \
|
||||
silentoldconfig olddefconfig oldnoconfig \
|
||||
allnoconfig allyesconfig allmodconfig \
|
||||
alldefconfig randconfig:
|
||||
- @$(MAKE) -C kconf conf
|
||||
+ @$(MAKE) -C kconf CC=$(HOSTCC) conf
|
||||
@./kconf/conf --$@ Kconfig
|
||||
|
||||
.PHONY: usedefconfig
|
||||
usedefconfig:
|
||||
- @$(MAKE) -C kconf conf
|
||||
+ @$(MAKE) -C kconf CC=$(HOSTCC) conf
|
||||
@./kconf/conf --defconfig=defconfig Kconfig
|
||||
|
||||
.PHONY: savedefconfig
|
||||
savedefconfig:
|
||||
- @$(MAKE) -C kconf conf
|
||||
+ @$(MAKE) -C kconf CC=$(HOSTCC) conf
|
||||
@./kconf/conf --savedefconfig=defconfig Kconfig
|
||||
|
||||
defconfig-%::
|
||||
- @$(MAKE) -C kconf conf
|
||||
+ @$(MAKE) -C kconf CC=$(HOSTCC) conf
|
||||
@./kconf/conf --defconfig=defconfigs/$(@:defconfig-%=%) Kconfig
|
||||
|
||||
.config:
|
@ -12,9 +12,9 @@ PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL=$(PROJECT_GIT)/project/odhcpd.git
|
||||
PKG_MIRROR_HASH:=e2e00e2bb6b7bacda5dcb713e4f9a4b1e316d75b140a4aa77145471bf6fe5c17
|
||||
PKG_SOURCE_DATE:=2023-06-24
|
||||
PKG_SOURCE_VERSION:=52112643308bb02a3b4fa2894dd7d4340ba4a237
|
||||
PKG_MIRROR_HASH:=9936331b64880260cf969cc5656e1e1a8b7dc0e0843d64621242c500a330b4d6
|
||||
PKG_SOURCE_DATE:=2023-10-24
|
||||
PKG_SOURCE_VERSION:=d8118f6e76e5519881f9a37137c3a06b3cb60fd2
|
||||
|
||||
PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
@ -25,8 +25,18 @@ include $(INCLUDE_DIR)/host-build.mk
|
||||
include $(INCLUDE_DIR)/cmake.mk
|
||||
|
||||
CMAKE_OPTIONS += -DSOVERSION=$(PKG_ABI_VERSION)
|
||||
|
||||
ifeq ($(HOST_OS),Darwin)
|
||||
CMAKE_HOST_OPTIONS += \
|
||||
-DCMAKE_SKIP_RPATH=FALSE \
|
||||
-DCMAKE_MACOSX_RPATH=1 \
|
||||
-DCMAKE_INSTALL_RPATH="${STAGING_DIR_HOSTPKG}/lib"
|
||||
else
|
||||
CMAKE_HOST_OPTIONS += \
|
||||
-DSOVERSION=$(PKG_ABI_VERSION)
|
||||
endif
|
||||
|
||||
CMAKE_HOST_OPTIONS += \
|
||||
-DSOVERSION=$(PKG_ABI_VERSION) \
|
||||
-DFS_SUPPORT=ON \
|
||||
-DMATH_SUPPORT=ON \
|
||||
-DNL80211_SUPPORT=OFF \
|
||||
|
@ -82,7 +82,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1241,9 +1278,14 @@ static const u16 bcm_sf2_4908_reg_offset
|
||||
@@ -1247,9 +1284,14 @@ static const u16 bcm_sf2_4908_reg_offset
|
||||
[REG_SPHY_CNTRL] = 0x24,
|
||||
[REG_CROSSBAR] = 0xc8,
|
||||
[REG_RGMII_11_CNTRL] = 0x014c,
|
||||
|
@ -29,7 +29,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
|
||||
--- a/drivers/net/dsa/bcm_sf2.c
|
||||
+++ b/drivers/net/dsa/bcm_sf2.c
|
||||
@@ -1542,10 +1542,14 @@ static int bcm_sf2_sw_probe(struct platf
|
||||
@@ -1548,10 +1548,14 @@ static int bcm_sf2_sw_probe(struct platf
|
||||
rev = reg_readl(priv, REG_PHY_REVISION);
|
||||
priv->hw_params.gphy_rev = rev & PHY_REVISION_MASK;
|
||||
|
||||
|
@ -15,7 +15,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
|
||||
--- a/drivers/net/dsa/bcm_sf2.c
|
||||
+++ b/drivers/net/dsa/bcm_sf2.c
|
||||
@@ -1556,6 +1556,12 @@ static int bcm_sf2_sw_probe(struct platf
|
||||
@@ -1562,6 +1562,12 @@ static int bcm_sf2_sw_probe(struct platf
|
||||
priv->hw_params.core_rev >> 8, priv->hw_params.core_rev & 0xff,
|
||||
priv->irq0, priv->irq1);
|
||||
|
||||
|
@ -256,7 +256,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -763,6 +763,10 @@ int dev_fill_forward_path(const struct n
|
||||
@@ -769,6 +769,10 @@ int dev_fill_forward_path(const struct n
|
||||
if (WARN_ON_ONCE(last_dev == ctx.dev))
|
||||
return -1;
|
||||
}
|
||||
|
@ -304,7 +304,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
}
|
||||
--- a/drivers/net/dsa/bcm_sf2.c
|
||||
+++ b/drivers/net/dsa/bcm_sf2.c
|
||||
@@ -686,7 +686,7 @@ static void bcm_sf2_sw_validate(struct d
|
||||
@@ -692,7 +692,7 @@ static void bcm_sf2_sw_validate(struct d
|
||||
state->interface != PHY_INTERFACE_MODE_GMII &&
|
||||
state->interface != PHY_INTERFACE_MODE_INTERNAL &&
|
||||
state->interface != PHY_INTERFACE_MODE_MOCA) {
|
||||
@ -313,7 +313,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
if (port != core_readl(priv, CORE_IMP0_PRT_ID))
|
||||
dev_err(ds->dev,
|
||||
"Unsupported interface: %d for port %d\n",
|
||||
@@ -714,10 +714,8 @@ static void bcm_sf2_sw_validate(struct d
|
||||
@@ -720,10 +720,8 @@ static void bcm_sf2_sw_validate(struct d
|
||||
phylink_set(mask, 100baseT_Half);
|
||||
phylink_set(mask, 100baseT_Full);
|
||||
|
||||
|
@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
/* Specifies the type of the struct net_device::ml_priv pointer */
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -1222,22 +1222,6 @@ int dev_change_name(struct net_device *d
|
||||
@@ -1242,22 +1242,6 @@ int dev_change_name(struct net_device *d
|
||||
|
||||
net = dev_net(dev);
|
||||
|
||||
@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
down_write(&devnet_rename_sem);
|
||||
|
||||
if (strncmp(newname, dev->name, IFNAMSIZ) == 0) {
|
||||
@@ -1254,7 +1238,8 @@ int dev_change_name(struct net_device *d
|
||||
@@ -1274,7 +1258,8 @@ int dev_change_name(struct net_device *d
|
||||
}
|
||||
|
||||
if (oldname[0] && !strchr(oldname, '%'))
|
||||
|
@ -0,0 +1,28 @@
|
||||
From 414a98abbefd82d591f4e2d1efd2917bcd3b6f6d Mon Sep 17 00:00:00 2001
|
||||
From: Peng Fan <peng.fan@nxp.com>
|
||||
Date: Fri, 13 Oct 2023 13:49:02 +0100
|
||||
Subject: [PATCH] nvmem: imx: correct nregs for i.MX6SLL
|
||||
|
||||
The nregs for i.MX6SLL should be 80 per fuse map, correct it.
|
||||
|
||||
Fixes: 6da27821a6f5 ("nvmem: imx-ocotp: add support for imx6sll")
|
||||
Cc: Stable@vger.kernel.org
|
||||
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231013124904.175782-2-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/imx-ocotp.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/imx-ocotp.c
|
||||
+++ b/drivers/nvmem/imx-ocotp.c
|
||||
@@ -499,7 +499,7 @@ static const struct ocotp_params imx6sl_
|
||||
};
|
||||
|
||||
static const struct ocotp_params imx6sll_params = {
|
||||
- .nregs = 128,
|
||||
+ .nregs = 80,
|
||||
.bank_address_words = 0,
|
||||
.set_timing = imx_ocotp_set_imx6_timing,
|
||||
.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,
|
@ -0,0 +1,28 @@
|
||||
From 7d6e10f5d254681983b53d979422c8de3fadbefb Mon Sep 17 00:00:00 2001
|
||||
From: Peng Fan <peng.fan@nxp.com>
|
||||
Date: Fri, 13 Oct 2023 13:49:03 +0100
|
||||
Subject: [PATCH] nvmem: imx: correct nregs for i.MX6UL
|
||||
|
||||
The nregs for i.MX6UL should be 144 per fuse map, correct it.
|
||||
|
||||
Fixes: 4aa2b4802046 ("nvmem: octop: Add support for imx6ul")
|
||||
Cc: Stable@vger.kernel.org
|
||||
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231013124904.175782-3-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/imx-ocotp.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/imx-ocotp.c
|
||||
+++ b/drivers/nvmem/imx-ocotp.c
|
||||
@@ -513,7 +513,7 @@ static const struct ocotp_params imx6sx_
|
||||
};
|
||||
|
||||
static const struct ocotp_params imx6ul_params = {
|
||||
- .nregs = 128,
|
||||
+ .nregs = 144,
|
||||
.bank_address_words = 0,
|
||||
.set_timing = imx_ocotp_set_imx6_timing,
|
||||
.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,
|
@ -0,0 +1,28 @@
|
||||
From 2382c1b044231fd49eaf9aa82bc7113fc55487b8 Mon Sep 17 00:00:00 2001
|
||||
From: Peng Fan <peng.fan@nxp.com>
|
||||
Date: Fri, 13 Oct 2023 13:49:04 +0100
|
||||
Subject: [PATCH] nvmem: imx: correct nregs for i.MX6ULL
|
||||
|
||||
The nregs for i.MX6ULL should be 80 per fuse map, correct it.
|
||||
|
||||
Fixes: ffbc34bf0e9c ("nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support")
|
||||
Cc: Stable@vger.kernel.org
|
||||
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231013124904.175782-4-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/imx-ocotp.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/imx-ocotp.c
|
||||
+++ b/drivers/nvmem/imx-ocotp.c
|
||||
@@ -520,7 +520,7 @@ static const struct ocotp_params imx6ul_
|
||||
};
|
||||
|
||||
static const struct ocotp_params imx6ull_params = {
|
||||
- .nregs = 64,
|
||||
+ .nregs = 80,
|
||||
.bank_address_words = 0,
|
||||
.set_timing = imx_ocotp_set_imx6_timing,
|
||||
.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,
|
@ -0,0 +1,37 @@
|
||||
From 16724d6ea40a2c9315f5a0d81005dfa4d7a6da24 Mon Sep 17 00:00:00 2001
|
||||
From: Luca Weiss <luca.weiss@fairphone.com>
|
||||
Date: Fri, 20 Oct 2023 11:55:40 +0100
|
||||
Subject: [PATCH] nvmem: qfprom: Mark core clk as optional
|
||||
|
||||
On some platforms like sc7280 on non-ChromeOS devices the core clock
|
||||
cannot be touched by Linux so we cannot provide it. Mark it as optional
|
||||
as accessing qfprom for reading works without it but we still prohibit
|
||||
writing if we cannot provide the clock.
|
||||
|
||||
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
|
||||
Reviewed-by: Douglas Anderson <dianders@chromium.org>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231020105545.216052-2-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/qfprom.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/drivers/nvmem/qfprom.c
|
||||
+++ b/drivers/nvmem/qfprom.c
|
||||
@@ -423,12 +423,12 @@ static int qfprom_probe(struct platform_
|
||||
if (IS_ERR(priv->vcc))
|
||||
return PTR_ERR(priv->vcc);
|
||||
|
||||
- priv->secclk = devm_clk_get(dev, "core");
|
||||
+ priv->secclk = devm_clk_get_optional(dev, "core");
|
||||
if (IS_ERR(priv->secclk))
|
||||
return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
|
||||
|
||||
- /* Only enable writing if we have SoC data. */
|
||||
- if (priv->soc_data)
|
||||
+ /* Only enable writing if we have SoC data and a valid clock */
|
||||
+ if (priv->soc_data && priv->secclk)
|
||||
econfig.reg_write = qfprom_reg_write;
|
||||
}
|
||||
|
@ -0,0 +1,330 @@
|
||||
From 2cc3b37f5b6df8189d55d0e812d9658ce256dfec Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Fri, 20 Oct 2023 11:55:41 +0100
|
||||
Subject: [PATCH] nvmem: add explicit config option to read old syntax fixed OF
|
||||
cells
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Binding for fixed NVMEM cells defined directly as NVMEM device subnodes
|
||||
has been deprecated. It has been replaced by the "fixed-layout" NVMEM
|
||||
layout binding.
|
||||
|
||||
New syntax is meant to be clearer and should help avoiding imprecise
|
||||
bindings.
|
||||
|
||||
NVMEM subsystem already supports the new binding. It should be a good
|
||||
idea to limit support for old syntax to existing drivers that actually
|
||||
support & use it (we can't break backward compatibility!). That way we
|
||||
additionally encourage new bindings & drivers to ignore deprecated
|
||||
binding.
|
||||
|
||||
It wasn't clear (to me) if rtc and w1 code actually uses old syntax
|
||||
fixed cells. I enabled them to don't risk any breakage.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
[for meson-{efuse,mx-efuse}.c]
|
||||
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
[for mtk-efuse.c, nvmem/core.c, nvmem-provider.h]
|
||||
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
||||
[MT8192, MT8195 Chromebooks]
|
||||
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
||||
[for microchip-otpc.c]
|
||||
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
||||
[SAMA7G5-EK]
|
||||
Tested-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
||||
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231020105545.216052-3-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/mtd/mtdcore.c | 2 ++
|
||||
drivers/nvmem/apple-efuses.c | 1 +
|
||||
drivers/nvmem/core.c | 8 +++++---
|
||||
drivers/nvmem/imx-ocotp-scu.c | 1 +
|
||||
drivers/nvmem/imx-ocotp.c | 1 +
|
||||
drivers/nvmem/meson-efuse.c | 1 +
|
||||
drivers/nvmem/meson-mx-efuse.c | 1 +
|
||||
drivers/nvmem/microchip-otpc.c | 1 +
|
||||
drivers/nvmem/mtk-efuse.c | 1 +
|
||||
drivers/nvmem/qcom-spmi-sdam.c | 1 +
|
||||
drivers/nvmem/qfprom.c | 1 +
|
||||
drivers/nvmem/rave-sp-eeprom.c | 1 +
|
||||
drivers/nvmem/rockchip-efuse.c | 1 +
|
||||
drivers/nvmem/sc27xx-efuse.c | 1 +
|
||||
drivers/nvmem/sec-qfprom.c | 1 +
|
||||
drivers/nvmem/sprd-efuse.c | 1 +
|
||||
drivers/nvmem/stm32-romem.c | 1 +
|
||||
drivers/nvmem/sunplus-ocotp.c | 1 +
|
||||
drivers/nvmem/sunxi_sid.c | 1 +
|
||||
drivers/nvmem/uniphier-efuse.c | 1 +
|
||||
drivers/nvmem/zynqmp_nvmem.c | 1 +
|
||||
drivers/rtc/nvmem.c | 1 +
|
||||
drivers/w1/slaves/w1_ds250x.c | 1 +
|
||||
include/linux/nvmem-provider.h | 2 ++
|
||||
24 files changed, 30 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/mtdcore.c
|
||||
+++ b/drivers/mtd/mtdcore.c
|
||||
@@ -541,6 +541,7 @@ static int mtd_nvmem_add(struct mtd_info
|
||||
config.dev = &mtd->dev;
|
||||
config.name = dev_name(&mtd->dev);
|
||||
config.owner = THIS_MODULE;
|
||||
+ config.add_legacy_fixed_of_cells = of_device_is_compatible(node, "nvmem-cells");
|
||||
config.reg_read = mtd_nvmem_reg_read;
|
||||
config.size = mtd->size;
|
||||
config.word_size = 1;
|
||||
@@ -898,6 +899,7 @@ static struct nvmem_device *mtd_otp_nvme
|
||||
config.name = compatible;
|
||||
config.id = NVMEM_DEVID_AUTO;
|
||||
config.owner = THIS_MODULE;
|
||||
+ config.add_legacy_fixed_of_cells = true;
|
||||
config.type = NVMEM_TYPE_OTP;
|
||||
config.root_only = true;
|
||||
config.ignore_wp = true;
|
||||
--- a/drivers/nvmem/apple-efuses.c
|
||||
+++ b/drivers/nvmem/apple-efuses.c
|
||||
@@ -36,6 +36,7 @@ static int apple_efuses_probe(struct pla
|
||||
struct resource *res;
|
||||
struct nvmem_config config = {
|
||||
.dev = &pdev->dev,
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.read_only = true,
|
||||
.reg_read = apple_efuses_read,
|
||||
.stride = sizeof(u32),
|
||||
--- a/drivers/nvmem/core.c
|
||||
+++ b/drivers/nvmem/core.c
|
||||
@@ -998,9 +998,11 @@ struct nvmem_device *nvmem_register(cons
|
||||
if (rval)
|
||||
goto err_remove_cells;
|
||||
|
||||
- rval = nvmem_add_cells_from_legacy_of(nvmem);
|
||||
- if (rval)
|
||||
- goto err_remove_cells;
|
||||
+ if (config->add_legacy_fixed_of_cells) {
|
||||
+ rval = nvmem_add_cells_from_legacy_of(nvmem);
|
||||
+ if (rval)
|
||||
+ goto err_remove_cells;
|
||||
+ }
|
||||
|
||||
rval = nvmem_add_cells_from_fixed_layout(nvmem);
|
||||
if (rval)
|
||||
--- a/drivers/nvmem/imx-ocotp-scu.c
|
||||
+++ b/drivers/nvmem/imx-ocotp-scu.c
|
||||
@@ -220,6 +220,7 @@ static int imx_scu_ocotp_write(void *con
|
||||
|
||||
static struct nvmem_config imx_scu_ocotp_nvmem_config = {
|
||||
.name = "imx-scu-ocotp",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.read_only = false,
|
||||
.word_size = 4,
|
||||
.stride = 1,
|
||||
--- a/drivers/nvmem/imx-ocotp.c
|
||||
+++ b/drivers/nvmem/imx-ocotp.c
|
||||
@@ -616,6 +616,7 @@ static int imx_ocotp_probe(struct platfo
|
||||
return PTR_ERR(priv->clk);
|
||||
|
||||
priv->params = of_device_get_match_data(&pdev->dev);
|
||||
+ imx_ocotp_nvmem_config.add_legacy_fixed_of_cells = true;
|
||||
imx_ocotp_nvmem_config.size = 4 * priv->params->nregs;
|
||||
imx_ocotp_nvmem_config.dev = dev;
|
||||
imx_ocotp_nvmem_config.priv = priv;
|
||||
--- a/drivers/nvmem/meson-efuse.c
|
||||
+++ b/drivers/nvmem/meson-efuse.c
|
||||
@@ -93,6 +93,7 @@ static int meson_efuse_probe(struct plat
|
||||
|
||||
econfig->dev = dev;
|
||||
econfig->name = dev_name(dev);
|
||||
+ econfig->add_legacy_fixed_of_cells = true;
|
||||
econfig->stride = 1;
|
||||
econfig->word_size = 1;
|
||||
econfig->reg_read = meson_efuse_read;
|
||||
--- a/drivers/nvmem/meson-mx-efuse.c
|
||||
+++ b/drivers/nvmem/meson-mx-efuse.c
|
||||
@@ -211,6 +211,7 @@ static int meson_mx_efuse_probe(struct p
|
||||
efuse->config.owner = THIS_MODULE;
|
||||
efuse->config.dev = &pdev->dev;
|
||||
efuse->config.priv = efuse;
|
||||
+ efuse->config.add_legacy_fixed_of_cells = true;
|
||||
efuse->config.stride = drvdata->word_size;
|
||||
efuse->config.word_size = drvdata->word_size;
|
||||
efuse->config.size = SZ_512;
|
||||
--- a/drivers/nvmem/microchip-otpc.c
|
||||
+++ b/drivers/nvmem/microchip-otpc.c
|
||||
@@ -261,6 +261,7 @@ static int mchp_otpc_probe(struct platfo
|
||||
return ret;
|
||||
|
||||
mchp_nvmem_config.dev = otpc->dev;
|
||||
+ mchp_nvmem_config.add_legacy_fixed_of_cells = true;
|
||||
mchp_nvmem_config.size = size;
|
||||
mchp_nvmem_config.priv = otpc;
|
||||
nvmem = devm_nvmem_register(&pdev->dev, &mchp_nvmem_config);
|
||||
--- a/drivers/nvmem/mtk-efuse.c
|
||||
+++ b/drivers/nvmem/mtk-efuse.c
|
||||
@@ -83,6 +83,7 @@ static int mtk_efuse_probe(struct platfo
|
||||
return PTR_ERR(priv->base);
|
||||
|
||||
pdata = device_get_match_data(dev);
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
econfig.stride = 1;
|
||||
econfig.word_size = 1;
|
||||
econfig.reg_read = mtk_reg_read;
|
||||
--- a/drivers/nvmem/qcom-spmi-sdam.c
|
||||
+++ b/drivers/nvmem/qcom-spmi-sdam.c
|
||||
@@ -142,6 +142,7 @@ static int sdam_probe(struct platform_de
|
||||
sdam->sdam_config.name = "spmi_sdam";
|
||||
sdam->sdam_config.id = NVMEM_DEVID_AUTO;
|
||||
sdam->sdam_config.owner = THIS_MODULE;
|
||||
+ sdam->sdam_config.add_legacy_fixed_of_cells = true;
|
||||
sdam->sdam_config.stride = 1;
|
||||
sdam->sdam_config.word_size = 1;
|
||||
sdam->sdam_config.reg_read = sdam_read;
|
||||
--- a/drivers/nvmem/qfprom.c
|
||||
+++ b/drivers/nvmem/qfprom.c
|
||||
@@ -357,6 +357,7 @@ static int qfprom_probe(struct platform_
|
||||
{
|
||||
struct nvmem_config econfig = {
|
||||
.name = "qfprom",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.id = NVMEM_DEVID_AUTO,
|
||||
--- a/drivers/nvmem/rave-sp-eeprom.c
|
||||
+++ b/drivers/nvmem/rave-sp-eeprom.c
|
||||
@@ -328,6 +328,7 @@ static int rave_sp_eeprom_probe(struct p
|
||||
of_property_read_string(np, "zii,eeprom-name", &config.name);
|
||||
config.priv = eeprom;
|
||||
config.dev = dev;
|
||||
+ config.add_legacy_fixed_of_cells = true;
|
||||
config.size = size;
|
||||
config.reg_read = rave_sp_eeprom_reg_read;
|
||||
config.reg_write = rave_sp_eeprom_reg_write;
|
||||
--- a/drivers/nvmem/rockchip-efuse.c
|
||||
+++ b/drivers/nvmem/rockchip-efuse.c
|
||||
@@ -205,6 +205,7 @@ static int rockchip_rk3399_efuse_read(vo
|
||||
|
||||
static struct nvmem_config econfig = {
|
||||
.name = "rockchip-efuse",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.read_only = true,
|
||||
--- a/drivers/nvmem/sc27xx-efuse.c
|
||||
+++ b/drivers/nvmem/sc27xx-efuse.c
|
||||
@@ -248,6 +248,7 @@ static int sc27xx_efuse_probe(struct pla
|
||||
econfig.reg_read = sc27xx_efuse_read;
|
||||
econfig.priv = efuse;
|
||||
econfig.dev = &pdev->dev;
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
nvmem = devm_nvmem_register(&pdev->dev, &econfig);
|
||||
if (IS_ERR(nvmem)) {
|
||||
dev_err(&pdev->dev, "failed to register nvmem config\n");
|
||||
--- a/drivers/nvmem/sec-qfprom.c
|
||||
+++ b/drivers/nvmem/sec-qfprom.c
|
||||
@@ -47,6 +47,7 @@ static int sec_qfprom_probe(struct platf
|
||||
{
|
||||
struct nvmem_config econfig = {
|
||||
.name = "sec-qfprom",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.id = NVMEM_DEVID_AUTO,
|
||||
--- a/drivers/nvmem/sprd-efuse.c
|
||||
+++ b/drivers/nvmem/sprd-efuse.c
|
||||
@@ -408,6 +408,7 @@ static int sprd_efuse_probe(struct platf
|
||||
econfig.read_only = false;
|
||||
econfig.name = "sprd-efuse";
|
||||
econfig.size = efuse->data->blk_nums * SPRD_EFUSE_BLOCK_WIDTH;
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
econfig.reg_read = sprd_efuse_read;
|
||||
econfig.reg_write = sprd_efuse_write;
|
||||
econfig.priv = efuse;
|
||||
--- a/drivers/nvmem/stm32-romem.c
|
||||
+++ b/drivers/nvmem/stm32-romem.c
|
||||
@@ -207,6 +207,7 @@ static int stm32_romem_probe(struct plat
|
||||
priv->cfg.priv = priv;
|
||||
priv->cfg.owner = THIS_MODULE;
|
||||
priv->cfg.type = NVMEM_TYPE_OTP;
|
||||
+ priv->cfg.add_legacy_fixed_of_cells = true;
|
||||
|
||||
priv->lower = 0;
|
||||
|
||||
--- a/drivers/nvmem/sunplus-ocotp.c
|
||||
+++ b/drivers/nvmem/sunplus-ocotp.c
|
||||
@@ -145,6 +145,7 @@ disable_clk:
|
||||
|
||||
static struct nvmem_config sp_ocotp_nvmem_config = {
|
||||
.name = "sp-ocotp",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.read_only = true,
|
||||
.word_size = 1,
|
||||
.size = QAC628_OTP_SIZE,
|
||||
--- a/drivers/nvmem/sunxi_sid.c
|
||||
+++ b/drivers/nvmem/sunxi_sid.c
|
||||
@@ -154,6 +154,7 @@ static int sunxi_sid_probe(struct platfo
|
||||
nvmem_cfg->dev = dev;
|
||||
nvmem_cfg->name = "sunxi-sid";
|
||||
nvmem_cfg->type = NVMEM_TYPE_OTP;
|
||||
+ nvmem_cfg->add_legacy_fixed_of_cells = true;
|
||||
nvmem_cfg->read_only = true;
|
||||
nvmem_cfg->size = cfg->size;
|
||||
nvmem_cfg->word_size = 1;
|
||||
--- a/drivers/nvmem/uniphier-efuse.c
|
||||
+++ b/drivers/nvmem/uniphier-efuse.c
|
||||
@@ -52,6 +52,7 @@ static int uniphier_efuse_probe(struct p
|
||||
econfig.size = resource_size(res);
|
||||
econfig.priv = priv;
|
||||
econfig.dev = dev;
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
nvmem = devm_nvmem_register(dev, &econfig);
|
||||
|
||||
return PTR_ERR_OR_ZERO(nvmem);
|
||||
--- a/drivers/nvmem/zynqmp_nvmem.c
|
||||
+++ b/drivers/nvmem/zynqmp_nvmem.c
|
||||
@@ -58,6 +58,7 @@ static int zynqmp_nvmem_probe(struct pla
|
||||
|
||||
priv->dev = dev;
|
||||
econfig.dev = dev;
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
econfig.reg_read = zynqmp_nvmem_read;
|
||||
econfig.priv = priv;
|
||||
|
||||
--- a/drivers/rtc/nvmem.c
|
||||
+++ b/drivers/rtc/nvmem.c
|
||||
@@ -21,6 +21,7 @@ int devm_rtc_nvmem_register(struct rtc_d
|
||||
|
||||
nvmem_config->dev = dev;
|
||||
nvmem_config->owner = rtc->owner;
|
||||
+ nvmem_config->add_legacy_fixed_of_cells = true;
|
||||
nvmem = devm_nvmem_register(dev, nvmem_config);
|
||||
if (IS_ERR(nvmem))
|
||||
dev_err(dev, "failed to register nvmem device for RTC\n");
|
||||
--- a/drivers/w1/slaves/w1_ds250x.c
|
||||
+++ b/drivers/w1/slaves/w1_ds250x.c
|
||||
@@ -168,6 +168,7 @@ static int w1_eprom_add_slave(struct w1_
|
||||
struct nvmem_device *nvmem;
|
||||
struct nvmem_config nvmem_cfg = {
|
||||
.dev = &sl->dev,
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.reg_read = w1_nvmem_read,
|
||||
.type = NVMEM_TYPE_OTP,
|
||||
.read_only = true,
|
||||
--- a/include/linux/nvmem-provider.h
|
||||
+++ b/include/linux/nvmem-provider.h
|
||||
@@ -82,6 +82,7 @@ struct nvmem_cell_info {
|
||||
* @owner: Pointer to exporter module. Used for refcounting.
|
||||
* @cells: Optional array of pre-defined NVMEM cells.
|
||||
* @ncells: Number of elements in cells.
|
||||
+ * @add_legacy_fixed_of_cells: Read fixed NVMEM cells from old OF syntax.
|
||||
* @keepout: Optional array of keepout ranges (sorted ascending by start).
|
||||
* @nkeepout: Number of elements in the keepout array.
|
||||
* @type: Type of the nvmem storage
|
||||
@@ -112,6 +113,7 @@ struct nvmem_config {
|
||||
struct module *owner;
|
||||
const struct nvmem_cell_info *cells;
|
||||
int ncells;
|
||||
+ bool add_legacy_fixed_of_cells;
|
||||
const struct nvmem_keepout *keepout;
|
||||
unsigned int nkeepout;
|
||||
enum nvmem_type type;
|
@ -0,0 +1,77 @@
|
||||
From 0720219f4d34a88a9badb4de70cfad7585687d48 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Herring <robh@kernel.org>
|
||||
Date: Fri, 20 Oct 2023 11:55:45 +0100
|
||||
Subject: [PATCH] nvmem: Use device_get_match_data()
|
||||
|
||||
Use preferred device_get_match_data() instead of of_match_device() to
|
||||
get the driver match data. With this, adjust the includes to explicitly
|
||||
include the correct headers.
|
||||
|
||||
Signed-off-by: Rob Herring <robh@kernel.org>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231020105545.216052-7-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/mxs-ocotp.c | 10 ++++------
|
||||
drivers/nvmem/stm32-romem.c | 7 ++++---
|
||||
2 files changed, 8 insertions(+), 9 deletions(-)
|
||||
|
||||
--- a/drivers/nvmem/mxs-ocotp.c
|
||||
+++ b/drivers/nvmem/mxs-ocotp.c
|
||||
@@ -13,8 +13,9 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/nvmem-provider.h>
|
||||
-#include <linux/of_device.h>
|
||||
+#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
+#include <linux/property.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/stmp_device.h>
|
||||
|
||||
@@ -140,11 +141,10 @@ static int mxs_ocotp_probe(struct platfo
|
||||
struct device *dev = &pdev->dev;
|
||||
const struct mxs_data *data;
|
||||
struct mxs_ocotp *otp;
|
||||
- const struct of_device_id *match;
|
||||
int ret;
|
||||
|
||||
- match = of_match_device(dev->driver->of_match_table, dev);
|
||||
- if (!match || !match->data)
|
||||
+ data = device_get_match_data(dev);
|
||||
+ if (!data)
|
||||
return -EINVAL;
|
||||
|
||||
otp = devm_kzalloc(dev, sizeof(*otp), GFP_KERNEL);
|
||||
@@ -169,8 +169,6 @@ static int mxs_ocotp_probe(struct platfo
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
- data = match->data;
|
||||
-
|
||||
ocotp_config.size = data->size;
|
||||
ocotp_config.priv = otp;
|
||||
ocotp_config.dev = dev;
|
||||
--- a/drivers/nvmem/stm32-romem.c
|
||||
+++ b/drivers/nvmem/stm32-romem.c
|
||||
@@ -10,7 +10,9 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/nvmem-provider.h>
|
||||
-#include <linux/of_device.h>
|
||||
+#include <linux/of.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/property.h>
|
||||
#include <linux/tee_drv.h>
|
||||
|
||||
#include "stm32-bsec-optee-ta.h"
|
||||
@@ -211,8 +213,7 @@ static int stm32_romem_probe(struct plat
|
||||
|
||||
priv->lower = 0;
|
||||
|
||||
- cfg = (const struct stm32_romem_cfg *)
|
||||
- of_match_device(dev->driver->of_match_table, dev)->data;
|
||||
+ cfg = device_get_match_data(dev);
|
||||
if (!cfg) {
|
||||
priv->cfg.read_only = true;
|
||||
priv->cfg.size = resource_size(res);
|
@ -0,0 +1,77 @@
|
||||
From f4cf4e5db331a5ce69e3f0b21d322cac0f4e4b5d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 23 Oct 2023 12:27:59 +0200
|
||||
Subject: [PATCH] Revert "nvmem: add new config option"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit 517f14d9cf3533d5ab4fded195ab6f80a92e378f.
|
||||
|
||||
Config option "no_of_node" is no longer needed since adding a more
|
||||
explicit and targeted option "add_legacy_fixed_of_cells".
|
||||
|
||||
That "no_of_node" config option was needed *earlier* to help mtd's case.
|
||||
|
||||
DT nodes of MTD partitions (that are also NVMEM devices) may contain
|
||||
subnodes. Those SHOULD NOT be treated as NVMEM fixed cells.
|
||||
|
||||
To prevent NVMEM core code from parsing subnodes a "no_of_node" option
|
||||
was added (and set to true in mtd) to make for_each_child_of_node() in
|
||||
NVMEM a no-op. That was a bit hacky because it was messing with
|
||||
"of_node" pointer to achieve some side-effect.
|
||||
|
||||
With the introduction of "add_legacy_fixed_of_cells" config option
|
||||
things got more explicit. MTD subsystem simply tells NVMEM when to look
|
||||
for fixed cells and there is no need to hack "of_node" pointer anymore.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231023102759.31529-1-zajec5@gmail.com
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/mtd/mtdcore.c | 1 -
|
||||
drivers/nvmem/core.c | 2 +-
|
||||
include/linux/nvmem-provider.h | 2 --
|
||||
3 files changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/mtdcore.c
|
||||
+++ b/drivers/mtd/mtdcore.c
|
||||
@@ -549,7 +549,6 @@ static int mtd_nvmem_add(struct mtd_info
|
||||
config.read_only = true;
|
||||
config.root_only = true;
|
||||
config.ignore_wp = true;
|
||||
- config.no_of_node = !of_device_is_compatible(node, "nvmem-cells");
|
||||
config.priv = mtd;
|
||||
|
||||
mtd->nvmem = nvmem_register(&config);
|
||||
--- a/drivers/nvmem/core.c
|
||||
+++ b/drivers/nvmem/core.c
|
||||
@@ -936,7 +936,7 @@ struct nvmem_device *nvmem_register(cons
|
||||
nvmem->nkeepout = config->nkeepout;
|
||||
if (config->of_node)
|
||||
nvmem->dev.of_node = config->of_node;
|
||||
- else if (!config->no_of_node)
|
||||
+ else
|
||||
nvmem->dev.of_node = config->dev->of_node;
|
||||
|
||||
switch (config->id) {
|
||||
--- a/include/linux/nvmem-provider.h
|
||||
+++ b/include/linux/nvmem-provider.h
|
||||
@@ -89,7 +89,6 @@ struct nvmem_cell_info {
|
||||
* @read_only: Device is read-only.
|
||||
* @root_only: Device is accessibly to root only.
|
||||
* @of_node: If given, this will be used instead of the parent's of_node.
|
||||
- * @no_of_node: Device should not use the parent's of_node even if it's !NULL.
|
||||
* @reg_read: Callback to read data.
|
||||
* @reg_write: Callback to write data.
|
||||
* @size: Device size.
|
||||
@@ -122,7 +121,6 @@ struct nvmem_config {
|
||||
bool ignore_wp;
|
||||
struct nvmem_layout *layout;
|
||||
struct device_node *of_node;
|
||||
- bool no_of_node;
|
||||
nvmem_reg_read_t reg_read;
|
||||
nvmem_reg_write_t reg_write;
|
||||
int size;
|
@ -0,0 +1,28 @@
|
||||
From 414a98abbefd82d591f4e2d1efd2917bcd3b6f6d Mon Sep 17 00:00:00 2001
|
||||
From: Peng Fan <peng.fan@nxp.com>
|
||||
Date: Fri, 13 Oct 2023 13:49:02 +0100
|
||||
Subject: [PATCH] nvmem: imx: correct nregs for i.MX6SLL
|
||||
|
||||
The nregs for i.MX6SLL should be 80 per fuse map, correct it.
|
||||
|
||||
Fixes: 6da27821a6f5 ("nvmem: imx-ocotp: add support for imx6sll")
|
||||
Cc: Stable@vger.kernel.org
|
||||
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231013124904.175782-2-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/imx-ocotp.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/imx-ocotp.c
|
||||
+++ b/drivers/nvmem/imx-ocotp.c
|
||||
@@ -499,7 +499,7 @@ static const struct ocotp_params imx6sl_
|
||||
};
|
||||
|
||||
static const struct ocotp_params imx6sll_params = {
|
||||
- .nregs = 128,
|
||||
+ .nregs = 80,
|
||||
.bank_address_words = 0,
|
||||
.set_timing = imx_ocotp_set_imx6_timing,
|
||||
.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,
|
@ -0,0 +1,28 @@
|
||||
From 7d6e10f5d254681983b53d979422c8de3fadbefb Mon Sep 17 00:00:00 2001
|
||||
From: Peng Fan <peng.fan@nxp.com>
|
||||
Date: Fri, 13 Oct 2023 13:49:03 +0100
|
||||
Subject: [PATCH] nvmem: imx: correct nregs for i.MX6UL
|
||||
|
||||
The nregs for i.MX6UL should be 144 per fuse map, correct it.
|
||||
|
||||
Fixes: 4aa2b4802046 ("nvmem: octop: Add support for imx6ul")
|
||||
Cc: Stable@vger.kernel.org
|
||||
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231013124904.175782-3-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/imx-ocotp.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/imx-ocotp.c
|
||||
+++ b/drivers/nvmem/imx-ocotp.c
|
||||
@@ -513,7 +513,7 @@ static const struct ocotp_params imx6sx_
|
||||
};
|
||||
|
||||
static const struct ocotp_params imx6ul_params = {
|
||||
- .nregs = 128,
|
||||
+ .nregs = 144,
|
||||
.bank_address_words = 0,
|
||||
.set_timing = imx_ocotp_set_imx6_timing,
|
||||
.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,
|
@ -0,0 +1,28 @@
|
||||
From 2382c1b044231fd49eaf9aa82bc7113fc55487b8 Mon Sep 17 00:00:00 2001
|
||||
From: Peng Fan <peng.fan@nxp.com>
|
||||
Date: Fri, 13 Oct 2023 13:49:04 +0100
|
||||
Subject: [PATCH] nvmem: imx: correct nregs for i.MX6ULL
|
||||
|
||||
The nregs for i.MX6ULL should be 80 per fuse map, correct it.
|
||||
|
||||
Fixes: ffbc34bf0e9c ("nvmem: imx-ocotp: Implement i.MX6ULL/ULZ support")
|
||||
Cc: Stable@vger.kernel.org
|
||||
Signed-off-by: Peng Fan <peng.fan@nxp.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231013124904.175782-4-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/imx-ocotp.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/drivers/nvmem/imx-ocotp.c
|
||||
+++ b/drivers/nvmem/imx-ocotp.c
|
||||
@@ -520,7 +520,7 @@ static const struct ocotp_params imx6ul_
|
||||
};
|
||||
|
||||
static const struct ocotp_params imx6ull_params = {
|
||||
- .nregs = 64,
|
||||
+ .nregs = 80,
|
||||
.bank_address_words = 0,
|
||||
.set_timing = imx_ocotp_set_imx6_timing,
|
||||
.ctrl = IMX_OCOTP_BM_CTRL_DEFAULT,
|
@ -0,0 +1,37 @@
|
||||
From 16724d6ea40a2c9315f5a0d81005dfa4d7a6da24 Mon Sep 17 00:00:00 2001
|
||||
From: Luca Weiss <luca.weiss@fairphone.com>
|
||||
Date: Fri, 20 Oct 2023 11:55:40 +0100
|
||||
Subject: [PATCH] nvmem: qfprom: Mark core clk as optional
|
||||
|
||||
On some platforms like sc7280 on non-ChromeOS devices the core clock
|
||||
cannot be touched by Linux so we cannot provide it. Mark it as optional
|
||||
as accessing qfprom for reading works without it but we still prohibit
|
||||
writing if we cannot provide the clock.
|
||||
|
||||
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
|
||||
Reviewed-by: Douglas Anderson <dianders@chromium.org>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231020105545.216052-2-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/qfprom.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/drivers/nvmem/qfprom.c
|
||||
+++ b/drivers/nvmem/qfprom.c
|
||||
@@ -423,12 +423,12 @@ static int qfprom_probe(struct platform_
|
||||
if (IS_ERR(priv->vcc))
|
||||
return PTR_ERR(priv->vcc);
|
||||
|
||||
- priv->secclk = devm_clk_get(dev, "core");
|
||||
+ priv->secclk = devm_clk_get_optional(dev, "core");
|
||||
if (IS_ERR(priv->secclk))
|
||||
return dev_err_probe(dev, PTR_ERR(priv->secclk), "Error getting clock\n");
|
||||
|
||||
- /* Only enable writing if we have SoC data. */
|
||||
- if (priv->soc_data)
|
||||
+ /* Only enable writing if we have SoC data and a valid clock */
|
||||
+ if (priv->soc_data && priv->secclk)
|
||||
econfig.reg_write = qfprom_reg_write;
|
||||
}
|
||||
|
@ -0,0 +1,330 @@
|
||||
From 2cc3b37f5b6df8189d55d0e812d9658ce256dfec Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Fri, 20 Oct 2023 11:55:41 +0100
|
||||
Subject: [PATCH] nvmem: add explicit config option to read old syntax fixed OF
|
||||
cells
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Binding for fixed NVMEM cells defined directly as NVMEM device subnodes
|
||||
has been deprecated. It has been replaced by the "fixed-layout" NVMEM
|
||||
layout binding.
|
||||
|
||||
New syntax is meant to be clearer and should help avoiding imprecise
|
||||
bindings.
|
||||
|
||||
NVMEM subsystem already supports the new binding. It should be a good
|
||||
idea to limit support for old syntax to existing drivers that actually
|
||||
support & use it (we can't break backward compatibility!). That way we
|
||||
additionally encourage new bindings & drivers to ignore deprecated
|
||||
binding.
|
||||
|
||||
It wasn't clear (to me) if rtc and w1 code actually uses old syntax
|
||||
fixed cells. I enabled them to don't risk any breakage.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
[for meson-{efuse,mx-efuse}.c]
|
||||
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
|
||||
[for mtk-efuse.c, nvmem/core.c, nvmem-provider.h]
|
||||
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
||||
[MT8192, MT8195 Chromebooks]
|
||||
Tested-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
||||
[for microchip-otpc.c]
|
||||
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
||||
[SAMA7G5-EK]
|
||||
Tested-by: Claudiu Beznea <claudiu.beznea@microchip.com>
|
||||
Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231020105545.216052-3-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/mtd/mtdcore.c | 2 ++
|
||||
drivers/nvmem/apple-efuses.c | 1 +
|
||||
drivers/nvmem/core.c | 8 +++++---
|
||||
drivers/nvmem/imx-ocotp-scu.c | 1 +
|
||||
drivers/nvmem/imx-ocotp.c | 1 +
|
||||
drivers/nvmem/meson-efuse.c | 1 +
|
||||
drivers/nvmem/meson-mx-efuse.c | 1 +
|
||||
drivers/nvmem/microchip-otpc.c | 1 +
|
||||
drivers/nvmem/mtk-efuse.c | 1 +
|
||||
drivers/nvmem/qcom-spmi-sdam.c | 1 +
|
||||
drivers/nvmem/qfprom.c | 1 +
|
||||
drivers/nvmem/rave-sp-eeprom.c | 1 +
|
||||
drivers/nvmem/rockchip-efuse.c | 1 +
|
||||
drivers/nvmem/sc27xx-efuse.c | 1 +
|
||||
drivers/nvmem/sec-qfprom.c | 1 +
|
||||
drivers/nvmem/sprd-efuse.c | 1 +
|
||||
drivers/nvmem/stm32-romem.c | 1 +
|
||||
drivers/nvmem/sunplus-ocotp.c | 1 +
|
||||
drivers/nvmem/sunxi_sid.c | 1 +
|
||||
drivers/nvmem/uniphier-efuse.c | 1 +
|
||||
drivers/nvmem/zynqmp_nvmem.c | 1 +
|
||||
drivers/rtc/nvmem.c | 1 +
|
||||
drivers/w1/slaves/w1_ds250x.c | 1 +
|
||||
include/linux/nvmem-provider.h | 2 ++
|
||||
24 files changed, 30 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/mtdcore.c
|
||||
+++ b/drivers/mtd/mtdcore.c
|
||||
@@ -523,6 +523,7 @@ static int mtd_nvmem_add(struct mtd_info
|
||||
config.dev = &mtd->dev;
|
||||
config.name = dev_name(&mtd->dev);
|
||||
config.owner = THIS_MODULE;
|
||||
+ config.add_legacy_fixed_of_cells = of_device_is_compatible(node, "nvmem-cells");
|
||||
config.reg_read = mtd_nvmem_reg_read;
|
||||
config.size = mtd->size;
|
||||
config.word_size = 1;
|
||||
@@ -891,6 +892,7 @@ static struct nvmem_device *mtd_otp_nvme
|
||||
config.name = compatible;
|
||||
config.id = NVMEM_DEVID_AUTO;
|
||||
config.owner = THIS_MODULE;
|
||||
+ config.add_legacy_fixed_of_cells = true;
|
||||
config.type = NVMEM_TYPE_OTP;
|
||||
config.root_only = true;
|
||||
config.ignore_wp = true;
|
||||
--- a/drivers/nvmem/apple-efuses.c
|
||||
+++ b/drivers/nvmem/apple-efuses.c
|
||||
@@ -36,6 +36,7 @@ static int apple_efuses_probe(struct pla
|
||||
struct resource *res;
|
||||
struct nvmem_config config = {
|
||||
.dev = &pdev->dev,
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.read_only = true,
|
||||
.reg_read = apple_efuses_read,
|
||||
.stride = sizeof(u32),
|
||||
--- a/drivers/nvmem/core.c
|
||||
+++ b/drivers/nvmem/core.c
|
||||
@@ -998,9 +998,11 @@ struct nvmem_device *nvmem_register(cons
|
||||
if (rval)
|
||||
goto err_remove_cells;
|
||||
|
||||
- rval = nvmem_add_cells_from_legacy_of(nvmem);
|
||||
- if (rval)
|
||||
- goto err_remove_cells;
|
||||
+ if (config->add_legacy_fixed_of_cells) {
|
||||
+ rval = nvmem_add_cells_from_legacy_of(nvmem);
|
||||
+ if (rval)
|
||||
+ goto err_remove_cells;
|
||||
+ }
|
||||
|
||||
rval = nvmem_add_cells_from_fixed_layout(nvmem);
|
||||
if (rval)
|
||||
--- a/drivers/nvmem/imx-ocotp-scu.c
|
||||
+++ b/drivers/nvmem/imx-ocotp-scu.c
|
||||
@@ -220,6 +220,7 @@ static int imx_scu_ocotp_write(void *con
|
||||
|
||||
static struct nvmem_config imx_scu_ocotp_nvmem_config = {
|
||||
.name = "imx-scu-ocotp",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.read_only = false,
|
||||
.word_size = 4,
|
||||
.stride = 1,
|
||||
--- a/drivers/nvmem/imx-ocotp.c
|
||||
+++ b/drivers/nvmem/imx-ocotp.c
|
||||
@@ -616,6 +616,7 @@ static int imx_ocotp_probe(struct platfo
|
||||
return PTR_ERR(priv->clk);
|
||||
|
||||
priv->params = of_device_get_match_data(&pdev->dev);
|
||||
+ imx_ocotp_nvmem_config.add_legacy_fixed_of_cells = true;
|
||||
imx_ocotp_nvmem_config.size = 4 * priv->params->nregs;
|
||||
imx_ocotp_nvmem_config.dev = dev;
|
||||
imx_ocotp_nvmem_config.priv = priv;
|
||||
--- a/drivers/nvmem/meson-efuse.c
|
||||
+++ b/drivers/nvmem/meson-efuse.c
|
||||
@@ -93,6 +93,7 @@ static int meson_efuse_probe(struct plat
|
||||
|
||||
econfig->dev = dev;
|
||||
econfig->name = dev_name(dev);
|
||||
+ econfig->add_legacy_fixed_of_cells = true;
|
||||
econfig->stride = 1;
|
||||
econfig->word_size = 1;
|
||||
econfig->reg_read = meson_efuse_read;
|
||||
--- a/drivers/nvmem/meson-mx-efuse.c
|
||||
+++ b/drivers/nvmem/meson-mx-efuse.c
|
||||
@@ -211,6 +211,7 @@ static int meson_mx_efuse_probe(struct p
|
||||
efuse->config.owner = THIS_MODULE;
|
||||
efuse->config.dev = &pdev->dev;
|
||||
efuse->config.priv = efuse;
|
||||
+ efuse->config.add_legacy_fixed_of_cells = true;
|
||||
efuse->config.stride = drvdata->word_size;
|
||||
efuse->config.word_size = drvdata->word_size;
|
||||
efuse->config.size = SZ_512;
|
||||
--- a/drivers/nvmem/microchip-otpc.c
|
||||
+++ b/drivers/nvmem/microchip-otpc.c
|
||||
@@ -261,6 +261,7 @@ static int mchp_otpc_probe(struct platfo
|
||||
return ret;
|
||||
|
||||
mchp_nvmem_config.dev = otpc->dev;
|
||||
+ mchp_nvmem_config.add_legacy_fixed_of_cells = true;
|
||||
mchp_nvmem_config.size = size;
|
||||
mchp_nvmem_config.priv = otpc;
|
||||
nvmem = devm_nvmem_register(&pdev->dev, &mchp_nvmem_config);
|
||||
--- a/drivers/nvmem/mtk-efuse.c
|
||||
+++ b/drivers/nvmem/mtk-efuse.c
|
||||
@@ -83,6 +83,7 @@ static int mtk_efuse_probe(struct platfo
|
||||
return PTR_ERR(priv->base);
|
||||
|
||||
pdata = device_get_match_data(dev);
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
econfig.stride = 1;
|
||||
econfig.word_size = 1;
|
||||
econfig.reg_read = mtk_reg_read;
|
||||
--- a/drivers/nvmem/qcom-spmi-sdam.c
|
||||
+++ b/drivers/nvmem/qcom-spmi-sdam.c
|
||||
@@ -142,6 +142,7 @@ static int sdam_probe(struct platform_de
|
||||
sdam->sdam_config.name = "spmi_sdam";
|
||||
sdam->sdam_config.id = NVMEM_DEVID_AUTO;
|
||||
sdam->sdam_config.owner = THIS_MODULE;
|
||||
+ sdam->sdam_config.add_legacy_fixed_of_cells = true;
|
||||
sdam->sdam_config.stride = 1;
|
||||
sdam->sdam_config.word_size = 1;
|
||||
sdam->sdam_config.reg_read = sdam_read;
|
||||
--- a/drivers/nvmem/qfprom.c
|
||||
+++ b/drivers/nvmem/qfprom.c
|
||||
@@ -357,6 +357,7 @@ static int qfprom_probe(struct platform_
|
||||
{
|
||||
struct nvmem_config econfig = {
|
||||
.name = "qfprom",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.id = NVMEM_DEVID_AUTO,
|
||||
--- a/drivers/nvmem/rave-sp-eeprom.c
|
||||
+++ b/drivers/nvmem/rave-sp-eeprom.c
|
||||
@@ -328,6 +328,7 @@ static int rave_sp_eeprom_probe(struct p
|
||||
of_property_read_string(np, "zii,eeprom-name", &config.name);
|
||||
config.priv = eeprom;
|
||||
config.dev = dev;
|
||||
+ config.add_legacy_fixed_of_cells = true;
|
||||
config.size = size;
|
||||
config.reg_read = rave_sp_eeprom_reg_read;
|
||||
config.reg_write = rave_sp_eeprom_reg_write;
|
||||
--- a/drivers/nvmem/rockchip-efuse.c
|
||||
+++ b/drivers/nvmem/rockchip-efuse.c
|
||||
@@ -205,6 +205,7 @@ static int rockchip_rk3399_efuse_read(vo
|
||||
|
||||
static struct nvmem_config econfig = {
|
||||
.name = "rockchip-efuse",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.read_only = true,
|
||||
--- a/drivers/nvmem/sc27xx-efuse.c
|
||||
+++ b/drivers/nvmem/sc27xx-efuse.c
|
||||
@@ -248,6 +248,7 @@ static int sc27xx_efuse_probe(struct pla
|
||||
econfig.reg_read = sc27xx_efuse_read;
|
||||
econfig.priv = efuse;
|
||||
econfig.dev = &pdev->dev;
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
nvmem = devm_nvmem_register(&pdev->dev, &econfig);
|
||||
if (IS_ERR(nvmem)) {
|
||||
dev_err(&pdev->dev, "failed to register nvmem config\n");
|
||||
--- a/drivers/nvmem/sec-qfprom.c
|
||||
+++ b/drivers/nvmem/sec-qfprom.c
|
||||
@@ -47,6 +47,7 @@ static int sec_qfprom_probe(struct platf
|
||||
{
|
||||
struct nvmem_config econfig = {
|
||||
.name = "sec-qfprom",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.stride = 1,
|
||||
.word_size = 1,
|
||||
.id = NVMEM_DEVID_AUTO,
|
||||
--- a/drivers/nvmem/sprd-efuse.c
|
||||
+++ b/drivers/nvmem/sprd-efuse.c
|
||||
@@ -408,6 +408,7 @@ static int sprd_efuse_probe(struct platf
|
||||
econfig.read_only = false;
|
||||
econfig.name = "sprd-efuse";
|
||||
econfig.size = efuse->data->blk_nums * SPRD_EFUSE_BLOCK_WIDTH;
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
econfig.reg_read = sprd_efuse_read;
|
||||
econfig.reg_write = sprd_efuse_write;
|
||||
econfig.priv = efuse;
|
||||
--- a/drivers/nvmem/stm32-romem.c
|
||||
+++ b/drivers/nvmem/stm32-romem.c
|
||||
@@ -207,6 +207,7 @@ static int stm32_romem_probe(struct plat
|
||||
priv->cfg.priv = priv;
|
||||
priv->cfg.owner = THIS_MODULE;
|
||||
priv->cfg.type = NVMEM_TYPE_OTP;
|
||||
+ priv->cfg.add_legacy_fixed_of_cells = true;
|
||||
|
||||
priv->lower = 0;
|
||||
|
||||
--- a/drivers/nvmem/sunplus-ocotp.c
|
||||
+++ b/drivers/nvmem/sunplus-ocotp.c
|
||||
@@ -145,6 +145,7 @@ disable_clk:
|
||||
|
||||
static struct nvmem_config sp_ocotp_nvmem_config = {
|
||||
.name = "sp-ocotp",
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.read_only = true,
|
||||
.word_size = 1,
|
||||
.size = QAC628_OTP_SIZE,
|
||||
--- a/drivers/nvmem/sunxi_sid.c
|
||||
+++ b/drivers/nvmem/sunxi_sid.c
|
||||
@@ -154,6 +154,7 @@ static int sunxi_sid_probe(struct platfo
|
||||
nvmem_cfg->dev = dev;
|
||||
nvmem_cfg->name = "sunxi-sid";
|
||||
nvmem_cfg->type = NVMEM_TYPE_OTP;
|
||||
+ nvmem_cfg->add_legacy_fixed_of_cells = true;
|
||||
nvmem_cfg->read_only = true;
|
||||
nvmem_cfg->size = cfg->size;
|
||||
nvmem_cfg->word_size = 1;
|
||||
--- a/drivers/nvmem/uniphier-efuse.c
|
||||
+++ b/drivers/nvmem/uniphier-efuse.c
|
||||
@@ -52,6 +52,7 @@ static int uniphier_efuse_probe(struct p
|
||||
econfig.size = resource_size(res);
|
||||
econfig.priv = priv;
|
||||
econfig.dev = dev;
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
nvmem = devm_nvmem_register(dev, &econfig);
|
||||
|
||||
return PTR_ERR_OR_ZERO(nvmem);
|
||||
--- a/drivers/nvmem/zynqmp_nvmem.c
|
||||
+++ b/drivers/nvmem/zynqmp_nvmem.c
|
||||
@@ -58,6 +58,7 @@ static int zynqmp_nvmem_probe(struct pla
|
||||
|
||||
priv->dev = dev;
|
||||
econfig.dev = dev;
|
||||
+ econfig.add_legacy_fixed_of_cells = true;
|
||||
econfig.reg_read = zynqmp_nvmem_read;
|
||||
econfig.priv = priv;
|
||||
|
||||
--- a/drivers/rtc/nvmem.c
|
||||
+++ b/drivers/rtc/nvmem.c
|
||||
@@ -21,6 +21,7 @@ int devm_rtc_nvmem_register(struct rtc_d
|
||||
|
||||
nvmem_config->dev = dev;
|
||||
nvmem_config->owner = rtc->owner;
|
||||
+ nvmem_config->add_legacy_fixed_of_cells = true;
|
||||
nvmem = devm_nvmem_register(dev, nvmem_config);
|
||||
if (IS_ERR(nvmem))
|
||||
dev_err(dev, "failed to register nvmem device for RTC\n");
|
||||
--- a/drivers/w1/slaves/w1_ds250x.c
|
||||
+++ b/drivers/w1/slaves/w1_ds250x.c
|
||||
@@ -168,6 +168,7 @@ static int w1_eprom_add_slave(struct w1_
|
||||
struct nvmem_device *nvmem;
|
||||
struct nvmem_config nvmem_cfg = {
|
||||
.dev = &sl->dev,
|
||||
+ .add_legacy_fixed_of_cells = true,
|
||||
.reg_read = w1_nvmem_read,
|
||||
.type = NVMEM_TYPE_OTP,
|
||||
.read_only = true,
|
||||
--- a/include/linux/nvmem-provider.h
|
||||
+++ b/include/linux/nvmem-provider.h
|
||||
@@ -82,6 +82,7 @@ struct nvmem_cell_info {
|
||||
* @owner: Pointer to exporter module. Used for refcounting.
|
||||
* @cells: Optional array of pre-defined NVMEM cells.
|
||||
* @ncells: Number of elements in cells.
|
||||
+ * @add_legacy_fixed_of_cells: Read fixed NVMEM cells from old OF syntax.
|
||||
* @keepout: Optional array of keepout ranges (sorted ascending by start).
|
||||
* @nkeepout: Number of elements in the keepout array.
|
||||
* @type: Type of the nvmem storage
|
||||
@@ -112,6 +113,7 @@ struct nvmem_config {
|
||||
struct module *owner;
|
||||
const struct nvmem_cell_info *cells;
|
||||
int ncells;
|
||||
+ bool add_legacy_fixed_of_cells;
|
||||
const struct nvmem_keepout *keepout;
|
||||
unsigned int nkeepout;
|
||||
enum nvmem_type type;
|
@ -0,0 +1,77 @@
|
||||
From 0720219f4d34a88a9badb4de70cfad7585687d48 Mon Sep 17 00:00:00 2001
|
||||
From: Rob Herring <robh@kernel.org>
|
||||
Date: Fri, 20 Oct 2023 11:55:45 +0100
|
||||
Subject: [PATCH] nvmem: Use device_get_match_data()
|
||||
|
||||
Use preferred device_get_match_data() instead of of_match_device() to
|
||||
get the driver match data. With this, adjust the includes to explicitly
|
||||
include the correct headers.
|
||||
|
||||
Signed-off-by: Rob Herring <robh@kernel.org>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231020105545.216052-7-srinivas.kandagatla@linaro.org
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/nvmem/mxs-ocotp.c | 10 ++++------
|
||||
drivers/nvmem/stm32-romem.c | 7 ++++---
|
||||
2 files changed, 8 insertions(+), 9 deletions(-)
|
||||
|
||||
--- a/drivers/nvmem/mxs-ocotp.c
|
||||
+++ b/drivers/nvmem/mxs-ocotp.c
|
||||
@@ -13,8 +13,9 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/nvmem-provider.h>
|
||||
-#include <linux/of_device.h>
|
||||
+#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
+#include <linux/property.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/stmp_device.h>
|
||||
|
||||
@@ -140,11 +141,10 @@ static int mxs_ocotp_probe(struct platfo
|
||||
struct device *dev = &pdev->dev;
|
||||
const struct mxs_data *data;
|
||||
struct mxs_ocotp *otp;
|
||||
- const struct of_device_id *match;
|
||||
int ret;
|
||||
|
||||
- match = of_match_device(dev->driver->of_match_table, dev);
|
||||
- if (!match || !match->data)
|
||||
+ data = device_get_match_data(dev);
|
||||
+ if (!data)
|
||||
return -EINVAL;
|
||||
|
||||
otp = devm_kzalloc(dev, sizeof(*otp), GFP_KERNEL);
|
||||
@@ -169,8 +169,6 @@ static int mxs_ocotp_probe(struct platfo
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
- data = match->data;
|
||||
-
|
||||
ocotp_config.size = data->size;
|
||||
ocotp_config.priv = otp;
|
||||
ocotp_config.dev = dev;
|
||||
--- a/drivers/nvmem/stm32-romem.c
|
||||
+++ b/drivers/nvmem/stm32-romem.c
|
||||
@@ -10,7 +10,9 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/nvmem-provider.h>
|
||||
-#include <linux/of_device.h>
|
||||
+#include <linux/of.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/property.h>
|
||||
#include <linux/tee_drv.h>
|
||||
|
||||
#include "stm32-bsec-optee-ta.h"
|
||||
@@ -211,8 +213,7 @@ static int stm32_romem_probe(struct plat
|
||||
|
||||
priv->lower = 0;
|
||||
|
||||
- cfg = (const struct stm32_romem_cfg *)
|
||||
- of_match_device(dev->driver->of_match_table, dev)->data;
|
||||
+ cfg = device_get_match_data(dev);
|
||||
if (!cfg) {
|
||||
priv->cfg.read_only = true;
|
||||
priv->cfg.size = resource_size(res);
|
@ -0,0 +1,77 @@
|
||||
From f4cf4e5db331a5ce69e3f0b21d322cac0f4e4b5d Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 23 Oct 2023 12:27:59 +0200
|
||||
Subject: [PATCH] Revert "nvmem: add new config option"
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
This reverts commit 517f14d9cf3533d5ab4fded195ab6f80a92e378f.
|
||||
|
||||
Config option "no_of_node" is no longer needed since adding a more
|
||||
explicit and targeted option "add_legacy_fixed_of_cells".
|
||||
|
||||
That "no_of_node" config option was needed *earlier* to help mtd's case.
|
||||
|
||||
DT nodes of MTD partitions (that are also NVMEM devices) may contain
|
||||
subnodes. Those SHOULD NOT be treated as NVMEM fixed cells.
|
||||
|
||||
To prevent NVMEM core code from parsing subnodes a "no_of_node" option
|
||||
was added (and set to true in mtd) to make for_each_child_of_node() in
|
||||
NVMEM a no-op. That was a bit hacky because it was messing with
|
||||
"of_node" pointer to achieve some side-effect.
|
||||
|
||||
With the introduction of "add_legacy_fixed_of_cells" config option
|
||||
things got more explicit. MTD subsystem simply tells NVMEM when to look
|
||||
for fixed cells and there is no need to hack "of_node" pointer anymore.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
|
||||
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20231023102759.31529-1-zajec5@gmail.com
|
||||
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
||||
---
|
||||
drivers/mtd/mtdcore.c | 1 -
|
||||
drivers/nvmem/core.c | 2 +-
|
||||
include/linux/nvmem-provider.h | 2 --
|
||||
3 files changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
--- a/drivers/mtd/mtdcore.c
|
||||
+++ b/drivers/mtd/mtdcore.c
|
||||
@@ -531,7 +531,6 @@ static int mtd_nvmem_add(struct mtd_info
|
||||
config.read_only = true;
|
||||
config.root_only = true;
|
||||
config.ignore_wp = true;
|
||||
- config.no_of_node = !of_device_is_compatible(node, "nvmem-cells");
|
||||
config.priv = mtd;
|
||||
|
||||
mtd->nvmem = nvmem_register(&config);
|
||||
--- a/drivers/nvmem/core.c
|
||||
+++ b/drivers/nvmem/core.c
|
||||
@@ -936,7 +936,7 @@ struct nvmem_device *nvmem_register(cons
|
||||
nvmem->nkeepout = config->nkeepout;
|
||||
if (config->of_node)
|
||||
nvmem->dev.of_node = config->of_node;
|
||||
- else if (!config->no_of_node)
|
||||
+ else
|
||||
nvmem->dev.of_node = config->dev->of_node;
|
||||
|
||||
switch (config->id) {
|
||||
--- a/include/linux/nvmem-provider.h
|
||||
+++ b/include/linux/nvmem-provider.h
|
||||
@@ -89,7 +89,6 @@ struct nvmem_cell_info {
|
||||
* @read_only: Device is read-only.
|
||||
* @root_only: Device is accessibly to root only.
|
||||
* @of_node: If given, this will be used instead of the parent's of_node.
|
||||
- * @no_of_node: Device should not use the parent's of_node even if it's !NULL.
|
||||
* @reg_read: Callback to read data.
|
||||
* @reg_write: Callback to write data.
|
||||
* @size: Device size.
|
||||
@@ -122,7 +121,6 @@ struct nvmem_config {
|
||||
bool ignore_wp;
|
||||
struct nvmem_layout *layout;
|
||||
struct device_node *of_node;
|
||||
- bool no_of_node;
|
||||
nvmem_reg_read_t reg_read;
|
||||
nvmem_reg_write_t reg_write;
|
||||
int size;
|
@ -77,7 +77,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
#include "mtdcore.h"
|
||||
|
||||
@@ -1082,6 +1083,8 @@ int mtd_device_parse_register(struct mtd
|
||||
@@ -1083,6 +1084,8 @@ int mtd_device_parse_register(struct mtd
|
||||
register_reboot_notifier(&mtd->reboot_notifier);
|
||||
}
|
||||
|
||||
|
@ -116,7 +116,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
help
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -3577,6 +3577,11 @@ static int xmit_one(struct sk_buff *skb,
|
||||
@@ -3597,6 +3597,11 @@ static int xmit_one(struct sk_buff *skb,
|
||||
if (dev_nit_active(dev))
|
||||
dev_queue_xmit_nit(skb, dev);
|
||||
|
||||
|
@ -20,7 +20,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
||||
{QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */
|
||||
--- a/drivers/usb/serial/option.c
|
||||
+++ b/drivers/usb/serial/option.c
|
||||
@@ -244,6 +244,8 @@ static void option_instat_callback(struc
|
||||
@@ -247,6 +247,8 @@ static void option_instat_callback(struc
|
||||
#define UBLOX_PRODUCT_R410M 0x90b2
|
||||
/* These Yuga products use Qualcomm's vendor ID */
|
||||
#define YUGA_PRODUCT_CLM920_NC5 0x9625
|
||||
@ -29,7 +29,7 @@ Subject: [PATCH] net/usb/qmi_wwan: add MeigLink modem support
|
||||
|
||||
#define QUECTEL_VENDOR_ID 0x2c7c
|
||||
/* These Quectel products use Quectel's vendor ID */
|
||||
@@ -1180,6 +1182,11 @@ static const struct usb_device_id option
|
||||
@@ -1185,6 +1187,11 @@ static const struct usb_device_id option
|
||||
.driver_info = ZLP },
|
||||
{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
|
||||
.driver_info = RSVD(4) },
|
||||
|
@ -341,7 +341,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
--- a/net/ipv4/fib_trie.c
|
||||
+++ b/net/ipv4/fib_trie.c
|
||||
@@ -3025,11 +3025,13 @@ static const struct seq_operations fib_r
|
||||
@@ -3029,11 +3029,13 @@ static const struct seq_operations fib_r
|
||||
|
||||
int __net_init fib_proc_init(struct net *net)
|
||||
{
|
||||
@ -357,7 +357,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
fib_triestat_seq_show, NULL))
|
||||
goto out2;
|
||||
|
||||
@@ -3040,17 +3042,21 @@ int __net_init fib_proc_init(struct net
|
||||
@@ -3044,17 +3046,21 @@ int __net_init fib_proc_init(struct net
|
||||
return 0;
|
||||
|
||||
out3:
|
||||
|
@ -91,7 +91,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
||||
|
||||
#include "mtdcore.h"
|
||||
|
||||
@@ -1074,6 +1075,8 @@ int mtd_device_parse_register(struct mtd
|
||||
@@ -1075,6 +1076,8 @@ int mtd_device_parse_register(struct mtd
|
||||
register_reboot_notifier(&mtd->reboot_notifier);
|
||||
}
|
||||
|
||||
|
@ -66,7 +66,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||||
static void rt_fibinfo_free(struct rtable __rcu **rtp)
|
||||
--- a/net/ipv4/fib_trie.c
|
||||
+++ b/net/ipv4/fib_trie.c
|
||||
@@ -2773,6 +2773,7 @@ static const char *const rtn_type_names[
|
||||
@@ -2777,6 +2777,7 @@ static const char *const rtn_type_names[
|
||||
[RTN_THROW] = "THROW",
|
||||
[RTN_NAT] = "NAT",
|
||||
[RTN_XRESOLVE] = "XRESOLVE",
|
||||
|
@ -32,7 +32,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
__u8 inner_protocol_type:1;
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -6054,6 +6054,9 @@ static enum gro_result dev_gro_receive(s
|
||||
@@ -6074,6 +6074,9 @@ static enum gro_result dev_gro_receive(s
|
||||
int same_flow;
|
||||
int grow;
|
||||
|
||||
@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (netif_elide_gro(skb->dev))
|
||||
goto normal;
|
||||
|
||||
@@ -8068,6 +8071,48 @@ static void __netdev_adjacent_dev_unlink
|
||||
@@ -8088,6 +8091,48 @@ static void __netdev_adjacent_dev_unlink
|
||||
&upper_dev->adj_list.lower);
|
||||
}
|
||||
|
||||
@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
static int __netdev_upper_dev_link(struct net_device *dev,
|
||||
struct net_device *upper_dev, bool master,
|
||||
void *upper_priv, void *upper_info,
|
||||
@@ -8119,6 +8164,7 @@ static int __netdev_upper_dev_link(struc
|
||||
@@ -8139,6 +8184,7 @@ static int __netdev_upper_dev_link(struc
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
@ -99,7 +99,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
ret = call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
||||
&changeupper_info.info);
|
||||
ret = notifier_to_errno(ret);
|
||||
@@ -8215,6 +8261,7 @@ static void __netdev_upper_dev_unlink(st
|
||||
@@ -8235,6 +8281,7 @@ static void __netdev_upper_dev_unlink(st
|
||||
|
||||
__netdev_adjacent_dev_unlink_neighbour(dev, upper_dev);
|
||||
|
||||
@ -107,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
call_netdevice_notifiers_info(NETDEV_CHANGEUPPER,
|
||||
&changeupper_info.info);
|
||||
|
||||
@@ -9034,6 +9081,7 @@ int dev_set_mac_address(struct net_devic
|
||||
@@ -9054,6 +9101,7 @@ int dev_set_mac_address(struct net_devic
|
||||
if (err)
|
||||
return err;
|
||||
dev->addr_assign_type = NET_ADDR_SET;
|
||||
|
@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
|
||||
/**
|
||||
* napi_disable - prevent NAPI from scheduling
|
||||
@@ -3362,6 +3363,7 @@ struct softnet_data {
|
||||
@@ -3363,6 +3364,7 @@ struct softnet_data {
|
||||
unsigned int processed;
|
||||
unsigned int time_squeeze;
|
||||
unsigned int received_rps;
|
||||
@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
#endif
|
||||
--- a/net/core/dev.c
|
||||
+++ b/net/core/dev.c
|
||||
@@ -4563,7 +4563,7 @@ static int rps_ipi_queued(struct softnet
|
||||
@@ -4583,7 +4583,7 @@ static int rps_ipi_queued(struct softnet
|
||||
#ifdef CONFIG_RPS
|
||||
struct softnet_data *mysd = this_cpu_ptr(&softnet_data);
|
||||
|
||||
@ -39,7 +39,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
sd->rps_ipi_next = mysd->rps_ipi_list;
|
||||
mysd->rps_ipi_list = sd;
|
||||
|
||||
@@ -5744,6 +5744,8 @@ static DEFINE_PER_CPU(struct work_struct
|
||||
@@ -5764,6 +5764,8 @@ static DEFINE_PER_CPU(struct work_struct
|
||||
/* Network device is going away, flush any packets still pending */
|
||||
static void flush_backlog(struct work_struct *work)
|
||||
{
|
||||
@ -48,7 +48,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
struct sk_buff *skb, *tmp;
|
||||
struct softnet_data *sd;
|
||||
|
||||
@@ -5759,9 +5761,18 @@ static void flush_backlog(struct work_st
|
||||
@@ -5779,9 +5781,18 @@ static void flush_backlog(struct work_st
|
||||
input_queue_head_incr(sd);
|
||||
}
|
||||
}
|
||||
@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
|
||||
if (skb->dev->reg_state == NETREG_UNREGISTERING) {
|
||||
__skb_unlink(skb, &sd->process_queue);
|
||||
@@ -5769,7 +5780,18 @@ static void flush_backlog(struct work_st
|
||||
@@ -5789,7 +5800,18 @@ static void flush_backlog(struct work_st
|
||||
input_queue_head_incr(sd);
|
||||
}
|
||||
}
|
||||
@ -86,7 +86,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
}
|
||||
|
||||
static bool flush_required(int cpu)
|
||||
@@ -6452,6 +6474,7 @@ static int process_backlog(struct napi_s
|
||||
@@ -6472,6 +6494,7 @@ static int process_backlog(struct napi_s
|
||||
|
||||
local_irq_disable();
|
||||
rps_lock(sd);
|
||||
@ -94,7 +94,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
if (skb_queue_empty(&sd->input_pkt_queue)) {
|
||||
/*
|
||||
* Inline a custom version of __napi_complete().
|
||||
@@ -6461,7 +6484,8 @@ static int process_backlog(struct napi_s
|
||||
@@ -6481,7 +6504,8 @@ static int process_backlog(struct napi_s
|
||||
* We can use a plain write instead of clear_bit(),
|
||||
* and we dont need an smp_mb() memory barrier.
|
||||
*/
|
||||
@ -104,7 +104,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
again = false;
|
||||
} else {
|
||||
skb_queue_splice_tail_init(&sd->input_pkt_queue,
|
||||
@@ -6878,6 +6902,57 @@ int dev_set_threaded(struct net_device *
|
||||
@@ -6898,6 +6922,57 @@ int dev_set_threaded(struct net_device *
|
||||
}
|
||||
EXPORT_SYMBOL(dev_set_threaded);
|
||||
|
||||
@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
void netif_napi_add(struct net_device *dev, struct napi_struct *napi,
|
||||
int (*poll)(struct napi_struct *, int), int weight)
|
||||
{
|
||||
@@ -11354,6 +11429,9 @@ static int dev_cpu_dead(unsigned int old
|
||||
@@ -11378,6 +11453,9 @@ static int dev_cpu_dead(unsigned int old
|
||||
raise_softirq_irqoff(NET_TX_SOFTIRQ);
|
||||
local_irq_enable();
|
||||
|
||||
@ -172,7 +172,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
|
||||
#ifdef CONFIG_RPS
|
||||
remsd = oldsd->rps_ipi_list;
|
||||
oldsd->rps_ipi_list = NULL;
|
||||
@@ -11693,6 +11771,7 @@ static int __init net_dev_init(void)
|
||||
@@ -11717,6 +11795,7 @@ static int __init net_dev_init(void)
|
||||
sd->cpu = i;
|
||||
#endif
|
||||
|
||||
|
@ -318,7 +318,7 @@ define Device/cmcc_rax3000m
|
||||
IMAGES := sysupgrade.itb
|
||||
IMAGE_SIZE := $$(shell expr 64 + $$(CONFIG_TARGET_ROOTFS_PARTSIZE))m
|
||||
IMAGE/sysupgrade.itb := append-kernel | \
|
||||
fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-with-rootfs | \
|
||||
fit gzip $$(KDIR)/image-$$(firstword $$(DEVICE_DTS)).dtb external-static-with-rootfs | \
|
||||
pad-rootfs | append-metadata
|
||||
ARTIFACTS := \
|
||||
emmc-gpt.bin emmc-preloader.bin emmc-bl31-uboot.fip \
|
||||
|
@ -18,12 +18,7 @@ mvebu_setup_interfaces()
|
||||
cznic,turris-omnia)
|
||||
ucidef_set_interfaces_lan_wan "lan0 lan1 lan2 lan3 lan4" "eth2"
|
||||
;;
|
||||
fortinet,fg-50e)
|
||||
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" "eth1 eth2"
|
||||
;;
|
||||
iptime,nas1dual)
|
||||
ucidef_set_interface_lan "eth0 eth1" "dhcp"
|
||||
;;
|
||||
fortinet,fg-30e|\
|
||||
linksys,wrt1200ac|\
|
||||
linksys,wrt1900ac-v1|\
|
||||
linksys,wrt1900ac-v2|\
|
||||
@ -32,6 +27,12 @@ mvebu_setup_interfaces()
|
||||
linksys,wrt32x)
|
||||
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"
|
||||
;;
|
||||
fortinet,fg-50e)
|
||||
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4 lan5" "eth1 eth2"
|
||||
;;
|
||||
iptime,nas1dual)
|
||||
ucidef_set_interface_lan "eth0 eth1" "dhcp"
|
||||
;;
|
||||
marvell,a385-db-ap)
|
||||
ucidef_set_interfaces_lan_wan "eth0 eth1" "eth2"
|
||||
;;
|
||||
|
@ -52,6 +52,7 @@ platform_do_upgrade() {
|
||||
solidrun,clearfog-pro-a1)
|
||||
legacy_sdcard_do_upgrade "$1"
|
||||
;;
|
||||
fortinet,fg-30e|\
|
||||
fortinet,fg-50e)
|
||||
fortinet_do_upgrade "$1"
|
||||
;;
|
||||
|
@ -0,0 +1,104 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
||||
|
||||
#include "armada-385-fortinet-fg-x0e.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Fortinet FortiGate 30E";
|
||||
compatible = "fortinet,fg-30e", "marvell,armada385", "marvell,armada380";
|
||||
|
||||
memory@0 {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x40000000>; /* 1GB */
|
||||
};
|
||||
};
|
||||
|
||||
&gpio_leds {
|
||||
led-14 {
|
||||
label = "amber:speed_wan";
|
||||
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:00:100Mbps";
|
||||
};
|
||||
|
||||
led-15 {
|
||||
label = "green:speed_wan";
|
||||
gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:00:1Gbps";
|
||||
};
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
pmx_switch_pins: switch-pins {
|
||||
marvell,pins = "mpp19";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
};
|
||||
|
||||
&mdio {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&mdio_pins>, <&pmx_switch_pins>;
|
||||
|
||||
/* Marvell 88E6176 */
|
||||
switch@2 {
|
||||
compatible = "marvell,mv88e6085";
|
||||
reg = <0x2>;
|
||||
reset-gpios = <&gpio0 19 GPIO_ACTIVE_LOW>;
|
||||
|
||||
ports {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
port@0 {
|
||||
reg = <0>;
|
||||
label = "wan";
|
||||
nvmem-cells = <&macaddr_bdinfo_d880>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
mac-address-increment = <1>;
|
||||
};
|
||||
|
||||
port@1 {
|
||||
reg = <1>;
|
||||
label = "lan4";
|
||||
nvmem-cells = <&macaddr_bdinfo_d880>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
mac-address-increment = <5>;
|
||||
};
|
||||
|
||||
port@2 {
|
||||
reg = <2>;
|
||||
label = "lan3";
|
||||
nvmem-cells = <&macaddr_bdinfo_d880>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
mac-address-increment = <4>;
|
||||
};
|
||||
|
||||
port@3 {
|
||||
reg = <3>;
|
||||
label = "lan2";
|
||||
nvmem-cells = <&macaddr_bdinfo_d880>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
mac-address-increment = <3>;
|
||||
};
|
||||
|
||||
port@4 {
|
||||
reg = <4>;
|
||||
label = "lan1";
|
||||
nvmem-cells = <&macaddr_bdinfo_d880>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
mac-address-increment = <2>;
|
||||
};
|
||||
|
||||
port@6 {
|
||||
reg = <6>;
|
||||
ethernet = <ð0>;
|
||||
phy-connection-type = "rgmii-id";
|
||||
|
||||
fixed-link {
|
||||
speed = <1000>;
|
||||
full-duplex;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
@ -1,215 +1,45 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include <dt-bindings/leds/common.h>
|
||||
#include "armada-385.dtsi"
|
||||
#include "armada-385-fortinet-fg-x0e.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Fortinet FortiGate 50E";
|
||||
compatible = "fortinet,fg-50e", "marvell,armada385", "marvell,armada380";
|
||||
|
||||
aliases {
|
||||
led-boot = &led_status_green;
|
||||
led-failsafe = &led_status_red;
|
||||
led-running = &led_status_green;
|
||||
led-upgrade = &led_status_green;
|
||||
label-mac-device = ð0;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial0:9600n8";
|
||||
};
|
||||
|
||||
memory@0 {
|
||||
device_type = "memory";
|
||||
reg = <0x00000000 0x80000000>; /* 2GB */
|
||||
};
|
||||
|
||||
soc {
|
||||
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
|
||||
MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
|
||||
MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
|
||||
MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
|
||||
MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
|
||||
};
|
||||
|
||||
gpio-keys {
|
||||
compatible = "gpio-keys";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pmx_gpio_keys_pins>;
|
||||
|
||||
reset {
|
||||
label = "reset";
|
||||
linux,code = <KEY_RESTART>;
|
||||
gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
};
|
||||
|
||||
gpio-leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pmx_gpio_leds_pins>;
|
||||
|
||||
led-0 {
|
||||
label = "red:alarm";
|
||||
gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
function = LED_FUNCTION_ALARM;
|
||||
};
|
||||
|
||||
led-1 {
|
||||
label = "red:ha";
|
||||
gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
};
|
||||
|
||||
led_status_green: led-2 {
|
||||
label = "green:sta";
|
||||
gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
function = LED_FUNCTION_STATUS;
|
||||
};
|
||||
|
||||
led-3 {
|
||||
label = "green:ha";
|
||||
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
};
|
||||
|
||||
led-4 {
|
||||
label = "amber:alarm";
|
||||
gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
function = LED_FUNCTION_ALARM;
|
||||
};
|
||||
|
||||
led_status_red: led-5 {
|
||||
label = "red:sta";
|
||||
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
function = LED_FUNCTION_STATUS;
|
||||
};
|
||||
|
||||
led-6 {
|
||||
label = "green:speed_wan1";
|
||||
gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "f1072004.mdio-mii:00:1Gbps";
|
||||
};
|
||||
|
||||
led-7 {
|
||||
label = "green:speed_wan2";
|
||||
gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "f1072004.mdio-mii:01:1Gbps";
|
||||
};
|
||||
|
||||
led-8 {
|
||||
label = "amber:speed_lan5";
|
||||
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:00:100Mbps";
|
||||
};
|
||||
|
||||
led-9 {
|
||||
label = "green:speed_lan5";
|
||||
gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:00:1Gbps";
|
||||
};
|
||||
|
||||
led-10 {
|
||||
label = "green:speed_lan4";
|
||||
gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:01:1Gbps";
|
||||
};
|
||||
|
||||
led-11 {
|
||||
label = "amber:speed_lan4";
|
||||
gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:01:100Mbps";
|
||||
};
|
||||
|
||||
led-12 {
|
||||
label = "amber:speed_lan3";
|
||||
gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:02:100Mbps";
|
||||
};
|
||||
|
||||
led-13 {
|
||||
label = "green:speed_lan3";
|
||||
gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:02:1Gbps";
|
||||
};
|
||||
|
||||
led-14 {
|
||||
label = "green:speed_lan1";
|
||||
gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:04:1Gbps";
|
||||
};
|
||||
|
||||
led-15 {
|
||||
label = "amber:speed_lan1";
|
||||
gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:04:100Mbps";
|
||||
};
|
||||
|
||||
led-16 {
|
||||
label = "green:speed_lan2";
|
||||
gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:03:1Gbps";
|
||||
};
|
||||
|
||||
led-17 {
|
||||
label = "amber:speed_lan2";
|
||||
gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:03:100Mbps";
|
||||
};
|
||||
};
|
||||
|
||||
reg_usb_vbus: regulator-usb-vbus {
|
||||
compatible = "fixed-regulator";
|
||||
regulator-name = "usb-vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
gpio = <&gpio1 21 GPIO_ACTIVE_LOW>;
|
||||
regulator-always-on;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2c0_pins>;
|
||||
status = "okay";
|
||||
|
||||
gpio2: gpio@24 {
|
||||
compatible = "nxp,pca9555";
|
||||
reg = <0x24>;
|
||||
gpio-controller;
|
||||
#gpio-cells = <0x2>;
|
||||
&gpio_leds {
|
||||
led-14 {
|
||||
label = "green:speed_wan1";
|
||||
gpios = <&gpio2 0 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "f1072004.mdio-mii:00:1Gbps";
|
||||
};
|
||||
|
||||
hwmon@28 {
|
||||
compatible = "nuvoton,nct7802";
|
||||
reg = <0x28>;
|
||||
led-15 {
|
||||
label = "green:speed_wan2";
|
||||
gpios = <&gpio2 1 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "f1072004.mdio-mii:01:1Gbps";
|
||||
};
|
||||
};
|
||||
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_pins>;
|
||||
status = "okay";
|
||||
led-16 {
|
||||
label = "amber:speed_lan5";
|
||||
gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:00:100Mbps";
|
||||
};
|
||||
|
||||
led-17 {
|
||||
label = "green:speed_lan5";
|
||||
gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:00:1Gbps";
|
||||
};
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
@ -217,48 +47,6 @@
|
||||
marvell,pins = "mpp19", "mpp20", "mpp23", "mpp34", "mpp41";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_gpio_leds_pins: gpio-leds-pins {
|
||||
marvell,pins = "mpp30", "mpp32", "mpp33", "mpp35",
|
||||
"mpp45", "mpp47";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_usb_pins: usb-pins {
|
||||
marvell,pins = "mpp53";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_gpio_keys_pins: gpio-keys-pins {
|
||||
marvell,pins = "mpp54";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
};
|
||||
|
||||
&bm {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&bm_bppi {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ð0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ge0_rgmii_pins>;
|
||||
status = "okay";
|
||||
|
||||
phy-connection-type = "rgmii-id";
|
||||
buffer-manager = <&bm>;
|
||||
bm,pool-long = <0>;
|
||||
bm,pool-short = <1>;
|
||||
nvmem-cells = <&macaddr_bdinfo_d880>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
|
||||
fixed-link {
|
||||
speed = <1000>;
|
||||
full-duplex;
|
||||
};
|
||||
};
|
||||
|
||||
ð1 {
|
||||
@ -388,120 +176,3 @@
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&usb3_0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pmx_usb_pins>;
|
||||
status = "okay";
|
||||
|
||||
vbus-supply = <®_usb_vbus>;
|
||||
};
|
||||
|
||||
&spi1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&spi1_pins>;
|
||||
status = "okay";
|
||||
|
||||
flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <50000000>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
reg = <0x0 0x1c0000>;
|
||||
label = "u-boot";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@1c0000 {
|
||||
reg = <0x1c0000 0x10000>;
|
||||
label = "firmware-info";
|
||||
|
||||
/*
|
||||
* 0x10 - 0x2f : image name (image1)
|
||||
* 0x30 - 0x4f : image name (image2)
|
||||
* 0x170 (1byte): active image (0x0/0x1)
|
||||
* 0x184 - 0x185: kernel block count (image1)
|
||||
* 0x18c - 0x18d: rootfs block count (image1)
|
||||
* 0x194 - 0x195: kernel block count (image2)
|
||||
* 0x19c - 0x19d: rootfs block count (image2)
|
||||
* 0x1be (1byte): bit7 -> active flag (image1)?
|
||||
* 0x1ce (1byte): bit7 -> active flag (image2)?
|
||||
*
|
||||
* Note: block size --> 0x200 (512 bytes)
|
||||
*/
|
||||
};
|
||||
|
||||
partition@1d0000 {
|
||||
reg = <0x1d0000 0x10000>;
|
||||
label = "dtb";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@1e0000 {
|
||||
reg = <0x1e0000 0x10000>;
|
||||
label = "u-boot-env";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@1f0000 {
|
||||
reg = <0x1f0000 0x10000>;
|
||||
label = "board-info";
|
||||
read-only;
|
||||
|
||||
compatible = "nvmem-cells";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
macaddr_bdinfo_d880: macaddr@d880 {
|
||||
reg = <0xd880 0x6>;
|
||||
};
|
||||
};
|
||||
|
||||
partition@200000 {
|
||||
reg = <0x200000 0x600000>;
|
||||
label = "kernel";
|
||||
};
|
||||
|
||||
partition@800000 {
|
||||
reg = <0x800000 0x1800000>;
|
||||
label = "rootfs";
|
||||
};
|
||||
|
||||
partition@2000000 {
|
||||
reg = <0x2000000 0x600000>;
|
||||
label = "kn2";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@2600000 {
|
||||
reg = <0x2600000 0x1800000>;
|
||||
label = "rfs2";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@3e00000 {
|
||||
reg = <0x3e00000 0x1200000>;
|
||||
label = "part1";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@5000000 {
|
||||
reg = <0x5000000 0x1200000>;
|
||||
label = "part2";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@6200000 {
|
||||
reg = <0x6200000 0x1e00000>;
|
||||
label = "config";
|
||||
read-only;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
@ -0,0 +1,338 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include <dt-bindings/leds/common.h>
|
||||
#include "armada-385.dtsi"
|
||||
|
||||
/ {
|
||||
aliases {
|
||||
led-boot = &led_status_green;
|
||||
led-failsafe = &led_status_red;
|
||||
led-running = &led_status_green;
|
||||
led-upgrade = &led_status_green;
|
||||
label-mac-device = ð0;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial0:9600n8";
|
||||
};
|
||||
|
||||
soc {
|
||||
ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
|
||||
MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000
|
||||
MBUS_ID(0x09, 0x19) 0 0xf1100000 0x10000
|
||||
MBUS_ID(0x09, 0x15) 0 0xf1110000 0x10000
|
||||
MBUS_ID(0x0c, 0x04) 0 0xf1200000 0x100000>;
|
||||
};
|
||||
|
||||
gpio-keys {
|
||||
compatible = "gpio-keys";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pmx_gpio_keys_pins>;
|
||||
|
||||
reset {
|
||||
label = "reset";
|
||||
linux,code = <KEY_RESTART>;
|
||||
gpios = <&gpio1 22 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
};
|
||||
|
||||
gpio_leds: gpio-leds {
|
||||
compatible = "gpio-leds";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pmx_gpio_leds_pins>;
|
||||
|
||||
led-0 {
|
||||
label = "red:alarm";
|
||||
gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
function = LED_FUNCTION_ALARM;
|
||||
};
|
||||
|
||||
led-1 {
|
||||
label = "red:ha";
|
||||
gpios = <&gpio1 0 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
};
|
||||
|
||||
led_status_green: led-2 {
|
||||
label = "green:sta";
|
||||
gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
function = LED_FUNCTION_STATUS;
|
||||
};
|
||||
|
||||
led-3 {
|
||||
label = "green:ha";
|
||||
gpios = <&gpio1 3 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
};
|
||||
|
||||
led-4 {
|
||||
label = "amber:alarm";
|
||||
gpios = <&gpio1 13 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
function = LED_FUNCTION_ALARM;
|
||||
};
|
||||
|
||||
led_status_red: led-5 {
|
||||
label = "red:sta";
|
||||
gpios = <&gpio1 15 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_RED>;
|
||||
function = LED_FUNCTION_STATUS;
|
||||
};
|
||||
|
||||
led-6 {
|
||||
label = "green:speed_lan4";
|
||||
gpios = <&gpio2 4 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:01:1Gbps";
|
||||
};
|
||||
|
||||
led-7 {
|
||||
label = "amber:speed_lan4";
|
||||
gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:01:100Mbps";
|
||||
};
|
||||
|
||||
led-8 {
|
||||
label = "amber:speed_lan3";
|
||||
gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:02:100Mbps";
|
||||
};
|
||||
|
||||
led-9 {
|
||||
label = "green:speed_lan3";
|
||||
gpios = <&gpio2 7 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:02:1Gbps";
|
||||
};
|
||||
|
||||
led-10 {
|
||||
label = "green:speed_lan1";
|
||||
gpios = <&gpio2 12 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:04:1Gbps";
|
||||
};
|
||||
|
||||
led-11 {
|
||||
label = "amber:speed_lan1";
|
||||
gpios = <&gpio2 13 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:04:100Mbps";
|
||||
};
|
||||
|
||||
led-12 {
|
||||
label = "green:speed_lan2";
|
||||
gpios = <&gpio2 14 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_GREEN>;
|
||||
linux,default-trigger = "mv88e6xxx-1:03:1Gbps";
|
||||
};
|
||||
|
||||
led-13 {
|
||||
label = "amber:speed_lan2";
|
||||
gpios = <&gpio2 15 GPIO_ACTIVE_LOW>;
|
||||
color = <LED_COLOR_ID_AMBER>;
|
||||
linux,default-trigger = "mv88e6xxx-1:03:100Mbps";
|
||||
};
|
||||
};
|
||||
|
||||
reg_usb_vbus: regulator-usb-vbus {
|
||||
compatible = "fixed-regulator";
|
||||
regulator-name = "usb-vbus";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
gpio = <&gpio1 21 GPIO_ACTIVE_LOW>;
|
||||
regulator-always-on;
|
||||
};
|
||||
};
|
||||
|
||||
&i2c0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&i2c0_pins>;
|
||||
status = "okay";
|
||||
|
||||
gpio2: gpio@24 {
|
||||
compatible = "nxp,pca9555";
|
||||
reg = <0x24>;
|
||||
gpio-controller;
|
||||
#gpio-cells = <0x2>;
|
||||
};
|
||||
|
||||
hwmon@28 {
|
||||
compatible = "nuvoton,nct7802";
|
||||
reg = <0x28>;
|
||||
};
|
||||
};
|
||||
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_pins>;
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
pmx_gpio_leds_pins: gpio-leds-pins {
|
||||
marvell,pins = "mpp30", "mpp32", "mpp33", "mpp35",
|
||||
"mpp45", "mpp47";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_usb_pins: usb-pins {
|
||||
marvell,pins = "mpp53";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
|
||||
pmx_gpio_keys_pins: gpio-keys-pins {
|
||||
marvell,pins = "mpp54";
|
||||
marvell,function = "gpio";
|
||||
};
|
||||
};
|
||||
|
||||
&bm {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&bm_bppi {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
ð0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&ge0_rgmii_pins>;
|
||||
status = "okay";
|
||||
|
||||
phy-connection-type = "rgmii-id";
|
||||
buffer-manager = <&bm>;
|
||||
bm,pool-long = <0>;
|
||||
bm,pool-short = <1>;
|
||||
nvmem-cells = <&macaddr_bdinfo_d880>;
|
||||
nvmem-cell-names = "mac-address";
|
||||
|
||||
fixed-link {
|
||||
speed = <1000>;
|
||||
full-duplex;
|
||||
};
|
||||
};
|
||||
|
||||
&usb3_0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pmx_usb_pins>;
|
||||
status = "okay";
|
||||
|
||||
vbus-supply = <®_usb_vbus>;
|
||||
};
|
||||
|
||||
&spi1 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&spi1_pins>;
|
||||
status = "okay";
|
||||
|
||||
flash@0 {
|
||||
compatible = "jedec,spi-nor";
|
||||
reg = <0>;
|
||||
spi-max-frequency = <50000000>;
|
||||
|
||||
partitions {
|
||||
compatible = "fixed-partitions";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
partition@0 {
|
||||
reg = <0x0 0x1c0000>;
|
||||
label = "u-boot";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@1c0000 {
|
||||
reg = <0x1c0000 0x10000>;
|
||||
label = "firmware-info";
|
||||
|
||||
/*
|
||||
* 0x10 - 0x2f : image name (image1)
|
||||
* 0x30 - 0x4f : image name (image2)
|
||||
* 0x170 (1byte): active image (0x0/0x1)
|
||||
* 0x184 - 0x185: kernel block count (image1)
|
||||
* 0x18c - 0x18d: rootfs block count (image1)
|
||||
* 0x194 - 0x195: kernel block count (image2)
|
||||
* 0x19c - 0x19d: rootfs block count (image2)
|
||||
* 0x1be (1byte): bit7 -> active flag (image1)?
|
||||
* 0x1ce (1byte): bit7 -> active flag (image2)?
|
||||
*
|
||||
* Note: block size --> 0x200 (512 bytes)
|
||||
*/
|
||||
};
|
||||
|
||||
partition@1d0000 {
|
||||
reg = <0x1d0000 0x10000>;
|
||||
label = "dtb";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@1e0000 {
|
||||
reg = <0x1e0000 0x10000>;
|
||||
label = "u-boot-env";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@1f0000 {
|
||||
reg = <0x1f0000 0x10000>;
|
||||
label = "board-info";
|
||||
read-only;
|
||||
|
||||
compatible = "nvmem-cells";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <1>;
|
||||
|
||||
macaddr_bdinfo_d880: macaddr@d880 {
|
||||
reg = <0xd880 0x6>;
|
||||
};
|
||||
};
|
||||
|
||||
partition@200000 {
|
||||
reg = <0x200000 0x600000>;
|
||||
label = "kernel";
|
||||
};
|
||||
|
||||
partition@800000 {
|
||||
reg = <0x800000 0x1800000>;
|
||||
label = "rootfs";
|
||||
};
|
||||
|
||||
partition@2000000 {
|
||||
reg = <0x2000000 0x600000>;
|
||||
label = "kn2";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@2600000 {
|
||||
reg = <0x2600000 0x1800000>;
|
||||
label = "rfs2";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@3e00000 {
|
||||
reg = <0x3e00000 0x1200000>;
|
||||
label = "part1";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@5000000 {
|
||||
reg = <0x5000000 0x1200000>;
|
||||
label = "part2";
|
||||
read-only;
|
||||
};
|
||||
|
||||
partition@6200000 {
|
||||
reg = <0x6200000 0x1e00000>;
|
||||
label = "config";
|
||||
read-only;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
@ -95,6 +95,21 @@ define Device/cznic_turris-omnia
|
||||
endef
|
||||
TARGET_DEVICES += cznic_turris-omnia
|
||||
|
||||
define Device/fortinet_fg-30e
|
||||
DEVICE_VENDOR := Fortinet
|
||||
DEVICE_MODEL := FortiGate 30E
|
||||
SOC := armada-385
|
||||
KERNEL := kernel-bin | append-dtb
|
||||
KERNEL_INITRAMFS := kernel-bin | append-dtb | fortigate-header | \
|
||||
gzip-filename FGT30E
|
||||
KERNEL_SIZE := 6144k
|
||||
DEVICE_DTS := armada-385-fortinet-fg-30e
|
||||
IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | \
|
||||
sysupgrade-tar rootfs=$$$$@ | append-metadata
|
||||
DEVICE_PACKAGES := kmod-hwmon-nct7802
|
||||
endef
|
||||
TARGET_DEVICES += fortinet_fg-30e
|
||||
|
||||
define Device/fortinet_fg-50e
|
||||
DEVICE_VENDOR := Fortinet
|
||||
DEVICE_MODEL := FortiGate 50E
|
||||
|
@ -0,0 +1,253 @@
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
|
||||
|
||||
/dts-v1/;
|
||||
|
||||
#include "ipq8074.dtsi"
|
||||
#include "ipq8074-hk-cpu.dtsi"
|
||||
#include "ipq8074-ess.dtsi"
|
||||
#include <dt-bindings/input/input.h>
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/leds/common.h>
|
||||
|
||||
/ {
|
||||
model = "Netgear WAX630";
|
||||
compatible = "netgear,wax630", "qcom,ipq8074";
|
||||
|
||||
aliases {
|
||||
serial0 = &blsp1_uart5;
|
||||
|
||||
ethernet0 = &dp6_syn;
|
||||
ethernet1 = &dp4;
|
||||
label-mac-device = &dp6_syn;
|
||||
|
||||
led-boot = &led_system_blue;
|
||||
led-failsafe = &led_system_red;
|
||||
led-running = &led_system_green;
|
||||
led-upgrade = &led_system_blue;
|
||||
};
|
||||
|
||||
chosen {
|
||||
stdout-path = "serial0:115200n8";
|
||||
bootargs-append = " root=/dev/ubiblock0_1";
|
||||
};
|
||||
|
||||
keys {
|
||||
compatible = "gpio-keys";
|
||||
|
||||
reset {
|
||||
label = "reset";
|
||||
gpios = <&tlmm 54 GPIO_ACTIVE_LOW>;
|
||||
linux,code = <KEY_RESTART>;
|
||||
};
|
||||
};
|
||||
|
||||
led-spi {
|
||||
compatible = "spi-gpio";
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
sck-gpios = <&tlmm 18 GPIO_ACTIVE_HIGH>;
|
||||
mosi-gpios = <&tlmm 19 GPIO_ACTIVE_HIGH>;
|
||||
|
||||
led_gpio: led-gpio@0 {
|
||||
compatible = "fairchild,74hc595";
|
||||
reg = <0>;
|
||||
gpio-controller;
|
||||
#gpio-cells = <2>;
|
||||
registers-number = <1>;
|
||||
enable-gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
|
||||
spi-max-frequency = <1000000>;
|
||||
};
|
||||
};
|
||||
|
||||
leds {
|
||||
compatible = "gpio-leds";
|
||||
|
||||
led_system_red: system-red {
|
||||
label = "system:red";
|
||||
gpios = <&tlmm 22 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
led_system_green: system-green {
|
||||
label = "system:green";
|
||||
gpios = <&tlmm 38 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
led_system_blue: system-blue {
|
||||
label = "system:blue";
|
||||
gpios = <&tlmm 21 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
lan1-green {
|
||||
label = "lan1:green";
|
||||
gpios = <&tlmm 26 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
lan1-orange {
|
||||
label = "lan1:orange";
|
||||
gpios = <&tlmm 27 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
lan2-green {
|
||||
label = "lan2:green";
|
||||
gpios = <&tlmm 57 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
lan2-orange {
|
||||
label = "lan2:orange";
|
||||
gpios = <&tlmm 60 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
2g-blue {
|
||||
label = "wlan2g:blue";
|
||||
gpios = <&tlmm 29 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
2g-green {
|
||||
label = "wlan2g:green";
|
||||
gpios = <&tlmm 30 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
5g-low-blue {
|
||||
label = "wlan5g_low:blue";
|
||||
gpios = <&tlmm 33 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
5g-low-green {
|
||||
label = "wlan5g_low:green";
|
||||
gpios = <&tlmm 34 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
5g-high-blue {
|
||||
label = "wlan5g_high:blue";
|
||||
gpios = <&tlmm 31 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
5g-high-green {
|
||||
label = "wlan5g_high:green";
|
||||
gpios = <&tlmm 32 GPIO_ACTIVE_LOW>;
|
||||
default-state = "off";
|
||||
};
|
||||
|
||||
};
|
||||
};
|
||||
|
||||
&edma {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&switch {
|
||||
status = "okay";
|
||||
|
||||
switch_cpu_bmp = <0x01>;
|
||||
switch_lan_bmp = <0x3e>;
|
||||
switch_wan_bmp = <0x40>;
|
||||
switch_mac_mode = <0x00>;
|
||||
switch_mac_mode1 = <0xff>;
|
||||
switch_mac_mode2 = <0x0d>;
|
||||
bm_tick_mode = <0x00>;
|
||||
tm_tick_mode = <0x00>;
|
||||
|
||||
qcom,port_phyinfo {
|
||||
port@3 {
|
||||
port_id = <4>;
|
||||
phy_address = <3>;
|
||||
};
|
||||
|
||||
port@5 {
|
||||
port_id = <6>;
|
||||
phy_address = <28>;
|
||||
port_mac_sel = "QGMAC_PORT";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&tlmm {
|
||||
mdio_pins: mdio-pins {
|
||||
mdc {
|
||||
pins = "gpio68";
|
||||
function = "mdc";
|
||||
drive-strength = <8>;
|
||||
bias-pull-up;
|
||||
};
|
||||
|
||||
mdio {
|
||||
pins = "gpio69";
|
||||
function = "mdio";
|
||||
drive-strength = <8>;
|
||||
bias-pull-up;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&mdio {
|
||||
status = "okay";
|
||||
|
||||
pinctrl-0 = <&mdio_pins>;
|
||||
pinctrl-names = "default";
|
||||
reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
|
||||
|
||||
qca8075: ethernet-phy@3 {
|
||||
compatible = "ethernet-phy-ieee802.3-c22";
|
||||
reg = <3>;
|
||||
};
|
||||
|
||||
qca8081: ethernet-phy@28 {
|
||||
compatible = "ethernet-phy-id004d.d101";
|
||||
reg = <28>;
|
||||
reset-gpios = <&tlmm 25 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
};
|
||||
|
||||
&dp4 {
|
||||
status = "okay";
|
||||
phy-handle = <&qca8075>;
|
||||
label = "lan2";
|
||||
};
|
||||
|
||||
&dp6_syn {
|
||||
status = "okay";
|
||||
phy-handle = <&qca8081>;
|
||||
label = "lan1";
|
||||
};
|
||||
|
||||
&qpic_bam {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&qpic_nand {
|
||||
status = "okay";
|
||||
|
||||
nand@0 {
|
||||
reg = <0>;
|
||||
nand-ecc-strength = <4>;
|
||||
nand-ecc-step-size = <512>;
|
||||
nand-bus-width = <8>;
|
||||
|
||||
partitions {
|
||||
compatible = "qcom,smem-part";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
&blsp1_uart5 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
&wifi {
|
||||
status = "okay";
|
||||
|
||||
qcom,ath11k-calibration-variant = "Netgear-WAX630";
|
||||
};
|
@ -23,6 +23,16 @@ define Device/UbiFit
|
||||
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
|
||||
endef
|
||||
|
||||
define Build/wax6xx-netgear-tar
|
||||
mkdir $@.tmp
|
||||
mv $@ $@.tmp/nand-ipq807x-apps.img
|
||||
md5sum $@.tmp/nand-ipq807x-apps.img | cut -c 1-32 > $@.tmp/nand-ipq807x-apps.md5sum
|
||||
echo $(DEVICE_MODEL) > $@.tmp/metadata.txt
|
||||
echo $(DEVICE_MODEL)"_V9.9.9.9" > $@.tmp/version
|
||||
tar -C $@.tmp/ -cf $@ .
|
||||
rm -rf $@.tmp
|
||||
endef
|
||||
|
||||
define Device/buffalo_wxr-5950ax12
|
||||
$(call Device/FitImage)
|
||||
DEVICE_VENDOR := Buffalo
|
||||
@ -115,20 +125,6 @@ define Device/netgear_rax120v2
|
||||
endef
|
||||
TARGET_DEVICES += netgear_rax120v2
|
||||
|
||||
define Device/netgear_wax620
|
||||
$(call Device/FitImage)
|
||||
$(call Device/UbiFit)
|
||||
DEVICE_VENDOR := Netgear
|
||||
DEVICE_MODEL := WAX620
|
||||
DEVICE_DTS_CONFIG := config@hk07
|
||||
BLOCKSIZE := 128k
|
||||
PAGESIZE := 2048
|
||||
SOC := ipq8072
|
||||
DEVICE_PACKAGES += kmod-spi-gpio kmod-gpio-nxp-74hc164 \
|
||||
ipq-wifi-netgear_wax620
|
||||
endef
|
||||
TARGET_DEVICES += netgear_wax620
|
||||
|
||||
define Device/netgear_wax218
|
||||
$(call Device/FitImage)
|
||||
$(call Device/UbiFit)
|
||||
@ -146,6 +142,35 @@ define Device/netgear_wax218
|
||||
endef
|
||||
TARGET_DEVICES += netgear_wax218
|
||||
|
||||
define Device/netgear_wax620
|
||||
$(call Device/FitImage)
|
||||
$(call Device/UbiFit)
|
||||
DEVICE_VENDOR := Netgear
|
||||
DEVICE_MODEL := WAX620
|
||||
DEVICE_DTS_CONFIG := config@hk07
|
||||
BLOCKSIZE := 128k
|
||||
PAGESIZE := 2048
|
||||
SOC := ipq8072
|
||||
DEVICE_PACKAGES += kmod-spi-gpio kmod-gpio-nxp-74hc164 \
|
||||
ipq-wifi-netgear_wax620
|
||||
endef
|
||||
TARGET_DEVICES += netgear_wax620
|
||||
|
||||
define Device/netgear_wax630
|
||||
$(call Device/FitImage)
|
||||
$(call Device/UbiFit)
|
||||
DEVICE_VENDOR := Netgear
|
||||
DEVICE_MODEL := WAX630
|
||||
DEVICE_DTS_CONFIG := config@hk01
|
||||
BLOCKSIZE := 128k
|
||||
PAGESIZE := 2048
|
||||
SOC := ipq8074
|
||||
IMAGES := ui-factory.tar factory.ubi sysupgrade.bin
|
||||
IMAGE/ui-factory.tar := append-ubi | wax6xx-netgear-tar
|
||||
DEVICE_PACKAGES += kmod-spi-gpio ipq-wifi-netgear_wax630
|
||||
endef
|
||||
TARGET_DEVICES += netgear_wax630
|
||||
|
||||
define Device/prpl_haze
|
||||
$(call Device/FitImage)
|
||||
$(call Device/EmmcImage)
|
||||
|
@ -12,14 +12,18 @@ edgecore,eap102)
|
||||
netgear,rax120v2)
|
||||
ucidef_set_led_netdev "aqr" "AQR" "white:aqr" "lan5"
|
||||
;;
|
||||
netgear,wax620)
|
||||
ucidef_set_led_netdev "lan" "LAN" "lan:green" "lan"
|
||||
;;
|
||||
netgear,wax218)
|
||||
ucidef_set_led_netdev "lan" "LAN" "blue:lan" "lan"
|
||||
ucidef_set_led_wlan "wlan5g" "WIFI 5GHz" "blue:wlan5g" "phy0radio"
|
||||
ucidef_set_led_wlan "wlan2g" "WIFI 2.4GHz" "blue:wlan2g" "phy1radio"
|
||||
;;
|
||||
netgear,wax620)
|
||||
ucidef_set_led_netdev "lan" "LAN" "lan:green" "lan"
|
||||
;;
|
||||
netgear,wax630)
|
||||
ucidef_set_led_netdev "lan1" "LAN1" "lan1:green" "lan1"
|
||||
ucidef_set_led_netdev "lan2" "LAN2" "lan2:green" "lan2"
|
||||
;;
|
||||
redmi,ax6|\
|
||||
redmi,ax6-stock|\
|
||||
xiaomi,ax3600|\
|
||||
|
@ -30,6 +30,9 @@ ipq807x_setup_interfaces()
|
||||
netgear,wax620)
|
||||
ucidef_set_interface_lan "lan" "dhcp"
|
||||
;;
|
||||
netgear,wax630)
|
||||
ucidef_set_interface_lan "lan1 lan2" "dhcp"
|
||||
;;
|
||||
prpl,haze)
|
||||
ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
|
||||
;;
|
||||
|
@ -17,6 +17,7 @@ case "$FIRMWARE" in
|
||||
netgear,rax120v2|\
|
||||
netgear,wax218|\
|
||||
netgear,wax620|\
|
||||
netgear,wax630|\
|
||||
qnap,301w|\
|
||||
redmi,ax6|\
|
||||
redmi,ax6-stock|\
|
||||
|
@ -70,7 +70,8 @@ platform_do_upgrade() {
|
||||
edimax,cax1800|\
|
||||
netgear,rax120v2|\
|
||||
netgear,wax218|\
|
||||
netgear,wax620)
|
||||
netgear,wax620|\
|
||||
netgear,wax630)
|
||||
nand_do_upgrade "$1"
|
||||
;;
|
||||
prpl,haze|\
|
||||
|
@ -9,8 +9,8 @@ board_config_update
|
||||
case $board in
|
||||
friendlyarm,nanopi-r1|\
|
||||
friendlyarm,nanopi-r1s-h5)
|
||||
ucidef_set_led_netdev "wan" "WAN" "nanopi:green:wan" "eth0"
|
||||
ucidef_set_led_netdev "lan" "LAN" "nanopi:green:lan" "eth1"
|
||||
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth0"
|
||||
ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth1"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
@ -17,7 +17,7 @@ CONFIG_ARCH_SUNXI=y
|
||||
CONFIG_ARCH_SUNXI_MC_SMP=y
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
CONFIG_ARM=y
|
||||
# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set
|
||||
CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=y
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
CONFIG_ARM_ARCH_TIMER=y
|
||||
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
|
||||
|
@ -18,7 +18,7 @@ CONFIG_ARCH_SUNXI=y
|
||||
CONFIG_ARCH_SUNXI_MC_SMP=y
|
||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y
|
||||
CONFIG_ARM=y
|
||||
# CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM is not set
|
||||
CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=y
|
||||
CONFIG_ARM_APPENDED_DTB=y
|
||||
CONFIG_ARM_ARCH_TIMER=y
|
||||
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
|
||||
|
Loading…
x
Reference in New Issue
Block a user