Merge Official Source

This commit is contained in:
CN_SZTL 2020-10-17 18:00:05 +08:00
commit 49e13b3be9
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
239 changed files with 4989 additions and 3326 deletions

View File

@ -329,27 +329,45 @@ menu "Global build settings"
endchoice endchoice
config TARGET_ROOTFS_SECURITY_LABELS config TARGET_ROOTFS_SECURITY_LABELS
bool "Enable rootfs security labels" bool
select KERNEL_SQUASHFS_XATTR select KERNEL_SQUASHFS_XATTR
select KERNEL_EXT4_FS_SECURITY select KERNEL_EXT4_FS_SECURITY
select KERNEL_F2FS_FS_SECURITY select KERNEL_F2FS_FS_SECURITY
select KERNEL_UBIFS_FS_SECURITY select KERNEL_UBIFS_FS_SECURITY
select KERNEL_JFFS2_FS_SECURITY select KERNEL_JFFS2_FS_SECURITY
config SELINUX
bool "Enable SELinux"
select KERNEL_SECURITY_SELINUX
select TARGET_ROOTFS_SECURITY_LABELS
select PACKAGE_procd-selinux
select PACKAGE_busybox-selinux
help help
This option enables the usage of SELinux labels This option enables SELinux kernel features, applies security labels
in squashfs rootfs and selects the selinux-variants of busybox and procd.
Selecting this option results in about 0.5MiB of additional flash space
usage accounting for increased kernel and rootfs size.
choice choice
prompt "default SELinux type" prompt "default SELinux type"
depends on TARGET_ROOTFS_SECURITY_LABELS depends on TARGET_ROOTFS_SECURITY_LABELS
default SELINUXTYPE_dssp default SELINUXTYPE_dssp
help help
Choose SELinux policy to be used for build. Select SELinux policy to be installed and used for applying rootfs labels.
config SELINUXTYPE_targeted config SELINUXTYPE_targeted
bool "targeted" bool "targeted"
select PACKAGE_refpolicy select PACKAGE_refpolicy
help
SELinux Reference Policy (refpolicy)
config SELINUXTYPE_dssp config SELINUXTYPE_dssp
bool "dssp" bool "dssp"
select PACKAGE_selinux-policy select PACKAGE_selinux-policy
help
Defensec SELinux Security Policy -- OpenWrt edition
endchoice endchoice
endmenu endmenu

View File

@ -1124,6 +1124,7 @@ config KERNEL_SECURITY_SELINUX
config KERNEL_SECURITY_SELINUX_BOOTPARAM config KERNEL_SECURITY_SELINUX_BOOTPARAM
bool "NSA SELinux boot parameter" bool "NSA SELinux boot parameter"
depends on KERNEL_SECURITY_SELINUX depends on KERNEL_SECURITY_SELINUX
default y
config KERNEL_SECURITY_SELINUX_DISABLE config KERNEL_SECURITY_SELINUX_DISABLE
bool "NSA SELinux runtime disable" bool "NSA SELinux runtime disable"
@ -1132,6 +1133,7 @@ config KERNEL_SECURITY_SELINUX_DISABLE
config KERNEL_SECURITY_SELINUX_DEVELOP config KERNEL_SECURITY_SELINUX_DEVELOP
bool "NSA SELinux Development Support" bool "NSA SELinux Development Support"
depends on KERNEL_SECURITY_SELINUX depends on KERNEL_SECURITY_SELINUX
default y
config KERNEL_LSM config KERNEL_LSM
string string

View File

@ -12,9 +12,11 @@ OPENWRT_GIT = $(PROJECT_GIT)
LEDE_GIT = $(PROJECT_GIT) LEDE_GIT = $(PROJECT_GIT)
ifdef PKG_SOURCE_VERSION ifdef PKG_SOURCE_VERSION
PKG_VERSION ?= $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION)) ifndef PKG_VERSION
PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION) PKG_VERSION := $(if $(PKG_SOURCE_DATE),$(PKG_SOURCE_DATE)-)$(call version_abbrev,$(PKG_SOURCE_VERSION))
PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz endif
PKG_SOURCE_SUBDIR ?= $(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE ?= $(PKG_SOURCE_SUBDIR).tar.xz
endif endif
DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED) DOWNLOAD_RDEP=$(STAMP_PREPARED) $(HOST_STAMP_PREPARED)

View File

@ -7,10 +7,10 @@ ifdef CONFIG_TESTING_KERNEL
endif endif
LINUX_VERSION-4.19 = .138 LINUX_VERSION-4.19 = .138
LINUX_VERSION-5.4 = .70 LINUX_VERSION-5.4 = .71
LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02 LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02
LINUX_KERNEL_HASH-5.4.70 = c0b3d8085c5ba235df38b00b740e053659709e8a5ca21957a239f6bc22c45007 LINUX_KERNEL_HASH-5.4.71 = 737049ef3cf38d46ee3b377354336cdbc1c4dd95b4e54975a70716f96c8d6cc7
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))

View File

@ -213,6 +213,7 @@ ifeq ($(DUMP),1)
CPU_CFLAGS += -mno-branch-likely CPU_CFLAGS += -mno-branch-likely
CPU_CFLAGS_mips32 = -mips32 -mtune=mips32 CPU_CFLAGS_mips32 = -mips32 -mtune=mips32
CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64 CPU_CFLAGS_mips64 = -mips64 -mtune=mips64 -mabi=64
CPU_CFLAGS_mips64r2 = -mips64r2 -mtune=mips64r2 -mabi=64
CPU_CFLAGS_24kc = -mips32r2 -mtune=24kc CPU_CFLAGS_24kc = -mips32r2 -mtune=24kc
CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc CPU_CFLAGS_74kc = -mips32r2 -mtune=74kc
CPU_CFLAGS_octeonplus = -march=octeon+ -mabi=64 CPU_CFLAGS_octeonplus = -march=octeon+ -mabi=64

View File

@ -11,6 +11,7 @@ include $(INCLUDE_DIR)/feeds.mk
include $(INCLUDE_DIR)/rootfs.mk include $(INCLUDE_DIR)/rootfs.mk
-include $(TMP_DIR)/.packagedeps -include $(TMP_DIR)/.packagedeps
package-y += kernel/linux
$(curdir)/autoremove:=1 $(curdir)/autoremove:=1
$(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m)) $(curdir)/builddirs:=$(sort $(package-) $(package-y) $(package-m))
$(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m)) $(curdir)/builddirs-default:=. $(sort $(package-y) $(package-m))

View File

@ -45,7 +45,7 @@ define Package/arm-trusted-firmware-mvebu-espressobin-v3-v5-1gb-1cs
TITLE:=ARM Trusted Firmware for Marvell ESPRESSObin V3-V5 (1GB 1CS) TITLE:=ARM Trusted Firmware for Marvell ESPRESSObin V3-V5 (1GB 1CS)
DEPENDS:=+u-boot-espressobin DEPENDS:=+u-boot-espressobin
UBOOT:=espressobin UBOOT:=espressobin
DDR_TOPOLOGY:=2 DDR_TOPOLOGY:=4
CLOCKSPRESET:=CPU_800_DDR_800 CLOCKSPRESET:=CPU_800_DDR_800
PLAT:=a3700 PLAT:=a3700
endef endef

View File

@ -27,7 +27,14 @@ glinet,gl-mv1000)
globalscale,espressobin|\ globalscale,espressobin|\
globalscale,espressobin-emmc|\ globalscale,espressobin-emmc|\
globalscale,espressobin-v7|\ globalscale,espressobin-v7|\
globalscale,espressobin-v7-emmc|\ globalscale,espressobin-v7-emmc)
idx="$(find_mtd_index u-boot-env)"
if [ -n "$idx" ]; then
ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x10000" "0x10000" "1"
else
ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1"
fi
;;
marvell,armada8040-mcbin-doubleshot|\ marvell,armada8040-mcbin-doubleshot|\
marvell,armada8040-mcbin-singleshot) marvell,armada8040-mcbin-singleshot)
ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1" ubootenv_add_uci_config "/dev/mtd0" "0x3f0000" "0x10000" "0x10000" "1"

View File

@ -8,10 +8,10 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_VERSION:=2020.10-rc4 PKG_VERSION:=2020.10
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_HASH:=0a7bdd2c7df2c14daf2730fcf3277fd917aadfaae935529e29c7412314bbf260 PKG_HASH:=0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622
include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -38,14 +38,12 @@ endef
define U-Boot/espressobin define U-Boot/espressobin
NAME:=Marvell ESPRESSObin NAME:=Marvell ESPRESSObin
BUILD_DEVICES:=globalscale_espressobin globalscale_espressobin-v7
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
UBOOT_CONFIG:=mvebu_espressobin-88f3720 UBOOT_CONFIG:=mvebu_espressobin-88f3720
endef endef
define U-Boot/espressobin-emmc define U-Boot/espressobin-emmc
NAME:=Marvell ESPRESSObin NAME:=Marvell ESPRESSObin
BUILD_DEVICES:=globalscale_espressobin-emmc globalscale_espressobin-v7-emmc
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
UBOOT_CONFIG:=mvebu_espressobin-88f3720 UBOOT_CONFIG:=mvebu_espressobin-88f3720
UBOOT_MAKE_FLAGS+=DEVICE_TREE=armada-3720-espressobin-emmc UBOOT_MAKE_FLAGS+=DEVICE_TREE=armada-3720-espressobin-emmc
@ -53,7 +51,6 @@ endef
define U-Boot/uDPU define U-Boot/uDPU
NAME:=Methode uDPU NAME:=Methode uDPU
BUILD_DEVICES:=methode_udpu
BUILD_SUBTARGET:=cortexa53 BUILD_SUBTARGET:=cortexa53
endef endef
@ -68,12 +65,15 @@ Build/Exports:=$(Host/Exports)
define Build/Configure define Build/Configure
# enable additional options beyond <device>_defconfig # enable additional options beyond <device>_defconfig
echo CONFIG_NET_RANDOM_ETHADDR=y >> $(PKG_BUILD_DIR)/configs/$(UBOOT_CONFIG)_defconfig
echo CONFIG_CMD_SETEXPR=y >> $(PKG_BUILD_DIR)/configs/$(UBOOT_CONFIG)_defconfig echo CONFIG_CMD_SETEXPR=y >> $(PKG_BUILD_DIR)/configs/$(UBOOT_CONFIG)_defconfig
$(call Build/Configure/U-Boot) $(call Build/Configure/U-Boot)
endef endef
define Package/u-boot/install
$(if $(findstring cortexa53,$(BUILD_SUBTARGET)),,$(Package/u-boot/install/default))
endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(STAGING_DIR_IMAGE) $(INSTALL_DIR) $(STAGING_DIR_IMAGE)
$(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE) $(CP) $(PKG_BUILD_DIR)/$(UBOOT_IMAGE) $(STAGING_DIR_IMAGE)/$(BUILD_VARIANT)-$(UBOOT_IMAGE)

View File

