| Message ID | 20190528045152.1214203-2-hs@denx.de |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | pwm, imx: add Kconfig and DM support | expand |
On Tue, 2019-05-28 at 06:51 +0200, Heiko Schocher wrote: > add Kconfig support for this driver. > > Signed-off-by: Heiko Schocher <hs@denx.de> Acked-by: Martyn Welch <martyn.welch@collabora.co.uk> > --- > > README | 4 ---- > configs/aristainetos2_defconfig | 1 + > configs/aristainetos2b_defconfig | 1 + > configs/aristainetos_defconfig | 1 + > configs/dms-ba16-1g_defconfig | 1 + > configs/dms-ba16_defconfig | 1 + > configs/ge_bx50v3_defconfig | 1 + > configs/mx53ppd_defconfig | 1 + > configs/vining_2000_defconfig | 1 + > drivers/pwm/Kconfig | 5 +++++ > include/configs/advantech_dms-ba16.h | 1 - > include/configs/aristainetos-common.h | 1 - > include/configs/aristainetos2.h | 3 --- > include/configs/aristainetos2b.h | 3 --- > include/configs/ge_bx50v3.h | 1 - > include/configs/mx53ppd.h | 1 - > include/configs/vining_2000.h | 1 - > scripts/config_whitelist.txt | 1 - > 18 files changed, 13 insertions(+), 16 deletions(-) > > diff --git a/README b/README > index fd1e17c513..730e28db88 100644 > --- a/README > +++ b/README > @@ -964,10 +964,6 @@ The following options need to be configured: > CONFIG_SH_ETHER_CACHE_WRITEBACK > If this option is set, the driver enables cache > flush. > > -- PWM Support: > - CONFIG_PWM_IMX > - Support for PWM module on the imx6. > - > - TPM Support: > CONFIG_TPM > Support TPM devices. > diff --git a/configs/aristainetos2_defconfig > b/configs/aristainetos2_defconfig > index 87a8678233..8bd1be4e05 100644 > --- a/configs/aristainetos2_defconfig > +++ b/configs/aristainetos2_defconfig > @@ -50,6 +50,7 @@ CONFIG_PHYLIB=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_MII=y > +CONFIG_PWM_IMX=y > CONFIG_SPI=y > CONFIG_MXC_SPI=y > CONFIG_USB=y > diff --git a/configs/aristainetos2b_defconfig > b/configs/aristainetos2b_defconfig > index 256d7229ba..ed9faa74f0 100644 > --- a/configs/aristainetos2b_defconfig > +++ b/configs/aristainetos2b_defconfig > @@ -48,6 +48,7 @@ CONFIG_PHYLIB=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ90X1=y > CONFIG_MII=y > +CONFIG_PWM_IMX=y > CONFIG_SPI=y > CONFIG_MXC_SPI=y > CONFIG_USB=y > diff --git a/configs/aristainetos_defconfig > b/configs/aristainetos_defconfig > index 44b30e33e8..e67aded809 100644 > --- a/configs/aristainetos_defconfig > +++ b/configs/aristainetos_defconfig > @@ -49,6 +49,7 @@ CONFIG_PHYLIB=y > CONFIG_PHY_MICREL=y > CONFIG_PHY_MICREL_KSZ8XXX=y > CONFIG_MII=y > +CONFIG_PWM_IMX=y > CONFIG_SPI=y > CONFIG_MXC_SPI=y > CONFIG_USB=y > diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16- > 1g_defconfig > index 980f7b4abb..5c06a4f03d 100644 > --- a/configs/dms-ba16-1g_defconfig > +++ b/configs/dms-ba16-1g_defconfig > @@ -41,6 +41,7 @@ CONFIG_SPI_FLASH_STMICRO=y > CONFIG_SPI_FLASH_WINBOND=y > CONFIG_PHYLIB=y > CONFIG_MII=y > +CONFIG_PWM_IMX=y > CONFIG_SPI=y > CONFIG_MXC_SPI=y > CONFIG_USB=y > diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig > index bea75b5d23..bc518f9fed 100644 > --- a/configs/dms-ba16_defconfig > +++ b/configs/dms-ba16_defconfig > @@ -40,6 +40,7 @@ CONFIG_SPI_FLASH_STMICRO=y > CONFIG_SPI_FLASH_WINBOND=y > CONFIG_PHYLIB=y > CONFIG_MII=y > +CONFIG_PWM_IMX=y > CONFIG_SPI=y > CONFIG_MXC_SPI=y > CONFIG_USB=y > diff --git a/configs/ge_bx50v3_defconfig > b/configs/ge_bx50v3_defconfig > index 3111451162..6adad7a995 100644 > --- a/configs/ge_bx50v3_defconfig > +++ b/configs/ge_bx50v3_defconfig > @@ -55,6 +55,7 @@ CONFIG_CMD_E1000=y > CONFIG_MII=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_IMX6=y > +CONFIG_PWM_IMX=y > CONFIG_SPI=y > CONFIG_DM_SPI=y > CONFIG_MXC_SPI=y > diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig > index 6c3818d845..b9ed46617b 100644 > --- a/configs/mx53ppd_defconfig > +++ b/configs/mx53ppd_defconfig > @@ -43,6 +43,7 @@ CONFIG_FSL_ESDHC=y > CONFIG_MII=y > CONFIG_PINCTRL=y > CONFIG_PINCTRL_IMX5=y > +CONFIG_PWM_IMX=y > CONFIG_RTC_S35392A=y > CONFIG_USB=y > CONFIG_USB_EHCI_MX5=y > diff --git a/configs/vining_2000_defconfig > b/configs/vining_2000_defconfig > index 073ff48329..0d87cd1431 100644 > --- a/configs/vining_2000_defconfig > +++ b/configs/vining_2000_defconfig > @@ -37,6 +37,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y > CONFIG_FSL_ESDHC=y > CONFIG_PHYLIB=y > CONFIG_MII=y > +CONFIG_PWM_IMX=y > CONFIG_PCI=y > CONFIG_USB=y > CONFIG_USB_STORAGE=y > diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig > index 2984b79766..1f36fc78fa 100644 > --- a/drivers/pwm/Kconfig > +++ b/drivers/pwm/Kconfig > @@ -18,6 +18,11 @@ config PWM_EXYNOS > used. It provides 5 channels which can be independently > programmed. Channel 4 (the last) is normally used as a timer. > > +config PWM_IMX > + bool "Enable support for i.MX27 and later PWM" > + help > + This PWM is found i.MX27 and later i.MX SoCs. > + > config PWM_ROCKCHIP > bool "Enable support for the Rockchip PWM" > depends on DM_PWM > diff --git a/include/configs/advantech_dms-ba16.h > b/include/configs/advantech_dms-ba16.h > index 22d1e41bc8..a037349162 100644 > --- a/include/configs/advantech_dms-ba16.h > +++ b/include/configs/advantech_dms-ba16.h > @@ -223,7 +223,6 @@ > #define CONFIG_IMX_VIDEO_SKIP > #endif > > -#define CONFIG_PWM_IMX > #define CONFIG_IMX6_PWM_PER_CLK 66000000 > > #ifdef CONFIG_CMD_PCI > diff --git a/include/configs/aristainetos-common.h > b/include/configs/aristainetos-common.h > index a24814673c..e998d9b1b2 100644 > --- a/include/configs/aristainetos-common.h > +++ b/include/configs/aristainetos-common.h > @@ -196,7 +196,6 @@ > #define CONFIG_VIDEO_BMP_LOGO > #define CONFIG_IMX_VIDEO_SKIP > > -#define CONFIG_PWM_IMX > #define CONFIG_IMX6_PWM_PER_CLK 66000000 > > #endif /* __ARISTAINETOS_COMMON_CONFIG_H */ > diff --git a/include/configs/aristainetos2.h > b/include/configs/aristainetos2.h > index 00e5667499..361e6ac654 100644 > --- a/include/configs/aristainetos2.h > +++ b/include/configs/aristainetos2.h > @@ -45,9 +45,6 @@ > #define CONFIG_LG4573_BUS 0 > #define CONFIG_LG4573_CS 0 > > -#define CONFIG_PWM_IMX > -#define CONFIG_IMX6_PWM_PER_CLK 66000000 > - > #include "aristainetos-common.h" > > #endif /* __ARISTAINETOS2_CONFIG_H */ > diff --git a/include/configs/aristainetos2b.h > b/include/configs/aristainetos2b.h > index cfe0e053b6..cdeb7a3b03 100644 > --- a/include/configs/aristainetos2b.h > +++ b/include/configs/aristainetos2b.h > @@ -45,9 +45,6 @@ > #define CONFIG_LG4573_BUS 0 > #define CONFIG_LG4573_CS 1 > > -#define CONFIG_PWM_IMX > -#define CONFIG_IMX6_PWM_PER_CLK 66000000 > - > #include "aristainetos-common.h" > > #endif /* __ARISTAINETOS2B_CONFIG_H */ > diff --git a/include/configs/ge_bx50v3.h > b/include/configs/ge_bx50v3.h > index 0481ed06a9..31214a6aa7 100644 > --- a/include/configs/ge_bx50v3.h > +++ b/include/configs/ge_bx50v3.h > @@ -198,7 +198,6 @@ > #define CONFIG_IMX_VIDEO_SKIP > #define CONFIG_CMD_BMP > > -#define CONFIG_PWM_IMX > #define CONFIG_IMX6_PWM_PER_CLK 66000000 > > #define CONFIG_PCI > diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h > index 2d6715cba2..d5b54dfa15 100644 > --- a/include/configs/mx53ppd.h > +++ b/include/configs/mx53ppd.h > @@ -211,7 +211,6 @@ > #define CONFIG_BCH > > /* Backlight Control */ > -#define CONFIG_PWM_IMX > #define CONFIG_IMX6_PWM_PER_CLK 66666000 > > #endif /* __CONFIG_H */ > diff --git a/include/configs/vining_2000.h > b/include/configs/vining_2000.h > index fd98c1417e..bce038c7a1 100644 > --- a/include/configs/vining_2000.h > +++ b/include/configs/vining_2000.h > @@ -86,7 +86,6 @@ > > #define CONFIG_IMX_THERMAL > > -#define CONFIG_PWM_IMX > #define CONFIG_IMX6_PWM_PER_CLK 66000000 > > #define CONFIG_ENV_OFFSET (8 * SZ_64K) > diff --git a/scripts/config_whitelist.txt > b/scripts/config_whitelist.txt > index 5ec4ffbeae..e1bf930be3 100644 > --- a/scripts/config_whitelist.txt > +++ b/scripts/config_whitelist.txt > @@ -1512,7 +1512,6 @@ CONFIG_PROOF_POINTS > CONFIG_PRPMC_PCI_ALIAS > CONFIG_PSRAM_SCFG > CONFIG_PWM > -CONFIG_PWM_IMX > CONFIG_PXA_LCD > CONFIG_PXA_MMC_GENERIC > CONFIG_PXA_PWR_I2C
> add Kconfig support for this driver. > Signed-off-by: Heiko Schocher <hs@denx.de> > Acked-by: Martyn Welch <martyn.welch@collabora.co.uk> Applied to u-boot-imx, master, thanks ! Best regards, Stefano Babic
diff --git a/README b/README index fd1e17c513..730e28db88 100644 --- a/README +++ b/README @@ -964,10 +964,6 @@ The following options need to be configured: CONFIG_SH_ETHER_CACHE_WRITEBACK If this option is set, the driver enables cache flush. -- PWM Support: - CONFIG_PWM_IMX - Support for PWM module on the imx6. - - TPM Support: CONFIG_TPM Support TPM devices. diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig index 87a8678233..8bd1be4e05 100644 --- a/configs/aristainetos2_defconfig +++ b/configs/aristainetos2_defconfig @@ -50,6 +50,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_MII=y +CONFIG_PWM_IMX=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig index 256d7229ba..ed9faa74f0 100644 --- a/configs/aristainetos2b_defconfig +++ b/configs/aristainetos2b_defconfig @@ -48,6 +48,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ90X1=y CONFIG_MII=y +CONFIG_PWM_IMX=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y diff --git a/configs/aristainetos_defconfig b/configs/aristainetos_defconfig index 44b30e33e8..e67aded809 100644 --- a/configs/aristainetos_defconfig +++ b/configs/aristainetos_defconfig @@ -49,6 +49,7 @@ CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y CONFIG_PHY_MICREL_KSZ8XXX=y CONFIG_MII=y +CONFIG_PWM_IMX=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y diff --git a/configs/dms-ba16-1g_defconfig b/configs/dms-ba16-1g_defconfig index 980f7b4abb..5c06a4f03d 100644 --- a/configs/dms-ba16-1g_defconfig +++ b/configs/dms-ba16-1g_defconfig @@ -41,6 +41,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y CONFIG_MII=y +CONFIG_PWM_IMX=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y diff --git a/configs/dms-ba16_defconfig b/configs/dms-ba16_defconfig index bea75b5d23..bc518f9fed 100644 --- a/configs/dms-ba16_defconfig +++ b/configs/dms-ba16_defconfig @@ -40,6 +40,7 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SPI_FLASH_WINBOND=y CONFIG_PHYLIB=y CONFIG_MII=y +CONFIG_PWM_IMX=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_USB=y diff --git a/configs/ge_bx50v3_defconfig b/configs/ge_bx50v3_defconfig index 3111451162..6adad7a995 100644 --- a/configs/ge_bx50v3_defconfig +++ b/configs/ge_bx50v3_defconfig @@ -55,6 +55,7 @@ CONFIG_CMD_E1000=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX6=y +CONFIG_PWM_IMX=y CONFIG_SPI=y CONFIG_DM_SPI=y CONFIG_MXC_SPI=y diff --git a/configs/mx53ppd_defconfig b/configs/mx53ppd_defconfig index 6c3818d845..b9ed46617b 100644 --- a/configs/mx53ppd_defconfig +++ b/configs/mx53ppd_defconfig @@ -43,6 +43,7 @@ CONFIG_FSL_ESDHC=y CONFIG_MII=y CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX5=y +CONFIG_PWM_IMX=y CONFIG_RTC_S35392A=y CONFIG_USB=y CONFIG_USB_EHCI_MX5=y diff --git a/configs/vining_2000_defconfig b/configs/vining_2000_defconfig index 073ff48329..0d87cd1431 100644 --- a/configs/vining_2000_defconfig +++ b/configs/vining_2000_defconfig @@ -37,6 +37,7 @@ CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_FSL_ESDHC=y CONFIG_PHYLIB=y CONFIG_MII=y +CONFIG_PWM_IMX=y CONFIG_PCI=y CONFIG_USB=y CONFIG_USB_STORAGE=y diff --git a/drivers/pwm/Kconfig b/drivers/pwm/Kconfig index 2984b79766..1f36fc78fa 100644 --- a/drivers/pwm/Kconfig +++ b/drivers/pwm/Kconfig @@ -18,6 +18,11 @@ config PWM_EXYNOS used. It provides 5 channels which can be independently programmed. Channel 4 (the last) is normally used as a timer. +config PWM_IMX + bool "Enable support for i.MX27 and later PWM" + help + This PWM is found i.MX27 and later i.MX SoCs. + config PWM_ROCKCHIP bool "Enable support for the Rockchip PWM" depends on DM_PWM diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index 22d1e41bc8..a037349162 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -223,7 +223,6 @@ #define CONFIG_IMX_VIDEO_SKIP #endif -#define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 #ifdef CONFIG_CMD_PCI diff --git a/include/configs/aristainetos-common.h b/include/configs/aristainetos-common.h index a24814673c..e998d9b1b2 100644 --- a/include/configs/aristainetos-common.h +++ b/include/configs/aristainetos-common.h @@ -196,7 +196,6 @@ #define CONFIG_VIDEO_BMP_LOGO #define CONFIG_IMX_VIDEO_SKIP -#define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 #endif /* __ARISTAINETOS_COMMON_CONFIG_H */ diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 00e5667499..361e6ac654 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -45,9 +45,6 @@ #define CONFIG_LG4573_BUS 0 #define CONFIG_LG4573_CS 0 -#define CONFIG_PWM_IMX -#define CONFIG_IMX6_PWM_PER_CLK 66000000 - #include "aristainetos-common.h" #endif /* __ARISTAINETOS2_CONFIG_H */ diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h index cfe0e053b6..cdeb7a3b03 100644 --- a/include/configs/aristainetos2b.h +++ b/include/configs/aristainetos2b.h @@ -45,9 +45,6 @@ #define CONFIG_LG4573_BUS 0 #define CONFIG_LG4573_CS 1 -#define CONFIG_PWM_IMX -#define CONFIG_IMX6_PWM_PER_CLK 66000000 - #include "aristainetos-common.h" #endif /* __ARISTAINETOS2B_CONFIG_H */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 0481ed06a9..31214a6aa7 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -198,7 +198,6 @@ #define CONFIG_IMX_VIDEO_SKIP #define CONFIG_CMD_BMP -#define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 #define CONFIG_PCI diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 2d6715cba2..d5b54dfa15 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -211,7 +211,6 @@ #define CONFIG_BCH /* Backlight Control */ -#define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66666000 #endif /* __CONFIG_H */ diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index fd98c1417e..bce038c7a1 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -86,7 +86,6 @@ #define CONFIG_IMX_THERMAL -#define CONFIG_PWM_IMX #define CONFIG_IMX6_PWM_PER_CLK 66000000 #define CONFIG_ENV_OFFSET (8 * SZ_64K) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 5ec4ffbeae..e1bf930be3 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1512,7 +1512,6 @@ CONFIG_PROOF_POINTS CONFIG_PRPMC_PCI_ALIAS CONFIG_PSRAM_SCFG CONFIG_PWM -CONFIG_PWM_IMX CONFIG_PXA_LCD CONFIG_PXA_MMC_GENERIC CONFIG_PXA_PWR_I2C
add Kconfig support for this driver. Signed-off-by: Heiko Schocher <hs@denx.de> --- README | 4 ---- configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/ge_bx50v3_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/vining_2000_defconfig | 1 + drivers/pwm/Kconfig | 5 +++++ include/configs/advantech_dms-ba16.h | 1 - include/configs/aristainetos-common.h | 1 - include/configs/aristainetos2.h | 3 --- include/configs/aristainetos2b.h | 3 --- include/configs/ge_bx50v3.h | 1 - include/configs/mx53ppd.h | 1 - include/configs/vining_2000.h | 1 - scripts/config_whitelist.txt | 1 - 18 files changed, 13 insertions(+), 16 deletions(-)