Commit 523ad4e3 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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: default avatarOlof Johansson <olof@lixom.net>
parents 131dc51d 135adbbe
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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>;
+5 −3
Original line number Diff line number Diff line
@@ -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>;
+1 −1
Original line number Diff line number Diff line
@@ -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>;
+1 −1
Original line number Diff line number Diff line
@@ -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 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ s5m8767: pmic@66 {
						 <1025000>, <950000>,
						 <918750>, <900000>,
						 <875000>, <831250>;
		wakeup-source;

		regulators {
			ldo1_reg: LDO1 {
Loading