Merge Official Source

This commit is contained in:
AmadeusGhost 2020-06-27 11:53:26 +08:00
commit 2ef4377132
125 changed files with 601 additions and 814 deletions

View File

@ -766,7 +766,7 @@ if KERNEL_CGROUPS
bool "Control Group Classifier"
default y
config KERNEL_NETPRIO_CGROUP
config KERNEL_CGROUP_NET_PRIO
bool "Network priority cgroup"
default y

View File

@ -2,3 +2,4 @@ src-git packages https://github.com/project-openwrt/packages.git
src-git luci https://github.com/project-openwrt/luci.git
src-git routing https://github.com/openwrt-routing/packages.git
src-git telephony https://github.com/openwrt/telephony.git
src-git freifunk https://github.com/freifunk/openwrt-packages.git

View File

@ -127,7 +127,7 @@ list_changed_conffiles() {
list_conffiles | while read file csum; do
[ -r "$file" ] || continue
echo "${csum} ${file}" | sha256sum -sc - || echo "$file"
echo "${csum} ${file}" | busybox sha256sum -sc - || echo "$file"
done
}

View File

@ -505,7 +505,7 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in
+#endif /* __NSA310_H */
--- /dev/null
+++ b/configs/nsa310_defconfig
@@ -0,0 +1,48 @@
@@ -0,0 +1,50 @@
+CONFIG_ARM=y
+CONFIG_SYS_DCACHE_OFF=y
+CONFIG_ARCH_CPU_INIT=y
@ -554,6 +554,8 @@ NOTE: this patch is ready for upstream, LEDE-specific parts are in
+CONFIG_LZMA=y
+CONFIG_LZO=y
+CONFIG_SYS_LONGHELP=y
+CONFIG_SATA_MV=y
+CONFIG_CMD_IDE=y
--- /dev/null
+++ b/include/configs/nsa310.h
@@ -0,0 +1,103 @@

View File

@ -1,51 +0,0 @@
#
# Copyright (C) 2017 Chris Blake <chrisrblake93@gmail.com>
#
# This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information.
#
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=leds-apu2
PKG_RELEASE:=1
PKG_MAINTAINER:=Chris Blake <chrisrblake93@gmail.com>
PKG_LICENSE:=GPL-2.0
include $(INCLUDE_DIR)/package.mk
define KernelPackage/leds-apu2
SUBMENU:=LED modules
TITLE:= PC Engines APU2/APU3 LED support
DEPENDS:= @GPIO_SUPPORT @TARGET_x86
FILES:=$(PKG_BUILD_DIR)/leds-apu2.ko
AUTOLOAD:=$(call AutoLoad,41,leds-apu2,1)
KCONFIG:=
endef
define KernelPackage/leds-apu2/description
Driver for the PC Engines APU2/APU3 LEDs & Reset Button.
endef
EXTRA_KCONFIG:= \
CONFIG_LEDS_APU2=m
EXTRA_CFLAGS:= \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
MAKE_OPTS:= \
$(KERNEL_MAKE_FLAGS) \
M="$(PKG_BUILD_DIR)" \
EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
$(EXTRA_KCONFIG)
define Build/Compile
$(MAKE) -C "$(LINUX_DIR)" \
$(MAKE_OPTS) \
modules
endef
$(eval $(call KernelPackage,leds-apu2))

View File

@ -1,8 +0,0 @@
config LEDS_APU2
tristate "PC Engines APU2/APU3 LED support"
depends on LEDS_CLASS
depends on LEDS_GPIO
depends on GPIOLIB
help
Say yes here to enable support for the CPU GPIO pins on the PC Engines
APU2/APU3 board, which enables the front LEDs and Reset Button.

View File

@ -1 +0,0 @@
obj-${CONFIG_LEDS_APU2} += leds-apu2.o

View File

