diff options
| author | Tom Rini <trini@konsulko.com> | 2016-02-23 15:35:47 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-02-23 15:35:47 -0500 |
| commit | 52dd704bf8eda7ca039cdb398ec0b6895c3ef939 (patch) | |
| tree | 16218aaacdd67330bfc1a6863a9f9dbcf73170fe /include | |
| parent | b625fab7069cab52fd8e0c3dbb25e0d04d020173 (diff) | |
| parent | dc44fd8ae4be0a88123a90ae2b3acdec45290ecf (diff) | |
| download | u-boot-52dd704bf8eda7ca039cdb398ec0b6895c3ef939.tar.gz u-boot-52dd704bf8eda7ca039cdb398ec0b6895c3ef939.tar.xz u-boot-52dd704bf8eda7ca039cdb398ec0b6895c3ef939.zip | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sun8i.h | 6 | ||||
| -rw-r--r-- | include/configs/sunxi-common.h | 6 | ||||
| -rw-r--r-- | include/sy8106a.h | 11 |
3 files changed, 20 insertions, 3 deletions
diff --git a/include/configs/sun8i.h b/include/configs/sun8i.h index 781ff6eae2..7c0ab1eab4 100644 --- a/include/configs/sun8i.h +++ b/include/configs/sun8i.h @@ -18,7 +18,11 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 #endif -#define CONFIG_SUNXI_USB_PHYS 2 +#ifdef CONFIG_MACH_SUN8I_H3 + #define CONFIG_SUNXI_USB_PHYS 4 +#else + #define CONFIG_SUNXI_USB_PHYS 2 +#endif #ifndef CONFIG_MACH_SUN8I_A83T diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index b4dfb3cc47..40850e5d99 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -206,7 +206,8 @@ #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK /* I2C */ -#if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER +#if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ + defined CONFIG_SY8106A_POWER #define CONFIG_SPL_I2C_SUPPORT #endif @@ -240,7 +241,8 @@ extern int soft_i2c_gpio_scl; /* PMU */ #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ - defined CONFIG_AXP221_POWER || defined CONFIG_AXP818_POWER + defined CONFIG_AXP221_POWER || defined CONFIG_AXP818_POWER || \ + defined CONFIG_SY8106A_POWER #define CONFIG_SPL_POWER_SUPPORT #endif diff --git a/include/sy8106a.h b/include/sy8106a.h new file mode 100644 index 0000000000..32e8c43dc0 --- /dev/null +++ b/include/sy8106a.h @@ -0,0 +1,11 @@ +/* + * (C) Copyright 2016 + * Jelle van der Waa <jelle@vdwaa.nl> + * + * SPDX-License-Identifier: GPL-2.0+ + */ +#ifndef _SY8106A_PMIC_H_ + +int sy8106a_set_vout1(unsigned int mvolt); + +#endif |