github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-01 12:11:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Samsung DTS ARM changes for v6.6

Browse Source 
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.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmTU/YwQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD11zgD/4jI5Zrrb6BLsXS30cyJKFDxdaa0cf/zAi5
 skbZWZDF+N2P4W2jQDmdov4XbviT9nVIefuHSWRef2R9rSC3sXw3dF5Vc4km+xmX
 pirY+Jkv9aWdn1MO+DZFymlLGnlrJInxANxnqloLLKru0mbClEcVePnRdPbmcjFc
 Mgz0ZbV3xqQ/bD06OYCgbI+4Iz2xBtdtF45Aphh6qRD1dnwW2/iAYtklSAkFMB5D
 L2M3GL/BVC+gEY9BaM+dKfZuLtMhkv1JVZzsONGveQQMFlvOYWAIGgRpvzyhVIxd
 7WfQiqAPk5CJOP6y7MyosziremXClLmRUMeqY4zhAmOdLGSY36sO+CcJ6Gk8zjL1
 T4OpnBuCMm7hRqkzGvAlTcY8gYI/REzz2gP0AK7IrHBlTfYbXkEjDsg0DdJpaECm
 TYkDnG1fxuxCKpWjQ4Xb1O/gomXnhNP0dRNqVcHqKN9aDfO/ZxUqmKYNc2BJmLMd
 SLM99ZO0rE56vM0um0usXymAAWsoNKLmNUWEhEC3xyTuh2LN/pmqmcgIK6T8YZfs
 KPY6xwIBYoX3b7tBs7/sndwQPOY478oj+qTpFcWjgPMR8jm7FBvjryqQ+yY8EUpf
 4eIZuxF8Ze5JdJozhvvB9OTxFluAVHDF46DjqBZqSAMUC/6LzMAOcwpzLhCVN3MP
 Zn8WXy35vQ==
 =N+vM
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmTXSaoACgkQYKtH/8kJ
 Uif/bg/+KRDz9nF1E5vOCf4LwVdGWRxAXSBABb3KeT53ES5UzEOrbyKXeK5WJ5u0
 XF7Wu9XJegfhuomvjtkeaWl1FSzb6mL+drw1MxSpO+2Kgs25C4krJTr6iElGoLkZ
 6OOt90j0Gm8OtjQnuWGKaZbir4BVglA5EkoFjqlq/s3Ibk4rBbykd+VNr/PrFNAG
 t5SzUzHjPkte5rVibceiHZRS5zXyCbD7UVjrFm5KsGwoHmTJiYvMPLXYAOlk5IYp
 CUZkdKy10zgANdfsDcFErFLaE/bncyyO7OFM3klLSIT/j9Hmn9aHncCLP/TOvAzP
 WLomLOeVgFafmvBTdYT6HJdW8isuoo2qSFTzItLtAHEycMfzTzW+7QVlPM/Qf4mA
 7ML19Z55BKxCmyD2jenYr4//p5bP6ZiyfX9MA782l+dqm7mNDbSzyLLpzv501qiu
 C/++15KIub5tHjx3DRy2ZqUSFkRJfduDSlbx/dzYK73ZNf1WVgg3mkjaEPzq3AcV
 STh8KZZAoNIWIibHraF2nwvevsACJwVOShSaWaLeA4IzRKP5rq/tQyhUme4JLncy
 PXKcLk0D3j6Ya6hzxJpztj97ROSNHr7EzTEHrYpt1OYKgFNgY9ZfKcmLhDJGTTnb
 wSBoroffsep/jOFX94VTyLbA2kYnFNMo3t1X1XXXVtTrhbxBLI8=
 =bZg4
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-08-12 10:58:17 +02:00
commit 75f79ef8b9
13 changed files with 1480 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/arm/boot/dts/samsung/Makefile
View File

@ -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 \

4
arch/arm/boot/dts/samsung/exynos4210-i9100.dts
View File

@ -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 {

8
arch/arm/boot/dts/samsung/exynos4210-trats.dts
View File

@ -20,10 +20,10 @@ / {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x10000000
0x50000000 0x10000000
0x60000000 0x10000000
0x70000000 0x10000000>;
reg = <0x40000000 0x10000000
0x50000000 0x10000000
0x60000000 0x10000000
0x70000000 0x10000000>;
};
aliases {

4
arch/arm/boot/dts/samsung/exynos4210-universal_c210.dts
View File

@ -20,8 +20,8 @@ / {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x10000000
0x50000000 0x10000000>;
reg = <0x40000000 0x10000000
0x50000000 0x10000000>;
};
aliases {

29
arch/arm/boot/dts/samsung/exynos4212-tab3-3g8.dts Normal file
View File

@ -0,0 +1,29 @@
// 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);
};

44
arch/arm/boot/dts/samsung/exynos4212-tab3-lte8.dts Normal file
View File

@ -0,0 +1,44 @@
// 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);
};

26
arch/arm/boot/dts/samsung/exynos4212-tab3-wifi8.dts Normal file
View File

@ -0,0 +1,26 @@
// 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>;
};
};

