Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d414570 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "soundwire: update soundwire driver for 32 bit environment"

parents 4ebfda2b da1042b2

drivers/soundwire/soundwire.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -143,7 +143,7 @@ int of_register_swr_devices(struct swr_master *master) 




	for_each_available_child_of_node(master->dev.of_node, node) {

	for_each_available_child_of_node(master->dev.of_node, node) {

		struct swr_boardinfo info = {};

		struct swr_boardinfo info = {};

		phys_addr_t addr;

		u64 addr;





		dev_dbg(&master->dev, "of_swr:register %s\n", node->full_name);

		dev_dbg(&master->dev, "of_swr:register %s\n", node->full_name);

include/linux/soundwire/soundwire.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -214,7 +214,7 @@ static inline struct swr_driver *to_swr_driver(struct device_driver *drv) 
struct swr_boardinfo {

struct swr_boardinfo {

	char               name[SOUNDWIRE_NAME_SIZE];

	char               name[SOUNDWIRE_NAME_SIZE];

	int                bus_num;

	int                bus_num;

	unsigned long      addr;

	u64		   addr;

	struct device_node *of_node;

	struct device_node *of_node;

	struct swr_device  *swr_slave;

	struct swr_device  *swr_slave;

};

};