Commit 9cd02b09 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Merge tag 'soundwire-5.3-rc5' of...

Merge tag 'soundwire-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-linus

Vinod writes:

soundwire fixes for v5.3-rc5

Pierre sent fixes which are queued now for v5.3-rc5 are:
 - regmap dependecy
 - cadence register definitions

* tag 'soundwire-5.3-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire:
  soundwire: fix regmap dependencies and align with other serial links
  soundwire: cadence_master: fix definitions for INTSTAT0/1
  soundwire: cadence_master: fix register definition for SLAVE_STATE
parents 01fd150f 8676b3ca
...@@ -44,7 +44,7 @@ config REGMAP_IRQ ...@@ -44,7 +44,7 @@ config REGMAP_IRQ
config REGMAP_SOUNDWIRE config REGMAP_SOUNDWIRE
tristate tristate
depends on SOUNDWIRE_BUS depends on SOUNDWIRE
config REGMAP_SCCB config REGMAP_SCCB
tristate tristate
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
# #
menuconfig SOUNDWIRE menuconfig SOUNDWIRE
bool "SoundWire support" tristate "SoundWire support"
help help
SoundWire is a 2-Pin interface with data and clock line ratified SoundWire is a 2-Pin interface with data and clock line ratified
by the MIPI Alliance. SoundWire is used for transporting data by the MIPI Alliance. SoundWire is used for transporting data
...@@ -17,17 +17,12 @@ if SOUNDWIRE ...@@ -17,17 +17,12 @@ if SOUNDWIRE
comment "SoundWire Devices" comment "SoundWire Devices"
config SOUNDWIRE_BUS
tristate
select REGMAP_SOUNDWIRE
config SOUNDWIRE_CADENCE config SOUNDWIRE_CADENCE
tristate tristate
config SOUNDWIRE_INTEL config SOUNDWIRE_INTEL
tristate "Intel SoundWire Master driver" tristate "Intel SoundWire Master driver"
select SOUNDWIRE_CADENCE select SOUNDWIRE_CADENCE
select SOUNDWIRE_BUS
depends on X86 && ACPI && SND_SOC depends on X86 && ACPI && SND_SOC
help help
SoundWire Intel Master driver. SoundWire Intel Master driver.
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Bus Objs #Bus Objs
soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.o soundwire-bus-objs := bus_type.o bus.o slave.o mipi_disco.o stream.o
obj-$(CONFIG_SOUNDWIRE_BUS) += soundwire-bus.o obj-$(CONFIG_SOUNDWIRE) += soundwire-bus.o
#Cadence Objs #Cadence Objs
soundwire-cadence-objs := cadence_master.o soundwire-cadence-objs := cadence_master.o
......
...@@ -81,8 +81,8 @@ ...@@ -81,8 +81,8 @@
#define CDNS_MCP_INTSET 0x4C #define CDNS_MCP_INTSET 0x4C
#define CDNS_SDW_SLAVE_STAT 0x50 #define CDNS_MCP_SLAVE_STAT 0x50
#define CDNS_MCP_SLAVE_STAT_MASK BIT(1, 0) #define CDNS_MCP_SLAVE_STAT_MASK GENMASK(1, 0)
#define CDNS_MCP_SLAVE_INTSTAT0 0x54 #define CDNS_MCP_SLAVE_INTSTAT0 0x54
#define CDNS_MCP_SLAVE_INTSTAT1 0x58 #define CDNS_MCP_SLAVE_INTSTAT1 0x58
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
#define CDNS_MCP_SLAVE_INTMASK0 0x5C #define CDNS_MCP_SLAVE_INTMASK0 0x5C
#define CDNS_MCP_SLAVE_INTMASK1 0x60 #define CDNS_MCP_SLAVE_INTMASK1 0x60
#define CDNS_MCP_SLAVE_INTMASK0_MASK GENMASK(30, 0) #define CDNS_MCP_SLAVE_INTMASK0_MASK GENMASK(31, 0)
#define CDNS_MCP_SLAVE_INTMASK1_MASK GENMASK(16, 0) #define CDNS_MCP_SLAVE_INTMASK1_MASK GENMASK(15, 0)
#define CDNS_MCP_PORT_INTSTAT 0x64 #define CDNS_MCP_PORT_INTSTAT 0x64
#define CDNS_MCP_PDI_STAT 0x6C #define CDNS_MCP_PDI_STAT 0x6C
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment