Skip to content

Commit 2ad26b7

Browse files
nunojsabebarino
authored andcommitted
include: linux: move adi-axi-common.h out of fpga
The adi-axi-common.h header has some common defines used in various ADI IPs. However they are not specific for any fpga manager so it's questionable for the header to live under include/linux/fpga. Hence let's just move one directory up and update all users. Suggested-by: Xu Yilun <[email protected]> Acked-by: Xu Yilun <[email protected]> Acked-by: Jonathan Cameron <[email protected]> # for IIO Signed-off-by: Nuno Sá <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Mark Brown <[email protected]> Acked-by: Uwe Kleine-König <[email protected]> Reviewed-by: David Lechner <[email protected]> Signed-off-by: Stephen Boyd <[email protected]>
1 parent 9933b83 commit 2ad26b7

File tree

7 files changed

+6
-7
lines changed

7 files changed

+6
-7
lines changed

drivers/dma/dma-axi-dmac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Author: Lars-Peter Clausen <[email protected]>
77
*/
88

9+
#include <linux/adi-axi-common.h>
910
#include <linux/bitfield.h>
1011
#include <linux/clk.h>
1112
#include <linux/device.h>
@@ -22,7 +23,6 @@
2223
#include <linux/platform_device.h>
2324
#include <linux/regmap.h>
2425
#include <linux/slab.h>
25-
#include <linux/fpga/adi-axi-common.h>
2626

2727
#include <dt-bindings/dma/axi-dmac.h>
2828

drivers/hwmon/axi-fan-control.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
*
55
* Copyright 2019 Analog Devices Inc.
66
*/
7+
#include <linux/adi-axi-common.h>
78
#include <linux/bits.h>
89
#include <linux/clk.h>
9-
#include <linux/fpga/adi-axi-common.h>
1010
#include <linux/hwmon.h>
1111
#include <linux/hwmon-sysfs.h>
1212
#include <linux/interrupt.h>

drivers/iio/adc/adi-axi-adc.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
* Copyright 2012-2020 Analog Devices Inc.
77
*/
88

9+
#include <linux/adi-axi-common.h>
910
#include <linux/bitfield.h>
1011
#include <linux/cleanup.h>
1112
#include <linux/clk.h>
@@ -20,8 +21,6 @@
2021
#include <linux/regmap.h>
2122
#include <linux/slab.h>
2223

23-
#include <linux/fpga/adi-axi-common.h>
24-
2524
#include <linux/iio/backend.h>
2625
#include <linux/iio/buffer-dmaengine.h>
2726
#include <linux/iio/buffer.h>

drivers/iio/dac/adi-axi-dac.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
*
66
* Copyright 2016-2024 Analog Devices Inc.
77
*/
8+
#include <linux/adi-axi-common.h>
89
#include <linux/bitfield.h>
910
#include <linux/bits.h>
1011
#include <linux/cleanup.h>
@@ -23,7 +24,6 @@
2324
#include <linux/regmap.h>
2425
#include <linux/units.h>
2526

26-
#include <linux/fpga/adi-axi-common.h>
2727
#include <linux/iio/backend.h>
2828
#include <linux/iio/buffer-dmaengine.h>
2929
#include <linux/iio/buffer.h>

drivers/pwm/pwm-axi-pwmgen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
* - Supports normal polarity. Does not support changing polarity.
1919
* - On disable, the PWM output becomes low (inactive).
2020
*/
21+
#include <linux/adi-axi-common.h>
2122
#include <linux/bits.h>
2223
#include <linux/clk.h>
2324
#include <linux/err.h>
24-
#include <linux/fpga/adi-axi-common.h>
2525
#include <linux/io.h>
2626
#include <linux/minmax.h>
2727
#include <linux/module.h>

drivers/spi/spi-axi-spi-engine.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
* Author: Lars-Peter Clausen <[email protected]>
77
*/
88

9+
#include <linux/adi-axi-common.h>
910
#include <linux/bitfield.h>
1011
#include <linux/bitops.h>
1112
#include <linux/clk.h>
1213
#include <linux/completion.h>
1314
#include <linux/dmaengine.h>
14-
#include <linux/fpga/adi-axi-common.h>
1515
#include <linux/interrupt.h>
1616
#include <linux/io.h>
1717
#include <linux/iopoll.h>
File renamed without changes.

0 commit comments

Comments
 (0)