@ -1,10 +0,0 @@
--- a/drivers/mtd/spi/spi-nor-ids.c
+++ b/drivers/mtd/spi/spi-nor-ids.c
@@ -151,6 +151,7 @@ const struct flash_info spi_nor_ids[] =
{ INFO("mx25u3235f", 0xc22536, 0, 4 * 1024, 1024, SECT_4K) },
{ INFO("mx25u6435f", 0xc22537, 0, 64 * 1024, 128, SECT_4K) },
{ INFO("mx25l12805d", 0xc22018, 0, 64 * 1024, 256, 0) },
+ { INFO("mx25u12835f", 0xc22538, 0, 64 * 1024, 256, SECT_4K) },
{ INFO("mx25l12855e", 0xc22618, 0, 64 * 1024, 256, 0) },
{ INFO("mx25l25635e", 0xc22019, 0, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ INFO("mx25u25635f", 0xc22539, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_4B_OPCODES) },

View File

@ -1,13 +0,0 @@
Increase max gunzip size in mvebu_armada-37xx.h.
This is required in order to boot itb images.
--- a/include/configs/mvebu_armada-37xx.h
+++ b/include/configs/mvebu_armada-37xx.h
@@ -12,6 +12,7 @@
/* additions for new ARM relocation support */
#define CONFIG_SYS_SDRAM_BASE 0x00000000
+#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */
/* auto boot */

View File

@ -1,43 +0,0 @@
From 264c45575ec6a3d507dc4e43954b8a78283aca6c Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Thu, 10 Sep 2020 17:58:43 +0200
Subject: [PATCH] mmc: xenon_sdhci: Add missing common host capabilities
Use mmc_of_parse() to set the common host properties. That includes
"bus-width", so parsing it can be removed from the driver.
But more importantly, "non-removable" is now respected, which fixes
the usage of eMMC.
Signed-off-by: Andre Heider <a.heider@gmail.com>
---
drivers/mmc/xenon_sdhci.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
--- a/drivers/mmc/xenon_sdhci.c
+++ b/drivers/mmc/xenon_sdhci.c
@@ -485,20 +485,10 @@ static int xenon_sdhci_probe(struct udev
armada_3700_soc_pad_voltage_set(host);
host->host_caps = MMC_MODE_HS | MMC_MODE_HS_52MHz | MMC_MODE_DDR_52MHz;
- switch (fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "bus-width",
- 1)) {
- case 8:
- host->host_caps |= MMC_MODE_8BIT;
- break;
- case 4:
- host->host_caps |= MMC_MODE_4BIT;
- break;
- case 1:
- break;
- default:
- printf("Invalid \"bus-width\" value\n");
- return -EINVAL;
- }
+
+ ret = mmc_of_parse(dev, &plat->cfg);
+ if (ret)
+ return ret;
host->ops = &xenon_sdhci_ops;

View File

@ -1,14 +1,16 @@
From 753947e2c374820dcbc9c86626812aeb7d460653 Mon Sep 17 00:00:00 2001 From cdcfd9211c805624a702b6ff81b9bd9515344749 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com> From: Andre Heider <a.heider@gmail.com>
Date: Fri, 4 Sep 2020 16:34:22 +0200 Date: Fri, 4 Sep 2020 16:34:22 +0200
Subject: [PATCH] arm64: dts: armada-3720-espressobin: use Linux Subject: [PATCH] arm64: dts: armada-3720-espressobin: use Linux
model/compatible strings model/compatible strings
Fix the actual board vendor and ease synching dts files from Linux. Fix the actual board vendor and ease synching dts files from Linux.
Signed-off-by: Andre Heider <a.heider@gmail.com>
--- ---
arch/arm/dts/armada-3720-espressobin.dts | 4 ++-- arch/arm/dts/armada-3720-espressobin.dts | 4 ++--
board/Marvell/mvebu_armada-37xx/board.c | 4 ++-- board/Marvell/mvebu_armada-37xx/board.c | 8 ++++----
2 files changed, 4 insertions(+), 4 deletions(-) 2 files changed, 6 insertions(+), 6 deletions(-)
--- a/arch/arm/dts/armada-3720-espressobin.dts --- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts +++ b/arch/arm/dts/armada-3720-espressobin.dts
@ -25,7 +27,24 @@ Fix the actual board vendor and ease synching dts files from Linux.
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
--- a/board/Marvell/mvebu_armada-37xx/board.c --- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c +++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -201,7 +201,7 @@ static int mii_multi_chip_mode_write(str @@ -88,14 +88,14 @@ int board_late_init(void)
if (env_get("fdtfile"))
return 0;
- if (!of_machine_is_compatible("marvell,armada-3720-espressobin"))
+ if (!of_machine_is_compatible("globalscale,espressobin"))
return 0;
/* If the memory controller has been configured for DDR4, we're running on v7 */
ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
& A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
- emmc = of_machine_is_compatible("marvell,armada-3720-espressobin-emmc");
+ emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
if (ddr4 && emmc)
env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
@@ -248,7 +248,7 @@ static int mii_multi_chip_mode_write(str
/* Bring-up board-specific network stuff */ /* Bring-up board-specific network stuff */
int board_network_enable(struct mii_dev *bus) int board_network_enable(struct mii_dev *bus)
{ {
@ -34,7 +53,7 @@ Fix the actual board vendor and ease synching dts files from Linux.
return 0; return 0;
/* /*
@@ -253,7 +253,7 @@ int ft_board_setup(void *blob, struct bd @@ -300,7 +300,7 @@ int ft_board_setup(void *blob, struct bd
int part_off; int part_off;
/* Fill SPI MTD partitions for Linux kernel on Espressobin */ /* Fill SPI MTD partitions for Linux kernel on Espressobin */

View File

@ -1,21 +1,20 @@
From ee59573dd531df96de0d9dc8e79b34ed3716c864 Mon Sep 17 00:00:00 2001 From a9ac1dd46a4fd11880be80227e1eb102e3c61dd8 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com> From: Andre Heider <a.heider@gmail.com>
Date: Fri, 4 Sep 2020 15:38:58 +0200 Date: Fri, 4 Sep 2020 15:38:58 +0200
Subject: [PATCH] arm64: dts: armada-3720-espressobin: split common parts to Subject: [PATCH] arm64: dts: armada-3720-espressobin: split common parts
.dtsi to .dtsi
Move most of the dts to the new common Move most of the dts to the new common armada-3720-espressobin.dtsi
arch/arm/dts/armada-3720-espressobin.dtsi file, just like Linux has. file, just like Linux, but keep the current, downstream based, version.
The dts itself is imported from Linux. The dts itself is imported from Linux.
Signed-off-by: Andre Heider <a.heider@gmail.com> Signed-off-by: Andre Heider <a.heider@gmail.com>
--- ---
arch/arm/dts/armada-3720-espressobin.dts | 190 ++---------------- arch/arm/dts/armada-3720-espressobin.dts | 164 +--------------------
...sobin.dts => armada-3720-espressobin.dtsi} | 3 - arch/arm/dts/armada-3720-espressobin.dtsi | 167 ++++++++++++++++++++++
2 files changed, 20 insertions(+), 173 deletions(-) 2 files changed, 174 insertions(+), 157 deletions(-)
rewrite arch/arm/dts/armada-3720-espressobin.dts (95%) create mode 100644 arch/arm/dts/armada-3720-espressobin.dtsi
copy arch/arm/dts/{armada-3720-espressobin.dts => armada-3720-espressobin.dtsi} (96%)
--- a/arch/arm/dts/armada-3720-espressobin.dts --- a/arch/arm/dts/armada-3720-espressobin.dts
+++ b/arch/arm/dts/armada-3720-espressobin.dts +++ b/arch/arm/dts/armada-3720-espressobin.dts

View File

@ -1,10 +1,12 @@
From 83908b6e2e5a7d7b0f4d040ffb4bf3ce6807b8fe Mon Sep 17 00:00:00 2001 From 408bba2fb84ad0b02c3f9529065126b40899e256 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com> From: Andre Heider <a.heider@gmail.com>
Date: Fri, 4 Sep 2020 15:44:41 +0200 Date: Fri, 4 Sep 2020 15:44:41 +0200
Subject: [PATCH] arm64: dts: a3720: add support for boards with populated emmc Subject: [PATCH] arm64: dts: a3720: add support for espressobin with
populated emmc
Import armada-3720-espressobin-emmc.dts from Linux, but use sdhc1 for Import armada-3720-espressobin-emmc.dts from Linux, but use sdhc1 for
emmc, since sdhc0 is used for the sd card. emmc, since our dtsi is still based on downstream and sdhc0 is used for
the sd card.
Signed-off-by: Andre Heider <a.heider@gmail.com> Signed-off-by: Andre Heider <a.heider@gmail.com>
--- ---

View File

@ -1,100 +0,0 @@
From d59406482c1847959305a986376b35e57da28e69 Mon Sep 17 00:00:00 2001
From: Andre Heider <a.heider@gmail.com>
Date: Sat, 5 Sep 2020 12:45:59 +0200
Subject: [PATCH] arm: mvebu: Espressobin: Set environment variable fdtfile
Required for the generic distro mechanism.
Linux ships with 4 variants:
marvell/armada-3720-espressobin-v7-emmc.dtb
marvell/armada-3720-espressobin-v7.dtb
marvell/armada-3720-espressobin-emmc.dtb
marvell/armada-3720-espressobin.dtb
Use available information to determine the appropriate filename.
Tested on a v5 board without eMMC.
Signed-off-by: Andre Heider <a.heider@gmail.com>
---
board/Marvell/mvebu_armada-37xx/board.c | 47 +++++++++++++++++++++
configs/mvebu_espressobin-88f3720_defconfig | 1 +
2 files changed, 48 insertions(+)
--- a/board/Marvell/mvebu_armada-37xx/board.c
+++ b/board/Marvell/mvebu_armada-37xx/board.c
@@ -5,6 +5,7 @@
#include <common.h>
#include <dm.h>
+#include <env.h>
#include <i2c.h>
#include <init.h>
#include <phy.h>
@@ -50,6 +51,22 @@ DECLARE_GLOBAL_DATA_PTR;
#define MVEBU_G2_SMI_PHY_CMD_REG (24)
#define MVEBU_G2_SMI_PHY_DATA_REG (25)
+/*
+ * Memory Controller Registers
+ *
+ * Assembled based on public information:
+ * https://gitlab.nic.cz/turris/mox-boot-builder/-/blob/master/wtmi/main.c#L332-336
+ * https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/blob/mv_ddr-armada-18.12/drivers/mv_ddr_mc6.h#L309-L332
+ *
+ * And checked against the written register values for the various topologies:
+ * https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/blob/mv_ddr-armada-atf-mainline/a3700/mv_ddr_tim.h
+ */
+#define A3700_CH0_MC_CTRL2_REG MVEBU_REGISTER(0x002c4)
+#define A3700_MC_CTRL2_SDRAM_TYPE_MASK 0xf
+#define A3700_MC_CTRL2_SDRAM_TYPE_OFFS 4
+#define A3700_MC_CTRL2_SDRAM_TYPE_DDR3 2
+#define A3700_MC_CTRL2_SDRAM_TYPE_DDR4 3
+
int board_early_init_f(void)
{
return 0;
@@ -63,6 +80,36 @@ int board_init(void)
return 0;
}
+#ifdef CONFIG_BOARD_LATE_INIT
+int board_late_init(void)
+{
+ bool ddr4, emmc;
+
+ if (env_get("fdtfile"))
+ return 0;
+
+ if (!of_machine_is_compatible("globalscale,espressobin"))
+ return 0;
+
+ /* If the memory controller has been configured for DDR4, we're running on v7 */
+ ddr4 = ((readl(A3700_CH0_MC_CTRL2_REG) >> A3700_MC_CTRL2_SDRAM_TYPE_OFFS)
+ & A3700_MC_CTRL2_SDRAM_TYPE_MASK) == A3700_MC_CTRL2_SDRAM_TYPE_DDR4;
+
+ emmc = of_machine_is_compatible("globalscale,espressobin-emmc");
+
+ if (ddr4 && emmc)
+ env_set("fdtfile", "marvell/armada-3720-espressobin-v7-emmc.dtb");
+ else if (ddr4)
+ env_set("fdtfile", "marvell/armada-3720-espressobin-v7.dtb");
+ else if (emmc)
+ env_set("fdtfile", "marvell/armada-3720-espressobin-emmc.dtb");
+ else
+ env_set("fdtfile", "marvell/armada-3720-espressobin.dtb");
+
+ return 0;
+}
+#endif
+
/* Board specific AHCI / SATA enable code */
int board_ahci_enable(void)
{
--- a/configs/mvebu_espressobin-88f3720_defconfig
+++ b/configs/mvebu_espressobin-88f3720_defconfig
@@ -84,3 +84,4 @@ CONFIG_USB_ETHER_RTL8152=y
CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_SHA1=y
CONFIG_SHA256=y
+CONFIG_BOARD_LATE_INIT=y

View File

@ -154,6 +154,12 @@ define U-Boot/nanopi_m1_plus
BUILD_DEVICES:=friendlyarm_nanopi-m1-plus BUILD_DEVICES:=friendlyarm_nanopi-m1-plus
endef endef
define U-Boot/zeropi
BUILD_SUBTARGET:=cortexa7
NAME:=ZeroPi (H3)
BUILD_DEVICES:=friendlyarm_zeropi
endef
define U-Boot/nanopi_neo_air define U-Boot/nanopi_neo_air
BUILD_SUBTARGET:=cortexa7 BUILD_SUBTARGET:=cortexa7
NAME:=U-Boot for NanoPi NEO Air (H3) NAME:=U-Boot for NanoPi NEO Air (H3)
@ -299,6 +305,7 @@ UBOOT_TARGETS := \
Linksprite_pcDuino3 \ Linksprite_pcDuino3 \
Lamobo_R1 \ Lamobo_R1 \
nanopi_m1_plus \ nanopi_m1_plus \
zeropi \
nanopi_neo \ nanopi_neo \
nanopi_neo_air \ nanopi_neo_air \
nanopi_neo_plus2 \ nanopi_neo_plus2 \

View File

@ -0,0 +1,81 @@
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -539,7 +539,8 @@ dtb-$(CONFIG_MACH_SUN8I_H3) += \
sun8i-h3-orangepi-plus.dtb \
sun8i-h3-orangepi-plus2e.dtb \
sun8i-h3-orangepi-zero-plus2.dtb \
- sun8i-h3-rervision-dvk.dtb
+ sun8i-h3-rervision-dvk.dtb \
+ sun8i-h3-zeropi.dtb
dtb-$(CONFIG_MACH_SUN8I_R40) += \
sun8i-r40-bananapi-m2-ultra.dtb \
sun8i-v40-bananapi-m2-berry.dtb
--- /dev/null
+++ b/arch/arm/dts/sun8i-h3-zeropi.dts
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "sun8i-h3-nanopi.dtsi"
+
+/ {
+ model = "FriendlyElec ZeroPi";
+ compatible = "friendlyarm,zeropi", "allwinner,sun8i-h3";
+
+ aliases {
+ ethernet0 = &emac;
+ };
+
+ reg_gmac_3v3: gmac-3v3 {
+ compatible = "regulator-fixed";
+ pinctrl-names = "default";
+ pinctrl-0 = <&gmac_power_pin_nanopi>;
+ regulator-name = "gmac-3v3";
+ regulator-min-microvolt = <3300000>;
+ regulator-max-microvolt = <3300000>;
+ startup-delay-us = <100000>;
+ enable-active-high;
+ gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
+ };
+};
+
+&ehci0 {
+ status = "okay";
+};
+
+&ohci0 {
+ status = "okay";
+};
+
+&pio {
+ gmac_power_pin_nanopi: gmac_power_pin@0 {
+ pins = "PD6";
+ function = "gpio_out";
+ };
+};
+
+&external_mdio {
+ ext_rgmii_phy: ethernet-phy@1 {
+ compatible = "ethernet-phy-ieee802.3-c22";
+ reg = <7>;
+ };
+};
+
+&emac {
+ pinctrl-names = "default";
+ pinctrl-0 = <&emac_rgmii_pins>;
+ phy-supply = <&reg_gmac_3v3>;
+ phy-handle = <&ext_rgmii_phy>;
+ phy-mode = "rgmii";
+
+ allwinner,leds-active-low;
+ status = "okay";
+};
+
+&usb_otg {
+ status = "okay";
+ dr_mode = "peripheral";
+};
+
+&usbphy {
+ usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */
+};

View File

@ -0,0 +1,24 @@
--- /dev/null
+++ b/configs/zeropi_defconfig
@@ -0,0 +1,21 @@
+CONFIG_ARM=y
+CONFIG_ARCH_SUNXI=y
+CONFIG_MACH_SUN8I_H3=y
+CONFIG_DRAM_CLK=408
+CONFIG_DRAM_ZQ=3881979
+CONFIG_DRAM_ODT_EN=y
+CONFIG_MACPWR="PD6"
+# CONFIG_VIDEO_DE2 is not set
+CONFIG_NR_DRAM_BANKS=1
+CONFIG_DEFAULT_DEVICE_TREE="sun8i-h3-zeropi"
+# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+CONFIG_CONSOLE_MUX=y
+CONFIG_SPL=y
+CONFIG_SYS_CLK_FREQ=480000000
+# CONFIG_CMD_IMLS is not set
+# CONFIG_CMD_FLASH is not set
+# CONFIG_CMD_FPGA is not set
+CONFIG_SUN8I_EMAC=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y

View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=perf PKG_NAME:=perf
PKG_VERSION:=$(LINUX_VERSION) PKG_VERSION:=$(LINUX_VERSION)
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
@ -22,6 +22,7 @@ PKG_FLAGS:=nonshared
PKG_BUILD_DIR:=$(LINUX_DIR)/tools/perf-$(TARGET_DIR_NAME) PKG_BUILD_DIR:=$(LINUX_DIR)/tools/perf-$(TARGET_DIR_NAME)
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
define Package/perf define Package/perf
SECTION:=devel SECTION:=devel
@ -38,6 +39,8 @@ endef
HOST_CFLAGS += -I$(LINUX_DIR)/tools/include HOST_CFLAGS += -I$(LINUX_DIR)/tools/include
TARGET_LDFLAGS += $(INTL_LDFLAGS)
MAKE_FLAGS = \ MAKE_FLAGS = \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
NO_LIBPERL=1 \ NO_LIBPERL=1 \
@ -50,11 +53,12 @@ MAKE_FLAGS = \
NO_LIBAUDIT=1 \ NO_LIBAUDIT=1 \
NO_LIBCRYPTO=1 \ NO_LIBCRYPTO=1 \
NO_LIBUNWIND=1 \ NO_LIBUNWIND=1 \
NO_LIBZSTD=1 \
NO_LIBCAP=1 \ NO_LIBCAP=1 \
CROSS_COMPILE="$(TARGET_CROSS)" \ CROSS_COMPILE="$(TARGET_CROSS)" \
CC="$(TARGET_CC)" \ CC="$(TARGET_CC)" \
LD="$(TARGET_CROSS)ld" \ LD="$(TARGET_CROSS)ld" \
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \ LDFLAGS="$(TARGET_LDFLAGS)" \
KBUILD_HOSTCFLAGS="$(HOST_CFLAGS)" \ KBUILD_HOSTCFLAGS="$(HOST_CFLAGS)" \
$(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \ $(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \

View File

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=trace-cmd PKG_NAME:=trace-cmd
PKG_VERSION:=v2.6.1 PKG_VERSION:=v2.6.1
PKG_RELEASE:=2 PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/ PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/
@ -31,6 +31,7 @@ endef
MAKE_FLAGS += \ MAKE_FLAGS += \
NO_PYTHON=1 \ NO_PYTHON=1 \
NO_AUDIT=1 \
prefix=/usr prefix=/usr
PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/trace-cmd/plugins PLUGINS_DIR := $(PKG_INSTALL_DIR)/usr/lib/trace-cmd/plugins

View File

@ -89,7 +89,6 @@ define KernelPackage/fs-cifs
TITLE:=CIFS support TITLE:=CIFS support
KCONFIG:= \ KCONFIG:= \
CONFIG_CIFS \ CONFIG_CIFS \
CONFIG_CIFS_XATTR=y \
CONFIG_CIFS_DFS_UPCALL=n \ CONFIG_CIFS_DFS_UPCALL=n \
CONFIG_CIFS_UPCALL=n \ CONFIG_CIFS_UPCALL=n \
CONFIG_CIFS_SMB311=n CONFIG_CIFS_SMB311=n
@ -206,13 +205,7 @@ define KernelPackage/fs-f2fs
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=F2FS filesystem support TITLE:=F2FS filesystem support
DEPENDS:= +kmod-crypto-hash +kmod-crypto-crc32 +!LINUX_4_19:kmod-nls-base DEPENDS:= +kmod-crypto-hash +kmod-crypto-crc32 +!LINUX_4_19:kmod-nls-base
KCONFIG:= \ KCONFIG:=CONFIG_F2FS_FS
CONFIG_F2FS_FS \
CONFIG_F2FS_STAT_FS=y \
CONFIG_F2FS_FS_XATTR=y \
CONFIG_F2FS_FS_POSIX_ACL=n \
CONFIG_F2FS_FS_SECURITY=n \
CONFIG_F2FS_CHECK_FS=n
FILES:=$(LINUX_DIR)/fs/f2fs/f2fs.ko FILES:=$(LINUX_DIR)/fs/f2fs/f2fs.ko
AUTOLOAD:=$(call AutoLoad,30,f2fs,1) AUTOLOAD:=$(call AutoLoad,30,f2fs,1)
endef endef
@ -483,8 +476,7 @@ $(eval $(call KernelPackage,fs-ntfs))
define KernelPackage/fs-reiserfs define KernelPackage/fs-reiserfs
SUBMENU:=$(FS_MENU) SUBMENU:=$(FS_MENU)
TITLE:=ReiserFS filesystem support TITLE:=ReiserFS filesystem support
KCONFIG:=CONFIG_REISERFS_FS \ KCONFIG:=CONFIG_REISERFS_FS
CONFIG_REISERFS_FS_XATTR=y
FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko FILES:=$(LINUX_DIR)/fs/reiserfs/reiserfs.ko
AUTOLOAD:=$(call AutoLoad,30,reiserfs,1) AUTOLOAD:=$(call AutoLoad,30,reiserfs,1)
endef endef

View File

@ -191,10 +191,10 @@ define KernelPackage/sound-soc-core
KCONFIG:= \ KCONFIG:= \
CONFIG_SND_SOC \ CONFIG_SND_SOC \
CONFIG_SND_SOC_ADI=n \ CONFIG_SND_SOC_ADI=n \
CONFIG_SND_SOC_DMAENGINE_PCM=y \ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y \
CONFIG_SND_SOC_ALL_CODECS=n CONFIG_SND_SOC_ALL_CODECS=n
FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko FILES:=$(LINUX_DIR)/sound/soc/snd-soc-core.ko
AUTOLOAD:=$(call AutoLoad,55, snd-soc-core) AUTOLOAD:=$(call AutoLoad,55,snd-soc-core)
$(call AddDepends/sound) $(call AddDepends/sound)
endef endef
@ -254,6 +254,20 @@ endef
$(eval $(call KernelPackage,sound-soc-imx-sgtl5000)) $(eval $(call KernelPackage,sound-soc-imx-sgtl5000))
define KernelPackage/sound-soc-spdif
TITLE:=SoC S/PDIF codec support
KCONFIG:=CONFIG_SND_SOC_SPDIF
FILES:= \
$(LINUX_DIR)/sound/soc/codecs/snd-soc-spdif-tx.ko \
$(LINUX_DIR)/sound/soc/codecs/snd-soc-spdif-rx.ko
DEPENDS:=+kmod-sound-soc-core
AUTOLOAD:=$(call AutoProbe,snd-soc-spdif-tx snd-soc-spdif-rx)
$(call AddDepends/sound)
endef
$(eval $(call KernelPackage,sound-soc-spdif))
define KernelPackage/pcspkr define KernelPackage/pcspkr
DEPENDS:=@TARGET_x86 +kmod-input-core DEPENDS:=@TARGET_x86 +kmod-input-core
TITLE:=PC speaker support TITLE:=PC speaker support

View File

@ -5,9 +5,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
PKG_SOURCE_DATE:=2020-09-12 PKG_SOURCE_DATE:=2020-10-08
PKG_SOURCE_VERSION:=55a7b6b7f2f773c06a79cb7359ffdab54ba32450 PKG_SOURCE_VERSION:=64ff909328c095749ef6eaed7302b3e024409d2f
PKG_MIRROR_HASH:=48625fe7a195053f1eb766eebc055faaf9b0b3e5eb1467080308e758c4ab7419 PKG_MIRROR_HASH:=2419944c2e715f1ffaad601ce2a80a6cff279de3912de8262c27183d9c758345
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=hostapd PKG_NAME:=hostapd
PKG_RELEASE:=11 PKG_RELEASE:=12
PKG_SOURCE_URL:=http://w1.fi/hostap.git PKG_SOURCE_URL:=http://w1.fi/hostap.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git

View File

@ -395,6 +395,7 @@ hostapd_bss_list_bans(struct ubus_context *ctx, struct ubus_object *obj,
return 0; return 0;
} }
#ifdef CONFIG_WPS
static int static int
hostapd_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj, hostapd_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method, struct ubus_request_data *req, const char *method,
@ -411,6 +412,53 @@ hostapd_bss_wps_start(struct ubus_context *ctx, struct ubus_object *obj,
return 0; return 0;
} }
static const char * pbc_status_enum_str(enum pbc_status status)
{
switch (status) {
case WPS_PBC_STATUS_DISABLE:
return "Disabled";
case WPS_PBC_STATUS_ACTIVE:
return "Active";
case WPS_PBC_STATUS_TIMEOUT:
return "Timed-out";
case WPS_PBC_STATUS_OVERLAP:
return "Overlap";
default:
return "Unknown";
}
}
static int
hostapd_bss_wps_status(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method,
struct blob_attr *msg)
{
int rc;
struct hostapd_data *hapd = container_of(obj, struct hostapd_data, ubus.obj);
blob_buf_init(&b, 0);
blobmsg_add_string(&b, "pbc_status", pbc_status_enum_str(hapd->wps_stats.pbc_status));
blobmsg_add_string(&b, "last_wps_result",
(hapd->wps_stats.status == WPS_STATUS_SUCCESS ?
"Success":
(hapd->wps_stats.status == WPS_STATUS_FAILURE ?
"Failed" : "None")));
/* If status == Failure - Add possible Reasons */
if(hapd->wps_stats.status == WPS_STATUS_FAILURE &&
hapd->wps_stats.failure_reason > 0)
blobmsg_add_string(&b, "reason", wps_ei_str(hapd->wps_stats.failure_reason));
if (hapd->wps_stats.status)
blobmsg_printf(&b, "peer_address", MACSTR, MAC2STR(hapd->wps_stats.peer_addr));
ubus_send_reply(ctx, req, b.head);
return 0;
}
static int static int
hostapd_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj, hostapd_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj,
struct ubus_request_data *req, const char *method, struct ubus_request_data *req, const char *method,
@ -426,6 +474,7 @@ hostapd_bss_wps_cancel(struct ubus_context *ctx, struct ubus_object *obj,
return 0; return 0;
} }
#endif /* CONFIG_WPS */
static int static int
hostapd_bss_update_beacon(struct ubus_context *ctx, struct ubus_object *obj, hostapd_bss_update_beacon(struct ubus_context *ctx, struct ubus_object *obj,
@ -1100,8 +1149,11 @@ static const struct ubus_method bss_methods[] = {
UBUS_METHOD_NOARG("get_clients", hostapd_bss_get_clients), UBUS_METHOD_NOARG("get_clients", hostapd_bss_get_clients),
UBUS_METHOD("del_client", hostapd_bss_del_client, del_policy), UBUS_METHOD("del_client", hostapd_bss_del_client, del_policy),
UBUS_METHOD_NOARG("list_bans", hostapd_bss_list_bans), UBUS_METHOD_NOARG("list_bans", hostapd_bss_list_bans),
#ifdef CONFIG_WPS
UBUS_METHOD_NOARG("wps_start", hostapd_bss_wps_start), UBUS_METHOD_NOARG("wps_start", hostapd_bss_wps_start),
UBUS_METHOD_NOARG("wps_status", hostapd_bss_wps_status),
UBUS_METHOD_NOARG("wps_cancel", hostapd_bss_wps_cancel), UBUS_METHOD_NOARG("wps_cancel", hostapd_bss_wps_cancel),
#endif
UBUS_METHOD_NOARG("update_beacon", hostapd_bss_update_beacon), UBUS_METHOD_NOARG("update_beacon", hostapd_bss_update_beacon),
UBUS_METHOD_NOARG("get_features", hostapd_bss_get_features), UBUS_METHOD_NOARG("get_features", hostapd_bss_get_features),
#ifdef NEED_AP_MLME #ifdef NEED_AP_MLME

View File

@ -50,6 +50,10 @@ static inline int has_feature(const char *feat)
#ifdef CONFIG_HS20 #ifdef CONFIG_HS20
if (!strcmp(feat, "hs20")) if (!strcmp(feat, "hs20"))
return 1; return 1;
#endif
#ifdef CONFIG_WPS
if (!strcmp(feat, "wps"))
return 1;
#endif #endif
return 0; return 0;
} }

View File

@ -12,9 +12,9 @@ PKG_RELEASE:=1
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git
PKG_MIRROR_HASH:=04cc533f567e8a928a1c13dedcad781e73dfc796db8e83ac1218b47412ce01bd PKG_MIRROR_HASH:=97cfe9528405d9a21c05fa1638780c27a66bfb6f21becfc3f4fdca1420711db8
PKG_SOURCE_DATE:=2020-07-11 PKG_SOURCE_DATE:=2020-10-16
PKG_SOURCE_VERSION:=5345343828df944ae247d91cc77182f87559bc9a PKG_SOURCE_VERSION:=f25ab8a8484215e5fc88c952f25db9a06de311f7
CMAKE_INSTALL:=1 CMAKE_INSTALL:=1
PKG_LICENSE:=GPL-2.0 PKG_LICENSE:=GPL-2.0

View File

@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=selinux-policy PKG_NAME:=selinux-policy
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git PKG_SOURCE_URL:=https://git.defensec.nl/selinux-policy.git
PKG_SOURCE_DATE:=2020-10-08 PKG_VERSION:=0.3
PKG_SOURCE_VERSION:=cdedea73ecbb8968f9736c35c143b586c8371467 PKG_MIRROR_HASH:=8f224e4e0ecb459648563862e26fcd5d4d113de5daa277363fc4316da5a05360
PKG_MIRROR_HASH:=3d5a6d60b496b51ae272f7cb495a409c724ee193792f78652a2040b57fab56fe PKG_SOURCE_VERSION:=v$(PKG_VERSION)
PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host PKG_BUILD_DEPENDS:=secilc/host policycoreutils/host
PKG_MAINTAINER:=Dominick Grift <dominick.grift@defensec.nl> PKG_MAINTAINER:=Dominick Grift <dominick.grift@defensec.nl>

View File

@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=policycoreutils PKG_NAME:=policycoreutils
PKG_VERSION:=3.1 PKG_VERSION:=3.1
PKG_RELEASE:=4 PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710 PKG_SOURCE_URL:=https://github.com/SELinuxProject/selinux/releases/download/20200710
@ -25,10 +25,6 @@ include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk include $(INCLUDE_DIR)/nls.mk
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
DIR_SBIN:= \
restorecon \
setfiles
DIR_USR_BIN:= \ DIR_USR_BIN:= \
newrole \ newrole \
secon secon
@ -43,7 +39,6 @@ LIBEXEC_UTILS := \
SBIN_UTILS:= \ SBIN_UTILS:= \
restorecon_xattr \ restorecon_xattr \
restorecon \
setfiles setfiles
USR_BIN_UTILS:= \ USR_BIN_UTILS:= \
@ -76,6 +71,7 @@ HOST_LDFLAGS += -Wl,-rpath=$(STAGING_DIR_HOSTPKG)/lib
$(eval $(foreach a,$(DIR_SBIN),ALTS_$(a):=300:/sbin/$(a):/sbin/policycoreutils-$(a)$(newline))) $(eval $(foreach a,$(DIR_SBIN),ALTS_$(a):=300:/sbin/$(a):/sbin/policycoreutils-$(a)$(newline)))
$(eval $(foreach a,$(DIR_USR_BIN),ALTS_$(a):=300:/usr/bin/$(a):/usr/bin/policycoreutils-$(a)$(newline))) $(eval $(foreach a,$(DIR_USR_BIN),ALTS_$(a):=300:/usr/bin/$(a):/usr/bin/policycoreutils-$(a)$(newline)))
$(eval $(foreach a,$(DIR_USR_SBIN),ALTS_$(a):=300:/usr/sbin/$(a):/usr/sbin/policycoreutils-$(a)$(newline))) $(eval $(foreach a,$(DIR_USR_SBIN),ALTS_$(a):=300:/usr/sbin/$(a):/usr/sbin/policycoreutils-$(a)$(newline)))
ALTS_setfiles:=300:/sbin/restorecon:/sbin/policycoreutils-setfiles 300:/sbin/setfiles:/sbin/policycoreutils-setfiles
DEPENDS_genhomedircon:=+libsemanage $(INTL_DEPENDS) DEPENDS_genhomedircon:=+libsemanage $(INTL_DEPENDS)
DEPENDS_load_policy:=+libselinux $(INTL_DEPENDS) DEPENDS_load_policy:=+libselinux $(INTL_DEPENDS)
@ -83,7 +79,6 @@ DEPENDS_newrole:=+libselinux +libaudit +BUSYBOX_CONFIG_PAM:libpam $(INTL_DEPENDS
DEPENDS_open_init_pty:=$(INTL_DEPENDS) DEPENDS_open_init_pty:=$(INTL_DEPENDS)
DEPENDS_pp:=+libsepol $(INTL_DEPENDS) DEPENDS_pp:=+libsepol $(INTL_DEPENDS)
DEPENDS_restorecon_xattr:=+libselinux +libsepol +libaudit $(INTL_DEPENDS) DEPENDS_restorecon_xattr:=+libselinux +libsepol +libaudit $(INTL_DEPENDS)
DEPENDS_restorecon:=+libselinux +libsepol +libaudit $(INTL_DEPENDS)
DEPENDS_run_init:=+libselinux +libaudit +BUSYBOX_CONFIG_PAM:libpam $(INTL_DEPENDS) DEPENDS_run_init:=+libselinux +libaudit +BUSYBOX_CONFIG_PAM:libpam $(INTL_DEPENDS)
DEPENDS_secon:=+libselinux $(INTL_DEPENDS) DEPENDS_secon:=+libselinux $(INTL_DEPENDS)
DEPENDS_semanage:=+libsemanage DEPENDS_semanage:=+libsemanage

View File

@ -212,6 +212,7 @@ start_qemu_malta() {
local is64 local is64
local isel local isel
local qemu_exe local qemu_exe
local cpu
local rootfs="$o_rootfs" local rootfs="$o_rootfs"
local kernel="$o_kernel" local kernel="$o_kernel"
local mach="${o_mach:-malta}" local mach="${o_mach:-malta}"
@ -220,6 +221,7 @@ start_qemu_malta() {
is64="$(echo $o_subtarget | grep -o 64)" is64="$(echo $o_subtarget | grep -o 64)"
[ "$(echo "$o_subtarget" | grep -o '^..')" = "le" ] && isel="el" [ "$(echo "$o_subtarget" | grep -o '^..')" = "le" ] && isel="el"
qemu_exe="qemu-system-mips$is64$isel" qemu_exe="qemu-system-mips$is64$isel"
[ -n "$is64" ] && cpu="MIPS64R2-generic" || cpu="24Kc"
[ -n "$kernel" ] || kernel="$o_bindir/openwrt-malta-${o_subtarget%-*}-vmlinux-initramfs.elf" [ -n "$kernel" ] || kernel="$o_bindir/openwrt-malta-${o_subtarget%-*}-vmlinux-initramfs.elf"
@ -243,7 +245,7 @@ start_qemu_malta() {
) )
} }
"$qemu_exe" -machine "$mach" -nographic \ "$qemu_exe" -machine "$mach" -cpu "$cpu" -nographic \
-kernel "$kernel" \ -kernel "$kernel" \
"${o_qemu_extra[@]}" "${o_qemu_extra[@]}"
} }

View File

@ -15,10 +15,7 @@ CONFIG_GENERIC_PHY=y
CONFIG_SATA_DWC=y CONFIG_SATA_DWC=y
# CONFIG_SATA_DWC_DEBUG is not set # CONFIG_SATA_DWC_DEBUG is not set
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
# CONFIG_F2FS_CHECK_FS is not set
CONFIG_F2FS_FS=y CONFIG_F2FS_FS=y
# CONFIG_F2FS_FS_SECURITY is not set
CONFIG_F2FS_STAT_FS=y
CONFIG_SCSI=y CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_GPIOLIB=y CONFIG_GPIOLIB=y

View File

@ -55,9 +55,7 @@ CONFIG_DEBUG_BUGVERBOSE=y
CONFIG_DTC=y CONFIG_DTC=y
CONFIG_EDAC_SUPPORT=y CONFIG_EDAC_SUPPORT=y
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
# CONFIG_F2FS_CHECK_FS is not set
CONFIG_F2FS_FS=y CONFIG_F2FS_FS=y
# CONFIG_F2FS_FS_SECURITY is not set
CONFIG_FAILOVER=y CONFIG_FAILOVER=y
CONFIG_FIX_EARLYCON_MEM=y CONFIG_FIX_EARLYCON_MEM=y
CONFIG_FRAME_POINTER=y CONFIG_FRAME_POINTER=y

View File

@ -68,9 +68,7 @@ CONFIG_DMA_REMAP=y
CONFIG_DTC=y CONFIG_DTC=y
CONFIG_EDAC_SUPPORT=y CONFIG_EDAC_SUPPORT=y
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
# CONFIG_F2FS_CHECK_FS is not set
CONFIG_F2FS_FS=y CONFIG_F2FS_FS=y
# CONFIG_F2FS_FS_SECURITY is not set
CONFIG_FAILOVER=y CONFIG_FAILOVER=y
CONFIG_FIX_EARLYCON_MEM=y CONFIG_FIX_EARLYCON_MEM=y
CONFIG_FRAME_POINTER=y CONFIG_FRAME_POINTER=y

View File

@ -0,0 +1,49 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9344_qxwlan_e750x.dtsi"
/ {
model = "Qxwlan E750A v4 16M";
compatible = "qxwlan,e750a-v4-16m", "qca,ar9344";
};
&leds {
lan {
label = "green:lan";
gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
};
wan {
label = "green:wan";
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
};
};
&eth0 {
status = "okay";
phy-handle = <&swphy4>;
mtd-mac-address = <&pridata 0x400>;
mtd-mac-address-increment = <1>;
};
&eth1 {
status = "okay";
mtd-mac-address = <&pridata 0x400>;
gmac-config {
device = <&gmac>;
switch-phy-swap = <0>;
switch-only-mode = <1>;
};
};
&partitions {
partition@70000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x070000 0xf90000>;
};
};

View File

@ -0,0 +1,49 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9344_qxwlan_e750x.dtsi"
/ {
model = "Qxwlan E750A v4 8M";
compatible = "qxwlan,e750a-v4-8m", "qca,ar9344";
};
&leds {
lan {
label = "green:lan";
gpios = <&gpio 19 GPIO_ACTIVE_LOW>;
};
wan {
label = "green:wan";
gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
};
};
&eth0 {
status = "okay";
phy-handle = <&swphy4>;
mtd-mac-address = <&pridata 0x400>;
mtd-mac-address-increment = <1>;
};
&eth1 {
status = "okay";
mtd-mac-address = <&pridata 0x400>;
gmac-config {
device = <&gmac>;
switch-phy-swap = <0>;
switch-only-mode = <1>;
};
};
&partitions {
partition@70000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0x070000 0x790000>;
};
};

View File

@ -0,0 +1,113 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "ar9344.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h>
/ {
aliases {
label-mac-device = &eth0;
led-boot = &led_system;
led-failsafe = &led_system;
led-running = &led_system;
led-upgrade = &led_system;
};
keys {
compatible = "gpio-keys";
reset {
label = "reset";
linux,code = <KEY_RESTART>;
gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
debounce-interval = <60>;
};
};
leds: leds {
compatible = "gpio-leds";
led_system: system {
label = "green:system";
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
default-state = "on";
};
sig1 {
label = "green:sig1";
gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
};
sig2 {
label = "green:sig2";
gpios = <&gpio 20 GPIO_ACTIVE_LOW>;
};
wlan {
label = "green:wlan";
gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy0tpt";
};
};
};
&pcie {
status = "okay";
};
&spi {
status = "okay";
num-cs = <1>;
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <25000000>;
partitions: partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x000000 0x040000>;
read-only;
};
partition@40000 {
label = "u-boot-env";
reg = <0x040000 0x010000>;
read-only;
};
pridata: partition@50000 {
label = "pri-data";
reg = <0x050000 0x010000>;
read-only;
};
art: partition@60000 {
label = "art";
reg = <0x060000 0x010000>;
read-only;
};
};
};
};
&ref {
clock-frequency = <40000000>;
};
&uart {
status = "okay";
};
&wmac {
status = "okay";
mtd-cal-data = <&art 0x1000>;
};

