diff options
| author | Tom Rini | 2020-06-30 11:43:18 -0400 |
|---|---|---|
| committer | Tom Rini | 2020-06-30 11:43:18 -0400 |
| commit | 5fdb3c0e7ee6bac6b8809ae69e52f16d22d45035 (patch) | |
| tree | d04c64ec751e7adf24de995ce0fa7eabc88865bc /include | |
| parent | 6b3c74428a3faca92701843c954b717e8d186b17 (diff) | |
| parent | e35c2a8fdd41a34c06c409ce700c5d5591429367 (diff) | |
Merge tag 'mips-pull-2020-06-29' of https://gitlab.denx.de/u-boot/custodians/u-boot-mips into next
- net: pcnet: cleanup and add DM support
- Makefile: add rule to build an endian-swapped U-Boot image
used by MIPS Malta EL variants
- CI: add Qemu tests for MIPS Malta
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/rk3399_common.h | 1 | ||||
| -rw-r--r-- | include/fsl_esdhc_imx.h | 3 | ||||
| -rw-r--r-- | include/linux/psci.h | 4 | ||||
| -rw-r--r-- | include/mipi_dsi.h | 6 | ||||
| -rw-r--r-- | include/zfs_common.h | 2 |
5 files changed, 13 insertions, 3 deletions
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index f0ae6e67a71..e63ebb14f72 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -67,6 +67,7 @@ "partitions=" PARTS_DEFAULT \ ROCKCHIP_DEVICE_SETTINGS \ BOOTENV \ + BOOTENV_SF \ "altbootcmd=" \ "setenv boot_syslinux_conf extlinux/extlinux-rollback.conf;" \ "run distro_bootcmd\0" diff --git a/include/fsl_esdhc_imx.h b/include/fsl_esdhc_imx.h index 33c6d52bfe9..279a66d9bff 100644 --- a/include/fsl_esdhc_imx.h +++ b/include/fsl_esdhc_imx.h @@ -203,7 +203,8 @@ #define ESDHC_STD_TUNING_EN BIT(24) /* NOTE: the minimum valid tuning start tap for mx6sl is 1 */ #define ESDHC_TUNING_START_TAP_DEFAULT 0x1 -#define ESDHC_TUNING_START_TAP_MASK 0xff +#define ESDHC_TUNING_START_TAP_MASK 0x7f +#define ESDHC_TUNING_CMD_CRC_CHECK_DISABLE BIT(7) #define ESDHC_TUNING_STEP_MASK 0x00070000 #define ESDHC_TUNING_STEP_SHIFT 16 diff --git a/include/linux/psci.h b/include/linux/psci.h index 9433df836b6..841dbc8da7e 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -91,8 +91,8 @@ unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, unsigned long a2, unsigned long a3); #else -unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, - unsigned long a2, unsigned long a3) +static inline unsigned long invoke_psci_fn(unsigned long a0, unsigned long a1, + unsigned long a2, unsigned long a3) { return PSCI_RET_DISABLED; } diff --git a/include/mipi_dsi.h b/include/mipi_dsi.h index 83c5163cf8e..c8a7d3daefa 100644 --- a/include/mipi_dsi.h +++ b/include/mipi_dsi.h @@ -221,9 +221,15 @@ static inline int mipi_dsi_pixel_format_to_bpp(enum mipi_dsi_pixel_format fmt) /** * struct mipi_dsi_panel_plat - DSI panel platform data * @device: DSI peripheral device + * @lanes: number of active data lanes + * @format: pixel format for video mode + * @mode_flags: DSI operation mode related flags */ struct mipi_dsi_panel_plat { struct mipi_dsi_device *device; + unsigned int lanes; + enum mipi_dsi_pixel_format format; + unsigned long mode_flags; }; /** diff --git a/include/zfs_common.h b/include/zfs_common.h index 027ba91b287..cb83e59e836 100644 --- a/include/zfs_common.h +++ b/include/zfs_common.h @@ -22,6 +22,8 @@ #ifndef __ZFS_COMMON__ #define __ZFS_COMMON__ +#include <part.h> + #define SECTOR_SIZE 0x200 #define SECTOR_BITS 9 |