Commit a0c97a6b authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-soc-5.13' of... 

Merge tag 'samsung-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/soc

Samsung mach/soc changes for v5.13

1. Update Krzysztof Kozlowski's email address in Maintainers.
2. Replace deprecated pwm_request() with pwm_get() in S3C24xx.
3. Correct kerneldoc.

* tag 'samsung-soc-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: correct kernel doc in platsmp
  ARM: s3c: Use pwm_get() in favour of pwm_request() in RX1950
  MAINTAINERS: use Krzysztof Kozlowski's Canonical address

Link: https://lore.kernel.org/r/20210407065828.7213-3-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f47e8e14 60310087

MAINTAINERS

+12 −12
Original line number Diff line number Diff line
@@ -2375,7 +2375,7 @@ F: sound/soc/rockchip/ 
N:	rockchip









ARM/SAMSUNG S3C, S5P AND EXYNOS ARM ARCHITECTURES









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained








@@ -10868,7 +10868,7 @@ F:	drivers/regulator/max77802-regulator.c







F:	include/dt-bindings/*/*max77802.h

















MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-pm@vger.kernel.org









S:	Supported








@@ -10877,7 +10877,7 @@ F:	drivers/power/supply/max77693_charger.c















MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS









M:	Chanwoo Choi <cw00.choi@samsung.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-kernel@vger.kernel.org









S:	Supported








@@ -11529,7 +11529,7 @@ F:	include/linux/memblock.h







F:	mm/memblock.c

















MEMORY CONTROLLER DRIVERS









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









L:	linux-kernel@vger.kernel.org









S:	Maintained









T:	git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git








@@ -12867,7 +12867,7 @@ F:	Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml







F:	drivers/regulator/pf8x00-regulator.c

















NXP PTN5150A CC LOGIC AND EXTCON DRIVER









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml








@@ -14158,7 +14158,7 @@ F:	drivers/pinctrl/renesas/















PIN CONTROLLER - SAMSUNG









M:	Tomasz Figa <tomasz.figa@gmail.com>









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









L:	linux-samsung-soc@vger.kernel.org








@@ -15717,7 +15717,7 @@ F:	Documentation/admin-guide/LSM/SafeSetID.rst







F:	security/safesetid/

















SAMSUNG AUDIO (ASoC) DRIVERS









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Sylwester Nawrocki <s.nawrocki@samsung.com>









L:	alsa-devel@alsa-project.org (moderated for non-subscribers)









S:	Supported








@@ -15725,7 +15725,7 @@ F:	Documentation/devicetree/bindings/sound/samsung*







F:	sound/soc/samsung/

















SAMSUNG EXYNOS PSEUDO RANDOM NUMBER GENERATOR (RNG) DRIVER









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









L:	linux-crypto@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org









S:	Maintained








@@ -15760,7 +15760,7 @@ S:	Maintained







F:	drivers/platform/x86/samsung-laptop.c

















SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>









L:	linux-kernel@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org








@@ -15785,7 +15785,7 @@ F:	drivers/media/platform/s3c-camif/







F:	include/media/drv-intf/s3c_camif.h

















SAMSUNG S3FWRN5 NFC DRIVER









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Krzysztof Opasiak <k.opasiak@samsung.com>









L:	linux-nfc@lists.01.org (moderated for non-subscribers)









S:	Maintained








@@ -15805,7 +15805,7 @@ S:	Supported







F:	drivers/media/i2c/s5k5baf.c

















SAMSUNG S5P Security SubSystem (SSS) DRIVER









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Vladimir Zapolskiy <vz@mleia.com>









L:	linux-crypto@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org








@@ -15837,7 +15837,7 @@ F:	include/linux/clk/samsung.h







F:	include/linux/platform_data/clk-s3c2410.h

















SAMSUNG SPI DRIVERS









M:	Krzysztof Kozlowski <krzk@kernel.org>









M:	Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>









M:	Andi Shyti <andi@etezian.org>









L:	linux-spi@vger.kernel.org









L:	linux-samsung-soc@vger.kernel.org
































arch/arm/mach-exynos/platsmp.c



+13
−15






























Original line number
Diff line number
Diff line







@@ -78,12 +78,11 @@ static inline void platform_do_lowpower(unsigned int cpu, int *spurious)







#endif /* CONFIG_HOTPLUG_CPU */



