@ -1,363 +0,0 @@
/*
* APU2 LED/GPIO Driver
* Copyright (c) 2016 Christian Lamparter <chunkeey (at) googlemail.com>
*
* Based on gpio-apu2.c - AMD FCH GPIO support for PC-Engines APU-2 board
*
* Copyright (c) 2015 Carsten Spiess <fli4l at carsten-spiess.de>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#include <linux/module.h>
#include <linux/types.h>
#include <linux/miscdevice.h>
#include <linux/gpio.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <linux/uaccess.h>
#include <linux/io.h>
#include <linux/version.h>
#include <linux/dmi.h>
#include <linux/string.h>
#include <linux/leds.h>
#include <linux/input.h>
#include <linux/gpio_keys.h>
#define DEVNAME "leds-apu2"
#define FCH_ACPI_MMIO_BASE 0xFED80000
#define FCH_GPIO_BASE (FCH_ACPI_MMIO_BASE + 0x1500)
#define FCH_GPIO_SIZE 0x300
#define APU_NUM_GPIO 4
#define GPIO_BIT_DIR 23
#define GPIO_BIT_WRITE 22
#define GPIO_BIT_READ 16
/* internal variables */
static struct pci_dev *gpio_apu2_pci;
static DEFINE_SPINLOCK (gpio_lock);
/* the watchdog platform device */
static struct platform_device *gpio_apu2_platform_device;
static struct platform_device *leddev;
static struct platform_device *keydev;
static const struct pci_device_id gpio_apu2_pci_tbl[] ={
{PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_HUDSON2_SMBUS, PCI_ANY_ID, PCI_ANY_ID},
{ 0, } /* End of list */
};
MODULE_DEVICE_TABLE (pci, gpio_apu2_pci_tbl);
/* EGPIO89=GPIO32, AGPIO68=GPIO57, AGPIO69=GPIO58, AGPIO70=GPIO59 */
static u8 gpio_offset[APU_NUM_GPIO] = {89, 68, 69, 70};
static void __iomem *gpio_addr[APU_NUM_GPIO] = {NULL, NULL, NULL, NULL};
static int gpio_apu2_get_dir (struct gpio_chip *chip, unsigned offset)
{
u32 val;
val = ~ioread32 (gpio_addr[offset]);
return (val >> GPIO_BIT_DIR) & 1;
}
static int gpio_apu2_dir_in (struct gpio_chip *gc, unsigned offset)
{
u32 val;
spin_lock_bh (&gpio_lock);
val = ioread32 (gpio_addr[offset]);
val &= ~BIT(GPIO_BIT_DIR);
iowrite32 (val, gpio_addr[offset]);
spin_unlock_bh (&gpio_lock);
return 0;
}
static int gpio_apu2_dir_out (struct gpio_chip *chip, unsigned offset,
int value)
{
u32 val;
spin_lock_bh (&gpio_lock);
val = ioread32 (gpio_addr[offset]);
val |= BIT(GPIO_BIT_DIR);
iowrite32 (val, gpio_addr[offset]);
spin_unlock_bh (&gpio_lock);
return 0;
}
static int gpio_apu2_get_data (struct gpio_chip *chip, unsigned offset)
{
u32 val;
val = ioread32 (gpio_addr[offset]);
return (val >> GPIO_BIT_READ) & 1;
}
static void gpio_apu2_set_data (struct gpio_chip *chip, unsigned offset, int value)
{
u32 val;
spin_lock_bh (&gpio_lock);
val = ioread32 (gpio_addr[offset]);
if (value)
val |= BIT(GPIO_BIT_WRITE);
else
val &= ~BIT(GPIO_BIT_WRITE);
iowrite32 (val, gpio_addr[offset]);
spin_unlock_bh (&gpio_lock);
}
static struct gpio_chip gpio_apu2_chip = {
.label = DEVNAME,
.owner = THIS_MODULE,
.base = -1,
.ngpio = APU_NUM_GPIO,
.get_direction = gpio_apu2_get_dir,
.direction_input = gpio_apu2_dir_in,
.direction_output = gpio_apu2_dir_out,
.get = gpio_apu2_get_data,
.set = gpio_apu2_set_data,
};
/*
*
*/
static int gpio_apu2_probe (struct platform_device *dev)
{
int ret = 0;
int i;
struct pci_dev *pci_dev = NULL;
/* Match the PCI device */
for_each_pci_dev (pci_dev) {
if (pci_match_id (gpio_apu2_pci_tbl, pci_dev) != NULL) {
gpio_apu2_pci = pci_dev;
break;
}
}
if (!gpio_apu2_pci)
return -ENODEV;
pr_info ("%s: PCI Revision ID: 0x%x\n", DEVNAME, gpio_apu2_pci->revision);
/* Determine type of southbridge chipset */
if (gpio_apu2_pci->revision < 0x40) {
return -EACCES;
}
/* Request memory region for GPIO's */
if (!devm_request_mem_region (&dev->dev, FCH_GPIO_BASE,
FCH_GPIO_SIZE, DEVNAME)){
pr_err ("%s: request GPIO mem region failed\n", DEVNAME);
return -ENXIO;
}
/* Map IO's for GPIO's */
for (i = 0; i < APU_NUM_GPIO; i++) {
gpio_addr[i] = devm_ioremap (&dev->dev,
FCH_GPIO_BASE + (gpio_offset[i] * sizeof (u32)), sizeof (u32));
if (!gpio_addr[i]) {
pr_err ("%s: map GPIO%d address failed\n", DEVNAME, gpio_offset[i]);
return -ENXIO;
}
}
gpio_apu2_chip.parent = &dev->dev;
ret = gpiochip_add (&gpio_apu2_chip);
if (ret) {
pr_err ("%s: adding gpiochip failed\n", DEVNAME);
}
return ret;
}
static int gpio_apu2_remove (struct platform_device *dev)
{
gpiochip_remove (&gpio_apu2_chip);
return 0;
}
static struct platform_driver gpio_apu2_driver = {
.probe = gpio_apu2_probe,
.remove = gpio_apu2_remove,
.driver = {
.owner = THIS_MODULE,
.name = DEVNAME
}
};
static struct gpio_led apu2_leds_gpio[] = {
{
.name = "apu2:green:power",
.gpio = 509,
.active_low = 1,
},
{
.name = "apu2:green:led2",
.gpio = 510,
.active_low = 1,
},
{
.name = "apu2:green:led3",
.gpio = 511,
.active_low = 1,
},
};
static struct gpio_keys_button apu2_gpio_keys[] = {
{
.desc = "Reset button",
.type = EV_KEY,
.code = KEY_RESTART,
.debounce_interval = 60,
.gpio = 508,
.active_low = 1,
},
};
static void register_gpio_keys_polled(int id, unsigned poll_interval,
unsigned nbuttons,
struct gpio_keys_button *buttons)
{
struct gpio_keys_platform_data pdata = { };
int err;
keydev = platform_device_alloc("gpio-keys-polled", id);
if (!keydev) {
printk(KERN_ERR "Failed to allocate gpio-keys platform device\n");
return;
}
pdata.poll_interval = poll_interval;
pdata.nbuttons = nbuttons;
pdata.buttons = buttons;
err = platform_device_add_data(keydev, &pdata, sizeof(pdata));
if (err) {
dev_err(&keydev->dev, "failed to add platform data to key driver (%d)", err);
goto err_put_pdev;
}
err = platform_device_add(keydev);
if (err) {
dev_err(&keydev->dev, "failed to register key platform device (%d)", err);
goto err_put_pdev;
}
return;
err_put_pdev:
platform_device_put(keydev);
keydev = NULL;
}
static void register_leds_gpio(int id, unsigned num_leds, struct gpio_led *leds)
{
struct gpio_led_platform_data pdata = { };
int err;
leddev = platform_device_alloc("leds-gpio", id);
if (!leddev) {
printk(KERN_ERR "Failed to allocate leds-gpio platform device\n");
return;
}
pdata.num_leds = num_leds;
pdata.leds = leds;
err = platform_device_add_data(leddev, &pdata, sizeof(pdata));
if (err) {
dev_err(&leddev->dev, "failed to add platform data to key driver (%d)", err);
goto err_put_pdev;
}
err = platform_device_add(leddev);
if (err) {
dev_err(&leddev->dev, "failed to register key platform device (%d)", err);
goto err_put_pdev;
}
return;
err_put_pdev:
platform_device_put(leddev);
leddev = NULL;
}
static int __init gpio_apu2_init (void)
{
int err;
const char *board_vendor = dmi_get_system_info(DMI_BOARD_VENDOR);
const char *board_name = dmi_get_system_info(DMI_BOARD_NAME);
pr_info ("%s: load APU2/LED GPIO driver module\n", DEVNAME);
err = platform_driver_register (&gpio_apu2_driver);
if (err)
goto exit;
gpio_apu2_platform_device = platform_device_register_simple (DEVNAME, -1, NULL, 0);
if (IS_ERR(gpio_apu2_platform_device)) {
err = PTR_ERR(gpio_apu2_platform_device);
goto exit_driver;
}
pr_info ("%s: APU2 GPIO/LED driver module loaded\n", DEVNAME);
register_leds_gpio(-1, ARRAY_SIZE(apu2_leds_gpio), apu2_leds_gpio);
register_gpio_keys_polled(-1, 20, ARRAY_SIZE(apu2_gpio_keys), apu2_gpio_keys);
return 0;
exit_driver:
platform_driver_unregister (&gpio_apu2_driver);
exit:
return err;
}
static void __exit gpio_apu2_exit (void)
{
platform_device_unregister (gpio_apu2_platform_device);
platform_device_unregister (leddev);
platform_device_unregister (keydev);
platform_driver_unregister (&gpio_apu2_driver);
pr_info ("%s: APU2 GPIO/LED driver module unloaded\n", DEVNAME);
}
MODULE_AUTHOR ("Carsten Spiess <fli4l at carsten-spiess.de>");
MODULE_DESCRIPTION("GPIO driver for AMD FCH on PC-Engines APU-2");
MODULE_LICENSE("GPL");
module_init (gpio_apu2_init);
module_exit (gpio_apu2_exit);

