github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 04:56:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Samsung DTS ARM changes for v5.14

Browse Source 
1. Several cleanups and alignment with dtschema.  This includes removal
    of unused properties and fixing LED brightness property.
 2. Enable PMIC RTC interrupt as a wakeup source (intended to wakeup for
    example from Suspend to RAM where the PMIC RTC's power is still
    supplied).
 3. Disable unused/not implemented camera on GT-I9100.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmDBwF4QHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD12lfD/sFwwIIAupFxyliXJuHuwluPZTvZ1bKlBjv
 AeIOFedlYQTNNo6cR9+LtMEA0on9E/HWPA3qarSgbfpOCQ1VX6lUOOdeaLnYLeay
 haciQaz7y/fS+tlRvap9HSCCNQ+HQSIynexotY/T0aqIa/XKGTiHgafqI/uGW15W
 7I2dUm0ecE0l8BRtZ8we6LMHHiltQF5XhiDM/5TI8rZofxa9maEAl6tYRfcbvkyZ
 BccZ4DalLHNhhHWOsfc5Jk/g9WxVt645xG2uebycAtuwq3m+ruzUjMzCWzQtSmIo
 wydGmOPALagONfykQWQgxlDuSKSJcn4sC2Kjna6qPvDHnhmoIU1gZmj07e+s5LdJ
 oEziCsYzLy3jdrZCNqLHkNSFxjkn5UH3O5R4fC8Y1e2zEGX2sA8T5Kz5IwLRssnZ
 ndTgdULjqVMm06mNnr7YhFeaWlLdphbW1DSP10MkyNEdhQ+9rCdZK76VA4m+1AkV
 ATDUNOsqq1mqvDh485i9057ohPSaA2T20NjB6h41a298Z/EELgxywQBpsW6a2rGT
 rOjZQOJxduViu3dn06faNDoEF6wYUWcnKAlwdyBNySOCHeEKUfvvF8cCzDtzwyFr
 qMZs2B9dnFw17w4wPcePpPu0E/9skjc5PEGg0MudTKhDsKsK7rSRSe1QVoC2FtDs
 /ELVDeUslg==
 =8yS0
 -----END PGP SIGNATURE-----

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

Samsung DTS ARM changes for v5.14

1. Several cleanups and alignment with dtschema.  This includes removal
   of unused properties and fixing LED brightness property.
2. Enable PMIC RTC interrupt as a wakeup source (intended to wakeup for
   example from Suspend to RAM where the PMIC RTC's power is still
   supplied).
3. Disable unused/not implemented camera on GT-I9100.

* tag 'samsung-dt-5.14' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: Disable unused camera input for I9100
  ARM: dts: exynos: enable PMIC wakeup from suspend on Odroid XU3/XU4 family
  ARM: dts: exynos: enable PMIC wakeup from suspend on SMDK5420
  ARM: dts: exynos: enable PMIC wakeup from suspend on Arndale Octa
  ARM: dts: exynos: enable PMIC wakeup from suspend on P4 Note
  ARM: dts: exynos: enable PMIC wakeup from suspend on Odroid X/U3
  ARM: dts: exynos: enable PMIC wakeup from suspend on Midas
  ARM: dts: exynos: enable PMIC wakeup from suspend on Odroid XU
  ARM: dts: exynos: enable PMIC wakeup from suspend on Arndale
  ARM: dts: exynos: enable PMIC wakeup from suspend on Origen4412
  ARM: dts: exynos: enable PMIC wakeup from suspend on Itop Core
  ARM: dts: s5pv210: remove unused Atmel touchscreen properties in Goni
  ARM: dts: exynos: fix PWM LED max brightness on Odroid XU4
  ARM: dts: exynos: fix PWM LED max brightness on Odroid HC1
  ARM: dts: exynos: fix PWM LED max brightness on Odroid XU/XU3
  ARM: dts: exynos: replace legacy MMS114 touchscreen x/y properties in GT-N7100
  ARM: dts: exynos: align Broadcom WiFi with dtschema

