diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-03-07 14:23:37 +0100 |
| commit | 63557eb99211a4d1e5f722255a2f9fd0a1e7c6ae (patch) | |
| tree | 1c23d2aca9a2fa5374c82b8cd6119c498c6983f8 /include | |
| parent | eae7bc9688f80eb105d159d544391dbd16be27fe (diff) | |
| parent | 4902e6c5e3be35f5653b304f4b578026473c91a3 (diff) | |
| download | barebox-63557eb99211a4d1e5f722255a2f9fd0a1e7c6ae.tar.gz barebox-63557eb99211a4d1e5f722255a2f9fd0a1e7c6ae.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/driver.h | 4 | ||||
| -rw-r--r-- | include/linux/phy.h | 2 | ||||
| -rw-r--r-- | include/printk.h | 19 |
3 files changed, 17 insertions, 8 deletions
diff --git a/include/driver.h b/include/driver.h index a8e046ed7f..3479e18194 100644 --- a/include/driver.h +++ b/include/driver.h @@ -352,10 +352,6 @@ struct cdev; /* These are used by drivers which work with direct memory accesses */ ssize_t mem_read(struct cdev *cdev, void *buf, size_t count, loff_t offset, ulong flags); ssize_t mem_write(struct cdev *cdev, const void *buf, size_t count, loff_t offset, ulong flags); -int mem_memmap(struct cdev *cdev, void **map, int flags); - -/* Use this if you have nothing to do in your drivers probe function */ -int dummy_probe(struct device_d *); int generic_memmap_ro(struct cdev *dev, void **map, int flags); int generic_memmap_rw(struct cdev *dev, void **map, int flags); diff --git a/include/linux/phy.h b/include/linux/phy.h index 5081ebacb3..82c8da03ce 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -66,6 +66,8 @@ typedef enum { PHY_INTERFACE_MODE_XAUI, /* 10GBASE-KR, XFI, SFI - single lane 10G Serdes */ PHY_INTERFACE_MODE_10GKR, + PHY_INTERFACE_MODE_SGMII_2500, + PHY_INTERFACE_MODE_NONE, PHY_INTERFACE_MODE_MAX, } phy_interface_t; diff --git a/include/printk.h b/include/printk.h index ab2c64cf3c..b0d5d09f83 100644 --- a/include/printk.h +++ b/include/printk.h @@ -134,10 +134,21 @@ extern struct list_head barebox_logbuf; extern void log_clean(unsigned int limit); -#define BAREBOX_LOG_PRINT_TIME (1 << 0) -#define BAREBOX_LOG_DIFF_TIME (1 << 1) - -void log_print(unsigned flags); +#define BAREBOX_LOG_PRINT_RAW BIT(2) +#define BAREBOX_LOG_DIFF_TIME BIT(1) +#define BAREBOX_LOG_PRINT_TIME BIT(0) + +#define BAREBOX_LOG_PRINT_VDEBUG BIT(8) +#define BAREBOX_LOG_PRINT_DEBUG BIT(7) +#define BAREBOX_LOG_PRINT_INFO BIT(6) +#define BAREBOX_LOG_PRINT_NOTICE BIT(5) +#define BAREBOX_LOG_PRINT_WARNING BIT(4) +#define BAREBOX_LOG_PRINT_ERR BIT(3) +#define BAREBOX_LOG_PRINT_CRIT BIT(2) +#define BAREBOX_LOG_PRINT_ALERT BIT(1) +#define BAREBOX_LOG_PRINT_EMERG BIT(0) + +void log_print(unsigned flags, unsigned levels); struct va_format { const char *fmt; |