View File

@ -210,7 +210,6 @@ $(eval $(call KernelPackage,i2c-piix4))
I2C_PXA_MODULES:= \
CONFIG_I2C_PXA_SLAVE=y \
CONFIG_I2C_PXA:drivers/i2c/busses/i2c-pxa
define KernelPackage/i2c-pxa

View File

@ -313,6 +313,23 @@ endef
$(eval $(call KernelPackage,gpio-it87))
define KernelPackage/gpio-amd-fch
SUBMENU:=$(OTHER_MENU)
DEPENDS:=@GPIO_SUPPORT @TARGET_x86
TITLE:=GPIO support for AMD Fusion Controller Hub (G-series SOCs)
KCONFIG:=CONFIG_GPIO_AMD_FCH
FILES:=$(LINUX_DIR)/drivers/gpio/gpio-amd-fch.ko
AUTOLOAD:=$(call AutoLoad,25,gpio-amd-fch,1)
endef
define KernelPackage/gpio-amd-fch/description
This option enables driver for GPIO on AMDs Fusion Controller Hub,
as found on G-series SOCs (eg. GX-412TC)
endef
$(eval $(call KernelPackage,gpio-amd-fch))
define KernelPackage/ppdev
SUBMENU:=$(OTHER_MENU)
TITLE:=Parallel port support

View File

