mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-04 05:50:17 +00:00 
			
		
		
		
	rockchip: rk3399: Fix enabling boot-on regulators
The new common rockchip pinctrl driver does not support explicit requests for a particular pinctrl function. As a result, the board_init() function bails out early before enabling the boot-on regulators. Fix this by simply removing the request for pwm0, pwm2 and pwm3. The generic DM code already does the necessary configuration if necessary. Reported-by: Levin Du <djw@t-chip.com.cn> Signed-of-by: Mark Kettenis <kettenis@openbsd.org>
This commit is contained in:
		
							parent
							
								
									4977cf67de
								
							
						
					
					
						commit
						7c7ce3600a
					
				@ -11,39 +11,9 @@
 | 
			
		||||
 | 
			
		||||
int board_init(void)
 | 
			
		||||
{
 | 
			
		||||
	struct udevice *pinctrl, *regulator;
 | 
			
		||||
	struct udevice *regulator;
 | 
			
		||||
	int ret;
 | 
			
		||||
 | 
			
		||||
	/*
 | 
			
		||||
	 * The PWM do not have decicated interrupt number in dts and can
 | 
			
		||||
	 * not get periph_id by pinctrl framework, so let's init them here.
 | 
			
		||||
	 * The PWM2 and PWM3 are for pwm regulater.
 | 
			
		||||
	 */
 | 
			
		||||
	ret = uclass_get_device(UCLASS_PINCTRL, 0, &pinctrl);
 | 
			
		||||
	if (ret) {
 | 
			
		||||
		debug("%s: Cannot find pinctrl device\n", __func__);
 | 
			
		||||
		goto out;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* Enable pwm0 for panel backlight */
 | 
			
		||||
	ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_PWM0);
 | 
			
		||||
	if (ret) {
 | 
			
		||||
		debug("%s PWM0 pinctrl init fail! (ret=%d)\n", __func__, ret);
 | 
			
		||||
		goto out;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_PWM2);
 | 
			
		||||
	if (ret) {
 | 
			
		||||
		debug("%s PWM2 pinctrl init fail!\n", __func__);
 | 
			
		||||
		goto out;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ret = pinctrl_request_noflags(pinctrl, PERIPH_ID_PWM3);
 | 
			
		||||
	if (ret) {
 | 
			
		||||
		debug("%s PWM3 pinctrl init fail!\n", __func__);
 | 
			
		||||
		goto out;
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	ret = regulators_enable_boot_on(false);
 | 
			
		||||
	if (ret)
 | 
			
		||||
		debug("%s: Cannot enable boot on regulator\n", __func__);
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user