Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
arm
/
boot
/
dts
/
exynos3250-rinato.dts
diff --git
a/kernel/arch/arm/boot/dts/exynos3250-rinato.dts
b/kernel/arch/arm/boot/dts/exynos3250-rinato.dts
index
75aba40
..
3e64d5d
100644
(file)
--- a/
kernel/arch/arm/boot/dts/exynos3250-rinato.dts
+++ b/
kernel/arch/arm/boot/dts/exynos3250-rinato.dts
@@
-16,6
+16,7
@@
#include "exynos3250.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
#include "exynos3250.dtsi"
#include <dt-bindings/input/input.h>
#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/clock/samsung,s2mps11.h>
/ {
model = "Samsung Rinato board";
/ {
model = "Samsung Rinato board";
@@
-48,7
+49,7
@@
i2c_max77836: i2c-gpio-0 {
compatible = "i2c-gpio";
i2c_max77836: i2c-gpio-0 {
compatible = "i2c-gpio";
- gpios = <&gpd0 2
0>, <&gpd0 3 0
>;
+ gpios = <&gpd0 2
GPIO_ACTIVE_HIGH>, <&gpd0 3 GPIO_ACTIVE_HIGH
>;
#address-cells = <1>;
#size-cells = <0>;
#address-cells = <1>;
#size-cells = <0>;
@@
-106,6
+107,21
@@
min-microvolt = <1100000>;
max-microvolt = <2700000>;
};
min-microvolt = <1100000>;
max-microvolt = <2700000>;
};
+
+ thermal-zones {
+ cpu_thermal: cpu-thermal {
+ cooling-maps {
+ map0 {
+ /* Corresponds to 500MHz */
+ cooling-device = <&cpu0 5 5>;
+ };
+ map1 {
+ /* Corresponds to 200MHz */
+ cooling-device = <&cpu0 8 8>;
+ };
+ };
+ };
+ };
};
&adc {
};
&adc {
@@
-131,8
+147,13
@@
};
};
};
};
+&cpu0 {
+ cpu0-supply = <&buck2_reg>;
+};
+
&exynos_usbphy {
status = "okay";
&exynos_usbphy {
status = "okay";
+ vbus-supply = <&safeout_reg>;
};
&hsotg {
};
&hsotg {
@@
-168,8
+189,8
@@
reg = <0>;
vdd3-supply = <&ldo16_reg>;
vci-supply = <&ldo20_reg>;
reg = <0>;
vdd3-supply = <&ldo16_reg>;
vci-supply = <&ldo20_reg>;
- reset-gpios = <&gpe0 1
0
>;
- te-gpios = <&gpx0 6
0
>;
+ reset-gpios = <&gpe0 1
GPIO_ACTIVE_HIGH
>;
+ te-gpios = <&gpx0 6
GPIO_ACTIVE_HIGH
>;
power-on-delay= <30>;
power-off-delay= <120>;
reset-delay = <5>;
power-on-delay= <30>;
power-off-delay= <120>;
reset-delay = <5>;
@@
-348,14
+369,14
@@
regulator-name = "V_EMMC_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-name = "V_EMMC_1.8V";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
- samsung,ext-control-gpios = <&gpk0 2
0
>;
+ samsung,ext-control-gpios = <&gpk0 2
GPIO_ACTIVE_HIGH
>;
};
ldo12_reg: LDO12 {
regulator-name = "V_EMMC_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
};
ldo12_reg: LDO12 {
regulator-name = "V_EMMC_2.8V";
regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>;
- samsung,ext-control-gpios = <&gpk0 2
0
>;
+ samsung,ext-control-gpios = <&gpk0 2
GPIO_ACTIVE_HIGH
>;
};
ldo13_reg: LDO13 {
};
ldo13_reg: LDO13 {
@@
-567,6
+588,10
@@
status = "okay";
};
status = "okay";
};
+&jpeg {
+ status = "okay";
+};
+
&mshc_0 {
#address-cells = <1>;
#size-cells = <0>;
&mshc_0 {
#address-cells = <1>;
#size-cells = <0>;
@@
-605,7
+630,7
@@
};
&rtc {
};
&rtc {
- clocks = <&cmu CLK_RTC>, <&s2mps14_osc
0
>;
+ clocks = <&cmu CLK_RTC>, <&s2mps14_osc
S2MPS11_CLK_AP
>;
clock-names = "rtc", "rtc_src";
status = "okay";
};
clock-names = "rtc", "rtc_src";
status = "okay";
};