Link: https://lore.kernel.org/r/20210610074055.12474-1-krzysztof.kozlowski@canonical.com
Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2021-06-12 08:38:10 -07:00
commit 523ad4e349
19 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/exynos3250-rinato.dts
View File

@ -653,7 +653,7 @@ &mshc_1 {
mmc-pwrseq = <&wlan_pwrseq>;
brcmf: wifi@1 {
compatible = "brcm,bcm4334-fmac";
compatible = "brcm,bcm4334-fmac", "brcm,bcm4329-fmac";
reg = <1>;
interrupt-parent = <&gpx1>;

8
arch/arm/boot/dts/exynos4210-i9100.dts
View File

@ -314,7 +314,8 @@ &fimc_0 {
};
&fimc_1 {
status = "okay";
/* Back camera not implemented */
status = "disabled";
assigned-clocks = <&clock CLK_MOUT_FIMC1>, <&clock CLK_SCLK_FIMC1>;
assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
@ -330,7 +331,8 @@ &fimc_2 {
};
&fimc_3 {
status = "okay";
/* Back camera not implemented */
status = "disabled";
assigned-clocks = <&clock CLK_MOUT_FIMC3>, <&clock CLK_SCLK_FIMC3>;
assigned-clock-parents = <&clock CLK_SCLK_MPLL>;
@ -806,7 +808,7 @@ &sdhci_3 {
pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>;
brcmf: wifi@1 {
compatible = "brcm,bcm4330-fmac";
compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac";
reg = <1>;
interrupt-parent = <&gpx2>;

2
arch/arm/boot/dts/exynos4210-trats.dts
View File

@ -521,7 +521,7 @@ &sdhci_3 {
pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>;
brcmf: wifi@1 {
compatible = "brcm,bcm4330-fmac";
compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac";
reg = <1>;
interrupt-parent = <&gpx2>;

2
arch/arm/boot/dts/exynos4210-universal_c210.dts
View File

@ -614,7 +614,7 @@ &sdhci_3 {
pinctrl-0 = <&sd3_clk>, <&sd3_cmd>, <&sd3_bus4>;
brcmf: wifi@1 {
compatible = "brcm,bcm4330-fmac";
compatible = "brcm,bcm4330-fmac", "brcm,bcm4329-fmac";
reg = <1>;
interrupt-parent = <&gpx2>;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;

1
arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
View File

@ -163,6 +163,7 @@ s5m8767: pmic@66 {
<1025000>, <950000>,
<918750>, <900000>,
<875000>, <831250>;
wakeup-source;
regulators {
ldo1_reg: LDO1 {

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

@ -668,6 +668,7 @@ max77686: pmic@9 {
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
pinctrl-0 = <&max77686_irq>;
pinctrl-names = "default";
wakeup-source;
reg = <0x09>;
#clock-cells = <1>;

4
arch/arm/boot/dts/exynos4412-n710x.dts
View File

@ -50,8 +50,8 @@ touchscreen@48 {
reg = <0x48>;
interrupt-parent = <&gpm2>;
interrupts = <3 IRQ_TYPE_EDGE_FALLING>;
x-size = <720>;
y-size = <1280>;
touchscreen-size-x = <720>;
touchscreen-size-y = <1280>;
avdd-supply = <&ldo23_reg>;
vdd-supply = <&ldo24_reg>;
};

1
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View File

@ -282,6 +282,7 @@ max77686: pmic@9 {
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&max77686_irq>;
wakeup-source;
reg = <0x09>;
#clock-cells = <1>;

1
arch/arm/boot/dts/exynos4412-origen.dts
View File

@ -144,6 +144,7 @@ pmic@66 {
<1200000>, <1200000>,
<1200000>, <1200000>,
<1200000>, <1200000>;
wakeup-source;
s5m8767_osc: clocks {
compatible = "samsung,s5m8767-clk";

1
arch/arm/boot/dts/exynos4412-p4note.dtsi
View File

@ -325,6 +325,7 @@ max77686: pmic@9 {
interrupts = <7 IRQ_TYPE_LEVEL_LOW>;
pinctrl-0 = <&max77686_irq>;
pinctrl-names = "default";
wakeup-source;
reg = <0x09>;
#clock-cells = <1>;

1
arch/arm/boot/dts/exynos5250-arndale.dts
View File

@ -218,6 +218,7 @@ pmic@66 {
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&s5m8767_irq>;
wakeup-source;
vinb1-supply = <&main_dc_reg>;
vinb2-supply = <&main_dc_reg>;

1
arch/arm/boot/dts/exynos5410-odroidxu.dts
View File

@ -190,6 +190,7 @@ max77802: pmic@9 {
pinctrl-names = "default";
pinctrl-0 = <&max77802_irq>, <&pmic_dvs_1>, <&pmic_dvs_2>,
<&pmic_dvs_3>;
wakeup-source;
#clock-cells = <1>;
inl1-supply = <&buck5_reg>;

1
arch/arm/boot/dts/exynos5420-arndale-octa.dts
View File

@ -352,6 +352,7 @@ pmic@66 {
interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&s2mps11_irq>;
wakeup-source;
s2mps11_osc: clocks {
compatible = "samsung,s2mps11-clk";

1
arch/arm/boot/dts/exynos5420-smdk5420.dts
View File

@ -132,6 +132,7 @@ &hsi2c_4 {
pmic@66 {
compatible = "samsung,s2mps11-pmic";
reg = <0x66>;
wakeup-source;
s2mps11_osc: clocks {
compatible = "samsung,s2mps11-clk";

1
arch/arm/boot/dts/exynos5422-odroid-core.dtsi
View File

@ -512,6 +512,7 @@ pmic@66 {
interrupts = <4 IRQ_TYPE_LEVEL_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&s2mps11_irq>;
wakeup-source;
s2mps11_osc: clocks {
compatible = "samsung,s2mps11-clk";

2
arch/arm/boot/dts/exynos5422-odroidhc1.dts
View File

@ -22,7 +22,7 @@ led-1 {
label = "blue:heartbeat";
pwms = <&pwm 2 2000000 0>;
pwm-names = "pwm2";
max_brightness = <255>;
max-brightness = <255>;
linux,default-trigger = "heartbeat";
};
};

2
arch/arm/boot/dts/exynos5422-odroidxu4.dts
View File

@ -24,7 +24,7 @@ led-1 {
label = "blue:heartbeat";
pwms = <&pwm 2 2000000 0>;
pwm-names = "pwm2";
max_brightness = <255>;
max-brightness = <255>;
linux,default-trigger = "heartbeat";
};
};

4
arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi
View File

@ -22,7 +22,7 @@ led-1 {
* Green LED is much brighter than the others
* so limit its max brightness
*/
max_brightness = <127>;
max-brightness = <127>;
linux,default-trigger = "mmc0";
};
@ -30,7 +30,7 @@ led-2 {
label = "blue:heartbeat";
pwms = <&pwm 2 2000000 0>;
pwm-names = "pwm2";
max_brightness = <255>;
max-brightness = <255>;
linux,default-trigger = "heartbeat";
};
};

9
arch/arm/boot/dts/s5pv210-goni.dts
View File

@ -358,15 +358,6 @@ touchscreen@4a {
reg = <0x4a>;
interrupt-parent = <&gpj0>;
interrupts = <5 IRQ_TYPE_EDGE_FALLING>;
atmel,x-line = <17>;
atmel,y-line = <11>;
atmel,x-size = <800>;
atmel,y-size = <480>;
atmel,burst-length = <0x21>;
atmel,threshold = <0x28>;
atmel,orientation = <1>;
vdd-supply = <&tsp_reg>;
};
};