From 50d33825b61a3c102dcfce117692b048ec819cf6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
Date: Thu, 19 May 2022 20:11:08 +0200
Subject: [PATCH] bcm27xx: enable PWM drivers in config
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Removes PWM module package.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 target/linux/bcm27xx/bcm2708/config-5.15 |  6 ++++++
 target/linux/bcm27xx/bcm2709/config-5.15 |  4 ++++
 target/linux/bcm27xx/bcm2710/config-5.15 |  4 ++++
 target/linux/bcm27xx/bcm2711/config-5.15 |  4 ++++
 target/linux/bcm27xx/modules/other.mk    | 18 ------------------
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/target/linux/bcm27xx/bcm2708/config-5.15 b/target/linux/bcm27xx/bcm2708/config-5.15
index 84b16b4a7a..a38d8ea951 100644
--- a/target/linux/bcm27xx/bcm2708/config-5.15
+++ b/target/linux/bcm27xx/bcm2708/config-5.15
@@ -132,6 +132,7 @@ CONFIG_EDAC_SUPPORT=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_EXTCON=y
 CONFIG_F2FS_FS=y
 CONFIG_FB=y
 CONFIG_FB_BCM2708=y
@@ -212,6 +213,7 @@ CONFIG_JBD2=y
 CONFIG_KERNEL_GZIP=y
 # CONFIG_KERNEL_XZ is not set
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGER_ACTPWR=y
 CONFIG_LEDS_TRIGGER_INPUT=y
 CONFIG_LIBFDT=y
@@ -288,6 +290,9 @@ CONFIG_PM_SLEEP=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_PWM=y
+CONFIG_PWM_BCM2835=y
+CONFIG_PWM_SYSFS=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
 CONFIG_RATIONAL=y
@@ -348,6 +353,7 @@ CONFIG_USB_COMMON=y
 CONFIG_USB_DWCOTG=y
 CONFIG_USB_NET_DRIVERS=y
 CONFIG_USB_NET_SMSC95XX=y
+CONFIG_USB_PHY=y
 CONFIG_USB_STORAGE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UAS=y
diff --git a/target/linux/bcm27xx/bcm2709/config-5.15 b/target/linux/bcm27xx/bcm2709/config-5.15
index 35452dd33d..ce8473e71b 100644
--- a/target/linux/bcm27xx/bcm2709/config-5.15
+++ b/target/linux/bcm27xx/bcm2709/config-5.15
@@ -268,6 +268,7 @@ CONFIG_KEYS=y
 CONFIG_KMAP_LOCAL=y
 CONFIG_KMAP_LOCAL_NON_LINEAR_PTE_ARRAY=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGER_ACTPWR=y
 CONFIG_LEDS_TRIGGER_INPUT=y
 CONFIG_LIBFDT=y
@@ -365,6 +366,9 @@ CONFIG_PM_SLEEP_SMP=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_PWM=y
+CONFIG_PWM_BCM2835=y
+CONFIG_PWM_SYSFS=y
 CONFIG_RAS=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
 CONFIG_RASPBERRYPI_POWER=y
diff --git a/target/linux/bcm27xx/bcm2710/config-5.15 b/target/linux/bcm27xx/bcm2710/config-5.15
index bd7cbea350..af6629241b 100644
--- a/target/linux/bcm27xx/bcm2710/config-5.15
+++ b/target/linux/bcm27xx/bcm2710/config-5.15
@@ -256,6 +256,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_KEYS=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGER_ACTPWR=y
 CONFIG_LEDS_TRIGGER_INPUT=y
 CONFIG_LIBFDT=y
@@ -345,6 +346,9 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_PWM=y
+CONFIG_PWM_BCM2835=y
+CONFIG_PWM_SYSFS=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_RASPBERRYPI_FIRMWARE=y
diff --git a/target/linux/bcm27xx/bcm2711/config-5.15 b/target/linux/bcm27xx/bcm2711/config-5.15
index 834b1b33ed..af0496e0f8 100644
--- a/target/linux/bcm27xx/bcm2711/config-5.15
+++ b/target/linux/bcm27xx/bcm2711/config-5.15
@@ -263,6 +263,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_JBD2=y
 CONFIG_KEYS=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_PWM=y
 CONFIG_LEDS_TRIGGER_ACTPWR=y
 CONFIG_LEDS_TRIGGER_INPUT=y
 CONFIG_LIBFDT=y
@@ -355,6 +356,9 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_PRINTK_TIME=y
 CONFIG_PTP_1588_CLOCK_OPTIONAL=y
+CONFIG_PWM=y
+CONFIG_PWM_BCM2835=y
+CONFIG_PWM_SYSFS=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
 CONFIG_RAS=y
diff --git a/target/linux/bcm27xx/modules/other.mk b/target/linux/bcm27xx/modules/other.mk
index 5f37e498d0..26e5989be4 100644
--- a/target/linux/bcm27xx/modules/other.mk
+++ b/target/linux/bcm27xx/modules/other.mk
@@ -2,24 +2,6 @@
 #
 # Copyright (C) 2019 OpenWrt.org
 
-define KernelPackage/pwm-bcm2835
-  SUBMENU:=$(OTHER_MENU)
-  TITLE:=BCM2835 PWM driver
-  KCONFIG:= \
-    CONFIG_PWM=y \
-    CONFIG_PWM_BCM2835
-  FILES:=$(LINUX_DIR)/drivers/pwm/pwm-bcm2835.ko
-  AUTOLOAD:=$(call AutoLoad,60,pwm-bcm2835)
-  DEPENDS:=@TARGET_bcm27xx
-endef
-
-define KernelPackage/pwm-bcm2835/description
-  This package contains the PWM framework driver for BCM2835 controller (Raspberry Pi)
-endef
-
-$(eval $(call KernelPackage,pwm-bcm2835))
-
-
 define KernelPackage/pwm-raspberrypi-poe
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Raspberry Pi Firwmware PoE Hat PWM support
-- 
2.30.2