ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-02-06 19:19:31 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

ath79: add MikroTik suffix to the local GPIO latch driver

Browse Source 
The upcoming 6.6 kernel will introduce a new upstream generic
"gpio-latch" driver. It will conflict with the downstream MikroTik
GPIO latch driver. Let's rename it to avoid any potential issues.

Signed-off-by: Shiji Yang <yangshiji66@qq.com>
This commit is contained in:
Shiji Yang 2024-03-16 08:39:16 +08:00 committed by Hauke Mehrtens
parent 24693ac7e5
commit e155e3bd09
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/ath79/config-6.1
View File

@ -81,7 +81,7 @@ CONFIG_GPIO_74X164=y
CONFIG_GPIO_ATH79=y CONFIG_GPIO_ATH79=y
CONFIG_GPIO_CDEV=y CONFIG_GPIO_CDEV=y
CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC=y
# CONFIG_GPIO_LATCH is not set # CONFIG_GPIO_LATCH_MIKROTIK is not set
# CONFIG_GPIO_RB91X_KEY is not set # CONFIG_GPIO_RB91X_KEY is not set
CONFIG_HARDWARE_WATCHPOINTS=y CONFIG_HARDWARE_WATCHPOINTS=y
CONFIG_HAS_DMA=y CONFIG_HAS_DMA=y

2
target/linux/ath79/dts/ar9342_mikrotik_routerboard-911g.dtsi
View File

@ -22,7 +22,7 @@
}; };
gpio_latch: gpio_latch { gpio_latch: gpio_latch {
compatible = "gpio-latch"; compatible = "gpio-latch-mikrotik";
gpio-controller; gpio-controller;
#gpio-cells = <2>; #gpio-cells = <2>;
gpios = <&gpio 0 GPIO_ACTIVE_HIGH>, gpios = <&gpio 0 GPIO_ACTIVE_HIGH>,

2
target/linux/ath79/files/drivers/gpio/gpio-latch.c → target/linux/ath79/files/drivers/gpio/gpio-latch-mikrotik.c
View File

@ -15,7 +15,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/of_gpio.h> #include <linux/of_gpio.h>
#define GPIO_LATCH_DRIVER_NAME "gpio-latch" #define GPIO_LATCH_DRIVER_NAME "gpio-latch-mikrotik"
#define GPIO_LATCH_LINES 9 #define GPIO_LATCH_LINES 9
struct gpio_latch_chip { struct gpio_latch_chip {

2
target/linux/ath79/mikrotik/config-default
View File

@ -3,7 +3,7 @@ CONFIG_CRYPTO_DEFLATE=y
CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HASH_INFO=y
CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_LZO=y
CONFIG_CRYPTO_ZSTD=y CONFIG_CRYPTO_ZSTD=y
CONFIG_GPIO_LATCH=y CONFIG_GPIO_LATCH_MIKROTIK=y
CONFIG_GPIO_RB4XX=y CONFIG_GPIO_RB4XX=y
CONFIG_GPIO_RB91X_KEY=y CONFIG_GPIO_RB91X_KEY=y
CONFIG_GPIO_WATCHDOG=y CONFIG_GPIO_WATCHDOG=y

4
target/linux/ath79/patches-6.1/911-mikrotik-rb91x.patch
View File

@ -33,7 +33,7 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
If unsure, say N. If unsure, say N.
+config GPIO_LATCH +config GPIO_LATCH_MIKROTIK
+ tristate "MikroTik RouterBOARD GPIO latch support" + tristate "MikroTik RouterBOARD GPIO latch support"
+ depends on ATH79 + depends on ATH79
+ help + help
@ -59,7 +59,7 @@ Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o obj-$(CONFIG_GPIO_IXP4XX) += gpio-ixp4xx.o
obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o obj-$(CONFIG_GPIO_JANZ_TTL) += gpio-janz-ttl.o
obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o obj-$(CONFIG_GPIO_KEMPLD) += gpio-kempld.o
+obj-$(CONFIG_GPIO_LATCH) += gpio-latch.o +obj-$(CONFIG_GPIO_LATCH_MIKROTIK) += gpio-latch-mikrotik.o
obj-$(CONFIG_GPIO_LOGICVC) += gpio-logicvc.o obj-$(CONFIG_GPIO_LOGICVC) += gpio-logicvc.o
obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o obj-$(CONFIG_GPIO_LOONGSON1) += gpio-loongson1.o
obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o obj-$(CONFIG_GPIO_LOONGSON) += gpio-loongson.o