@ -0,0 +1,34 @@
From d946085ff5a331de64e91a2e3c96b9ca79d740f5 Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Mon, 15 Jun 2020 00:10:34 +0200
Subject: [PATCH] ath9k: enabled MFP capability unconditionally
ath9k will already fallback on software-crypto for chipsets not
supporting IEEE802.11w (MFP). So advertising MFP is not dependent
on disabling HW crypto for all traffic entirely.
Signed-off-by: David Bauer <mail@david-bauer.net>
---
drivers/net/wireless/ath/ath9k/init.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -928,6 +928,7 @@ static void ath9k_set_hw_capab(struct at
ieee80211_hw_set(hw, HOST_BROADCAST_PS_BUFFERING);
ieee80211_hw_set(hw, SUPPORT_FAST_XMIT);
ieee80211_hw_set(hw, SUPPORTS_CLONED_SKBS);
+ ieee80211_hw_set(hw, MFP_CAPABLE);
if (ath9k_ps_enable)
ieee80211_hw_set(hw, SUPPORTS_PS);
@@ -940,9 +941,6 @@ static void ath9k_set_hw_capab(struct at
IEEE80211_RADIOTAP_MCS_HAVE_STBC;
}
- if (AR_SREV_9160_10_OR_LATER(sc->sc_ah) || ath9k_modparam_nohwcrypt)
- ieee80211_hw_set(hw, MFP_CAPABLE);
-
hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR |
NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |
NL80211_FEATURE_P2P_GO_CTWIN;

View File

@ -46,10 +46,16 @@ setup_interface () {
proto_add_dns_search "$i"
done
# TODO: Deprecate timesvr in favor of timesrv
if [ -n "$timesvr" -a -z "$timesrv" ]; then
timesrv="$timesvr"
echo "Environment variable 'timesvr' will be deprecated; use 'timesrv' instead."
fi
proto_add_data
[ -n "$ZONE" ] && json_add_string zone "$ZONE"
[ -n "$ntpsrv" ] && json_add_string ntpserver "$ntpsrv"
[ -n "$timesvr" ] && json_add_string timeserver "$timesvr"
[ -n "$timesrv" ] && json_add_string timeserver "$timesrv"
[ -n "$hostname" ] && json_add_string hostname "$hostname"
[ -n "$message" ] && json_add_string message "$message"
[ -n "$timezone" ] && json_add_int timezone "$timezone"

View File

@ -0,0 +1,25 @@
From 3f5c106a880a02b21739f2022746e6aa7672474c Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Tue, 23 Jun 2020 21:38:46 +0800
Subject: [PATCH] _GNU_SOURCE for random
---
includes.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/includes.h b/includes.h
index e8c3e18..2789f23 100644
--- a/includes.h
+++ b/includes.h
@@ -125,6 +125,8 @@
#endif
#ifdef HAVE_SYS_RANDOM_H
+/* uclibc needs _GNU_SOURCE */
+#define _GNU_SOURCE
#include <sys/random.h>
#endif
--
2.25.1

View File

@ -0,0 +1,34 @@
From a7a67585cbc3fe5df85c641618b347a51a943356 Mon Sep 17 00:00:00 2001
From: Matt Johnston <matt@ucc.asn.au>
Date: Tue, 23 Jun 2020 22:24:58 +0800
Subject: [PATCH] move GNU_SOURCE earlier
---
includes.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/includes.h b/includes.h
index 2789f23..884ebf7 100644
--- a/includes.h
+++ b/includes.h
@@ -25,6 +25,8 @@
#ifndef DROPBEAR_INCLUDES_H_
#define DROPBEAR_INCLUDES_H_
+/* uclibc needs _GNU_SOURCE, maybe other things? */
+#define _GNU_SOURCE
#include "options.h"
#include "debug.h"
@@ -125,8 +127,6 @@
#endif
#ifdef HAVE_SYS_RANDOM_H
-/* uclibc needs _GNU_SOURCE */
-#define _GNU_SOURCE
#include <sys/random.h>
#endif
--
2.25.1

View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ubox
PKG_RELEASE:=3
PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL=$(PROJECT_GIT)/project/ubox.git
@ -25,6 +25,12 @@ define Package/ubox
CATEGORY:=Base system
DEPENDS:=+libubox +ubusd +ubus +libubus +libuci +USE_GLIBC:librt
TITLE:=OpenWrt system helper toolbox
ALTERNATIVES:=\
100:/sbin/rmmod:/sbin/kmodloader \
100:/sbin/insmod:/sbin/kmodloader \
100:/sbin/lsmod:/sbin/kmodloader \
100:/sbin/modinfo:/sbin/kmodloader \
100:/sbin/modprobe:/sbin/kmodloader
endef
define Package/getrandom
@ -50,12 +56,6 @@ define Package/ubox/install
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{kmodloader,validate_data} $(1)/sbin/
$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libvalidate.so $(1)/lib
$(LN) kmodloader $(1)/sbin/rmmod
$(LN) kmodloader $(1)/sbin/insmod
$(LN) kmodloader $(1)/sbin/lsmod
$(LN) kmodloader $(1)/sbin/modinfo
$(LN) kmodloader $(1)/sbin/modprobe
endef
define Package/logd/install

View File

@ -2,10 +2,8 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=urandom-seed
PKG_VERSION:=1.0
PKG_RELEASE:=1
PKG_LICENSE:=GPL-2.0
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0-only
include $(INCLUDE_DIR)/package.mk
@ -14,7 +12,7 @@ define Package/urandom-seed
CATEGORY:=Base system
DEPENDS:=+getrandom
TITLE:=/etc/urandom.seed handling for OpenWrt
URL:=http://openwrt.org/
URL:=https://openwrt.org/
endef
define Build/Prepare

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=util-linux
PKG_VERSION:=2.35.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/$(PKG_NAME)/v2.35
@ -267,6 +267,7 @@ endef
define Package/logger
$(call Package/util-linux/Default)
TITLE:=a shell command interface to the syslog system log module
ALTERNATIVES:=200:/usr/bin/logger:/usr/bin/util-linux-logger
endef
define Package/logger/description
@ -659,7 +660,7 @@ endef
define Package/logger/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/logger $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/logger $(1)/usr/bin/util-linux-logger
endef
define Package/look/install

View File

@ -5,6 +5,10 @@
/ {
compatible = "qca,ar7100";
chosen {
bootargs = "console=ttyS0,115200";
};
cpus {
#address-cells = <1>;
#size-cells = <0>;

View File

@ -12,10 +12,6 @@
led-running = &led_user;
};
chosen {
bootargs = "console=ttyS0,115200";
};
leds {
compatible = "gpio-leds";

View File

@ -16,10 +16,6 @@
led-upgrade = &led_diag;
};
chosen {
bootargs = "console=ttyS0,115200";
};
extosc: ref {
compatible = "fixed-clock";
#clock-cells = <0>;

View File

@ -17,10 +17,6 @@
led-upgrade = &led_power_orange;
};
chosen {
bootargs = "console=ttyS0,115200";
};
extosc: ref {
compatible = "fixed-clock";
#clock-cells = <0>;

View File

@ -14,10 +14,6 @@
label-mac-device = &eth0;
};
chosen {
bootargs = "console=ttyS0,115200";
};
extosc: ref {
compatible = "fixed-clock";
#clock-cells = <0>;

View File

@ -10,10 +10,6 @@
compatible = "siemens,ws-ap3610", "qca,ar7161";
model = "Siemens WS-AP3610";
chosen {
bootargs = "console=ttyS0,115200";
};
aliases {
led-boot = &led_power_green;
led-failsafe = &led_power_red;

View File

@ -6,10 +6,6 @@
#include "ar7100.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200";
};
aliases {
led-boot = &led_rf;
led-failsafe = &led_rf;

View File

@ -6,10 +6,6 @@
#include "ar9344.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200";
};
keys {
compatible = "gpio-keys";

View File

@ -18,10 +18,6 @@
label-mac-device = &wmac;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -18,10 +18,6 @@
label-mac-device = &wmac;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -17,10 +17,6 @@
led-upgrade = &led_status;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -6,10 +6,6 @@
#include "qca953x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_link4;
led-failsafe = &led_link4;

View File

@ -14,10 +14,6 @@
led-upgrade = &led_system;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -18,10 +18,6 @@
label-mac-device = &wmac;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -6,10 +6,6 @@
#include "qca953x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -6,10 +6,6 @@
#include "qca953x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
label-mac-device = &wmac;
};

View File

@ -6,10 +6,6 @@
#include "qca953x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -7,10 +7,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -0,0 +1,111 @@
// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
#include "qca9556_avm_fritz-repeater.dtsi"
/ {
compatible = "avm,fritzdvbc", "qca,qca9556";
model = "AVM FRITZ!WLAN Repeater DVB-C";
aliases {
led-boot = &led_power;
led-failsafe = &led_power;
led-running = &led_power;
led-upgrade = &led_power;
};
led_spi {
compatible = "spi-gpio";
#address-cells = <1>;
#size-cells = <0>;
sck-gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
mosi-gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
num-chipselects = <0>;
spi_gpio: led_gpio@0 {
compatible = "fairchild,74hc595";
reg = <0>;
gpio-controller;
#gpio-cells = <2>;
registers-number = <2>;
spi-max-frequency = <10000000>;
gpio_latch_bit {
gpio-hog;
gpios = <16 GPIO_ACTIVE_HIGH>;
output-high;
line-name = "gpio-latch-bit";
};
};
};
/*
* GPIO pins 100 or greater in the vendor GPL dump are redirected
* to the shift register.
* So OEM source pin 100 becomes 0 on the SR and so forth.
*/
leds {
compatible = "gpio-leds";
led_power: power {
label = "fritzdvbc:green:power";
gpios = <&spi_gpio 6 GPIO_ACTIVE_LOW>;
};
wlan {
label = "fritzdvbc:green:wlan";
gpios = <&spi_gpio 7 GPIO_ACTIVE_LOW>;
linux,default-trigger = "phy1tpt";
};
tv {
label = "fritzdvbc:green:tv";
gpios = <&spi_gpio 5 GPIO_ACTIVE_LOW>;
};
rssihigh {
label = "fritzdvbc:green:rssihigh";
gpios = <&spi_gpio 1 GPIO_ACTIVE_LOW>;
};
rssimediumhigh {
label = "fritzdvbc:green:rssimediumhigh";
gpios = <&spi_gpio 2 GPIO_ACTIVE_LOW>;
};
rssimedium {
label = "fritzdvbc:green:rssimedium";
gpios = <&spi_gpio 3 GPIO_ACTIVE_LOW>;
};
rssimediumlow {
label = "fritzdvbc:green:rssimediumlow";
gpios = <&spi_gpio 4 GPIO_ACTIVE_LOW>;
};
rssilow {
label = "fritzdvbc:green:rssilow";
gpios = <&spi_gpio 0 GPIO_ACTIVE_LOW>;
};
};
};
&pcie0 {
status = "okay";
};
&gpio {
reset-pcie-ep {
gpio-hog;
gpios = <109 GPIO_ACTIVE_HIGH>;
output-high;
line-name = "PCIE EP reset";
};
reset-pcie-bus {
gpio-hog;
gpios = <110 GPIO_ACTIVE_HIGH>;
output-high;
line-name = "PCIE Bus reset";
};
};

View File

@ -15,10 +15,6 @@
serial0 = &uart;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -17,10 +17,6 @@
led-upgrade = &led_power;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -13,10 +13,6 @@
led-upgrade = &led_power;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds: leds {
compatible = "gpio-leds";

View File

@ -6,10 +6,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -16,10 +16,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -10,10 +10,6 @@
compatible = "dlink,dap-2695-a1", "qca,qca9558";
model = "D-link DAP-2695-A1";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power_red;
led-failsafe = &led_power_red;

View File

@ -10,10 +10,6 @@
compatible = "domywifi,dw33d", "qca,qca9558";
model = "DomyWifi DW33D";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -10,10 +10,6 @@
compatible = "engenius,ecb1750", "qca,qca9558";
model = "EnGenius ECB1750";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power_orange;
led-failsafe = &led_power_orange;

View File

@ -10,10 +10,6 @@
model = "EnGenius EPG5000";
compatible = "engenius,epg5000", "qca,qca9558";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power;
led-failsafe = &led_power;

View File

@ -10,10 +10,6 @@
compatible = "librerouter,librerouter-v1", "qca,qca9558";
model = "LibreRouter v1";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -17,10 +17,6 @@
serial0 = &uart;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -6,10 +6,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power_green;
led-failsafe = &led_power_amber;

View File

@ -10,10 +10,6 @@
compatible = "ocedo,koala", "qca,qca9558";
model = "OCEDO Koala";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -10,10 +10,6 @@
compatible = "ocedo,ursus", "qca,qca9558";
model = "OCEDO Ursus";
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -10,10 +10,6 @@
model = "Sitecom WLR-8100 (X8 AC1750)";
compatible = "sitecom,wlr-8100", "qca,qca9558";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_status_amber;
led-failsafe = &led_status_amber;

View File

@ -6,10 +6,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -6,10 +6,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -18,10 +18,6 @@
mdio-gpio0 = &mdio2;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -6,10 +6,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power;
led-failsafe = &led_power;

View File

@ -10,10 +10,6 @@
compatible = "tplink,tl-wdr4900-v2", "qca,qca9558";
model = "TP-Link TL-WDR4900 v2";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -6,10 +6,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -10,10 +10,6 @@
compatible = "tplink,tl-wr941n-v7-cn", "qca,qca9558";
model = "TP-Link TL-WR941N v7 (CN)";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -10,10 +10,6 @@
compatible = "trendnet,tew-823dru", "qca,qca9558";
model = "TRENDNET TEW-823DRU";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power_green;
led-failsafe = &led_power_green;

View File

@ -10,10 +10,6 @@
compatible = "zyxel,nbg6716", "qca,qca9558";
model = "ZyXEL NBG6716";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power;
led-failsafe = &led_power;

View File

@ -8,6 +8,10 @@
#address-cells = <1>;
#size-cells = <1>;
chosen {
bootargs = "console=ttyS0,115200n8";
};
cpus {
#address-cells = <1>;
#size-cells = <0>;

View File

@ -5,12 +5,6 @@
#include "qca955x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
};
&uart {
status = "okay";
};

View File

@ -17,10 +17,6 @@
led-upgrade = &led_info_red;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
led_spi {
compatible = "spi-gpio";
#address-cells = <1>;

View File

@ -10,10 +10,6 @@
compatible = "tplink,archer-c25-v1", "qca,qca9561";
model = "TP-Link Archer C25 v1";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power;
led-failsafe = &led_power;

View File

@ -16,10 +16,6 @@
label-mac-device = &eth1;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
led_spi {
compatible = "spi-gpio";
#address-cells = <1>;

View File

@ -6,10 +6,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power;
led-failsafe = &led_power;

View File

@ -17,10 +17,6 @@
led-upgrade = &led_red;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -6,10 +6,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -17,10 +17,6 @@
led-upgrade = &led_power;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -6,10 +6,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power;
led-failsafe = &led_power;

View File

@ -9,10 +9,6 @@
compatible = "glinet,gl-ar750s", "qca,qca9563";
model = "GL.iNet GL-AR750S";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power;
led-failsafe = &led_power;

View File

@ -10,10 +10,6 @@
model = "NEC Aterm WG1200CR";
compatible = "nec,wg1200cr", "qca,qca9563";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power_green;
led-failsafe = &led_power_red;

View File

@ -10,10 +10,6 @@
model = "NEC Aterm WG800HP";
compatible = "nec,wg800hp", "qca,qca9563";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power_green;
led-failsafe = &led_power_red;

View File

@ -6,10 +6,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_power_amber;
led-failsafe = &led_power_amber;

View File

@ -17,10 +17,6 @@
led-upgrade = &led_status_red;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -10,10 +10,6 @@
model = "ROSINSON WR818";
compatible = "rosinson,wr818", "qca,qca9563";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -10,10 +10,6 @@
compatible = "tplink,archer-c2-v3", "qca,qca9563";
model = "TP-Link Archer C2 v3";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -10,10 +10,6 @@
compatible = "tplink,archer-c7-v4", "qca,qca9563";
model = "TP-Link Archer C7 v4";
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -9,10 +9,6 @@
aliases {
label-mac-device = &eth0;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
};
&pcie {

View File

@ -6,10 +6,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -6,10 +6,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
label-mac-device = &eth0;
led-boot = &led_power;

View File

@ -6,10 +6,6 @@
#include "qca956x.dtsi"
/ {
chosen {
bootargs = "console=ttyS0,115200n8";
};
aliases {
led-boot = &led_system;
led-failsafe = &led_system;

View File

@ -13,10 +13,6 @@
led-upgrade = &led_blue;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
leds {
compatible = "gpio-leds";

View File

@ -10,10 +10,6 @@
label-mac-device = &eth0;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
keys {
compatible = "gpio-keys";

View File

@ -8,6 +8,10 @@
#address-cells = <1>;
#size-cells = <1>;
chosen {
bootargs = "console=ttyS0,115200n8";
};
cpus {
#address-cells = <1>;
#size-cells = <0>;

View File

@ -9,10 +9,6 @@
aliases {
label-mac-device = &wmac;
};
chosen {
bootargs = "console=ttyS0,115200n8";
};
};
&spi {

View File

@ -38,6 +38,14 @@ avm,fritz4020)
ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth1"
ucidef_set_led_switch "lan" "LAN" "$boardname:green:lan" "switch0" "0x1E"
;;
avm,fritzdvbc)
ucidef_set_rssimon "wlan1" "200000" "1"
ucidef_set_led_rssi "rssilow" "RSSILOW" "$boardname:green:rssilow" "wlan1" "1" "100"
ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "$boardname:green:rssimediumlow" "wlan1" "20" "100"
ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "$boardname:green:rssimedium" "wlan1" "40" "100"
ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "$boardname:green:rssimediumhigh" "wlan1" "60" "100"
ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "$boardname:green:rssihigh" "wlan1" "80" "100"
;;
comfast,cf-e110n-v2)
ucidef_set_led_netdev "lan" "LAN" "$boardname:green:lan" "eth1"
ucidef_set_led_switch "wan" "WAN" "$boardname:green:wan" "switch0" "0x02"

View File

@ -15,6 +15,7 @@ ath79_setup_interfaces()
aruba,ap-105|\
avm,fritz1750e|\
avm,fritz300e|\
avm,fritzdvbc|\
comfast,cf-wr752ac-v1|\
comfast,cf-e130n-v2|\
devolo,dvl1200i|\
@ -352,7 +353,8 @@ ath79_setup_macs()
label_mac=$(mtd_get_mac_binary art 0x1002)
;;
avm,fritz1750e|\
avm,fritz450e)
avm,fritz450e|\
avm,fritzdvbc)
label_mac=$(fritz_tffs -n macwlan -i $(find_mtd_part "tffs (1)"))
;;
avm,fritz300e)

View File

@ -11,7 +11,8 @@ case "$FIRMWARE" in
case $board in
avm,fritz1750e|\
avm,fritz4020|\
avm,fritz450e)
avm,fritz450e|\
avm,fritzdvbc)
caldata_extract_reverse "urlader" 0x1541 0x440
;;
dlink,dap-2695-a1)

View File

@ -10,7 +10,8 @@ board=$(board_name)
case "$FIRMWARE" in
"ath10k/cal-pci-0000:00:00.0.bin")
case $board in
avm,fritz1750e)
avm,fritz1750e|\
avm,fritzdvbc)
caldata_extract "urlader" 0x198a 0x844
;;
comfast,cf-wr650ac-v1|\

View File

@ -3,7 +3,8 @@
preinit_set_mac_address() {
case $(board_name) in
avm,fritz1750e|\
avm,fritz450e)
avm,fritz450e|\
avm,fritzdvbc)
ip link set dev eth0 address $(fritz_tffs -n maca -i $(find_mtd_part "tffs (1)"))
;;
dlink,dap-2695-a1)

