From bed44f499fa95c72d9180967ea46f418488872df Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 11 Jan 2019 18:37:06 -0700 Subject: Convert CONFIG_BOARD_TYPES to Kconfig This converts the following to Kconfig: CONFIG_BOARD_TYPES Signed-off-by: Simon Glass Reviewed-by: Lukasz Majewski Acked-by: Alexey Brodkin Reviewed-by: Minkyu Kang --- include/configs/axs10x.h | 5 ----- include/configs/hsdk.h | 5 ----- include/configs/odroid.h | 1 - include/configs/odroid_xu3.h | 1 - 4 files changed, 12 deletions(-) (limited to 'include') diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index e128d1c08ba..0f4d78a5945 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -31,11 +31,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_128M #define CONFIG_SYS_LOAD_ADDR 0x82000000 -/* - * This board might be of different versions so handle it - */ -#define CONFIG_BOARD_TYPES - /* * NAND Flash configuration */ diff --git a/include/configs/hsdk.h b/include/configs/hsdk.h index 9af1d12701c..7735cc17208 100644 --- a/include/configs/hsdk.h +++ b/include/configs/hsdk.h @@ -32,11 +32,6 @@ #define CONFIG_SYS_BOOTM_LEN SZ_128M #define CONFIG_SYS_LOAD_ADDR 0x82000000 -/* - * This board might be of different versions so handle it - */ -#define CONFIG_BOARD_TYPES - /* * UART configuration */ diff --git a/include/configs/odroid.h b/include/configs/odroid.h index c3520bb15f4..b8809c8dcc7 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -186,7 +186,6 @@ * TODO: Add Odroid X support */ #define CONFIG_MISC_COMMON -#define CONFIG_BOARD_TYPES #undef CONFIG_REVISION_TAG diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index 0337c264752..f178549a722 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -87,7 +87,6 @@ /* Set soc_rev, soc_id, board_rev, boardname, fdtfile */ #define CONFIG_ODROID_REV_AIN 9 #define CONFIG_REVISION_TAG -#define CONFIG_BOARD_TYPES #undef CONFIG_SYS_BOARD #define CONFIG_SYS_BOARD "odroid" -- cgit v1.2.3 From a42ff927a7bd66961691cca578d09c990eb4bc00 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 11 Jan 2019 18:37:07 -0700 Subject: exynos: Drop duplicate 'model' line At present the model is shown twice, once in the generic code and once in the exynos code. Drop the latter. Signed-off-by: Simon Glass Reviewed-by: Lukasz Majewski Reviewed-by: Minkyu Kang --- include/samsung/misc.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include') diff --git a/include/samsung/misc.h b/include/samsung/misc.h index 0f957dc3675..017560c2566 100644 --- a/include/samsung/misc.h +++ b/include/samsung/misc.h @@ -32,9 +32,7 @@ void draw_logo(void); char *get_dfu_alt_system(char *interface, char *devstr); char *get_dfu_alt_boot(char *interface, char *devstr); #endif -#ifdef CONFIG_BOARD_TYPES void set_board_type(void); const char *get_board_type(void); -#endif #endif /* __SAMSUNG_MISC_COMMON_H__ */ -- cgit v1.2.3 From 38b043d452eb801515673d526b15a6ca8029df69 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 11 Jan 2019 18:37:14 -0700 Subject: fdt: samsung: Drop unused fdt_compat_id values This enum still exists but we can shrink it a little based on recent driver-model conversions with samsung. Update it to remove unused items. Signed-off-by: Simon Glass Reviewed-by: Lukasz Majewski --- include/fdtdec.h | 6 ------ 1 file changed, 6 deletions(-) (limited to 'include') diff --git a/include/fdtdec.h b/include/fdtdec.h index f1bcbf837ff..de7dd63b5a4 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -133,18 +133,12 @@ enum fdt_compat_id { /* Tegra210 XUSB pad controller */ COMPAT_SMSC_LAN9215, /* SMSC 10/100 Ethernet LAN9215 */ COMPAT_SAMSUNG_EXYNOS5_SROMC, /* Exynos5 SROMC */ - COMPAT_SAMSUNG_S3C2440_I2C, /* Exynos I2C Controller */ - COMPAT_SAMSUNG_EXYNOS5_SOUND, /* Exynos Sound */ - COMPAT_WOLFSON_WM8994_CODEC, /* Wolfson WM8994 Sound Codec */ COMPAT_SAMSUNG_EXYNOS_USB_PHY, /* Exynos phy controller for usb2.0 */ COMPAT_SAMSUNG_EXYNOS5_USB3_PHY,/* Exynos phy controller for usb3.0 */ COMPAT_SAMSUNG_EXYNOS_TMU, /* Exynos TMU */ COMPAT_SAMSUNG_EXYNOS_MIPI_DSI, /* Exynos mipi dsi */ COMPAT_SAMSUNG_EXYNOS_DWMMC, /* Exynos DWMMC controller */ - COMPAT_SAMSUNG_EXYNOS_MMC, /* Exynos MMC controller */ COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */ - COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ - COMPAT_SAMSUNG_EXYNOS5_I2C, /* Exynos5 High Speed I2C Controller */ COMPAT_SAMSUNG_EXYNOS_SYSMMU, /* Exynos sysmmu */ COMPAT_INTEL_MICROCODE, /* Intel microcode update */ COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */ -- cgit v1.2.3 From 91b3a1866b82329dd0d5333aa59141fccb1f2c17 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Fri, 11 Jan 2019 18:37:15 -0700 Subject: fdt: tegra: Drop COMPAT_AMS_AS3722 This is no-longer used. Drop it. Signed-off-by: Simon Glass Reviewed-by: Lukasz Majewski --- include/fdtdec.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/fdtdec.h b/include/fdtdec.h index de7dd63b5a4..2a8ad960260 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -141,7 +141,6 @@ enum fdt_compat_id { COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */ COMPAT_SAMSUNG_EXYNOS_SYSMMU, /* Exynos sysmmu */ COMPAT_INTEL_MICROCODE, /* Intel microcode update */ - COMPAT_AMS_AS3722, /* AMS AS3722 PMIC */ COMPAT_INTEL_QRK_MRC, /* Intel Quark MRC */ COMPAT_ALTERA_SOCFPGA_DWMAC, /* SoCFPGA Ethernet controller */ COMPAT_ALTERA_SOCFPGA_DWMMC, /* SoCFPGA DWMMC controller */ -- cgit v1.2.3 From cc4a224af226b2ea818d32af26742aaad8a3983e Mon Sep 17 00:00:00 2001 From: Lokesh Vutla Date: Fri, 11 Jan 2019 15:15:51 +0530 Subject: power: regulator: Introduce regulator_set_enable_if_allowed api regulator_set_enable() api throws an error in the following three cases: - when requested to disable an always-on regulator - when set_enable() ops not provided by regulator driver - when enabling is actually failed.(Error returned by the regulator driver) Sometimes consumer drivers doesn't want to track the first two scenarios and just need to worry about the case where enabling is actually failed. But it is also a good practice to have an error value returned in the first two cases. So introduce an api regulator_set_enable_if_allowed() which ignores the first two error cases and returns an error as given by regulator driver. Consumer drivers can use this api need not worry about the first two error conditions. Signed-off-by: Lokesh Vutla Reviewed-by: Simon Glass --- include/power/regulator.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'include') diff --git a/include/power/regulator.h b/include/power/regulator.h index 5318ab3acec..314160a894b 100644 --- a/include/power/regulator.h +++ b/include/power/regulator.h @@ -303,6 +303,17 @@ int regulator_get_enable(struct udevice *dev); */ int regulator_set_enable(struct udevice *dev, bool enable); +/** + * regulator_set_enable_if_allowed: set regulator enable state if allowed by + * regulator + * + * @dev - pointer to the regulator device + * @enable - set true or false + * @return - 0 on success or if enabling is not supported + * -errno val if fails. + */ +int regulator_set_enable_if_allowed(struct udevice *dev, bool enable); + /** * regulator_get_mode: get active operation mode id of a given regulator * -- cgit v1.2.3 From f0b02f3dd674783b02ee18e1c841b47c294318f7 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Thu, 27 Dec 2018 13:24:38 -0700 Subject: sound: i2s: Tidy up a few comments Fix a struct typo and drop a comment (and function prototype) which is not actually used. Signed-off-by: Simon Glass --- include/i2s.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'include') diff --git a/include/i2s.h b/include/i2s.h index 28f6184811c..7760aab7c46 100644 --- a/include/i2s.h +++ b/include/i2s.h @@ -78,7 +78,7 @@ struct i2s_reg { /* This structure stores the i2s related information */ struct i2s_uc_priv { unsigned int rfs; /* LR clock frame size */ - unsigned int bfs; /* Bit slock frame size */ + unsigned int bfs; /* Bit clock frame size */ unsigned int audio_pll_clk; /* Audio pll frequency in Hz */ unsigned int samplingrate; /* sampling rate */ unsigned int bitspersample; /* bits per sample */ @@ -123,13 +123,4 @@ int i2s_tx_data(struct udevice *dev, void *data, uint data_size); int i2s_transfer_tx_data(struct i2s_uc_priv *pi2s_tx, void *data, uint data_size); -/* - * Initialise i2s transmiter - * - * @param pi2s_tx pointer of i2s transmitter parameter structure. - * - * @return int value 0 for success, -1 in case of error - */ -int i2s_tx_init(struct i2s_uc_priv *pi2s_tx); - #endif /* __I2S_H__ */ -- cgit v1.2.3