Merge tag 'samsung-soc-5.6-2' of... (a9eeb0e6) · Commits · 戴 / test

arch/arm/mach-exynos/Kconfig

+0 −1

Original line number	Diff line number	Diff line
		@@ -64,7 +64,6 @@ config ARCH_EXYNOS4
		select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
		select CPU_EXYNOS4210
		select GIC_NON_BANKED
		select MIGHT_HAVE_CACHE_L2X0
		help
		Samsung Exynos4 (Cortex-A9) SoC based systems

+12 −7

Original line number	Diff line number	Diff line
		@@ -377,6 +377,7 @@ static struct pwm_lookup rx1950_pwm_lookup[] = {
		};

		static struct pwm_device *lcd_pwm;
		static struct pwm_state lcd_pwm_state;

		static void rx1950_lcd_power(int enable)
		{
		@@ -429,15 +430,16 @@ static void rx1950_lcd_power(int enable)

		/* GPB1->OUTPUT, GPB1->0 */
		gpio_direction_output(S3C2410_GPB(1), 0);
		pwm_config(lcd_pwm, 0, LCD_PWM_PERIOD);
		pwm_disable(lcd_pwm);

		lcd_pwm_state.enabled = false;
		pwm_apply_state(lcd_pwm, &lcd_pwm_state);

		/* GPC0->0, GPC10->0 */
		gpio_direction_output(S3C2410_GPC(0), 0);
		gpio_direction_output(S3C2410_GPC(10), 0);
		} else {
		pwm_config(lcd_pwm, LCD_PWM_DUTY, LCD_PWM_PERIOD);
		pwm_enable(lcd_pwm);
		lcd_pwm_state.enabled = true;
		pwm_apply_state(lcd_pwm, &lcd_pwm_state);

		gpio_direction_output(S3C2410_GPC(0), 1);
		gpio_direction_output(S3C2410_GPC(5), 1);
		@@ -493,10 +495,13 @@ static int rx1950_backlight_init(struct device *dev)
		}

		/*
		* FIXME: pwm_apply_args() should be removed when switching to
		* the atomic PWM API.
		* This is only required to initialize .polarity; all other values are
		* fixed in this driver.
		*/
		pwm_apply_args(lcd_pwm);
		pwm_init_state(lcd_pwm, &lcd_pwm_state);

		lcd_pwm_state.period = LCD_PWM_PERIOD;
		lcd_pwm_state.duty_cycle = LCD_PWM_DUTY;

		rx1950_lcd_power(1);
		rx1950_bl_power(1);

+0 −1

Original line number	Diff line number	Diff line
		@@ -336,7 +336,6 @@ config MACH_WLF_CRAGG_6410

		config MACH_S3C64XX_DT
		bool "Samsung S3C6400/S3C6410 machine using Device Tree"
		select TIMER_OF
		select CPU_S3C6400
		select CPU_S3C6410
		select PINCTRL