View File

@ -194,7 +194,9 @@ etactica,eg200)
ucidef_set_led_netdev "lan" "LAN" "red:eth0" "eth0" ucidef_set_led_netdev "lan" "LAN" "red:eth0" "eth0"
ucidef_set_led_oneshot "modbus" "Modbus" "red:modbus" "100" "33" ucidef_set_led_oneshot "modbus" "Modbus" "red:modbus" "100" "33"
;; ;;
glinet,gl-mifi) glinet,gl-mifi|\
qxwlan,e750a-v4-8m|\
qxwlan,e750a-v4-16m)
ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x02" ucidef_set_led_switch "lan" "LAN" "green:lan" "switch0" "0x02"
ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1" ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
;; ;;

View File

@ -1502,6 +1502,27 @@ define Device/qihoo_c301
endef endef
TARGET_DEVICES += qihoo_c301 TARGET_DEVICES += qihoo_c301
define Device/qxwlan_e750a-v4
SOC := ar9344
DEVICE_VENDOR := Qxwlan
DEVICE_MODEL := E750A
DEVICE_PACKAGES := kmod-usb2
endef
define Device/qxwlan_e750a-v4-16m
$(Device/qxwlan_e750a-v4)
DEVICE_VARIANT := v4 (16M)
IMAGE_SIZE := 15936k
endef
TARGET_DEVICES += qxwlan_e750a-v4-16m
define Device/qxwlan_e750a-v4-8m
$(Device/qxwlan_e750a-v4)
DEVICE_VARIANT := v4 (8M)
IMAGE_SIZE := 7744k
endef
TARGET_DEVICES += qxwlan_e750a-v4-8m
define Device/rosinson_wr818 define Device/rosinson_wr818
SOC := qca9563 SOC := qca9563
DEVICE_VENDOR := Rosinson DEVICE_VENDOR := Rosinson

