Unverified Commit 75f79ef8 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'samsung-dt-6.6' of... 

Merge tag 'samsung-dt-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt

Samsung DTS ARM changes for v6.6

1. Galaxy S II: correct LCD screen's physical size.
2. Add Samsung Galaxy Tab 3 8.0 boards (Exynos4212).
3. Galaxy S3 family: add USB connector and USB OTG. Full USB OTG still
   seems not to work, but at least HDMI improved and dtbs_check is
   happy.
4. Fix issues pointed out by dtbs_check and W=1: unit addresses, use
   'gpios' suffix over 'gpio', update i2c-arb device node to newer
   binding.
5. Few white-space cleanups.

* tag 'samsung-dt-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: samsung: exynos4412-midas: add USB connector and USB OTG
  ARM: dts: samsung: exynos5250-snow: switch i2c-arb to new child variant
  ARM: dts: samsung: exynos5250-snow: use 'gpios' suffix for i2c-arb
  ARM: dts: samsung: fix Exynos4212 Tab3 makefile entries
  ARM: dts: exynos: Add Samsung Galaxy Tab 3 8.0 boards
  ARM: dts: samsung: s5pv210-smdkv210: correct ethernet reg addresses (split)
  ARM: dts: samsung: s3c6410-mini6410: correct ethernet reg addresses (split)
  ARM: dts: samsung: exynos4210-i9100: Fix LCD screen's physical size
  ARM: dts: s5pv210: minor whitespace cleanup around '='
  ARM: dts: exynos: minor whitespace cleanup around '='

Link: https://lore.kernel.org/r/20230810151250.220202-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 08caced4 57f706bf

arch/arm/boot/dts/samsung/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -9,6 +9,9 @@ dtb-$(CONFIG_ARCH_EXYNOS4) += \ 
	exynos4210-smdkv310.dtb \

	exynos4210-trats.dtb \

	exynos4210-universal_c210.dtb \

	exynos4212-tab3-3g8.dtb \

	exynos4212-tab3-lte8.dtb \

	exynos4212-tab3-wifi8.dtb \

	exynos4412-i9300.dtb \

	exynos4412-i9305.dtb \

	exynos4412-itop-elite.dtb \

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

+2 −2
Original line number Diff line number Diff line
@@ -207,8 +207,8 @@ lcd@0 { 
			power-on-delay = <10>;

			reset-delay = <10>;



			panel-width-mm = <90>;

			panel-height-mm = <154>;

			panel-width-mm = <56>;

			panel-height-mm = <93>;



			display-timings {

				timing {

arch/arm/boot/dts/samsung/exynos4212-tab3-3g8.dts

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

/*

 * Samsung's Exynos4212 based Galaxy Tab 3 8.0 3G board device tree

 * source

 *

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

 *		http://www.samsung.com

 */



/dts-v1/;

#include "exynos4212-tab3.dtsi"



/ {

	model = "Samsung Galaxy Tab 3 8.0 3G (SM-T311) based on Exynos4212";

	compatible = "samsung,t311", "samsung,tab3", "samsung,exynos4212", "samsung,exynos4";

	chassis-type = "tablet";

};



/* Pin control sleep state overrides */

&sleep0 {

	PIN_SLP(gpb-5, INPUT, UP);

};



&sleep1 {

	PIN_SLP(gpl0-0, OUT0, NONE);

	PIN_SLP(gpl1-0, OUT0, NONE);

	PIN_SLP(gpl2-4, OUT0, NONE);

	PIN_SLP(gpm3-3, OUT1, NONE);

};

arch/arm/boot/dts/samsung/exynos4212-tab3-lte8.dts

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

/*

 * Samsung's Exynos4212 based Galaxy Tab 3 8.0 LTE board device tree

 * source

 *

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

 *		http://www.samsung.com

 */



/dts-v1/;

#include "exynos4212-tab3.dtsi"



/ {

	model = "Samsung Galaxy Tab 3 8.0 LTE (SM-T315) based on Exynos4212";

	compatible = "samsung,t315", "samsung,tab3", "samsung,exynos4212", "samsung,exynos4";

	chassis-type = "tablet";

};



/* Pin control sleep state overrides */

&sleep0 {

	PIN_SLP(gpa0-4, INPUT, UP);

	PIN_SLP(gpa0-5, INPUT, UP);



	PIN_SLP(gpb-5, INPUT, UP);



	PIN_SLP(gpc0-0, PREV, NONE);

	PIN_SLP(gpc1-3, INPUT, NONE);



	PIN_SLP(gpf1-6, INPUT, NONE);

	PIN_SLP(gpf2-2, PREV, NONE);

};



&sleep1 {

	PIN_SLP(gpl0-0, PREV, NONE);



	PIN_SLP(gpl1-0, PREV, NONE);



	PIN_SLP(gpl2-1, INPUT, DOWN);

	PIN_SLP(gpl2-2, INPUT, DOWN);

	PIN_SLP(gpl2-4, OUT0, NONE);

	PIN_SLP(gpl2-5, PREV, NONE);



	PIN_SLP(gpm3-3, OUT1, NONE);

};

arch/arm/boot/dts/samsung/exynos4212-tab3-wifi8.dts

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

/*

 * Samsung's Exynos4212 based Galaxy Tab 3 8.0 WiFi board device tree

 * source

 *

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

 *		http://www.samsung.com

 */



/dts-v1/;

#include "exynos4212-tab3.dtsi"



/ {

	model = "Samsung Galaxy Tab 3 8.0 WiFi (SM-T310) based on Exynos4212";

	compatible = "samsung,t310", "samsung,tab3", "samsung,exynos4212", "samsung,exynos4";

	chassis-type = "tablet";

};



&i2c_lightsensor {

	status = "okay";



	lightsensor@10 {

		compatible = "capella,cm3323";

		reg = <0x10>;

	};

};