1310
arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi Normal file
View File

File diff suppressed because it is too large Load Diff

52
arch/arm/boot/dts/samsung/exynos4412-midas.dtsi
View File

@ -182,6 +182,38 @@ pmic@66 {
pinctrl-0 = <&max77693_irq>;
reg = <0x66>;
muic {
compatible = "maxim,max77693-muic";
connector {
compatible = "samsung,usb-connector-11pin",
"usb-b-connector";
label = "micro-USB";
type = "micro";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
muic_to_usb: endpoint {
remote-endpoint = <&usb_to_muic>;
};
};
port@3 {
reg = <3>;
muic_to_mhl: endpoint {
remote-endpoint = <&mhl_to_muic>;
};
};
};
};
};
regulators {
esafeout1_reg: ESAFEOUT1 {
regulator-name = "ESAFEOUT1";
@ -287,6 +319,14 @@ mhl_to_hdmi: endpoint {
remote-endpoint = <&hdmi_to_mhl>;
};
};
port@1 {
reg = <1>;
mhl_to_muic: endpoint {
remote-endpoint = <&muic_to_mhl>;
};
};
};
};
};
@ -545,8 +585,16 @@ hdmi_to_mhl: endpoint {
&hsotg {
vusb_d-supply = <&ldo15_reg>;
vusb_a-supply = <&ldo12_reg>;
dr_mode = "peripheral";
dr_mode = "otg";
role-switch-default-mode = "peripheral";
usb-role-switch;
status = "okay";
port {
usb_to_muic: endpoint {
remote-endpoint = <&muic_to_usb>;
};
};
};
&i2c_0 {
@ -990,7 +1038,7 @@ &mshc_0 {
&pmu_system_controller {
assigned-clocks = <&pmu_system_controller 0>;
assigned-clock-parents = <&clock CLK_XUSBXTI>;
assigned-clock-parents = <&clock CLK_XUSBXTI>;
};
&pinctrl_0 {

8
arch/arm/boot/dts/samsung/exynos5250-snow-common.dtsi
View File

@ -60,12 +60,9 @@ vbat: vbat-fixed-regulator {
i2c-arbitrator {
compatible = "i2c-arb-gpio-challenge";
#address-cells = <1>;
#size-cells = <0>;
i2c-parent = <&i2c_4>;
our-claim-gpio = <&gpf0 3 GPIO_ACTIVE_LOW>;
our-claim-gpios = <&gpf0 3 GPIO_ACTIVE_LOW>;
their-claim-gpios = <&gpe0 4 GPIO_ACTIVE_LOW>;
slew-delay-us = <10>;
wait-retry-us = <3000>;
@ -75,8 +72,7 @@ i2c-arbitrator {
pinctrl-0 = <&arb_our_claim &arb_their_claim>;
/* Use ID 104 as a hint that we're on physical bus 4 */
i2c_104: i2c@0 {
reg = <0>;
i2c_104: i2c-arb {
#address-cells = <1>;
#size-cells = <0>;

2
arch/arm/boot/dts/samsung/s3c6410-mini6410.dts
View File

@ -51,7 +51,7 @@ srom-cs1-bus@18000000 {
ethernet@18000000 {
compatible = "davicom,dm9000";
reg = <0x18000000 0x2 0x18000004 0x2>;
reg = <0x18000000 0x2>, <0x18000004 0x2>;
interrupt-parent = <&gpn>;
interrupts = <7 IRQ_TYPE_LEVEL_HIGH>;
davicom,no-eeprom;

12
arch/arm/boot/dts/samsung/s5pv210-pinctrl.dtsi
View File

@ -832,12 +832,12 @@ lcd_clk: lcd-clk-pins {
};
lcd_data24: lcd-data-width24-pins {
samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",
"gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",
"gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
samsung,pins = "gpf0-4", "gpf0-5", "gpf0-6", "gpf0-7",
"gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3",
"gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7",
"gpf2-0", "gpf2-1", "gpf2-2", "gpf2-3",
"gpf2-4", "gpf2-5", "gpf2-6", "gpf2-7",
"gpf3-0", "gpf3-1", "gpf3-2", "gpf3-3";
samsung,pin-function = <S5PV210_PIN_FUNC_2>;
samsung,pin-pud = <S5PV210_PIN_PULL_NONE>;
samsung,pin-drv = <S5PV210_PIN_DRV_LV1>;

2
arch/arm/boot/dts/samsung/s5pv210-smdkv210.dts
View File

@ -41,7 +41,7 @@ pmic_ap_clk: clock-0 {
ethernet@a8000000 {
compatible = "davicom,dm9000";
reg = <0xA8000000 0x2 0xA8000002 0x2>;
reg = <0xa8000000 0x2>, <0xa8000002 0x2>;
interrupt-parent = <&gph1>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
local-mac-address = [00 00 de ad be ef];