Skip to content

L
linux
Commit 6daf2aab authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

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

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

Samsung DeviceTree ARM update for v4.12:
1. Enhancements to PCIe nodes on Exynos5440.
2. Fix thermal values on some of Exynos5420 boards like Odroid XU3.
3. Add proper clock frequency properties to DSI nodes.
4. Fix watchdog reset on Exynos4412.
5. Fix watchdog infinite interrupt in soft mode on Exynos4210,
   Exynos5440, S3C64xx and S5Pv210.
6. Enable watchdog on Exynos4 and S3C SoCs.

* tag 'samsung-dt-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: add HDMI controller phandle to exynos4.dtsi
  ARM: dts: s5pv210: Fix infinite interrupt in soft mode
  ARM: dts: s3c64xx: Fix infinite interrupt in soft mode
  ARM: dts: exynos: Fix infinite interrupt in soft mode on Exynos4210 and Exynos5440
  ARM: dts: exynos: Enable watchdog on all Exynos4 boards
  ARM: dts: s3c64xx: Enable watchdog on all S3C64xx boards
  ARM: dts: exynos: Fix watchdog reset on Exynos4412
  ARM: dts: exynos: Add the burst and esc clock frequency properties to DSI node
  ARM: dts: exynos: Do not ignore real-world fuse values for thermal zone 0 on Exynos5420
  ARM: dts: exynos: Add phy-pcie node for pcie to Exynos5440
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 10719376 a1146328
Show whitespace changes
Inline Side-by-side
Showing with 77 additions and 44 deletions
arch/arm/boot/dts/exynos3250-rinato.dts
View file @ 6daf2aab
...@@ -215,6 +215,8 @@ &hsotg { ...@@ -215,6 +215,8 @@ &hsotg {
&dsi_0 { &dsi_0 {
vddcore-supply = <&ldo6_reg>; vddcore-supply = <&ldo6_reg>;
vddio-supply = <&ldo6_reg>; vddio-supply = <&ldo6_reg>;
samsung,burst-clock-frequency = <250000000>;
samsung,esc-clock-frequency = <20000000>;
samsung,pll-clock-frequency = <24000000>; samsung,pll-clock-frequency = <24000000>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/exynos4.dtsi
View file @ 6daf2aab
...@@ -283,15 +283,6 @@ csis_1: csis@11890000 { ...@@ -283,15 +283,6 @@ csis_1: csis@11890000 {
}; };
}; };
watchdog: watchdog@10060000 {
compatible = "samsung,s3c2410-wdt";
reg = <0x10060000 0x100>;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_WDT>;
clock-names = "watchdog";
status = "disabled";
};
rtc: rtc@10070000 { rtc: rtc@10070000 {
compatible = "samsung,s3c6410-rtc"; compatible = "samsung,s3c6410-rtc";
reg = <0x10070000 0x100>; reg = <0x10070000 0x100>;
...@@ -771,6 +762,7 @@ hdmicec: cec@100B0000 { ...@@ -771,6 +762,7 @@ hdmicec: cec@100B0000 {
clocks = <&clock CLK_HDMI_CEC>; clocks = <&clock CLK_HDMI_CEC>;
clock-names = "hdmicec"; clock-names = "hdmicec";
samsung,syscon-phandle = <&pmu_system_controller>; samsung,syscon-phandle = <&pmu_system_controller>;
hdmi-phandle = <&hdmi>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hdmi_cec>; pinctrl-0 = <&hdmi_cec>;
status = "disabled"; status = "disabled";
......
arch/arm/boot/dts/exynos4210-origen.dts
View file @ 6daf2aab
...@@ -328,7 +328,3 @@ &rtc { ...@@ -328,7 +328,3 @@ &rtc {
&tmu { &tmu {
status = "okay"; status = "okay";
}; };
&watchdog {
status = "okay";
};
arch/arm/boot/dts/exynos4210-trats.dts
View file @ 6daf2aab
...@@ -197,6 +197,8 @@ &cpu0 { ...@@ -197,6 +197,8 @@ &cpu0 {
&dsi_0 { &dsi_0 {
vddcore-supply = <&vusb_reg>; vddcore-supply = <&vusb_reg>;
vddio-supply = <&vmipi_reg>; vddio-supply = <&vmipi_reg>;
samsung,burst-clock-frequency = <500000000>;
samsung,esc-clock-frequency = <20000000>;
samsung,pll-clock-frequency = <24000000>; samsung,pll-clock-frequency = <24000000>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/exynos4210.dtsi
View file @ 6daf2aab
...@@ -119,6 +119,14 @@ mct_map: mct-map { ...@@ -119,6 +119,14 @@ mct_map: mct-map {
}; };
}; };
watchdog: watchdog@10060000 {
compatible = "samsung,s3c6410-wdt";
reg = <0x10060000 0x100>;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_WDT>;
clock-names = "watchdog";
};
clock: clock-controller@10030000 { clock: clock-controller@10030000 {
compatible = "samsung,exynos4210-clock"; compatible = "samsung,exynos4210-clock";
reg = <0x10030000 0x20000>; reg = <0x10030000 0x20000>;
......
arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi
View file @ 6daf2aab
...@@ -495,7 +495,3 @@ &tmu { ...@@ -495,7 +495,3 @@ &tmu {
vtmu-supply = <&ldo16_reg>; vtmu-supply = <&ldo16_reg>;
status = "okay"; status = "okay";
}; };
&watchdog {
status = "okay";
};
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View file @ 6daf2aab
...@@ -555,7 +555,3 @@ &tmu { ...@@ -555,7 +555,3 @@ &tmu {
vtmu-supply = <&ldo10_reg>; vtmu-supply = <&ldo10_reg>;
status = "okay"; status = "okay";
}; };
&watchdog {
status = "okay";
};
arch/arm/boot/dts/exynos4412-origen.dts
View file @ 6daf2aab
...@@ -541,7 +541,3 @@ &serial_2 { ...@@ -541,7 +541,3 @@ &serial_2 {
&serial_3 { &serial_3 {
status = "okay"; status = "okay";
}; };
&watchdog {
status = "okay";
};
arch/arm/boot/dts/exynos4412-trats2.dts
View file @ 6daf2aab
...@@ -385,6 +385,8 @@ csis1_ep: endpoint { ...@@ -385,6 +385,8 @@ csis1_ep: endpoint {
&dsi_0 { &dsi_0 {
vddcore-supply = <&ldo8_reg>; vddcore-supply = <&ldo8_reg>;
vddio-supply = <&ldo10_reg>; vddio-supply = <&ldo10_reg>;
samsung,burst-clock-frequency = <500000000>;
samsung,esc-clock-frequency = <20000000>;
samsung,pll-clock-frequency = <24000000>; samsung,pll-clock-frequency = <24000000>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/exynos4412.dtsi
View file @ 6daf2aab
...@@ -215,6 +215,15 @@ mct_map: mct-map { ...@@ -215,6 +215,15 @@ mct_map: mct-map {
}; };
}; };
watchdog: watchdog@10060000 {
compatible = "samsung,exynos5250-wdt";
reg = <0x10060000 0x100>;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_WDT>;
clock-names = "watchdog";
samsung,syscon-phandle = <&pmu_system_controller>;
};
adc: adc@126C0000 { adc: adc@126C0000 {
compatible = "samsung,exynos-adc-v1"; compatible = "samsung,exynos-adc-v1";
reg = <0x126C0000 0x100>; reg = <0x126C0000 0x100>;
......
arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi 0 → 100644
View file @ 6daf2aab
/*
* Device tree sources for Exynos5420 TMU sensor configuration
*
* Copyright (c) 2014 Lukasz Majewski <l.majewski@samsung.com>
* Copyright (c) 2017 Krzysztof Kozlowski <krzk@kernel.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*
*/
#include <dt-bindings/thermal/thermal_exynos.h>
#thermal-sensor-cells = <0>;
samsung,tmu_gain = <8>;
samsung,tmu_reference_voltage = <16>;
samsung,tmu_noise_cancel_mode = <4>;
samsung,tmu_efuse_value = <55>;
samsung,tmu_min_efuse_value = <0>;
samsung,tmu_max_efuse_value = <100>;
samsung,tmu_first_point_trim = <25>;
samsung,tmu_second_point_trim = <85>;
samsung,tmu_default_temp_offset = <50>;
samsung,tmu_cal_type = <TYPE_ONE_POINT_TRIMMING>;
arch/arm/boot/dts/exynos5420.dtsi
View file @ 6daf2aab
...@@ -699,7 +699,7 @@ tmu_cpu0: tmu@10060000 { ...@@ -699,7 +699,7 @@ tmu_cpu0: tmu@10060000 {
interrupts = <0 65 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 65 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_TMU>; clocks = <&clock CLK_TMU>;
clock-names = "tmu_apbif"; clock-names = "tmu_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi" #include "exynos5420-tmu-sensor-conf.dtsi"
}; };
tmu_cpu1: tmu@10064000 { tmu_cpu1: tmu@10064000 {
...@@ -708,7 +708,7 @@ tmu_cpu1: tmu@10064000 { ...@@ -708,7 +708,7 @@ tmu_cpu1: tmu@10064000 {
interrupts = <0 183 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 183 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_TMU>; clocks = <&clock CLK_TMU>;
clock-names = "tmu_apbif"; clock-names = "tmu_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi" #include "exynos5420-tmu-sensor-conf.dtsi"
}; };
tmu_cpu2: tmu@10068000 { tmu_cpu2: tmu@10068000 {
...@@ -717,7 +717,7 @@ tmu_cpu2: tmu@10068000 { ...@@ -717,7 +717,7 @@ tmu_cpu2: tmu@10068000 {
interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 184 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_TMU>, <&clock CLK_TMU>; clocks = <&clock CLK_TMU>, <&clock CLK_TMU>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; clock-names = "tmu_apbif", "tmu_triminfo_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi" #include "exynos5420-tmu-sensor-conf.dtsi"
}; };
tmu_cpu3: tmu@1006c000 { tmu_cpu3: tmu@1006c000 {
...@@ -726,7 +726,7 @@ tmu_cpu3: tmu@1006c000 { ...@@ -726,7 +726,7 @@ tmu_cpu3: tmu@1006c000 {
interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 185 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_TMU>, <&clock CLK_TMU_GPU>; clocks = <&clock CLK_TMU>, <&clock CLK_TMU_GPU>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; clock-names = "tmu_apbif", "tmu_triminfo_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi" #include "exynos5420-tmu-sensor-conf.dtsi"
}; };
tmu_gpu: tmu@100a0000 { tmu_gpu: tmu@100a0000 {
...@@ -735,7 +735,7 @@ tmu_gpu: tmu@100a0000 { ...@@ -735,7 +735,7 @@ tmu_gpu: tmu@100a0000 {
interrupts = <0 215 IRQ_TYPE_LEVEL_HIGH>; interrupts = <0 215 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_TMU_GPU>, <&clock CLK_TMU>; clocks = <&clock CLK_TMU_GPU>, <&clock CLK_TMU>;
clock-names = "tmu_apbif", "tmu_triminfo_apbif"; clock-names = "tmu_apbif", "tmu_triminfo_apbif";
#include "exynos4412-tmu-sensor-conf.dtsi" #include "exynos5420-tmu-sensor-conf.dtsi"
}; };
sysmmu_g2dr: sysmmu@0x10A60000 { sysmmu_g2dr: sysmmu@0x10A60000 {
......
arch/arm/boot/dts/exynos5440.dtsi
View file @ 6daf2aab
...@@ -189,7 +189,7 @@ i2c@100000 { ...@@ -189,7 +189,7 @@ i2c@100000 {
}; };
watchdog@110000 { watchdog@110000 {
compatible = "samsung,s3c2410-wdt"; compatible = "samsung,s3c6410-wdt";
reg = <0x110000 0x1000>; reg = <0x110000 0x1000>;
interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_B_125>; clocks = <&clock CLK_B_125>;
...@@ -290,11 +290,22 @@ ehci@221000 { ...@@ -290,11 +290,22 @@ ehci@221000 {
clock-names = "usbhost"; clock-names = "usbhost";
}; };
pcie_phy0: pcie-phy@270000 {
#phy-cells = <0>;
compatible = "samsung,exynos5440-pcie-phy";
reg = <0x270000 0x1000>, <0x271000 0x40>;
};
pcie_phy1: pcie-phy@272000 {
#phy-cells = <0>;
compatible = "samsung,exynos5440-pcie-phy";
reg = <0x272000 0x1000>, <0x271040 0x40>;
};
pcie_0: pcie@290000 { pcie_0: pcie@290000 {
compatible = "samsung,exynos5440-pcie", "snps,dw-pcie"; compatible = "samsung,exynos5440-pcie", "snps,dw-pcie";
reg = <0x290000 0x1000 reg = <0x290000 0x1000>, <0x40000000 0x1000>;
0x270000 0x1000 reg-names = "elbi", "config";
0x271000 0x40>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>;
...@@ -303,8 +314,8 @@ pcie_0: pcie@290000 { ...@@ -303,8 +314,8 @@ pcie_0: pcie@290000 {
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
device_type = "pci"; device_type = "pci";
ranges = <0x00000800 0 0x40000000 0x40000000 0 0x00001000 /* configuration space */ phys = <&pcie_phy0>;
0x81000000 0 0 0x40001000 0 0x00010000 /* downstream I/O */ ranges = <0x81000000 0 0 0x40001000 0 0x00010000 /* downstream I/O */
0x82000000 0 0x40011000 0x40011000 0 0x1ffef000>; /* non-prefetchable memory */ 0x82000000 0 0x40011000 0x40011000 0 0x1ffef000>; /* non-prefetchable memory */
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0>; interrupt-map-mask = <0 0 0 0>;
...@@ -315,9 +326,8 @@ pcie_0: pcie@290000 { ...@@ -315,9 +326,8 @@ pcie_0: pcie@290000 {
pcie_1: pcie@2a0000 { pcie_1: pcie@2a0000 {
compatible = "samsung,exynos5440-pcie", "snps,dw-pcie"; compatible = "samsung,exynos5440-pcie", "snps,dw-pcie";
reg = <0x2a0000 0x1000 reg = <0x2a0000 0x1000>, <0x60000000 0x1000>;
0x272000 0x1000 reg-names = "elbi", "config";
0x271040 0x40>;
interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
...@@ -326,8 +336,8 @@ pcie_1: pcie@2a0000 { ...@@ -326,8 +336,8 @@ pcie_1: pcie@2a0000 {
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
device_type = "pci"; device_type = "pci";
ranges = <0x00000800 0 0x60000000 0x60000000 0 0x00001000 /* configuration space */ phys = <&pcie_phy1>;
0x81000000 0 0 0x60001000 0 0x00010000 /* downstream I/O */ ranges = <0x81000000 0 0 0x60001000 0 0x00010000 /* downstream I/O */
0x82000000 0 0x60011000 0x60011000 0 0x1ffef000>; /* non-prefetchable memory */ 0x82000000 0 0x60011000 0x60011000 0 0x1ffef000>; /* non-prefetchable memory */
#interrupt-cells = <1>; #interrupt-cells = <1>;
interrupt-map-mask = <0 0 0 0>; interrupt-map-mask = <0 0 0 0>;
......
arch/arm/boot/dts/s3c64xx.dtsi
View file @ 6daf2aab
...@@ -94,13 +94,12 @@ sdhci2: sdhci@7c400000 { ...@@ -94,13 +94,12 @@ sdhci2: sdhci@7c400000 {
}; };
watchdog: watchdog@7e004000 { watchdog: watchdog@7e004000 {
compatible = "samsung,s3c2410-wdt"; compatible = "samsung,s3c6410-wdt";
reg = <0x7e004000 0x1000>; reg = <0x7e004000 0x1000>;
interrupt-parent = <&vic0>; interrupt-parent = <&vic0>;
interrupts = <26>; interrupts = <26>;
clock-names = "watchdog"; clock-names = "watchdog";
clocks = <&clocks PCLK_WDT>; clocks = <&clocks PCLK_WDT>;
status = "disabled";
}; };
i2c0: i2c@7f004000 { i2c0: i2c@7f004000 {
......
arch/arm/boot/dts/s5pv210.dtsi
View file @ 6daf2aab
...@@ -310,7 +310,7 @@ pwm: pwm@e2500000 { ...@@ -310,7 +310,7 @@ pwm: pwm@e2500000 {
}; };
watchdog: watchdog@e2700000 { watchdog: watchdog@e2700000 {
compatible = "samsung,s3c2410-wdt"; compatible = "samsung,s3c6410-wdt";
reg = <0xe2700000 0x1000>; reg = <0xe2700000 0x1000>;
interrupt-parent = <&vic0>; interrupt-parent = <&vic0>;
interrupts = <26>; interrupts = <26>;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7