View File

@ -159,7 +159,7 @@ TARGET_DEVICES += ubnt_edgeswitch-5xp
define Device/ubnt_edgeswitch-8xp
$(Device/ubnt-sw)
DEVICE_MODEL := EdgeSwitch 8XP
DEVICE_PACKAGES += switch-bcm53xx-mdio
DEVICE_PACKAGES += kmod-switch-bcm53xx-mdio
endef
TARGET_DEVICES += ubnt_edgeswitch-8xp

View File

@ -223,6 +223,16 @@ define Device/avm_fritz450e
endef
TARGET_DEVICES += avm_fritz450e
define Device/avm_fritzdvbc
$(Device/avm)
SOC := qca9556
IMAGE_SIZE := 15232k
DEVICE_MODEL := FRITZ!WLAN Repeater DVB-C
DEVICE_PACKAGES += rssileds kmod-ath10k-ct-smallbuffers \
ath10k-firmware-qca988x-ct -swconfig
endef
TARGET_DEVICES += avm_fritzdvbc
define Device/buffalo_bhr-4grv
SOC := ar7242
DEVICE_VENDOR := Buffalo

View File

@ -0,0 +1,56 @@
From 8c9254d41881c81bea610193c6ac59c8cb8b79fe Mon Sep 17 00:00:00 2001
From: Florian Eckert <fe@dev.tdt.de>
Date: Fri, 27 Mar 2020 16:11:55 +0100
Subject: [PATCH] Revert "platform/x86: pcengines-apuv2: wire up simswitch gpio
as led"
This reverts commit 5037d4ddda31c2dbbb018109655f61054b1756dc.
Commit message from linux:
The APU3+ boards have two SIM sockets, while only one of them
can be routed to the mpcie slots at a time. Selection is done
via simswap gpio.
We currently don't have a fitting subsystem for those cases yet,
so just wire it up to a LED for the time being. While this isn't
really semantically correct, it's a good compromise.
Explanation why this does not work:
This change connects the simswap to the LED subsystem of the kernel.
From my point of view, it's nonsense. If we do it this way, then this
can be switched relatively easily via the LED subsystem (trigger:
none/default-on) and that is dangerous! If this is used, it would be
unfavorable, since there is also another trigger (trigger: heartbeat/netdev).
This LED also appears in the LuCI and can therefore be switched by the user.
Therefore, this simswap GPIO should remain in the GPIO
subsystem and be switched via it and not be connected to the LED
subsystem. To avoid the problems mentioned above. The LED subsystem is
not made for this and it is not a good compromise, but rather dangerous.
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
---
drivers/platform/x86/pcengines-apuv2.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/drivers/platform/x86/pcengines-apuv2.c
+++ b/drivers/platform/x86/pcengines-apuv2.c
@@ -77,8 +77,7 @@ static const struct amd_fch_gpio_pdata b
static const struct gpio_led apu2_leds[] = {
{ .name = "apu:green:1" },
{ .name = "apu:green:2" },
- { .name = "apu:green:3" },
- { .name = "apu:simswap" },
+ { .name = "apu:green:3" }
};
static const struct gpio_led_platform_data apu2_leds_pdata = {
@@ -95,8 +94,6 @@ static struct gpiod_lookup_table gpios_l
NULL, 1, GPIO_ACTIVE_LOW),
GPIO_LOOKUP_IDX(AMD_FCH_GPIO_DRIVER_NAME, APU2_GPIO_LINE_LED3,
NULL, 2, GPIO_ACTIVE_LOW),
- GPIO_LOOKUP_IDX(AMD_FCH_GPIO_DRIVER_NAME, APU2_GPIO_LINE_SIMSWAP,
- NULL, 3, GPIO_ACTIVE_LOW),
}
};