View File

@ -159,7 +159,6 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS_SECURITY=y
CONFIG_F2FS_FS=y CONFIG_F2FS_FS=y
CONFIG_F2FS_STAT_FS=y
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_BCM2708=y CONFIG_FB_BCM2708=y
CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_COPYAREA=y

View File

@ -205,7 +205,6 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS_SECURITY=y
CONFIG_F2FS_FS=y CONFIG_F2FS_FS=y
CONFIG_F2FS_STAT_FS=y
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_BCM2708=y CONFIG_FB_BCM2708=y
CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_COPYAREA=y

View File

@ -248,7 +248,6 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS_SECURITY=y
CONFIG_F2FS_FS=y CONFIG_F2FS_FS=y
CONFIG_F2FS_STAT_FS=y
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_BCM2708=y CONFIG_FB_BCM2708=y
CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_COPYAREA=y

View File

@ -253,7 +253,6 @@ CONFIG_EXT4_FS=y
CONFIG_EXT4_FS_POSIX_ACL=y CONFIG_EXT4_FS_POSIX_ACL=y
CONFIG_EXT4_FS_SECURITY=y CONFIG_EXT4_FS_SECURITY=y
CONFIG_F2FS_FS=y CONFIG_F2FS_FS=y
CONFIG_F2FS_STAT_FS=y
CONFIG_FB=y CONFIG_FB=y
CONFIG_FB_BCM2708=y CONFIG_FB_BCM2708=y
CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_COPYAREA=y