/**









 * exynos_core_power_down : power down the specified cpu









 * exynos_cpu_power_down() - power down the specified cpu









 * @cpu: the cpu to power down









 *









 * Power down the specified cpu. The sequence must be finished by a









 * call to cpu_do_idle()









 *









 */









void exynos_cpu_power_down(int cpu)









{








@@ -107,7 +106,7 @@ void exynos_cpu_power_down(int cpu)







}



















/**









 * exynos_cpu_power_up : power up the specified cpu









 * exynos_cpu_power_up() - power up the specified cpu









 * @cpu: the cpu to power up









 *









 * Power up the specified cpu








@@ -124,9 +123,8 @@ void exynos_cpu_power_up(int cpu)







}



















/**









 * exynos_cpu_power_state : returns the power state of the cpu









 * exynos_cpu_power_state() - returns the power state of the cpu









 * @cpu: the cpu to retrieve the power state from









 *









 */









int exynos_cpu_power_state(int cpu)









{








@@ -135,7 +133,7 @@ int exynos_cpu_power_state(int cpu)







}



















/**









 * exynos_cluster_power_down : power down the specified cluster









 * exynos_cluster_power_down() - power down the specified cluster









 * @cluster: the cluster to power down









 */









void exynos_cluster_power_down(int cluster)








@@ -144,7 +142,7 @@ void exynos_cluster_power_down(int cluster)







}



















/**









 * exynos_cluster_power_up : power up the specified cluster









 * exynos_cluster_power_up() - power up the specified cluster









 * @cluster: the cluster to power up









 */









void exynos_cluster_power_up(int cluster)








@@ -154,7 +152,7 @@ void exynos_cluster_power_up(int cluster)







}



















/**









 * exynos_cluster_power_state : returns the power state of the cluster









 * exynos_cluster_power_state() - returns the power state of the cluster









 * @cluster: the cluster to retrieve the power state from









 *









 */








@@ -165,7 +163,7 @@ int exynos_cluster_power_state(int cluster)







}



















/**









 * exynos_scu_enable : enables SCU for Cortex-A9 based system









 * exynos_scu_enable() - enables SCU for Cortex-A9 based system









 */









void exynos_scu_enable(void)









{
































arch/arm/mach-s3c/mach-rx1950.c



+6
−5






























Original line number
Diff line number
Diff line







@@ -384,6 +384,8 @@ static struct s3c2410fb_mach_info rx1950_lcd_cfg = {







static struct pwm_lookup rx1950_pwm_lookup[] = {









	PWM_LOOKUP("samsung-pwm", 0, "pwm-backlight.0", NULL, 48000,









		   PWM_POLARITY_NORMAL),









	PWM_LOOKUP("samsung-pwm", 1, "pwm-backlight.0", "RX1950 LCD", LCD_PWM_PERIOD,









		   PWM_POLARITY_NORMAL),









};



















static struct pwm_device *lcd_pwm;








@@ -498,19 +500,18 @@ static void rx1950_bl_power(int enable)







static int rx1950_backlight_init(struct device *dev)









{









	WARN_ON(gpio_request(S3C2410_GPB(0), "Backlight"));









	lcd_pwm = pwm_request(1, "RX1950 LCD");









	lcd_pwm = pwm_get(dev, "RX1950 LCD");









	if (IS_ERR(lcd_pwm)) {









		dev_err(dev, "Unable to request PWM for LCD power!\n");









		return PTR_ERR(lcd_pwm);









	}



















	/*









	 * This is only required to initialize .polarity; all other values are









	 * fixed in this driver.









	 * Call pwm_init_state to initialize .polarity and .period. The other









	 * values are fixed in this driver.









	 */









	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);








@@ -524,7 +525,7 @@ static void rx1950_backlight_exit(struct device *dev)







	rx1950_bl_power(0);









	rx1950_lcd_power(0);



















	pwm_free(lcd_pwm);









	pwm_put(lcd_pwm);









	gpio_free(S3C2410_GPB(0));









}