View File

@ -1,5 +1,3 @@
CONFIG_ADM6996_PHY=y
CONFIG_AR8216_PHY=y
CONFIG_AT803X_PHY=y
CONFIG_BLK_MQ_PCI=y
CONFIG_CPU_MIPSR2_IRQ_EI=y
@ -69,10 +67,6 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_RFS_ACCEL=y
CONFIG_RPS=y
CONFIG_RTL8306_PHY=y
CONFIG_RTL8366S_PHY=y
CONFIG_RTL8367B_PHY=y
CONFIG_RTL8367_PHY=y
CONFIG_SENSORS_LTQ_CPUTEMP=y
CONFIG_SGL_ALLOC=y
CONFIG_SMP=y

View File

@ -1,5 +1,3 @@
CONFIG_ADM6996_PHY=y
CONFIG_AR8216_PHY=y
CONFIG_AT803X_PHY=y
CONFIG_BLK_MQ_PCI=y
CONFIG_CPU_MIPSR2_IRQ_EI=y
@ -74,10 +72,6 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_RFS_ACCEL=y
CONFIG_RPS=y
CONFIG_RTL8306_PHY=y
CONFIG_RTL8366S_PHY=y
CONFIG_RTL8367B_PHY=y
CONFIG_RTL8367_PHY=y
CONFIG_SENSORS_LTQ_CPUTEMP=y
CONFIG_SGL_ALLOC=y
CONFIG_SMP=y

