leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge https://gitlab.denx.de/u-boot/custodians/u-boot-samsung

Browse Source
This commit is contained in:
Tom Rini
2021-02-26 07:54:27 -05:00
parent 94218ca9a8 0b547b40b1
commit d9bc92f554
12 changed files with 29 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
board/samsung/common/misc.c
View File

@@ -117,32 +117,33 @@ void set_board_info(void)
#ifdef CONFIG_LCD_MENU
static int power_key_pressed(u32 reg)
{
#if !CONFIG_IS_ENABLED(DM_I2C) /* TODO(maintainer): Convert to driver model */
struct pmic *pmic;
struct udevice *dev;
int ret;
u32 status;
u32 mask;
pmic = pmic_get(KEY_PWR_PMIC_NAME);
if (!pmic) {
printf("%s: Not found\n", KEY_PWR_PMIC_NAME);
if (IS_ENABLED(CONFIG_TARGET_TRATS))
ret = pmic_get("max8997-pmic", &dev);
else if (IS_ENABLED(CONFIG_TARGET_TRATS2))
ret = pmic_get("max77686-pmic", &dev);
else if (IS_ENABLED(CONFIG_TARGET_S5PC210_UNIVERSAL))
ret = pmic_get("max8998-pmic", &dev);
else
return 0;
}
if (pmic_probe(pmic))
return 0;
if (ret)
return ret;
if (reg == KEY_PWR_STATUS_REG)
mask = KEY_PWR_STATUS_MASK;
else
mask = KEY_PWR_INTERRUPT_MASK;
if (pmic_reg_read(pmic, reg, &status))
return 0;
status = pmic_reg_read(dev, reg);
if (status < 0)
return status;
return !!(status & mask);
#else
return 0;
#endif
}
static int key_pressed(int key)

2
board/samsung/espresso7420/MAINTAINERS
View File

@@ -1,5 +1,5 @@
ESPRESSO7420 Board
M: Thomas Abraham <thomas.ab@samsung.com>
M: Minkyu Kang <mk7.kang@samsung.com>
S: Maintained
F: board/samsung/espresso7420/
F: include/configs/espresso7420.h

2
board/samsung/goni/MAINTAINERS
View File

@@ -1,5 +1,5 @@
GONI BOARD
M: Robert Baldyga <r.baldyga@samsung.com>
M: Jaehoon Chung <jh80.chung@samsung.com>
S: Maintained
F: board/samsung/goni/
F: include/configs/s5p_goni.h

2
board/samsung/origen/MAINTAINERS
View File

@@ -1,5 +1,5 @@
ORIGEN BOARD
M: Chander Kashyap <k.chander@samsung.com>
M: Minkyu Kang <mk7.kang@samsung.com>
S: Maintained
F: board/samsung/origen/
F: include/configs/origen.h

4
board/samsung/smdk5250/MAINTAINERS
View File

@@ -1,12 +1,12 @@
SMDK5250 BOARD
M: Chander Kashyap <k.chander@samsung.com>
M: Jaehoon Chung <jh80.chung@samsung.com>
S: Maintained
F: board/samsung/smdk5250/
F: include/configs/smdk5250.h
F: configs/smdk5250_defconfig
SNOW BOARD
M: Akshay Saraswat <akshay.s@samsung.com>
M: Jaehoon Chung <jh80.chung@samsung.com>
S: Maintained
F: include/configs/snow.h
F: configs/snow_defconfig

2
board/samsung/smdk5420/MAINTAINERS
View File

@@ -1,5 +1,5 @@
SMDK5420 BOARD
M: Akshay Saraswat <akshay.s@samsung.com>
M: Jaehoon Chung <jh80.chung@samsung.com>
S: Maintained
F: board/samsung/smdk5420/
F: include/configs/peach-pit.h

2
board/samsung/smdkv310/MAINTAINERS
View File

@@ -1,5 +1,5 @@
SMDKV310 BOARD
M: Chander Kashyap <k.chander@samsung.com>
M: Jaehoon Chung <jh80.chung@samsung.com>
S: Maintained
F: board/samsung/smdkv310/
F: include/configs/smdkv310.h