Skip to content

Fix GPIO Kconfig bug & add BT host driver #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 29, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@
reg = <0x1e72000 0x8000>; // 32K
};

ibt@1e789150 {
compatible = "bt-host";
reg = <0x1e789140 0x18>;
};

i2c0: i2c@1e78a040 {
compatible = "aspeed,ast2400-i2c", "i2c";
reg = <0x1e78a040 0x40>, <0x1e78a000 0x40>;
Expand Down
15 changes: 7 additions & 8 deletions drivers/gpio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@ config GPIO_ALTERA

If driver is built as a module it will be called gpio-altera.

config GPIO_ASPEED
bool "Aspeed AST2400 GPIO support"
depends on ARCH_ASPEED && OF
select GENERIC_IRQ_CHIP
help
Say Y here to support Aspeed AST2400 GPIO.

config GPIO_BCM_KONA
bool "Broadcom Kona GPIO"
depends on OF_GPIO && (ARCH_BCM_MOBILE || COMPILE_TEST)
Expand Down Expand Up @@ -968,14 +975,6 @@ config GPIO_SODAVILLE
select GENERIC_IRQ_CHIP
help
Say Y here to support Intel Sodaville GPIO.

config GPIO_ASPEED
bool "Aspeed AST2400 GPIO support"
depends on ARCH_ASPEED && OF
select GENERIC_IRQ_CHIP
help
Say Y here to support Aspeed AST2400 GPIO.

endmenu

menu "SPI GPIO expanders"
Expand Down
5 changes: 5 additions & 0 deletions drivers/misc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,11 @@ config VEXPRESS_SYSCFG
bus. System Configuration interface is one of the possible means
of generating transactions on this bus.

config ASPEED_BT_IPMI_HOST
tristate "BT IPMI host driver"
help
Support for the Aspeed BT ipmi host.

source "drivers/misc/c2port/Kconfig"
source "drivers/misc/eeprom/Kconfig"
source "drivers/misc/cb710/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/misc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ obj-$(CONFIG_GENWQE) += genwqe/
obj-$(CONFIG_ECHO) += echo/
obj-$(CONFIG_VEXPRESS_SYSCFG) += vexpress-syscfg.o
obj-$(CONFIG_CXL_BASE) += cxl/
obj-$(CONFIG_ASPEED_BT_IPMI_HOST) += bt-host.o
Loading