diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:47 +0100 |
| commit | 2a17e75a976d11c1712972d29813094b8020ac35 (patch) | |
| tree | ea0e991c927752937803d72a5411f7159365aa83 /include | |
| parent | a5f75fe8175aefec5b7cefaadc5359096c8eb22c (diff) | |
| parent | 7185b353c96e1e831533eeaaada06ad9bebf84a2 (diff) | |
| download | barebox-2a17e75a976d11c1712972d29813094b8020ac35.tar.gz barebox-2a17e75a976d11c1712972d29813094b8020ac35.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phy.h | 3 | ||||
| -rw-r--r-- | include/linux/types.h | 1 | ||||
| -rw-r--r-- | include/mtd/mtd-peb.h | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 5b2c63ff69..5081ebacb3 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -43,10 +43,12 @@ /* Interface Mode definitions */ typedef enum { PHY_INTERFACE_MODE_NA, + PHY_INTERFACE_MODE_INTERNAL, PHY_INTERFACE_MODE_MII, PHY_INTERFACE_MODE_GMII, PHY_INTERFACE_MODE_SGMII, PHY_INTERFACE_MODE_TBI, + PHY_INTERFACE_MODE_REVMII, PHY_INTERFACE_MODE_RMII, PHY_INTERFACE_MODE_RGMII, PHY_INTERFACE_MODE_RGMII_ID, @@ -55,6 +57,7 @@ typedef enum { PHY_INTERFACE_MODE_RTBI, PHY_INTERFACE_MODE_SMII, PHY_INTERFACE_MODE_XGMII, + PHY_INTERFACE_MODE_MOCA, PHY_INTERFACE_MODE_QSGMII, PHY_INTERFACE_MODE_TRGMII, PHY_INTERFACE_MODE_1000BASEX, diff --git a/include/linux/types.h b/include/linux/types.h index ed3a5b6e81..c19d1dc053 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -15,6 +15,7 @@ typedef __kernel_fd_set fd_set; typedef __kernel_dev_t dev_t; typedef __kernel_ino_t ino_t; typedef __kernel_mode_t mode_t; +typedef unsigned short umode_t; typedef __kernel_off_t off_t; typedef __kernel_pid_t pid_t; typedef __kernel_daddr_t daddr_t; diff --git a/include/mtd/mtd-peb.h b/include/mtd/mtd-peb.h index e4fd01df90..23f89d89a8 100644 --- a/include/mtd/mtd-peb.h +++ b/include/mtd/mtd-peb.h @@ -12,6 +12,7 @@ int mtd_peb_torture(struct mtd_info *mtd, int pnum); int mtd_peb_erase(struct mtd_info *mtd, int pnum); int mtd_peb_mark_bad(struct mtd_info *mtd, int pnum); int mtd_peb_is_bad(struct mtd_info *mtd, int pnum); +int mtd_skip_bad(struct mtd_info *mtd, int *pnum); int mtd_peb_check_all_ff(struct mtd_info *mtd, int pnum, int offset, int len, int warn); int mtd_peb_verify(struct mtd_info *mtd, const void *buf, int pnum, |