summaryrefslogtreecommitdiff
path: root/include/dm
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-12-05 15:06:24 -0500
committerTom Rini <trini@konsulko.com>2018-12-05 15:06:24 -0500
commit9450ab2ba8d720bd9f73bccc0af2e2b5a2c2aaf1 (patch)
treeb0566746ed9a8dd261e61113c19cf0a234a6417b /include/dm
parenta77a8fde7bb850178c2e4ad3db354b536114ea32 (diff)
parent08898e8b22d74a4511eadee9b06b11aab43e809c (diff)
Merge branch 'master' of git://git.denx.de/u-boot-spi
- Various MTD fixes from Boris - Zap various unused / legacy paths. - pxa3xx NAND update from Miquel Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/dm')
-rw-r--r--include/dm/platform_data/spi_pl022.h (renamed from include/dm/platform_data/pl022_spi.h)13
1 files changed, 3 insertions, 10 deletions
diff --git a/include/dm/platform_data/pl022_spi.h b/include/dm/platform_data/spi_pl022.h
index 77fe6da3cb2..63a58ee4535 100644
--- a/include/dm/platform_data/pl022_spi.h
+++ b/include/dm/platform_data/spi_pl022.h
@@ -7,22 +7,15 @@
* in ofdata_to_platdata.
*/
-#ifndef __PL022_SPI_H__
-#define __PL022_SPI_H__
+#ifndef __spi_pl022_h
+#define __spi_pl022_h
-#if !CONFIG_IS_ENABLED(OF_PLATDATA)
-#include <clk.h>
-#endif
#include <fdtdec.h>
struct pl022_spi_pdata {
fdt_addr_t addr;
fdt_size_t size;
-#if !CONFIG_IS_ENABLED(OF_PLATDATA)
- struct clk clk;
-#else
unsigned int freq;
-#endif
};
-#endif
+#endif /* __spi_pl022_h */