View File

@ -14,7 +14,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -8486,8 +8486,6 @@ int alloc_contig_range(unsigned long sta @@ -8489,8 +8489,6 @@ int alloc_contig_range(unsigned long sta
/* Make sure the range is really isolated. */ /* Make sure the range is really isolated. */
if (test_pages_isolated(outer_start, end, false)) { if (test_pages_isolated(outer_start, end, false)) {

View File

@ -8,104 +8,91 @@
board_config_update board_config_update
board=$(board_name) board=$(board_name)
model="${board##*,}"
case "$board" in case "$board" in
actiontec,r1000h) actiontec,r1000h)
ucidef_set_led_usbport "usb" "USB" "R1000H:green:usb" "usb1-port1" "usb2-port1" ucidef_set_led_usbport "usb" "USB" "green:usb" "usb1-port1" "usb2-port1"
;; ;;
adb,a4001n) adb,a4001n|\
ucidef_set_led_usbdev "usb" "USB" "A4001N:green:usb" "1-1" comtrend,ar-5315u|\
comtrend,vr-3032u|\
huawei,hg253s-v2|\
nucom,r5010un-v2|\
sagem,fast-2704-v2)
ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-1"
;; ;;
adb,a4001n1) adb,a4001n1)
ucidef_set_led_netdev "lan" "LAN" "A4001N1:green:eth" "eth0" ucidef_set_led_netdev "lan" "LAN" "green:eth" "eth0"
ucidef_set_led_usbdev "usb" "USB" "A4001N1:green:3g" "1-1" ucidef_set_led_usbdev "usb" "USB" "green:3g" "1-1"
;; ;;
adb,pdg-a4001n-a-000-1a1-ax) adb,pdg-a4001n-a-000-1a1-ax)
ucidef_set_led_netdev "lan" "LAN" "$model:green:internet" "eth0.1" ucidef_set_led_netdev "lan" "LAN" "green:internet" "eth0.1"
ucidef_set_led_netdev "wan" "WAN" "$model:green:adsl" "eth0.2" ucidef_set_led_netdev "wan" "WAN" "green:adsl" "eth0.2"
ucidef_set_led_netdev "wlan0" "WIFI" "$model:green:wifi" "wlan0" ucidef_set_led_netdev "wlan0" "WIFI" "green:wifi" "wlan0"
ucidef_set_led_usbdev "usb" "USB" "$model:green:service" "1-1" ucidef_set_led_usbdev "usb" "USB" "green:service" "1-1"
;; ;;
adb,av4202n) adb,av4202n)
ucidef_set_led_netdev "wlan0" "WLAN" "AV4202N:blue:wifi" "wlan0" ucidef_set_led_netdev "wlan0" "WLAN" "blue:wifi" "wlan0"
;; ;;
bt,home-hub-2-a) bt,home-hub-2-a)
ucidef_set_led_netdev "lan" "LAN" "HOMEHUB2A:blue:broadband" "eth0.1" ucidef_set_led_netdev "lan" "LAN" "blue:broadband" "eth0.1"
ucidef_set_led_netdev "wlan0" "WIFI" "HOMEHUB2A:green:wireless" "wlan0" ucidef_set_led_netdev "wlan0" "WIFI" "green:wireless" "wlan0"
ucidef_set_led_usbdev "usb1" "USB1" "HOMEHUB2A:blue:phone" "1-1" ucidef_set_led_usbdev "usb1" "USB1" "blue:phone" "1-1"
ucidef_set_led_usbdev "usb2" "USB2" "HOMEHUB2A:green:phone" "2-1" ucidef_set_led_usbdev "usb2" "USB2" "green:phone" "2-1"
;;
comtrend,ar-5315u)
ucidef_set_led_usbdev "usb" "USB" "AR-5315u:green:usb" "1-1"
;;
comtrend,vr-3032u|\
huawei,hg253s-v2)
ucidef_set_led_usbdev "usb" "USB" "$model:green:usb" "1-1"
;; ;;
huawei,echolife-hg553) huawei,echolife-hg553)
ucidef_set_led_netdev "lan" "LAN" "HW553:blue:lan" "eth0" ucidef_set_led_netdev "lan" "LAN" "blue:lan" "eth0"
ucidef_set_led_usbdev "usb1" "USB1" "HW553:red:hspa" "1-1" ucidef_set_led_usbdev "usb1" "USB1" "red:hspa" "1-1"
ucidef_set_led_usbdev "usb2" "USB2" "HW553:blue:hspa" "1-2" ucidef_set_led_usbdev "usb2" "USB2" "blue:hspa" "1-2"
;; ;;
huawei,echolife-hg556a-a|\ huawei,echolife-hg556a-a|\
huawei,echolife-hg556a-b|\ huawei,echolife-hg556a-b|\
huawei,echolife-hg556a-c) huawei,echolife-hg556a-c)
ucidef_set_led_netdev "lan" "LAN" "HW556:red:dsl" "eth0" ucidef_set_led_netdev "lan" "LAN" "red:dsl" "eth0"
ucidef_set_led_usbdev "usb" "USB" "HW556:red:hspa" "1-2" ucidef_set_led_usbdev "usb" "USB" "red:hspa" "1-2"
;;
huawei,echolife-hg622)
ucidef_set_led_usbdev "usb" "USB" "HG622:green:usb" "1-2"
;; ;;
huawei,echolife-hg622|\
huawei,echolife-hg655b) huawei,echolife-hg655b)
ucidef_set_led_usbdev "usb" "USB" "HW65x:green:usb" "1-2" ucidef_set_led_usbdev "usb" "USB" "green:usb" "1-2"
;; ;;
inventel,livebox-1) inventel,livebox-1)
ucidef_set_led_netdev "lan" "LAN" "Livebox1:red:traffic" "eth0" ucidef_set_led_netdev "lan" "LAN" "red:traffic" "eth0"
ucidef_set_led_netdev "wan" "WAN" "Livebox1:red:adsl" "eth1" ucidef_set_led_netdev "wan" "WAN" "red:adsl" "eth1"
ucidef_set_led_netdev "wlan0" "WIFI" "Livebox1:red:wifi" "wlan0" ucidef_set_led_netdev "wlan0" "WIFI" "red:wifi" "wlan0"
;; ;;
netgear,dgnd3700-v1) netgear,dgnd3700-v1)
ucidef_set_led_netdev "lan" "LAN" "DGND3700v1_3800B:green:lan" "eth0.1" ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0.1"
ucidef_set_led_netdev "wan" "WAN" "DGND3700v1_3800B:green:inet" "eth0.2" ucidef_set_led_netdev "wan" "WAN" "green:inet" "eth0.2"
ucidef_set_led_netdev "wlan0" "WIFI2G" "DGND3700v1_3800B:green:wifi2g" "wlan0" ucidef_set_led_netdev "wlan0" "WIFI2G" "green:wifi2g" "wlan0"
ucidef_set_led_netdev "wlan1" "WIFI5G" "DGND3700v1_3800B:blue:wifi5g" "wlan1" ucidef_set_led_netdev "wlan1" "WIFI5G" "blue:wifi5g" "wlan1"
ucidef_set_led_usbdev "usb1" "USB1" "DGND3700v1_3800B:green:usb-back" "1-1" ucidef_set_led_usbdev "usb1" "USB1" "green:usb-back" "1-1"
ucidef_set_led_usbdev "usb2" "USB2" "DGND3700v1_3800B:green:usb-front" "1-2" ucidef_set_led_usbdev "usb2" "USB2" "green:usb-front" "1-2"
;; ;;
netgear,dgnd3700-v2) netgear,dgnd3700-v2)
ucidef_set_led_netdev "lan" "LAN" "$model:green:ethernet" "eth0" ucidef_set_led_netdev "lan" "LAN" "green:ethernet" "eth0"
ucidef_set_led_usbdev "usb1" "USB1" "$model:green:usb1" "1-1" ucidef_set_led_usbdev "usb1" "USB1" "green:usb1" "1-1"
ucidef_set_led_usbdev "usb2" "USB2" "$model:green:usb2" "1-2" ucidef_set_led_usbdev "usb2" "USB2" "green:usb2" "1-2"
;; ;;
netgear,evg2000) netgear,evg2000)
ucidef_set_led_netdev "lan" "LAN" "EVG2000:green:lan" "eth0" ucidef_set_led_netdev "lan" "LAN" "green:lan" "eth0"
ucidef_set_led_netdev "wan" "WAN" "EVG2000:green:wan" "eth1" ucidef_set_led_netdev "wan" "WAN" "green:wan" "eth1"
ucidef_set_led_netdev "wlan0" "WIFI" "EVG2000:green:wireless" "wlan0" ucidef_set_led_netdev "wlan0" "WIFI" "green:wireless" "wlan0"
ucidef_set_led_usbdev "usb1" "USB1" "EVG2000:green:voip1" "1-1" ucidef_set_led_usbdev "usb1" "USB1" "green:voip1" "1-1"
ucidef_set_led_usbdev "usb2" "USB2" "EVG2000:green:voip2" "1-2" ucidef_set_led_usbdev "usb2" "USB2" "green:voip2" "1-2"
;;
nucom,r5010un-v2)
ucidef_set_led_usbdev "usb" "USB" "R5010UNv2:green:usb" "1-1"
;; ;;
sagem,fast-2704n) sagem,fast-2704n)
ucidef_set_led_netdev "wan" "WAN" "F@ST2704N:green:inet" "eth0.2" ucidef_set_led_netdev "wan" "WAN" "green:inet" "eth0.2"
;;
sagem,fast-2704-v2)
ucidef_set_led_usbdev "usb" "USB" "F@ST2704V2:green:usb" "1-1"
;;
sercomm,ad1018)
ucidef_set_led_netdev "wlan0" "WLAN" "$model:green:wifi" "wlan0"
;; ;;
sercomm,ad1018|\
sercomm,ad1018-nor) sercomm,ad1018-nor)
ucidef_set_led_netdev "wlan0" "WLAN" "AD1018:green:wifi" "wlan0" ucidef_set_led_netdev "wlan0" "WLAN" "green:wifi" "wlan0"
;; ;;
sercomm,h500-s-lowi|\ sercomm,h500-s-lowi|\
sercomm,h500-s-vfes) sercomm,h500-s-vfes)
ucidef_set_led_netdev "wan" "WAN" "h500-s:green:internet" "eth0.2" ucidef_set_led_netdev "wan" "WAN" "green:internet" "eth0.2"
;; ;;
telsey,cpva502plus) telsey,cpva502plus)
ucidef_set_led_netdev "lan" "LAN" "CPVA502+:amber:link" "eth0" ucidef_set_led_netdev "lan" "LAN" "amber:link" "eth0"
;; ;;
esac esac

