mirror of
https://github.com/padavanonly/immortalwrt-mt798x.git
synced 2025-12-16 16:56:38 +00:00
Merge Official Source
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen
commit
8a74c863d5
@ -8,13 +8,13 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=intel-microcode
|
||||
PKG_VERSION:=20210608
|
||||
PKG_VERSION:=20220510
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).2.tar.xz
|
||||
PKG_SOURCE:=intel-microcode_3.$(PKG_VERSION).1.tar.xz
|
||||
PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/non-free/i/intel-microcode/
|
||||
PKG_HASH:=fbf82688ffd0d87b352a35c57bd097ea014f0ad32c9c8f9629725c1b43d1c84d
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/intel-microcode-3.$(PKG_VERSION).2
|
||||
PKG_HASH:=49752447c1b905dd130699cdef09fb2bba47b6f413d27787c98a5569273e283e
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/intel-microcode-3.$(PKG_VERSION).1
|
||||
|
||||
PKG_BUILD_DEPENDS:=iucode-tool/host
|
||||
|
||||
|
||||
@ -10,7 +10,6 @@ include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=spidev-test
|
||||
PKG_RELEASE:=$(LINUX_VERSION)
|
||||
PKG_FLAGS:=nonshared
|
||||
PKG_BUILD_DIR:=$(LINUX_DIR)/tools/spi-$(TARGET_DIR_NAME)
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
@ -19,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
|
||||
define Package/spidev-test
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
DEPENDS:=+kmod-spi-dev @!IN_SDK
|
||||
DEPENDS:=+kmod-spi-dev
|
||||
TITLE:=SPI testing utility
|
||||
VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE)
|
||||
URL:=http://www.kernel.org
|
||||
@ -30,6 +29,8 @@ define Package/spidev-test/description
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
# For SDK: Sources are copied by target/sdk/Makefile's
|
||||
# USERSPACE_UTILS(_FILES)
|
||||
$(CP) $(LINUX_DIR)/tools/spi/* $(PKG_BUILD_DIR)/
|
||||
endef
|
||||
|
||||
|
||||
@ -136,6 +136,7 @@ CONFIG_IRQ_DOMAIN=y
|
||||
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
||||
CONFIG_IRQ_FORCED_THREADING=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_LEDS_BCM63138=y
|
||||
CONFIG_LEDS_GPIO=y
|
||||
CONFIG_LIBFDT=y
|
||||
CONFIG_LOCK_DEBUGGING_SUPPORT=y
|
||||
|
||||
@ -0,0 +1,79 @@
|
||||
From ea559c81b61603d4044df6f826f10a832c42c98c Mon Sep 17 00:00:00 2001
|
||||
From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
|
||||
Date: Wed, 15 Jun 2022 17:52:59 -0700
|
||||
Subject: [PATCH] arm64: dts: broadcom: align gpio-key node names with dtschema
|
||||
|
||||
The node names should be generic and DT schema expects certain pattern
|
||||
(e.g. with key/button/switch).
|
||||
|
||||
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
|
||||
Link: https://lore.kernel.org/r/20220616005333.18491-6-krzysztof.kozlowski@linaro.org
|
||||
---
|
||||
.../broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts | 8 ++++----
|
||||
.../boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts | 8 ++++----
|
||||
2 files changed, 8 insertions(+), 8 deletions(-)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906-tplink-archer-c2300-v1.dts
|
||||
@@ -83,25 +83,25 @@
|
||||
compatible = "gpio-keys-polled";
|
||||
poll-interval = <100>;
|
||||
|
||||
- brightness {
|
||||
+ key-brightness {
|
||||
label = "LEDs";
|
||||
linux,code = <KEY_BRIGHTNESS_ZERO>;
|
||||
gpios = <&gpio0 18 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
- wps {
|
||||
+ key-wps {
|
||||
label = "WPS";
|
||||
linux,code = <KEY_WPS_BUTTON>;
|
||||
gpios = <&gpio0 21 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
- wifi {
|
||||
+ key-wifi {
|
||||
label = "WiFi";
|
||||
linux,code = <KEY_RFKILL>;
|
||||
gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
- restart {
|
||||
+ key-restart {
|
||||
label = "Reset";
|
||||
linux,code = <KEY_RESTART>;
|
||||
gpios = <&gpio0 23 GPIO_ACTIVE_LOW>;
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
|
||||
@@ -18,25 +18,25 @@
|
||||
compatible = "gpio-keys-polled";
|
||||
poll-interval = <100>;
|
||||
|
||||
- wifi {
|
||||
+ key-wifi {
|
||||
label = "WiFi";
|
||||
linux,code = <KEY_RFKILL>;
|
||||
gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
- wps {
|
||||
+ key-wps {
|
||||
label = "WPS";
|
||||
linux,code = <KEY_WPS_BUTTON>;
|
||||
gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
- restart {
|
||||
+ key-restart {
|
||||
label = "Reset";
|
||||
linux,code = <KEY_RESTART>;
|
||||
gpios = <&gpio0 30 GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
- brightness {
|
||||
+ key-brightness {
|
||||
label = "LEDs";
|
||||
linux,code = <KEY_BRIGHTNESS_ZERO>;
|
||||
gpios = <&gpio0 31 GPIO_ACTIVE_LOW>;
|
||||
@ -0,0 +1,33 @@
|
||||
From b4a544e415e9be33b37d9bfa9d9f9f4d13f553d6 Mon Sep 17 00:00:00 2001
|
||||
From: William Zhang <william.zhang@broadcom.com>
|
||||
Date: Fri, 8 Jul 2022 11:25:06 -0700
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcm4908: Fix timer node for BCM4906 SoC
|
||||
|
||||
The cpu mask value in interrupt property inherits from bcm4908.dtsi
|
||||
which sets to four cpus. Correct the value to two cpus for dual core
|
||||
BCM4906 SoC.
|
||||
|
||||
Fixes: c8b404fb05dc ("arm64: dts: broadcom: bcm4908: add BCM4906 Netgear R8000P DTS files")
|
||||
Signed-off-by: William Zhang <william.zhang@broadcom.com>
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4906.dtsi
|
||||
@@ -9,6 +9,14 @@
|
||||
/delete-node/ cpu@3;
|
||||
};
|
||||
|
||||
+ timer {
|
||||
+ compatible = "arm,armv8-timer";
|
||||
+ interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
|
||||
+ <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
|
||||
+ <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
|
||||
+ <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
|
||||
+ };
|
||||
+
|
||||
pmu {
|
||||
compatible = "arm,cortex-a53-pmu";
|
||||
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
|
||||
@ -0,0 +1,28 @@
|
||||
From 8bd582ae9a71d7f14c4e0c735b2eacaf7516d626 Mon Sep 17 00:00:00 2001
|
||||
From: William Zhang <william.zhang@broadcom.com>
|
||||
Date: Fri, 8 Jul 2022 11:25:07 -0700
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcm4908: Fix cpu node for smp boot
|
||||
|
||||
Add spin-table enable-method and cpu-release-addr properties for
|
||||
cpu0 node. This is required by all ARMv8 SoC. Otherwise some
|
||||
bootloader like u-boot can not update cpu-release-addr and linux
|
||||
fails to start up secondary cpus.
|
||||
|
||||
Fixes: 2961f69f151c ("arm64: dts: broadcom: add BCM4908 and Asus GT-AC5300 early DTS files")
|
||||
Signed-off-by: William Zhang <william.zhang@broadcom.com>
|
||||
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
@@ -29,6 +29,8 @@
|
||||
device_type = "cpu";
|
||||
compatible = "brcm,brahma-b53";
|
||||
reg = <0x0>;
|
||||
+ enable-method = "spin-table";
|
||||
+ cpu-release-addr = <0x0 0xfff8>;
|
||||
next-level-cache = <&l2>;
|
||||
};
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
From cd91fb2776967b2b2dea27307a3f23ba3d9bbb32 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Wed, 9 Feb 2022 21:32:02 +0100
|
||||
Subject: [PATCH] watchdog: allow building BCM7038_WDT for BCM4908
|
||||
@ -11,6 +12,9 @@ including the watchdog block. Allow building this driver for it.
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
|
||||
Link: https://lore.kernel.org/r/20220209203202.26395-1-zajec5@gmail.com
|
||||
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
||||
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
|
||||
---
|
||||
drivers/watchdog/Kconfig | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
@ -1,5 +1,6 @@
|
||||
From 2dd441f16d6ad6104d85c4e5dfeb6dde4df26869 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Wed, 16 Feb 2022 07:28:34 +0100
|
||||
Date: Wed, 16 Feb 2022 07:34:08 +0100
|
||||
Subject: [PATCH] watchdog: bcm7038_wdt: Support BCM6345 compatible string
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
@ -12,6 +13,11 @@ programmed just like the 7038 one.
|
||||
|
||||
Cc: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
|
||||
Link: https://lore.kernel.org/r/20220216063408.23168-1-zajec5@gmail.com
|
||||
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
|
||||
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
|
||||
---
|
||||
drivers/watchdog/bcm7038_wdt.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
@ -0,0 +1,112 @@
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 18 Jul 2022 13:16:05 +0200
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcm4908: add remaining LED pins
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Include all 32 pins.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
---
|
||||
.../boot/dts/broadcom/bcm4908/bcm4908.dtsi | 75 +++++++++++++++++++
|
||||
1 file changed, 75 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
@@ -352,6 +352,61 @@
|
||||
groups = "led_9_grp_a";
|
||||
};
|
||||
|
||||
+ pins_led_10_a: led_10-a-pins {
|
||||
+ function = "led_10";
|
||||
+ groups = "led_10_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_11_a: led_11-a-pins {
|
||||
+ function = "led_11";
|
||||
+ groups = "led_11_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_12_a: led_12-a-pins {
|
||||
+ function = "led_12";
|
||||
+ groups = "led_12_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_13_a: led_13-a-pins {
|
||||
+ function = "led_13";
|
||||
+ groups = "led_13_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_14_a: led_14-a-pins {
|
||||
+ function = "led_14";
|
||||
+ groups = "led_14_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_15_a: led_15-a-pins {
|
||||
+ function = "led_15";
|
||||
+ groups = "led_15_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_16_a: led_16-a-pins {
|
||||
+ function = "led_16";
|
||||
+ groups = "led_16_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_17_a: led_17-a-pins {
|
||||
+ function = "led_17";
|
||||
+ groups = "led_17_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_18_a: led_18-a-pins {
|
||||
+ function = "led_18";
|
||||
+ groups = "led_18_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_19_a: led_19-a-pins {
|
||||
+ function = "led_19";
|
||||
+ groups = "led_19_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_20_a: led_20-a-pins {
|
||||
+ function = "led_20";
|
||||
+ groups = "led_20_grp_a";
|
||||
+ };
|
||||
+
|
||||
pins_led_21_a: led_21-a-pins {
|
||||
function = "led_21";
|
||||
groups = "led_21_grp_a";
|
||||
@@ -362,6 +417,21 @@
|
||||
groups = "led_22_grp_a";
|
||||
};
|
||||
|
||||
+ pins_led_23_a: led_23-a-pins {
|
||||
+ function = "led_23";
|
||||
+ groups = "led_23_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_24_a: led_24-a-pins {
|
||||
+ function = "led_24";
|
||||
+ groups = "led_24_grp_a";
|
||||
+ };
|
||||
+
|
||||
+ pins_led_25_a: led_25-a-pins {
|
||||
+ function = "led_25";
|
||||
+ groups = "led_25_grp_a";
|
||||
+ };
|
||||
+
|
||||
pins_led_26_a: led_26-a-pins {
|
||||
function = "led_26";
|
||||
groups = "led_26_grp_a";
|
||||
@@ -387,6 +457,11 @@
|
||||
groups = "led_30_grp_a";
|
||||
};
|
||||
|
||||
+ pins_led_31_a: led_31-a-pins {
|
||||
+ function = "led_31";
|
||||
+ groups = "led_31_grp_a";
|
||||
+ };
|
||||
+
|
||||
pins_hs_uart: hs_uart-pins {
|
||||
function = "hs_uart";
|
||||
groups = "hs_uart_grp";
|
||||
@ -0,0 +1,32 @@
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 18 Jul 2022 13:17:57 +0200
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcm4908: add LEDs controller block
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
BCM4908 includes LEDs controller that supports multiple brightness
|
||||
levels & hardware blinking.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
---
|
||||
arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
@@ -517,6 +517,14 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+ leds: leds@800 {
|
||||
+ compatible = "brcm,bcm4908-leds", "brcm,bcm63138-leds";
|
||||
+ reg = <0x800 0xdc>;
|
||||
+
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ };
|
||||
+
|
||||
nand-controller@1800 {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
@ -0,0 +1,78 @@
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 18 Jul 2022 13:21:54 +0200
|
||||
Subject: [PATCH] arm64: dts: broadcom: bcm4908: add Asus GT-AC5300 LEDs
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
There are 5 software-controllable LEDs on PCB.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
---
|
||||
.../bcm4908/bcm4908-asus-gt-ac5300.dts | 48 +++++++++++++++++++
|
||||
1 file changed, 48 insertions(+)
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908-asus-gt-ac5300.dts
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
#include <dt-bindings/gpio/gpio.h>
|
||||
#include <dt-bindings/input/input.h>
|
||||
+#include <dt-bindings/leds/common.h>
|
||||
|
||||
#include "bcm4908.dtsi"
|
||||
|
||||
@@ -118,6 +119,53 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&leds {
|
||||
+ led-power@11 {
|
||||
+ reg = <0x11>;
|
||||
+ function = LED_FUNCTION_POWER;
|
||||
+ color = <LED_COLOR_ID_WHITE>;
|
||||
+ default-state = "on";
|
||||
+ active-low;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pins_led_17_a>;
|
||||
+ };
|
||||
+
|
||||
+ led-wan-red@12 {
|
||||
+ reg = <0x12>;
|
||||
+ function = LED_FUNCTION_WAN;
|
||||
+ color = <LED_COLOR_ID_RED>;
|
||||
+ active-low;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pins_led_18_a>;
|
||||
+ };
|
||||
+
|
||||
+ led-wps@14 {
|
||||
+ reg = <0x14>;
|
||||
+ function = LED_FUNCTION_WPS;
|
||||
+ color = <LED_COLOR_ID_WHITE>;
|
||||
+ active-low;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pins_led_20_a>;
|
||||
+ };
|
||||
+
|
||||
+ led-wan-white@15 {
|
||||
+ reg = <0x15>;
|
||||
+ function = LED_FUNCTION_WAN;
|
||||
+ color = <LED_COLOR_ID_WHITE>;
|
||||
+ active-low;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pins_led_21_a>;
|
||||
+ };
|
||||
+
|
||||
+ led-lan@19 {
|
||||
+ reg = <0x19>;
|
||||
+ function = LED_FUNCTION_LAN;
|
||||
+ color = <LED_COLOR_ID_WHITE>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&pins_led_25_a>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
&nandcs {
|
||||
nand-ecc-strength = <4>;
|
||||
nand-ecc-step-size = <512>;
|
||||
@ -12,7 +12,7 @@ Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
|
||||
--- a/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
+++ b/arch/arm64/boot/dts/broadcom/bcm4908/bcm4908.dtsi
|
||||
@@ -290,7 +290,7 @@
|
||||
@@ -292,7 +292,7 @@
|
||||
gpio0: gpio-controller@500 {
|
||||
compatible = "brcm,bcm6345-gpio";
|
||||
reg-names = "dirout", "dat";
|
||||
|
||||
@ -237,6 +237,7 @@ CONFIG_IRQ_DOMAIN=y
|
||||
CONFIG_IRQ_DOMAIN_HIERARCHY=y
|
||||
CONFIG_IRQ_FORCED_THREADING=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
# CONFIG_LEDS_BCM63138 is not set
|
||||
CONFIG_LIBFDT=y
|
||||
CONFIG_LOCK_DEBUGGING_SUPPORT=y
|
||||
CONFIG_LOCK_SPIN_ON_OWNER=y
|
||||
|
||||
@ -106,6 +106,7 @@ CONFIG_IRQ_MIPS_CPU=y
|
||||
CONFIG_IRQ_WORK=y
|
||||
CONFIG_KEXEC=y
|
||||
CONFIG_KEXEC_CORE=y
|
||||
# CONFIG_LEDS_BCM63138 is not set
|
||||
CONFIG_LEDS_BCM6328=y
|
||||
CONFIG_LEDS_BCM6358=y
|
||||
CONFIG_LEDS_GPIO=y
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
From 13344f8ce8a0d98aa7f5d69ce3b47393c73a343b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 27 Dec 2021 15:59:04 +0100
|
||||
Subject: [PATCH] dt-bindings: leds: add Broadcom's BCM63138 controller
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Broadcom used 2 LEDs hardware blocks for their BCM63xx SoCs:
|
||||
1. Older one (BCM6318, BCM6328, BCM6362, BCM63268, BCM6838)
|
||||
2. Newer one (BCM6848, BCM6858, BCM63138, BCM63148, BCM63381, BCM68360)
|
||||
|
||||
The newer one was also later also used on BCM4908 SoC.
|
||||
|
||||
Old block is already documented in the leds-bcm6328.yaml. This binding
|
||||
documents the new one which uses different registers & programming. It's
|
||||
first used in BCM63138 thus the binding name.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Reviewed-by: Rob Herring <robh@kernel.org>
|
||||
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Signed-off-by: Pavel Machek <pavel@ucw.cz>
|
||||
---
|
||||
.../bindings/leds/leds-bcm63138.yaml | 95 +++++++++++++++++++
|
||||
1 file changed, 95 insertions(+)
|
||||
create mode 100644 Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
|
||||
|
||||
--- /dev/null
|
||||
+++ b/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
|
||||
@@ -0,0 +1,95 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
|
||||
+%YAML 1.2
|
||||
+---
|
||||
+$id: http://devicetree.org/schemas/leds/leds-bcm63138.yaml#
|
||||
+$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
+
|
||||
+title: Broadcom's BCM63138 LEDs controller
|
||||
+
|
||||
+maintainers:
|
||||
+ - Rafał Miłecki <rafal@milecki.pl>
|
||||
+
|
||||
+description: |
|
||||
+ This LEDs controller was first used on BCM63138 and later reused on BCM4908,
|
||||
+ BCM6848, BCM6858, BCM63138, BCM63148, BCM63381 and BCM68360 SoCs.
|
||||
+
|
||||
+ It supports up to 32 LEDs that can be connected parallelly or serially. It
|
||||
+ also includes limited support for hardware blinking.
|
||||
+
|
||||
+ Binding serially connected LEDs isn't documented yet.
|
||||
+
|
||||
+properties:
|
||||
+ compatible:
|
||||
+ oneOf:
|
||||
+ - items:
|
||||
+ - enum:
|
||||
+ - brcm,bcm4908-leds
|
||||
+ - brcm,bcm6848-leds
|
||||
+ - brcm,bcm6858-leds
|
||||
+ - brcm,bcm63148-leds
|
||||
+ - brcm,bcm63381-leds
|
||||
+ - brcm,bcm68360-leds
|
||||
+ - const: brcm,bcm63138-leds
|
||||
+ - const: brcm,bcm63138-leds
|
||||
+
|
||||
+ reg:
|
||||
+ maxItems: 1
|
||||
+
|
||||
+ "#address-cells":
|
||||
+ const: 1
|
||||
+
|
||||
+ "#size-cells":
|
||||
+ const: 0
|
||||
+
|
||||
+patternProperties:
|
||||
+ "^led@[a-f0-9]+$":
|
||||
+ type: object
|
||||
+
|
||||
+ $ref: common.yaml#
|
||||
+
|
||||
+ properties:
|
||||
+ reg:
|
||||
+ maxItems: 1
|
||||
+ description: LED pin number
|
||||
+
|
||||
+ active-low:
|
||||
+ type: boolean
|
||||
+ description: Makes LED active low.
|
||||
+
|
||||
+ required:
|
||||
+ - reg
|
||||
+
|
||||
+ unevaluatedProperties: false
|
||||
+
|
||||
+required:
|
||||
+ - reg
|
||||
+ - "#address-cells"
|
||||
+ - "#size-cells"
|
||||
+
|
||||
+additionalProperties: false
|
||||
+
|
||||
+examples:
|
||||
+ - |
|
||||
+ #include <dt-bindings/leds/common.h>
|
||||
+
|
||||
+ leds@ff800800 {
|
||||
+ compatible = "brcm,bcm4908-leds", "brcm,bcm63138-leds";
|
||||
+ reg = <0xff800800 0xdc>;
|
||||
+
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+
|
||||
+ led@0 {
|
||||
+ reg = <0x0>;
|
||||
+ function = LED_FUNCTION_POWER;
|
||||
+ color = <LED_COLOR_ID_GREEN>;
|
||||
+ default-state = "on";
|
||||
+ };
|
||||
+
|
||||
+ led@3 {
|
||||
+ reg = <0x3>;
|
||||
+ function = LED_FUNCTION_STATUS;
|
||||
+ color = <LED_COLOR_ID_GREEN>;
|
||||
+ active-low;
|
||||
+ };
|
||||
+ };
|
||||
@ -0,0 +1,371 @@
|
||||
From a0ba692072d89075d0a75c7ad9df31f2c1ee9a1c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Mon, 27 Dec 2021 15:59:05 +0100
|
||||
Subject: [PATCH] leds: bcm63138: add support for BCM63138 controller
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It's a new controller first introduced in BCM63138 SoC. Later it was
|
||||
also used in BCM4908, some BCM68xx and some BCM63xxx SoCs.
|
||||
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
|
||||
Signed-off-by: Pavel Machek <pavel@ucw.cz>
|
||||
---
|
||||
drivers/leds/blink/Kconfig | 12 ++
|
||||
drivers/leds/blink/Makefile | 1 +
|
||||
drivers/leds/blink/leds-bcm63138.c | 308 +++++++++++++++++++++++++++++
|
||||
3 files changed, 321 insertions(+)
|
||||
create mode 100644 drivers/leds/blink/leds-bcm63138.c
|
||||
|
||||
--- /dev/null
|
||||
+++ b/drivers/leds/blink/Kconfig
|
||||
@@ -0,0 +1,11 @@
|
||||
+config LEDS_BCM63138
|
||||
+ tristate "LED Support for Broadcom BCM63138 SoC"
|
||||
+ depends on LEDS_CLASS
|
||||
+ depends on ARCH_BCM4908 || ARCH_BCM_5301X || BCM63XX || COMPILE_TEST
|
||||
+ depends on HAS_IOMEM
|
||||
+ depends on OF
|
||||
+ default ARCH_BCM4908
|
||||
+ help
|
||||
+ This option enables support for LED controller that is part of
|
||||
+ BCM63138 SoC. The same hardware block is known to be also used
|
||||
+ in BCM4908, BCM6848, BCM6858, BCM63148, BCM63381 and BCM68360.
|
||||
--- /dev/null
|
||||
+++ b/drivers/leds/blink/Makefile
|
||||
@@ -0,0 +1,2 @@
|
||||
+# SPDX-License-Identifier: GPL-2.0
|
||||
+obj-$(CONFIG_LEDS_BCM63138) += leds-bcm63138.o
|
||||
--- /dev/null
|
||||
+++ b/drivers/leds/blink/leds-bcm63138.c
|
||||
@@ -0,0 +1,308 @@
|
||||
+// SPDX-License-Identifier: GPL-2.0-only
|
||||
+/*
|
||||
+ * Copyright (C) 2021 Rafał Miłecki <rafal@milecki.pl>
|
||||
+ */
|
||||
+#include <linux/delay.h>
|
||||
+#include <linux/io.h>
|
||||
+#include <linux/leds.h>
|
||||
+#include <linux/module.h>
|
||||
+#include <linux/of.h>
|
||||
+#include <linux/pinctrl/consumer.h>
|
||||
+#include <linux/platform_device.h>
|
||||
+#include <linux/spinlock.h>
|
||||
+
|
||||
+#define BCM63138_MAX_LEDS 32
|
||||
+#define BCM63138_MAX_BRIGHTNESS 9
|
||||
+
|
||||
+#define BCM63138_LED_BITS 4 /* how many bits control a single LED */
|
||||
+#define BCM63138_LED_MASK ((1 << BCM63138_LED_BITS) - 1) /* 0xf */
|
||||
+#define BCM63138_LEDS_PER_REG (32 / BCM63138_LED_BITS) /* 8 */
|
||||
+
|
||||
+#define BCM63138_GLB_CTRL 0x00
|
||||
+#define BCM63138_GLB_CTRL_SERIAL_LED_DATA_PPOL 0x00000002
|
||||
+#define BCM63138_GLB_CTRL_SERIAL_LED_EN_POL 0x00000008
|
||||
+#define BCM63138_MASK 0x04
|
||||
+#define BCM63138_HW_LED_EN 0x08
|
||||
+#define BCM63138_SERIAL_LED_SHIFT_SEL 0x0c
|
||||
+#define BCM63138_FLASH_RATE_CTRL1 0x10
|
||||
+#define BCM63138_FLASH_RATE_CTRL2 0x14
|
||||
+#define BCM63138_FLASH_RATE_CTRL3 0x18
|
||||
+#define BCM63138_FLASH_RATE_CTRL4 0x1c
|
||||
+#define BCM63138_BRIGHT_CTRL1 0x20
|
||||
+#define BCM63138_BRIGHT_CTRL2 0x24
|
||||
+#define BCM63138_BRIGHT_CTRL3 0x28
|
||||
+#define BCM63138_BRIGHT_CTRL4 0x2c
|
||||
+#define BCM63138_POWER_LED_CFG 0x30
|
||||
+#define BCM63138_HW_POLARITY 0xb4
|
||||
+#define BCM63138_SW_DATA 0xb8
|
||||
+#define BCM63138_SW_POLARITY 0xbc
|
||||
+#define BCM63138_PARALLEL_LED_POLARITY 0xc0
|
||||
+#define BCM63138_SERIAL_LED_POLARITY 0xc4
|
||||
+#define BCM63138_HW_LED_STATUS 0xc8
|
||||
+#define BCM63138_FLASH_CTRL_STATUS 0xcc
|
||||
+#define BCM63138_FLASH_BRT_CTRL 0xd0
|
||||
+#define BCM63138_FLASH_P_LED_OUT_STATUS 0xd4
|
||||
+#define BCM63138_FLASH_S_LED_OUT_STATUS 0xd8
|
||||
+
|
||||
+struct bcm63138_leds {
|
||||
+ struct device *dev;
|
||||
+ void __iomem *base;
|
||||
+ spinlock_t lock;
|
||||
+};
|
||||
+
|
||||
+struct bcm63138_led {
|
||||
+ struct bcm63138_leds *leds;
|
||||
+ struct led_classdev cdev;
|
||||
+ u32 pin;
|
||||
+ bool active_low;
|
||||
+};
|
||||
+
|
||||
+/*
|
||||
+ * I/O access
|
||||
+ */
|
||||
+
|
||||
+static void bcm63138_leds_write(struct bcm63138_leds *leds, unsigned int reg,
|
||||
+ u32 data)
|
||||
+{
|
||||
+ writel(data, leds->base + reg);
|
||||
+}
|
||||
+
|
||||
+static unsigned long bcm63138_leds_read(struct bcm63138_leds *leds,
|
||||
+ unsigned int reg)
|
||||
+{
|
||||
+ return readl(leds->base + reg);
|
||||
+}
|
||||
+
|
||||
+static void bcm63138_leds_update_bits(struct bcm63138_leds *leds,
|
||||
+ unsigned int reg, u32 mask, u32 val)
|
||||
+{
|
||||
+ WARN_ON(val & ~mask);
|
||||
+
|
||||
+ bcm63138_leds_write(leds, reg, (bcm63138_leds_read(leds, reg) & ~mask) | (val & mask));
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * Helpers
|
||||
+ */
|
||||
+
|
||||
+static void bcm63138_leds_set_flash_rate(struct bcm63138_leds *leds,
|
||||
+ struct bcm63138_led *led,
|
||||
+ u8 value)
|
||||
+{
|
||||
+ int reg_offset = (led->pin >> fls((BCM63138_LEDS_PER_REG - 1))) * 4;
|
||||
+ int shift = (led->pin & (BCM63138_LEDS_PER_REG - 1)) * BCM63138_LED_BITS;
|
||||
+
|
||||
+ bcm63138_leds_update_bits(leds, BCM63138_FLASH_RATE_CTRL1 + reg_offset,
|
||||
+ BCM63138_LED_MASK << shift, value << shift);
|
||||
+}
|
||||
+
|
||||
+static void bcm63138_leds_set_bright(struct bcm63138_leds *leds,
|
||||
+ struct bcm63138_led *led,
|
||||
+ u8 value)
|
||||
+{
|
||||
+ int reg_offset = (led->pin >> fls((BCM63138_LEDS_PER_REG - 1))) * 4;
|
||||
+ int shift = (led->pin & (BCM63138_LEDS_PER_REG - 1)) * BCM63138_LED_BITS;
|
||||
+
|
||||
+ bcm63138_leds_update_bits(leds, BCM63138_BRIGHT_CTRL1 + reg_offset,
|
||||
+ BCM63138_LED_MASK << shift, value << shift);
|
||||
+}
|
||||
+
|
||||
+static void bcm63138_leds_enable_led(struct bcm63138_leds *leds,
|
||||
+ struct bcm63138_led *led,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ u32 bit = BIT(led->pin);
|
||||
+
|
||||
+ bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit,
|
||||
+ value == LED_OFF ? 0 : bit);
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * API callbacks
|
||||
+ */
|
||||
+
|
||||
+static void bcm63138_leds_brightness_set(struct led_classdev *led_cdev,
|
||||
+ enum led_brightness value)
|
||||
+{
|
||||
+ struct bcm63138_led *led = container_of(led_cdev, struct bcm63138_led, cdev);
|
||||
+ struct bcm63138_leds *leds = led->leds;
|
||||
+ unsigned long flags;
|
||||
+
|
||||
+ spin_lock_irqsave(&leds->lock, flags);
|
||||
+
|
||||
+ bcm63138_leds_enable_led(leds, led, value);
|
||||
+ if (!value)
|
||||
+ bcm63138_leds_set_flash_rate(leds, led, 0);
|
||||
+ else
|
||||
+ bcm63138_leds_set_bright(leds, led, value);
|
||||
+
|
||||
+ spin_unlock_irqrestore(&leds->lock, flags);
|
||||
+}
|
||||
+
|
||||
+static int bcm63138_leds_blink_set(struct led_classdev *led_cdev,
|
||||
+ unsigned long *delay_on,
|
||||
+ unsigned long *delay_off)
|
||||
+{
|
||||
+ struct bcm63138_led *led = container_of(led_cdev, struct bcm63138_led, cdev);
|
||||
+ struct bcm63138_leds *leds = led->leds;
|
||||
+ unsigned long flags;
|
||||
+ u8 value;
|
||||
+
|
||||
+ if (!*delay_on && !*delay_off) {
|
||||
+ *delay_on = 640;
|
||||
+ *delay_off = 640;
|
||||
+ }
|
||||
+
|
||||
+ if (*delay_on != *delay_off) {
|
||||
+ dev_dbg(led_cdev->dev, "Blinking at unequal delays is not supported\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ switch (*delay_on) {
|
||||
+ case 1152 ... 1408: /* 1280 ms ± 10% */
|
||||
+ value = 0x7;
|
||||
+ break;
|
||||
+ case 576 ... 704: /* 640 ms ± 10% */
|
||||
+ value = 0x6;
|
||||
+ break;
|
||||
+ case 288 ... 352: /* 320 ms ± 10% */
|
||||
+ value = 0x5;
|
||||
+ break;
|
||||
+ case 126 ... 154: /* 140 ms ± 10% */
|
||||
+ value = 0x4;
|
||||
+ break;
|
||||
+ case 59 ... 72: /* 65 ms ± 10% */
|
||||
+ value = 0x3;
|
||||
+ break;
|
||||
+ default:
|
||||
+ dev_dbg(led_cdev->dev, "Blinking delay value %lu is unsupported\n",
|
||||
+ *delay_on);
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ spin_lock_irqsave(&leds->lock, flags);
|
||||
+
|
||||
+ bcm63138_leds_enable_led(leds, led, BCM63138_MAX_BRIGHTNESS);
|
||||
+ bcm63138_leds_set_flash_rate(leds, led, value);
|
||||
+
|
||||
+ spin_unlock_irqrestore(&leds->lock, flags);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
+ * LED driver
|
||||
+ */
|
||||
+
|
||||
+static void bcm63138_leds_create_led(struct bcm63138_leds *leds,
|
||||
+ struct device_node *np)
|
||||
+{
|
||||
+ struct led_init_data init_data = {
|
||||
+ .fwnode = of_fwnode_handle(np),
|
||||
+ };
|
||||
+ struct device *dev = leds->dev;
|
||||
+ struct bcm63138_led *led;
|
||||
+ struct pinctrl *pinctrl;
|
||||
+ u32 bit;
|
||||
+ int err;
|
||||
+
|
||||
+ led = devm_kzalloc(dev, sizeof(*led), GFP_KERNEL);
|
||||
+ if (!led) {
|
||||
+ dev_err(dev, "Failed to alloc LED\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ led->leds = leds;
|
||||
+
|
||||
+ if (of_property_read_u32(np, "reg", &led->pin)) {
|
||||
+ dev_err(dev, "Missing \"reg\" property in %pOF\n", np);
|
||||
+ goto err_free;
|
||||
+ }
|
||||
+
|
||||
+ if (led->pin >= BCM63138_MAX_LEDS) {
|
||||
+ dev_err(dev, "Invalid \"reg\" value %d\n", led->pin);
|
||||
+ goto err_free;
|
||||
+ }
|
||||
+
|
||||
+ led->active_low = of_property_read_bool(np, "active-low");
|
||||
+
|
||||
+ led->cdev.max_brightness = BCM63138_MAX_BRIGHTNESS;
|
||||
+ led->cdev.brightness_set = bcm63138_leds_brightness_set;
|
||||
+ led->cdev.blink_set = bcm63138_leds_blink_set;
|
||||
+
|
||||
+ err = devm_led_classdev_register_ext(dev, &led->cdev, &init_data);
|
||||
+ if (err) {
|
||||
+ dev_err(dev, "Failed to register LED %pOF: %d\n", np, err);
|
||||
+ goto err_free;
|
||||
+ }
|
||||
+
|
||||
+ pinctrl = devm_pinctrl_get_select_default(led->cdev.dev);
|
||||
+ if (IS_ERR(pinctrl) && PTR_ERR(pinctrl) != -ENODEV) {
|
||||
+ dev_warn(led->cdev.dev, "Failed to select %pOF pinctrl: %ld\n",
|
||||
+ np, PTR_ERR(pinctrl));
|
||||
+ }
|
||||
+
|
||||
+ bit = BIT(led->pin);
|
||||
+ bcm63138_leds_update_bits(leds, BCM63138_PARALLEL_LED_POLARITY, bit,
|
||||
+ led->active_low ? 0 : bit);
|
||||
+ bcm63138_leds_update_bits(leds, BCM63138_HW_LED_EN, bit, 0);
|
||||
+ bcm63138_leds_set_flash_rate(leds, led, 0);
|
||||
+ bcm63138_leds_enable_led(leds, led, led->cdev.brightness);
|
||||
+
|
||||
+ return;
|
||||
+
|
||||
+err_free:
|
||||
+ devm_kfree(dev, led);
|
||||
+}
|
||||
+
|
||||
+static int bcm63138_leds_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct device_node *np = dev_of_node(&pdev->dev);
|
||||
+ struct device *dev = &pdev->dev;
|
||||
+ struct bcm63138_leds *leds;
|
||||
+ struct device_node *child;
|
||||
+
|
||||
+ leds = devm_kzalloc(dev, sizeof(*leds), GFP_KERNEL);
|
||||
+ if (!leds)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ leds->dev = dev;
|
||||
+
|
||||
+ leds->base = devm_platform_ioremap_resource(pdev, 0);
|
||||
+ if (IS_ERR(leds->base))
|
||||
+ return PTR_ERR(leds->base);
|
||||
+
|
||||
+ spin_lock_init(&leds->lock);
|
||||
+
|
||||
+ bcm63138_leds_write(leds, BCM63138_GLB_CTRL,
|
||||
+ BCM63138_GLB_CTRL_SERIAL_LED_DATA_PPOL |
|
||||
+ BCM63138_GLB_CTRL_SERIAL_LED_EN_POL);
|
||||
+ bcm63138_leds_write(leds, BCM63138_HW_LED_EN, 0);
|
||||
+ bcm63138_leds_write(leds, BCM63138_SERIAL_LED_POLARITY, 0);
|
||||
+ bcm63138_leds_write(leds, BCM63138_PARALLEL_LED_POLARITY, 0);
|
||||
+
|
||||
+ for_each_available_child_of_node(np, child) {
|
||||
+ bcm63138_leds_create_led(leds, child);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct of_device_id bcm63138_leds_of_match_table[] = {
|
||||
+ { .compatible = "brcm,bcm63138-leds", },
|
||||
+ { },
|
||||
+};
|
||||
+
|
||||
+static struct platform_driver bcm63138_leds_driver = {
|
||||
+ .probe = bcm63138_leds_probe,
|
||||
+ .driver = {
|
||||
+ .name = "leds-bcm63xxx",
|
||||
+ .of_match_table = bcm63138_leds_of_match_table,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+module_platform_driver(bcm63138_leds_driver);
|
||||
+
|
||||
+MODULE_AUTHOR("Rafał Miłecki");
|
||||
+MODULE_LICENSE("GPL");
|
||||
+MODULE_DEVICE_TABLE(of, bcm63138_leds_of_match_table);
|
||||
--- a/drivers/leds/Kconfig
|
||||
+++ b/drivers/leds/Kconfig
|
||||
@@ -824,6 +824,8 @@ config LEDS_LM36274
|
||||
Say Y to enable the LM36274 LED driver for TI LMU devices.
|
||||
This supports the LED device LM36274.
|
||||
|
||||
+source "drivers/leds/blink/Kconfig"
|
||||
+
|
||||
comment "LED Triggers"
|
||||
source "drivers/leds/trigger/Kconfig"
|
||||
|
||||
--- a/drivers/leds/Makefile
|
||||
+++ b/drivers/leds/Makefile
|
||||
@@ -95,3 +95,6 @@ obj-$(CONFIG_LEDS_USER) += uleds.o
|
||||
|
||||
# LED Triggers
|
||||
obj-$(CONFIG_LEDS_TRIGGERS) += trigger/
|
||||
+
|
||||
+# LED Blink
|
||||
+obj-y += blink/
|
||||
@ -0,0 +1,30 @@
|
||||
From 13b64a0c19059b38150c79d65d350ae44034c5df Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Sun, 17 Jul 2022 14:42:46 +0200
|
||||
Subject: [PATCH] dt-bindings: leds: leds-bcm63138: unify full stops in
|
||||
descriptions
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Description of "reg" doesn't have full stop at the end. It makes sense
|
||||
as it's a one-sentence only. Use the same style for "active-low".
|
||||
|
||||
Reported-by: Pavel Machek <pavel@ucw.cz>
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Pavel Machek <pavel@ucw.cz>
|
||||
---
|
||||
Documentation/devicetree/bindings/leds/leds-bcm63138.yaml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
|
||||
+++ b/Documentation/devicetree/bindings/leds/leds-bcm63138.yaml
|
||||
@@ -54,7 +54,7 @@ patternProperties:
|
||||
|
||||
active-low:
|
||||
type: boolean
|
||||
- description: Makes LED active low.
|
||||
+ description: Makes LED active low
|
||||
|
||||
required:
|
||||
- reg
|
||||
@ -0,0 +1,25 @@
|
||||
From bcc607cdbb1f931111196699426f0cb83bfb296a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Sun, 17 Jul 2022 14:42:47 +0200
|
||||
Subject: [PATCH] leds: add help info about BCM63138 module name
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
It's what we do for all other LEDs drivers.
|
||||
|
||||
Reported-by: Pavel Machek <pavel@ucw.cz>
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Pavel Machek <pavel@ucw.cz>
|
||||
---
|
||||
drivers/leds/blink/Kconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/drivers/leds/blink/Kconfig
|
||||
+++ b/drivers/leds/blink/Kconfig
|
||||
@@ -9,3 +9,5 @@ config LEDS_BCM63138
|
||||
This option enables support for LED controller that is part of
|
||||
BCM63138 SoC. The same hardware block is known to be also used
|
||||
in BCM4908, BCM6848, BCM6858, BCM63148, BCM63381 and BCM68360.
|
||||
+
|
||||
+ If compiled as module it will be called leds-bcm63138.
|
||||
@ -0,0 +1,30 @@
|
||||
From 92cfc71ee2ddfb499ed53e21b28bdf8739bc70bc Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
||||
Date: Sun, 17 Jul 2022 14:42:48 +0200
|
||||
Subject: [PATCH] leds: leds-bcm63138: get rid of LED_OFF
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The whole "enum led_brightness" is marked as obsolete. Replace it with a
|
||||
(non-)zero check.
|
||||
|
||||
Reported-by: Pavel Machek <pavel@ucw.cz>
|
||||
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
||||
Signed-off-by: Pavel Machek <pavel@ucw.cz>
|
||||
---
|
||||
drivers/leds/blink/leds-bcm63138.c | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
--- a/drivers/leds/blink/leds-bcm63138.c
|
||||
+++ b/drivers/leds/blink/leds-bcm63138.c
|
||||
@@ -113,8 +113,7 @@ static void bcm63138_leds_enable_led(str
|
||||
{
|
||||
u32 bit = BIT(led->pin);
|
||||
|
||||
- bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit,
|
||||
- value == LED_OFF ? 0 : bit);
|
||||
+ bcm63138_leds_update_bits(leds, BCM63138_SW_DATA, bit, value ? bit : 0);
|
||||
}
|
||||
|
||||
/*
|
||||
@ -22,8 +22,7 @@ compex,wpq864 |\
|
||||
netgear,d7800 |\
|
||||
netgear,r7500 |\
|
||||
netgear,r7500v2 |\
|
||||
qcom,ipq8064-ap148 |\
|
||||
tplink,vr2600v)
|
||||
qcom,ipq8064-ap148)
|
||||
ucidef_add_switch "switch0" \
|
||||
"1:lan" "2:lan" "3:lan" "4:lan" "6@eth1" "5:wan" "0@eth0"
|
||||
;;
|
||||
@ -51,7 +50,8 @@ nec,wg2600hp3)
|
||||
"2:lan" "3:lan" "4:lan" "5:lan" "0@eth1" "1:wan" "6@eth0"
|
||||
;;
|
||||
netgear,r7800 |\
|
||||
tplink,c2600)
|
||||
tplink,c2600 |\
|
||||
tplink,vr2600v)
|
||||
ucidef_add_switch "switch0" \
|
||||
"1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" "6@eth1" "5:wan" "0@eth0"
|
||||
;;
|
||||
|
||||
@ -48,6 +48,7 @@ define Device/ubnt_edgerouter
|
||||
DEVICE_MODEL := EdgeRouter
|
||||
BOARD_NAME := er
|
||||
CMDLINE := $(ER_CMDLINE)
|
||||
SUPPORTED_DEVICES += er
|
||||
endef
|
||||
TARGET_DEVICES += ubnt_edgerouter
|
||||
|
||||
@ -68,6 +69,7 @@ define Device/ubnt_edgerouter-lite
|
||||
DEVICE_MODEL := EdgeRouter Lite
|
||||
BOARD_NAME := erlite
|
||||
CMDLINE := $(ERLITE_CMDLINE)
|
||||
SUPPORTED_DEVICES += erlite
|
||||
endef
|
||||
TARGET_DEVICES += ubnt_edgerouter-lite
|
||||
|
||||
|
||||
@ -82,6 +82,18 @@ KERNEL_FILES_BASE := \
|
||||
|
||||
KERNEL_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(KERNEL_FILES_BASE))))
|
||||
|
||||
# The kernel source hosts various userspace utilities sources.
|
||||
# These are packaged separately from the kernel and kernel modules.
|
||||
# The source has to be included here to be buildable by the SDK.
|
||||
#
|
||||
USERSPACE_UTILS_FILES := \
|
||||
tools/build \
|
||||
tools/scripts \
|
||||
tools/usb/usbip \
|
||||
tools/spi
|
||||
|
||||
USERSPACE_FILES := $(patsubst $(TOPDIR)/%,%,$(wildcard $(addprefix $(LINUX_DIR)/,$(USERSPACE_UTILS_FILES))))
|
||||
|
||||
all: compile
|
||||
|
||||
$(BIN_DIR)/$(SDK_NAME).tar.xz: clean
|
||||
@ -100,8 +112,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
|
||||
$(SDK_DIRS) $(KERNEL_FILES) | \
|
||||
$(TAR) -xf - -C $(SDK_BUILD_DIR)
|
||||
|
||||
# Copy usbip sources, this is required for the usbip userspace packages to be buildable by the SDK.
|
||||
$(TAR) -cf - -C $(TOPDIR) $(KDIR_BASE)/tools/usb/usbip/ | \
|
||||
$(TAR) -cf - -C $(TOPDIR) $(USERSPACE_FILES) | \
|
||||
$(TAR) -xf - -C $(SDK_BUILD_DIR)
|
||||
|
||||
(cd $(SDK_BUILD_DIR); find $(STAGING_SUBDIR_HOST)/bin $(STAGING_SUBDIR_HOST)/usr/bin \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user