View File

@ -42,7 +42,7 @@
gpio_fan {
gpios = <&gpio0 13 GPIO_ACTIVE_HIGH
&gpio0 14 GPIO_ACTIVE_HIGH>;
&gpio0 14 GPIO_ACTIVE_HIGH>;
alarm-gpios = <&gpio0 10 GPIO_ACTIVE_HIGH>;
};
@ -50,22 +50,9 @@
compatible = "gpio-keys";
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_hdd_present &pmx_buttons>;
pinctrl-0 = <&pmx_buttons>;
pinctrl-names = "default";
hdd1-present {
label = "HDD1 Present";
linux,code = <KEY_PROG1>;
gpios = <&gpio0 11 GPIO_ACTIVE_LOW>;
};
hdd2-present {
label = "HDD2 Present";
linux,code = <KEY_PROG2>;
gpios = <&gpio0 12 GPIO_ACTIVE_LOW>;
};
power {
label = "Power Switch";
linux,code = <KEY_POWER>;
@ -75,7 +62,7 @@
function {
label = "Function Button";
linux,code = <KEY_OPTION>;
linux,code = <KEY_CONFIG>;
gpios = <&gpio0 16 GPIO_ACTIVE_LOW>;
};
};
@ -131,11 +118,11 @@
#address-cells = <1>;
#size-cells = <0>;
pinctrl-0 = <&pmx_power_usb &pmx_power_hdd1 &pmx_power_hdd2>;
pinctrl-names = "default";
usb_v5_regulator: usb-v5-regulator {
usb_power: regulator@0 {
compatible = "regulator-fixed";
reg = <0>;
regulator-name = "USB";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@ -145,7 +132,7 @@
gpio = <&gpio0 5 GPIO_ACTIVE_HIGH>;
};
ata1_regulator: ata1-regulator {
sata1_power: regulator@1 {
compatible = "regulator-fixed";
reg = <1>;
regulator-name = "HDD1";
@ -158,7 +145,7 @@
gpio = <&gpio0 8 GPIO_ACTIVE_HIGH>;
};
ata2_regulator: ata2-regulator {
sata2_power: regulator@2 {
compatible = "regulator-fixed";
reg = <2>;
regulator-name = "HDD2";
@ -183,11 +170,13 @@
pinctrl-0 = <&ge1_rgmii_pins>;
pinctrl-names = "default";
status = "okay";
phy = <&phy0>;
phy-mode = "rgmii-id";
phy-handle = <&ethphy0>;
phy-connection-type = "rgmii-id";
};
&i2c0 {
pinctrl-0 = <&i2c0_pins>;
pinctrl-names = "default";
clock-frequency = <100000>;
status = "okay";
@ -201,16 +190,18 @@
pinctrl-0 = <&mdio_pins>;
pinctrl-names = "default";
phy0: ethernet-phy@0 { /* Marvell 88E1518 */
ethphy0: ethernet-phy@0 { /* Marvell 88E1518 */
reg = <0>;
/* LED2 is used to inform uBoot if the power-switch was slided
to the "off" position, and then power off the machine.
Page 0x3, Register 0x10, bit 8:
0x800: LED2 off, power off the machine
0x900: LED2 on, boot the machine */
marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED Function */
<0x3 0x11 0x1 0x4401>, /* LED polarity */
<0x3 0x12 0x1 0x4905>; /* LED Timer */
/*
* LED2 is used to inform, at restart time, if the power
* switch was slided to the "off" position.
* Page 0x3, Register 0x10, bits 8-11:
* 0x800: LED2 off, power off the machine
* 0x900: LED2 on, boot the machine
*/
marvell,reg-init = <0x3 0x10 0x1 0x1991>, /* LED function */
<0x3 0x11 0x1 0x4401>, /* LED polarity */
<0x3 0x12 0x1 0x4905>; /* LED timer */
};
};

View File

@ -9,10 +9,6 @@
compatible = "dovado,tiny-ac", "ralink,mt7620a-soc";
model = "Dovado Tiny AC";
chosen {
bootargs = "console=ttyS0,57600";
};
leds {
compatible = "gpio-leds";

View File

@ -29,10 +29,6 @@
led-upgrade = &led_power;
};
chosen {
bootargs = "console=ttyS0,57600";
};
keys {
compatible = "gpio-keys";

View File

@ -17,10 +17,6 @@
led-upgrade = &led_power;
};
chosen {
bootargs = "console=ttyS0,57600";
};
keys {
compatible = "gpio-keys";

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