View File

@ -0,0 +1,21 @@
. /lib/functions/migrations.sh
board=$(board_name)
case "$board" in
brcm,bcm96318ref-p300|\
brcm,bcm963281tan|\
brcm,bcm96328avng|\
d-link,dsl-2640b-b|\
d-link,dva-g3810bn-tl|\
netgear,dg834g-v4|\
usrobotics,usr9108)
migrate_leds "^.*::="
;;
esac
remove_devicename_leds
migrations_apply system
exit 0

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm3368.dtsi" #include "bcm3368.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -24,7 +22,7 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_green: power_green { led_power_green: power_green {
label = "CVG834G:green:power"; label = "green:power";
gpios = <&gpio1 5 0>; gpios = <&gpio1 5 0>;
default-state = "on"; default-state = "on";
}; };

View File

@ -1,3 +1,5 @@
/dts-v1/;
/ { / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

View File

@ -5,8 +5,6 @@
* Copyright (C) 2020 Daniel González Cabanelas <dgcbueu@gmail.com> * Copyright (C) 2020 Daniel González Cabanelas <dgcbueu@gmail.com>
*/ */
/dts-v1/;
#include "bcm63167-sercomm-h500-s.dtsi" #include "bcm63167-sercomm-h500-s.dtsi"
/ { / {

View File

@ -5,8 +5,6 @@
* Copyright (C) 2020 Daniel González Cabanelas <dgcbueu@gmail.com> * Copyright (C) 2020 Daniel González Cabanelas <dgcbueu@gmail.com>
*/ */
/dts-v1/;
#include "bcm63167-sercomm-h500-s.dtsi" #include "bcm63167-sercomm-h500-s.dtsi"
/ { / {

View File

@ -52,58 +52,58 @@
mobile_red { mobile_red {
reg = <0>; reg = <0>;
label = "h500-s:red:mobile"; label = "red:mobile";
}; };
mobile_green { mobile_green {
reg = <1>; reg = <1>;
label = "h500-s:green:mobile"; label = "green:mobile";
}; };
led_power_red: power_red { led_power_red: power_red {
reg = <8>; reg = <8>;
label = "h500-s:red:power"; label = "red:power";
}; };
wifi_green { wifi_green {
reg = <9>; reg = <9>;
label = "h500-s:green:wifi"; label = "green:wifi";
}; };
phone_red { phone_red {
reg = <12>; reg = <12>;
label = "h500-s:red:phone"; label = "red:phone";
}; };
wifi_red { wifi_red {
reg = <13>; reg = <13>;
label = "h500-s:red:wifi"; label = "red:wifi";
}; };
internet_red { internet_red {
reg = <14>; reg = <14>;
label = "h500-s:red:internet"; label = "red:internet";
}; };
internet_green { internet_green {
reg = <15>; reg = <15>;
label = "h500-s:green:internet"; label = "green:internet";
}; };
phone_green { phone_green {
reg = <16>; reg = <16>;
label = "h500-s:green:phone"; label = "green:phone";
}; };
led_power_green: power_green { led_power_green: power_green {
reg = <17>; reg = <17>;
label = "h500-s:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
mobile_blue { mobile_blue {
reg = <23>; reg = <23>;
label = "h500-s:blue:mobile"; label = "blue:mobile";
}; };
}; };

View File

@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
/dts-v1/;
#include "bcm63268.dtsi" #include "bcm63268.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -70,31 +68,31 @@
led@2 { led@2 {
reg = <2>; reg = <2>;
active-low; active-low;
label = "vr-3032u:red:inet"; label = "red:inet";
}; };
led@3 { led@3 {
reg = <3>; reg = <3>;
active-low; active-low;
label = "vr-3032u:green:dsl"; label = "green:dsl";
}; };
led@4 { led@4 {
reg = <4>; reg = <4>;
active-low; active-low;
label = "vr-3032u:green:usb"; label = "green:usb";
}; };
led@7 { led@7 {
reg = <7>; reg = <7>;
active-low; active-low;
label = "vr-3032u:green:wps"; label = "green:wps";
}; };
led@8 { led@8 {
reg = <8>; reg = <8>;
active-low; active-low;
label = "vr-3032u:green:inet"; label = "green:inet";
}; };
led@9 { led@9 {
@ -142,7 +140,7 @@
led_power_green: led@20 { led_power_green: led@20 {
reg = <20>; reg = <20>;
active-low; active-low;
label = "vr-3032u:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm63268.dtsi" #include "bcm63268.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,64 +36,64 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
lan1_green { lan1_green {
label = "SR102:green:lan1"; label = "green:lan1";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
power_red { power_red {
label = "SR102:red:power"; label = "red:power";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
wifi_red { wifi_red {
label = "SR102:red:wifi"; label = "red:wifi";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
inet_red { inet_red {
label = "SR102:red:inet"; label = "red:inet";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
}; };
inet_white { inet_white {
label = "SR102:white:inet"; label = "white:inet";
gpios = <&pinctrl 5 0>; gpios = <&pinctrl 5 0>;
}; };
led_power_white: power_white { led_power_white: power_white {
label = "SR102:white:power"; label = "white:power";
gpios = <&pinctrl 6 0>; gpios = <&pinctrl 6 0>;
default-state = "on"; default-state = "on";
}; };
wifi_white { wifi_white {
label = "SR102:white:wifi"; label = "white:wifi";
gpios = <&pinctrl 8 0>; gpios = <&pinctrl 8 0>;
}; };
lan2_red { lan2_red {
label = "SR102:red:lan2"; label = "red:lan2";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
lan3_red { lan3_red {
label = "SR102:red:lan3"; label = "red:lan3";
gpios = <&pinctrl 10 1>; gpios = <&pinctrl 10 1>;
}; };
lan4_red { lan4_red {
label = "SR102:red:lan4"; label = "red:lan4";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
lan1_red { lan1_red {
label = "SR102:red:lan1"; label = "red:lan1";
gpios = <&pinctrl 12 1>; gpios = <&pinctrl 12 1>;
}; };
lan2_green { lan2_green {
label = "SR102:green:lan2"; label = "green:lan2";
gpios = <&pinctrl 13 0>; gpios = <&pinctrl 13 0>;
}; };
lan3_green { lan3_green {
label = "SR102:green:lan3"; label = "green:lan3";
gpios = <&pinctrl 14 1>; gpios = <&pinctrl 14 1>;
}; };
lan4_green { lan4_green {
label = "SR102:green:lan4"; label = "green:lan4";
gpios = <&pinctrl 15 1>; gpios = <&pinctrl 15 1>;
}; };
hd_white { hd_white {
label = "SR102:white:hd"; label = "white:hd";
gpios = <&pinctrl 18 0>; gpios = <&pinctrl 18 0>;
}; };
}; };

View File

@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
/dts-v1/;
#include "bcm63268.dtsi" #include "bcm63268.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -56,50 +54,50 @@
led@2 { led@2 {
reg = <2>; reg = <2>;
active-low; active-low;
label = "vg-8050:red:internet"; label = "red:internet";
}; };
led@3 { led@3 {
reg = <3>; reg = <3>;
active-low; active-low;
label = "vg-8050:red:power"; label = "red:power";
}; };
led_power_green: led@6 { led_power_green: led@6 {
reg = <6>; reg = <6>;
active-low; active-low;
label = "vg-8050:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
led@7 { led@7 {
reg = <7>; reg = <7>;
active-low; active-low;
label = "vg-8050:green:wps"; label = "green:wps";
}; };
led@8 { led@8 {
reg = <8>; reg = <8>;
active-low; active-low;
label = "vg-8050:green:internet"; label = "green:internet";
}; };
led@10 { led@10 {
reg = <10>; reg = <10>;
active-low; active-low;
label = "vg-8050:green:voip"; label = "green:voip";
}; };
led@12 { led@12 {
reg = <12>; reg = <12>;
active-low; active-low;
label = "vg-8050:red:voip"; label = "red:voip";
}; };
led@14 { led@14 {
reg = <14>; reg = <14>;
active-low; active-low;
label = "vg-8050:red:wps"; label = "red:wps";
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6318.dtsi" #include "bcm6318.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,22 +36,22 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
inet { inet {
label = "96318REF_P300:green:inet"; label = "green:inet";
gpios = <&pinctrl 8 1>; gpios = <&pinctrl 8 1>;
}; };
inet_fail { inet_fail {
label = "96318REF_P300:red:inet-fail"; label = "red:inet-fail";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
post_failed { post_failed {
label = "96318REF_P300:red:post-failed"; label = "red:post-failed";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
usb_pwron { usb_pwron {
label = "96318REF_P300::usb-pwron"; label = "usb-pwron";
gpios = <&pinctrl 13 1>; gpios = <&pinctrl 13 1>;
default-state = "on"; default-state = "on";
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6318.dtsi" #include "bcm6318.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,17 +36,17 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
inet { inet {
label = "96318REF:green:inet"; label = "green:inet";
gpios = <&pinctrl 8 1>; gpios = <&pinctrl 8 1>;
}; };
inet_fail { inet_fail {
label = "96318REF:red:inet-fail"; label = "red:inet-fail";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
post_failed { post_failed {
label = "96318REF:red:post-failed"; label = "red:post-failed";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6318.dtsi" #include "bcm6318.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -91,20 +89,20 @@
led@0 { led@0 {
reg = <0>; reg = <0>;
active-low; active-low;
label = "AR-5315u:green:wps"; label = "green:wps";
}; };
led_power_green: led@1 { led_power_green: led@1 {
reg = <1>; reg = <1>;
active-low; active-low;
label = "AR-5315u:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
led@2 { led@2 {
reg = <2>; reg = <2>;
active-low; active-low;
label = "AR-5315u:green:usb"; label = "green:usb";
}; };
led@4 { led@4 {
@ -138,25 +136,25 @@
led@8 { led@8 {
reg = <8>; reg = <8>;
active-low; active-low;
label = "AR-5315u:green:inet"; label = "green:inet";
}; };
led@9 { led@9 {
reg = <9>; reg = <9>;
active-low; active-low;
label = "AR-5315u:red:inet"; label = "red:inet";
}; };
led@10 { led@10 {
reg = <10>; reg = <10>;
active-low; active-low;
label = "AR-5315u:green:dsl"; label = "green:dsl";
}; };
led@11 { led@11 {
reg = <11>; reg = <11>;
active-low; active-low;
label = "AR-5315u:red:power"; label = "red:power";
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6318.dtsi" #include "bcm6318.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -52,39 +50,39 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_green: power_green { led_power_green: power_green {
label = "dsl-275xb:green:power"; label = "green:power";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
default-state = "on"; default-state = "on";
}; };
inet_green { inet_green {
label = "dsl-275xb:green:inet"; label = "green:inet";
gpios = <&pinctrl 8 1>; gpios = <&pinctrl 8 1>;
}; };
inet_red { inet_red {
label = "dsl-275xb:red:inet-fail"; label = "red:inet-fail";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
power_red { power_red {
label = "dsl-275xb:red:post-failed"; label = "red:post-failed";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
wps_blue { wps_blue {
label = "dsl-275xb:blue:wps"; label = "blue:wps";
gpios = <&pinctrl 16 1>; gpios = <&pinctrl 16 1>;
}; };
dsl_green { dsl_green {
label = "dsl-275xb:green:dsl"; label = "green:dsl";
gpios = <&pinctrl 17 1>; gpios = <&pinctrl 17 1>;
}; };
usb_green { usb_green {
/* not user controllable? */ /* not user controllable? */
label = "dsl-275xb:green:usb"; label = "green:usb";
gpios = <&pinctrl 49 1>; gpios = <&pinctrl 49 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6318.dtsi" #include "bcm6318.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -52,48 +50,48 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
wps_green { wps_green {
label = "F@ST2704N:green:wps"; label = "green:wps";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
lan1_green { lan1_green {
label = "F@ST2704N:green:lan1"; label = "green:lan1";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
}; };
lan2_green { lan2_green {
label = "F@ST2704N:green:lan2"; label = "green:lan2";
gpios = <&pinctrl 5 1>; gpios = <&pinctrl 5 1>;
}; };
lan3_green { lan3_green {
label = "F@ST2704N:green:lan3"; label = "green:lan3";
gpios = <&pinctrl 6 1>; gpios = <&pinctrl 6 1>;
}; };
lan4_green { lan4_green {
label = "F@ST2704N:green:lan4"; label = "green:lan4";
gpios = <&pinctrl 7 1>; gpios = <&pinctrl 7 1>;
}; };
inet_green { inet_green {
label = "F@ST2704N:green:inet"; label = "green:inet";
gpios = <&pinctrl 8 1>; gpios = <&pinctrl 8 1>;
}; };
inet_red { inet_red {
label = "F@ST2704N:red:inet"; label = "red:inet";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
dsl_green { dsl_green {
label = "F@ST2704N:green:dsl"; label = "green:dsl";
gpios = <&pinctrl 10 1>; gpios = <&pinctrl 10 1>;
}; };
led_power_red: power_red { led_power_red: power_red {
label = "F@ST2704N:red:power"; label = "red:power";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
power_green { power_green {
label = "F@ST2704N:green:power"; label = "green:power";
gpios = <&pinctrl 47 1>; gpios = <&pinctrl 47 1>;
default-state = "on"; default-state = "on";
}; };
usb_green { usb_green {
label = "F@ST2704N:green:usb"; label = "green:usb";
gpios = <&pinctrl 49 1>; gpios = <&pinctrl 49 1>;
}; };
}; };

View File

@ -1,3 +1,5 @@
/dts-v1/;
/ { / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm63268.dtsi" #include "bcm63268.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm63268.dtsi" #include "bcm63268.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>

View File

@ -1,3 +1,5 @@
/dts-v1/;
/ { / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm63268.dtsi" #include "bcm63268.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -31,12 +29,12 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
usb1 { usb1 {
label = "963269BHR:green:usb1"; label = "green:usb1";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
usb2 { usb2 {
label = "963269BHR:green:usb2"; label = "green:usb2";
gpios = <&pinctrl 10 1>; gpios = <&pinctrl 10 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -45,24 +43,24 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
inet_red { inet_red {
label = "A4001N:red:inet"; label = "red:inet";
gpios = <&pinctrl 1 0>; gpios = <&pinctrl 1 0>;
}; };
power_red { power_red {
label = "A4001N:red:power"; label = "red:power";
gpios = <&pinctrl 4 0>; gpios = <&pinctrl 4 0>;
}; };
led_power_green: power_green { led_power_green: power_green {
label = "A4001N:green:power"; label = "green:power";
gpios = <&pinctrl 8 0>; gpios = <&pinctrl 8 0>;
default-state = "on"; default-state = "on";
}; };
usb_green { usb_green {
label = "A4001N:green:usb"; label = "green:usb";
gpios = <&pinctrl 10 1>; gpios = <&pinctrl 10 1>;
}; };
dsl_green { dsl_green {
label = "A4001N:green:dsl"; label = "green:dsl";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -45,52 +43,52 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
inet_red { inet_red {
label = "A4001N1:red:inet"; label = "red:inet";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
ppp_green { ppp_green {
label = "A4001N1:green:ppp"; label = "green:ppp";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
led_power_green: power_green { led_power_green: power_green {
label = "A4001N1:green:power"; label = "green:power";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
default-state = "on"; default-state = "on";
}; };
ppp_red { ppp_red {
label = "A4001N1:red:ppp"; label = "red:ppp";
gpios = <&pinctrl 5 1>; gpios = <&pinctrl 5 1>;
}; };
usb_green { usb_green {
label = "A4001N1:green:3g"; label = "green:3g";
gpios = <&pinctrl 6 1>; gpios = <&pinctrl 6 1>;
}; };
usb_red { usb_red {
label = "A4001N1:red:3g"; label = "red:3g";
gpios = <&pinctrl 7 1>; gpios = <&pinctrl 7 1>;
}; };
power_red { power_red {
label = "A4001N1:red:power"; label = "red:power";
gpios = <&pinctrl 8 1>; gpios = <&pinctrl 8 1>;
}; };
wlan_green { wlan_green {
label = "A4001N1:green:wlan"; label = "green:wlan";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
wlan_red { wlan_red {
label = "A4001N1:red:wlan"; label = "red:wlan";
gpios = <&pinctrl 10 1>; gpios = <&pinctrl 10 1>;
}; };
inet_green { inet_green {
label = "A4001N1:green:inet"; label = "green:inet";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
eth_red { eth_red {
label = "A4001N1:red:eth"; label = "red:eth";
gpios = <&pinctrl 20 1>; gpios = <&pinctrl 20 1>;
}; };
eth_green { eth_green {
label = "A4001N1:green:eth"; label = "green:eth";
gpios = <&pinctrl 31 1>; gpios = <&pinctrl 31 1>;
}; };
}; };

View File

@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -53,61 +51,61 @@
led@2 { led@2 {
reg = <2>; reg = <2>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:red:internet"; label = "red:internet";
}; };
led@3 { led@3 {
reg = <3>; reg = <3>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:green:adsl"; label = "green:adsl";
}; };
led@5 { led@5 {
reg = <5>; reg = <5>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:red:adsl"; label = "red:adsl";
}; };
led@6 { led@6 {
reg = <6>; reg = <6>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:green:service"; label = "green:service";
}; };
led@7 { led@7 {
reg = <7>; reg = <7>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:red:service"; label = "red:service";
}; };
led@8 { led@8 {
reg = <8>; reg = <8>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:red:power"; label = "red:power";
}; };
led@9 { led@9 {
reg = <9>; reg = <9>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:green:wifi"; label = "green:wifi";
}; };
led@10 { led@10 {
reg = <10>; reg = <10>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:red:wifi"; label = "red:wifi";
}; };
led@11 { led@11 {
reg = <11>; reg = <11>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:green:internet"; label = "green:internet";
}; };
led_power_green: led@12 { led_power_green: led@12 {
reg = <12>; reg = <12>;
active-low; active-low;
label = "pdg-a4001n-a-000-1a1-ax:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -24,28 +22,28 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
inet { inet {
label = "963281TAN::internet"; label = "internet";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
led_power: power { led_power: power {
label = "963281TAN::power"; label = "power";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
default-state = "on"; default-state = "on";
}; };
inet_fail { inet_fail {
label = "963281TAN::internet-fail"; label = "internet-fail";
gpios = <&pinctrl 7 1>; gpios = <&pinctrl 7 1>;
}; };
power_fail { power_fail {
label = "963281TAN::power-fail"; label = "power-fail";
gpios = <&pinctrl 8 1>; gpios = <&pinctrl 8 1>;
}; };
wps { wps {
label = "963281TAN::wps"; label = "wps";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
dsl { dsl {
label = "963281TAN::dsl"; label = "dsl";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -24,28 +22,28 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
inet_fail { inet_fail {
label = "96328avng::internet-fail"; label = "internet-fail";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
dsl { dsl {
label = "96328avng::dsl"; label = "dsl";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
led_power: power { led_power: power {
label = "96328avng::power"; label = "power";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
default-state = "on"; default-state = "on";
}; };
power_fail { power_fail {
label = "96328avng::power-fail"; label = "power-fail";
gpios = <&pinctrl 8 1>; gpios = <&pinctrl 8 1>;
}; };
wps { wps {
label = "96328avng::wps"; label = "wps";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
inet { inet {
label = "96328avng::internet"; label = "internet";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -82,19 +80,19 @@
led_alarm_red: led@2 { led_alarm_red: led@2 {
reg = <2>; reg = <2>;
active-low; active-low;
label = "AR-5381u:red:alarm"; label = "red:alarm";
}; };
led@3 { led@3 {
reg = <3>; reg = <3>;
active-low; active-low;
label = "AR-5381u:green:inet"; label = "green:inet";
}; };
led_power_green: led@4 { led_power_green: led@4 {
reg = <4>; reg = <4>;
active-low; active-low;
label = "AR-5381u:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -81,29 +79,29 @@
led@1 { led@1 {
reg = <1>; reg = <1>;
label = "AR-5387un:red:inet"; label = "red:inet";
}; };
led@4 { led@4 {
reg = <4>; reg = <4>;
label = "AR-5387un:red:power"; label = "red:power";
}; };
led@7 { led@7 {
reg = <7>; reg = <7>;
label = "AR-5387un:green:inet"; label = "green:inet";
}; };
led_power_green: led@8 { led_power_green: led@8 {
reg = <8>; reg = <8>;
label = "AR-5387un:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
led@11 { led@11 {
reg = <11>; reg = <11>;
active-low; active-low;
label = "AR-5387un:green:dsl"; label = "green:dsl";
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -52,28 +50,28 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
inet_red { inet_red {
label = "dsl-274xb:red:internet"; label = "red:internet";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
dsl_green { dsl_green {
label = "dsl-274xb:green:dsl"; label = "green:dsl";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
led_power_green: power_green { led_power_green: power_green {
label = "dsl-274xb:green:power"; label = "green:power";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
default-state = "on"; default-state = "on";
}; };
power_red { power_red {
label = "dsl-274xb:red:power"; label = "red:power";
gpios = <&pinctrl 8 1>; gpios = <&pinctrl 8 1>;
}; };
wps_blue { wps_blue {
label = "dsl-274xb:blue:wps"; label = "blue:wps";
gpios = <&pinctrl 9 1>; gpios = <&pinctrl 9 1>;
}; };
inet_green { inet_green {
label = "dsl-274xb:green:internet"; label = "green:internet";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -45,32 +43,32 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
inet_green { inet_green {
label = "R5010UNv2:green:inet"; label = "green:inet";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
inet_fail_red { inet_fail_red {
label = "R5010UNv2:red:inet-fail"; label = "red:inet-fail";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
dsl_red { dsl_red {
label = "R5010UNv2:green:dsl"; label = "green:dsl";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
led_power_green: power_green { led_power_green: power_green {
label = "R5010UNv2:green:power"; label = "green:power";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
default-state = "on"; default-state = "on";
}; };
power_fail_red { power_fail_red {
label = "R5010UNv2:red:power-fail"; label = "red:power-fail";
gpios = <&pinctrl 5 1>; gpios = <&pinctrl 5 1>;
}; };
wps_green { wps_green {
label = "R5010UNv2:green:wps"; label = "green:wps";
gpios = <&pinctrl 10 1>; gpios = <&pinctrl 10 1>;
}; };
usb_green { usb_green {
label = "R5010UNv2:green:usb"; label = "green:usb";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -52,32 +50,32 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
usb_green { usb_green {
label = "F@ST2704V2:green:usb"; label = "green:usb";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
inet_red { inet_red {
label = "F@ST2704V2:red:inet"; label = "red:inet";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
dsl_green { dsl_green {
label = "F@ST2704V2:green:dsl"; label = "green:dsl";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
led_power_green: power_green { led_power_green: power_green {
label = "F@ST2704V2:green:power"; label = "green:power";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
default-state = "on"; default-state = "on";
}; };
power_red { power_red {
label = "F@ST2704V2:red:power"; label = "red:power";
gpios = <&pinctrl 5 1>; gpios = <&pinctrl 5 1>;
}; };
wps_green { wps_green {
label = "F@ST2704V2:green:wps"; label = "green:wps";
gpios = <&pinctrl 10 1>; gpios = <&pinctrl 10 1>;
}; };
inet_green { inet_green {
label = "F@ST2704V2:green:inet"; label = "green:inet";
gpios = <&pinctrl 11 1>; gpios = <&pinctrl 11 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -71,56 +69,56 @@
inet_red@0 { inet_red@0 {
reg = <0>; reg = <0>;
active-low; active-low;
label = "AD1018:red:internet"; label = "red:internet";
}; };
inet_green@1 { inet_green@1 {
reg = <1>; reg = <1>;
active-low; active-low;
label = "AD1018:green:internet"; label = "green:internet";
}; };
led_power_green: power_green@8 { led_power_green: power_green@8 {
reg = <8>; reg = <8>;
active-low; active-low;
label = "AD1018:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
adsl_green@10 { adsl_green@10 {
reg = <10>; reg = <10>;
active-low; active-low;
label = "AD1018:green:adsl"; label = "green:adsl";
}; };
adsl_red@11 { adsl_red@11 {
reg = <11>; reg = <11>;
active-low; active-low;
label = "AD1018:red:adsl"; label = "red:adsl";
}; };
phone_green@12 { phone_green@12 {
reg = <12>; reg = <12>;
active-low; active-low;
label = "AD1018:green:phone"; label = "green:phone";
}; };
wps_green@13 { wps_green@13 {
reg = <13>; reg = <13>;
active-low; active-low;
label = "AD1018:green:wps"; label = "green:wps";
}; };
wifi_green@14 { wifi_green@14 {
reg = <14>; reg = <14>;
active-low; active-low;
label = "AD1018:green:wifi"; label = "green:wifi";
}; };
usb_green@15 { usb_green@15 {
reg = <15>; reg = <15>;
active-low; active-low;
label = "AD1018:green:usb"; label = "green:usb";
}; };
ephy0_spd@17 { ephy0_spd@17 {

View File

@ -1,7 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
/dts-v1/;
#include "bcm6328.dtsi" #include "bcm6328.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -66,56 +64,56 @@
led@0 { led@0 {
reg = <0>; reg = <0>;
active-low; active-low;
label = "ad1018:red:internet"; label = "red:internet";
}; };
led@1 { led@1 {
reg = <1>; reg = <1>;
active-low; active-low;
label = "ad1018:green:internet"; label = "green:internet";
}; };
led_power_green: led@8 { led_power_green: led@8 {
reg = <8>; reg = <8>;
active-low; active-low;
label = "ad1018:green:power"; label = "green:power";
default-state = "on"; default-state = "on";
}; };
led@10 { led@10 {
reg = <10>; reg = <10>;
active-low; active-low;
label = "ad1018:green:adsl"; label = "green:adsl";
}; };
led@11 { led@11 {
reg = <11>; reg = <11>;
active-low; active-low;
label = "ad1018:red:adsl"; label = "red:adsl";
}; };
led@12 { led@12 {
reg = <12>; reg = <12>;
active-low; active-low;
label = "ad1018:green:phone"; label = "green:phone";
}; };
led@13 { led@13 {
reg = <13>; reg = <13>;
active-low; active-low;
label = "ad1018:green:wps"; label = "green:wps";
}; };
led@14 { led@14 {
reg = <14>; reg = <14>;
active-low; active-low;
label = "ad1018:green:wifi"; label = "green:wifi";
}; };
led@15 { led@15 {
reg = <15>; reg = <15>;
active-low; active-low;
label = "ad1018:green:usb"; label = "green:usb";
}; };
led@17 { led@17 {

View File

@ -1,3 +1,5 @@
/dts-v1/;
/ { / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6338.dtsi" #include "bcm6338.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -17,24 +15,24 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
power_green { power_green {
label = "96338GW:green:power"; label = "green:power";
gpios = <&gpio0 0 1>; gpios = <&gpio0 0 1>;
default-state = "on"; default-state = "on";
}; };
stop_green { stop_green {
label = "96338GW:green:stop"; label = "green:stop";
gpios = <&gpio0 1 1>; gpios = <&gpio0 1 1>;
}; };
dsl_green { dsl_green {
label = "96338GW:green:adsl"; label = "green:adsl";
gpios = <&gpio0 3 1>; gpios = <&gpio0 3 1>;
}; };
ppp_fail_green { ppp_fail_green {
label = "96338GW:green:ppp-fail"; label = "green:ppp-fail";
gpios = <&gpio0 4 1>; gpios = <&gpio0 4 1>;
}; };
ses_green { ses_green {
label = "96338GW:green:ses"; label = "green:ses";
gpios = <&gpio0 5 1>; gpios = <&gpio0 5 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6338.dtsi" #include "bcm6338.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -17,24 +15,24 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
power_green { power_green {
label = "96338W:green:power"; label = "green:power";
gpios = <&gpio0 0 1>; gpios = <&gpio0 0 1>;
default-state = "on"; default-state = "on";
}; };
stop_green { stop_green {
label = "96338W:green:stop"; label = "green:stop";
gpios = <&gpio0 1 1>; gpios = <&gpio0 1 1>;
}; };
dsl_green { dsl_green {
label = "96338W:green:adsl"; label = "green:adsl";
gpios = <&gpio0 3 1>; gpios = <&gpio0 3 1>;
}; };
ppp_fail_green { ppp_fail_green {
label = "96338W:green:ppp-fail"; label = "green:ppp-fail";
gpios = <&gpio0 4 1>; gpios = <&gpio0 4 1>;
}; };
ses_green { ses_green {
label = "96338W:green:ses"; label = "green:ses";
gpios = <&gpio0 5 1>; gpios = <&gpio0 5 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6338.dtsi" #include "bcm6338.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -17,18 +15,18 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
green_power { green_power {
label = "96338W2_E7T:green:power"; label = "green:power";
gpios = <&gpio0 0 1>; gpios = <&gpio0 0 1>;
default-state = "on"; default-state = "on";
}; };
green_stop { green_stop {
label = "96338W2_E7T:green:ppp"; label = "green:ppp";
gpios = <&gpio0 4 1>; gpios = <&gpio0 4 1>;
}; };
green_adsl { green_adsl {
label = "96338W2_E7T:green:ppp-fail"; label = "green:ppp-fail";
gpios = <&gpio0 5 1>; gpios = <&gpio0 5 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6338.dtsi" #include "bcm6338.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -17,20 +15,20 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
green_power { green_power {
label = "RTA1320_16M:green:power"; label = "green:power";
gpios = <&gpio0 0 1>; gpios = <&gpio0 0 1>;
default-state = "on"; default-state = "on";
}; };
green_stop { green_stop {
label = "RTA1320_16M:green:stop"; label = "green:stop";
gpios = <&gpio0 1 1>; gpios = <&gpio0 1 1>;
}; };
green_adsl { green_adsl {
label = "RTA1320_16M:green:adsl"; label = "green:adsl";
gpios = <&gpio0 3 1>; gpios = <&gpio0 3 1>;
}; };
green_ppp { green_ppp {
label = "RTA1320_16M:green:ppp"; label = "green:ppp";
gpios = <&gpio0 4 1>; gpios = <&gpio0 4 1>;
}; };
}; };

View File

@ -1,3 +1,5 @@
/dts-v1/;
/ { / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6345.dtsi" #include "bcm6345.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6345.dtsi" #include "bcm6345.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,22 +36,22 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
usb { usb {
label = "RTA770BW:green:usb"; label = "green:usb";
gpios = <&gpio0 7 1>; gpios = <&gpio0 7 1>;
}; };
adsl { adsl {
label = "RTA770BW:green:adsl"; label = "green:adsl";
gpios = <&gpio0 8 0>; gpios = <&gpio0 8 0>;
}; };
led_diag: diag { led_diag: diag {
label = "RTA770BW:green:diag"; label = "green:diag";
gpios = <&gpio0 10 1>; gpios = <&gpio0 10 1>;
}; };
wlan { wlan {
label = "RTA770BW:green:wlan"; label = "green:wlan";
gpios = <&gpio0 11 1>; gpios = <&gpio0 11 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6345.dtsi" #include "bcm6345.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,22 +36,22 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
usb { usb {
label = "RTA770W:green:usb"; label = "green:usb";
gpios = <&gpio0 7 1>; gpios = <&gpio0 7 1>;
}; };
adsl { adsl {
label = "RTA770W:green:adsl"; label = "green:adsl";
gpios = <&gpio0 8 0>; gpios = <&gpio0 8 0>;
}; };
led_diag: diag { led_diag: diag {
label = "RTA770W:green:diag"; label = "green:diag";
gpios = <&gpio0 10 1>; gpios = <&gpio0 10 1>;
}; };
wlan { wlan {
label = "RTA770W:green:wlan"; label = "green:wlan";
gpios = <&gpio0 11 1>; gpios = <&gpio0 11 1>;
}; };
}; };

View File

@ -1,3 +1,5 @@
/dts-v1/;
/ { / {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,16 +36,16 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_green: power_green { led_power_green: power_green {
label = "AR1004G:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
inet_green { inet_green {
label = "AR1004G:green:inet"; label = "green:inet";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
power_red { power_red {
label = "AR1004G:red:power"; label = "red:power";
gpios = <&pinctrl 6 1>; gpios = <&pinctrl 6 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -31,24 +29,24 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
power_green { power_green {
label = "96348GW-10:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
stop_green { stop_green {
label = "96348GW-10:green:stop"; label = "green:stop";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
adsl_fail_green { adsl_fail_green {
label = "96348GW-10:green:adsl-fail"; label = "green:adsl-fail";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
ppp_green { ppp_green {
label = "96348GW-10:green:ppp"; label = "green:ppp";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
ppp_fail_green { ppp_fail_green {
label = "96348GW-10:green:ppp-fail"; label = "green:ppp-fail";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -31,24 +29,24 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
power_green { power_green {
label = "96348GW-10:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
stop_green { stop_green {
label = "96348GW-10:green:stop"; label = "green:stop";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
adsl_fail_green { adsl_fail_green {
label = "96348GW-10:green:adsl-fail"; label = "green:adsl-fail";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
ppp_green { ppp_green {
label = "96348GW-10:green:ppp"; label = "green:ppp";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
ppp_fail_green { ppp_fail_green {
label = "96348GW-10:green:ppp-fail"; label = "green:ppp-fail";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,24 +36,24 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_green: power_green { led_power_green: power_green {
label = "96348GW-11:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
stop_green { stop_green {
label = "96348GW-11:green:stop"; label = "green:stop";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
adsl_fail_green { adsl_fail_green {
label = "96348GW-11:green:adsl-fail"; label = "green:adsl-fail";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
ppp_green { ppp_green {
label = "96348GW-11:green:ppp"; label = "green:ppp";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
ppp_fail_green { ppp_fail_green {
label = "96348GW-11:green:ppp-fail"; label = "green:ppp-fail";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,24 +36,24 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_green: power_green { led_power_green: power_green {
label = "96348GW:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
stop_green { stop_green {
label = "96348GW:green:stop"; label = "green:stop";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
adsl_fail_green { adsl_fail_green {
label = "96348GW:green:adsl-fail"; label = "green:adsl-fail";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
ppp_green { ppp_green {
label = "96348GW:green:ppp"; label = "green:ppp";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
ppp_fail_green { ppp_fail_green {
label = "96348GW:green:ppp-fail"; label = "green:ppp-fail";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -17,24 +15,24 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
power_green { power_green {
label = "96348R:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
stop_green { stop_green {
label = "96348R:green:stop"; label = "green:stop";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
adsl_fail_green { adsl_fail_green {
label = "96348R:green:adsl-fail"; label = "green:adsl-fail";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
ppp_green { ppp_green {
label = "96348R:green:ppp"; label = "green:ppp";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
ppp_fail_green { ppp_fail_green {
label = "96348R:green:ppp-fail"; label = "green:ppp-fail";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,23 +36,23 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_green: power_green { led_power_green: power_green {
label = "V2110:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
}; };
power_red { power_red {
label = "V2110:red:power"; label = "red:power";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
adsl_green { adsl_green {
label = "V2110:green:adsl"; label = "green:adsl";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
ppp_green { ppp_green {
label = "V2110:green:ppp"; label = "green:ppp";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
wireless_green { wireless_green {
label = "V2110:green:wireless"; label = "green:wireless";
gpios = <&pinctrl 6 1>; gpios = <&pinctrl 6 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -31,23 +29,23 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
power_green { power_green {
label = "V2500V_BB:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
}; };
power_red { power_red {
label = "V2500V_BB:red:power"; label = "red:power";
gpios = <&pinctrl 1 1>; gpios = <&pinctrl 1 1>;
}; };
adsl_green { adsl_green {
label = "V2500V_BB:green:adsl"; label = "green:adsl";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
ppp_green { ppp_green {
label = "V2500V_BB:green:ppp"; label = "green:ppp";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
wireless_green { wireless_green {
label = "V2500V_BB:green:wireless"; label = "green:wireless";
gpios = <&pinctrl 6 1>; gpios = <&pinctrl 6 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -45,16 +43,16 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
power_green { power_green {
label = "96348A-122:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
alarm_red { alarm_red {
label = "96348A-122:red:alarm"; label = "red:alarm";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
wps_green { wps_green {
label = "96348A-122:green:wps"; label = "green:wps";
gpios = <&pinctrl 6 1>; gpios = <&pinctrl 6 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,12 +36,12 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_green: power_green { led_power_green: power_green {
label = "CT536_CT5621:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
adsl_fail_green { adsl_fail_green {
label = "CT536_CT5621:green:adsl-fail"; label = "green:adsl-fail";
gpios = <&pinctrl 2 1>; gpios = <&pinctrl 2 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -38,20 +36,20 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_power_green: power_green { led_power_green: power_green {
label = "D-4P-W:green:power"; label = "green:power";
gpios = <&pinctrl 0 1>; gpios = <&pinctrl 0 1>;
default-state = "on"; default-state = "on";
}; };
status { status {
label = "D-4P-W::status"; label = "status";
gpios = <&pinctrl 3 1>; gpios = <&pinctrl 3 1>;
}; };
inet_green { inet_green {
label = "D-4P-W:green:internet"; label = "green:internet";
gpios = <&pinctrl 4 1>; gpios = <&pinctrl 4 1>;
}; };
inet_red { inet_red {
label = "D-4P-W:red:internet"; label = "red:internet";
gpios = <&pinctrl 5 1>; gpios = <&pinctrl 5 1>;
}; };
}; };

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>

View File

@ -1,5 +1,3 @@
/dts-v1/;
#include "bcm6348.dtsi" #include "bcm6348.dtsi"
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
@ -45,28 +43,28 @@
compatible = "gpio-leds"; compatible = "gpio-leds";
led_red_adsl_fail: red_adsl_fail { led_red_adsl_fail: red_adsl_fail {
label = "Livebox1:red:adsl-fail-power"; label = "red:adsl-fail-power";
gpios = <&pinctrl 0 0>; gpios = <&pinctrl 0 0>;
default-state = "on"; default-state = "on";
}; };
red_adsl { red_adsl {
label = "Livebox1:red:adsl"; label = "red:adsl";
gpios = <&pinctrl 1 0>; gpios = <&pinctrl 1 0>;
}; };
red_traffic { red_traffic {
label = "Livebox1:red:traffic"; label = "red:traffic";
gpios = <&pinctrl 2 0>; gpios = <&pinctrl 2 0>;
}; };
red_phone { red_phone {
label = "Livebox1:red:phone"; label = "red:phone";
gpios = <&pinctrl 3 0>; gpios = <&pinctrl 3 0>;
}; };
red_wifi { red_wifi {
label = "Livebox1:red:wifi"; label = "red:wifi";
gpios = <&pinctrl 4 0>; gpios = <&pinctrl 4 0>;
}; };
}; };

Some files were not shown because too many files have changed in this diff Show More