Unverified Commit 7949803d authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Samsung DTS ARM changes for v5.20

1. Add display panel and backlight to P4 Note family (Samsung Galaxy
   Note 10.1).
2. DTS cleanup: white-spaces, node names, LED color/function.
3. Switch to DTS-local header for pinctrl register values instead of
   bindings header.  The bindings header is being deprecated because it
   does not reflect the purpose of bindings.

* tag 'samsung-dt-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: add function and color to LED nodes in Odroid XU/XU3
  ARM: dts: exynos: add function and color to LED node in Odroid XU4
  ARM: dts: exynos: add function and color to LED node in Odroid HC1
  ARM: dts: exynos: add function and color to LED nodes in Odroid X/X2
  ARM: dts: exynos: add function and color to LED node in Odroid U3
  ARM: dts: exynos: add function and color to LED nodes in Itop Elite
  ARM: dts: exynos: add function to LED nodes in Tiny4412
  ARM: dts: exynos: add function to LED node in Origen 4210
  ARM: dts: exynos: add function and color to aat1290 flash LED node in Galaxy S3
  ARM: dts: exynos: align aat1290 flash LED node with bindings in Galaxy S3
  ARM: dts: s5pv210: align gpio-key node names with dtschema
  ARM: dts: exynos: align gpio-key node names with dtschema
  ARM: dts: exynos: use local header for pinctrl register values
  ARM: dts: s5pv210: use local header for pinctrl register values
  ARM: dts: s3c64xx: use local header for pinctrl register values
  ARM: dts: s3c2410: use local header for pinctrl register values
  ARM: dts: exynos: align MMC node name with dtschema
  ARM: dts: exynos: adjust whitespace around '='
  ARM: dts: exynos: add panel and backlight to p4note

Link: https://lore.kernel.org/r/20220624080746.31947-1-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 03c765b0 82cd1690

arch/arm/boot/dts/exynos-pinctrl.h

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Samsung Exynos DTS pinctrl constants

 *

 * Copyright (c) 2016 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 * Copyright (c) 2022 Linaro Ltd

 * Author: Krzysztof Kozlowski <krzk@kernel.org>

 */



#ifndef __DTS_ARM_SAMSUNG_EXYNOS_PINCTRL_H__

#define __DTS_ARM_SAMSUNG_EXYNOS_PINCTRL_H__



#define EXYNOS_PIN_PULL_NONE		0

#define EXYNOS_PIN_PULL_DOWN		1

#define EXYNOS_PIN_PULL_UP		3



/* Pin function in power down mode */

#define EXYNOS_PIN_PDN_OUT0		0

#define EXYNOS_PIN_PDN_OUT1		1

#define EXYNOS_PIN_PDN_INPUT		2

#define EXYNOS_PIN_PDN_PREV		3



/* Drive strengths for Exynos3250, Exynos4 (all) and Exynos5250 */

#define EXYNOS4_PIN_DRV_LV1		0

#define EXYNOS4_PIN_DRV_LV2		2

#define EXYNOS4_PIN_DRV_LV3		1

#define EXYNOS4_PIN_DRV_LV4		3



/* Drive strengths for Exynos5260 */

#define EXYNOS5260_PIN_DRV_LV1		0

#define EXYNOS5260_PIN_DRV_LV2		1

#define EXYNOS5260_PIN_DRV_LV4		2

#define EXYNOS5260_PIN_DRV_LV6		3



/*

 * Drive strengths for Exynos5410, Exynos542x, Exynos5800 and Exynos850 (except

 * GPIO_HSI block)

 */

#define EXYNOS5420_PIN_DRV_LV1		0

#define EXYNOS5420_PIN_DRV_LV2		1

#define EXYNOS5420_PIN_DRV_LV3		2

#define EXYNOS5420_PIN_DRV_LV4		3



#define EXYNOS_PIN_FUNC_INPUT		0

#define EXYNOS_PIN_FUNC_OUTPUT		1

#define EXYNOS_PIN_FUNC_2		2

#define EXYNOS_PIN_FUNC_3		3

#define EXYNOS_PIN_FUNC_4		4

#define EXYNOS_PIN_FUNC_5		5

#define EXYNOS_PIN_FUNC_6		6

#define EXYNOS_PIN_FUNC_EINT		0xf

#define EXYNOS_PIN_FUNC_F		EXYNOS_PIN_FUNC_EINT



#endif /* __DTS_ARM_SAMSUNG_EXYNOS_PINCTRL_H__ */

arch/arm/boot/dts/exynos3250-pinctrl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
 * tree nodes are listed in this file.

 */



#include <dt-bindings/pinctrl/samsung.h>

#include "exynos-pinctrl.h"



#define PIN_IN(_pin, _pull, _drv)					\

	pin- ## _pin {							\

arch/arm/boot/dts/exynos3250.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ hsotg: hsotg@12480000 { 
			status = "disabled";

		};



		mshc_0: mshc@12510000 {

		mshc_0: mmc@12510000 {

			compatible = "samsung,exynos5420-dw-mshc";

			reg = <0x12510000 0x1000>;

			interrupts = <GIC_SPI 142 IRQ_TYPE_LEVEL_HIGH>;
@@ -388,7 +388,7 @@ mshc_0: mshc@12510000 { 
			status = "disabled";

		};



		mshc_1: mshc@12520000 {

		mshc_1: mmc@12520000 {

			compatible = "samsung,exynos5420-dw-mshc";

			reg = <0x12520000 0x1000>;

			interrupts = <GIC_SPI 143 IRQ_TYPE_LEVEL_HIGH>;
@@ -400,7 +400,7 @@ mshc_1: mshc@12520000 { 
			status = "disabled";

		};



		mshc_2: mshc@12530000 {

		mshc_2: mmc@12530000 {

			compatible = "samsung,exynos5250-dw-mshc";

			reg = <0x12530000 0x1000>;

			interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;

arch/arm/boot/dts/exynos4210-i9100.dts

+4 −4
Original line number Diff line number Diff line
@@ -89,21 +89,21 @@ vt_core_15v_reg: regulator-5 { 
	gpio-keys {

		compatible = "gpio-keys";



		vol-down {

		key-vol-down {

			gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEDOWN>;

			label = "volume down";

			debounce-interval = <10>;

		};



		vol-up {

		key-vol-up {

			gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_VOLUMEUP>;

			label = "volume up";

			debounce-interval = <10>;

		};



		power {

		key-power {

			gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_POWER>;

			label = "power";
@@ -111,7 +111,7 @@ power { 
			wakeup-source;

		};



		ok {

		key-ok {

			gpios = <&gpx3 5 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_OK>;

			label = "ok";

arch/arm/boot/dts/exynos4210-origen.dts

+7 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "exynos4210.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/input/input.h>

#include <dt-bindings/leds/common.h>

#include "exynos-mfc-reserved-memory.dtsi"



/ {
@@ -46,35 +47,35 @@ mmc_reg: voltage-regulator { 
	gpio-keys {

		compatible = "gpio-keys";



		up {

		key-up {

			label = "Up";

			gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_UP>;

			wakeup-source;

		};



		down {

		key-down {

			label = "Down";

			gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_DOWN>;

			wakeup-source;

		};



		back {

		key-back {

			label = "Back";

			gpios = <&gpx1 7 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_BACK>;

			wakeup-source;

		};



		home {

		key-home {

			label = "Home";

			gpios = <&gpx1 6 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_HOME>;

			wakeup-source;

		};



		menu {

		key-menu {

			label = "Menu";

			gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;

			linux,code = <KEY_MENU>;
@@ -86,6 +87,7 @@ leds { 
		compatible = "gpio-leds";

		status {

			gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;

			function = LED_FUNCTION_HEARTBEAT;

			linux,default-trigger = "heartbeat";

		};

	};