Skip to content

L
linux
Commit b1ee27d4 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

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

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

Merge "Samsung DT updates for v4.4" from Kukjin Kim:

- New board support
  : add exynos5250-snow-rev5 DT file to support Snow Rev5+ board
  : add exynos5422-odroidxu4 DT file to support Odroid XU4 board
  : split exynos5422-odroidxu3-audio DT file from odroidxu3-common

- USE GPIO constants for flags cells for exynos boards
- fix cpu compatible value to 'arm926ej-s' for s3c2416

- add DMA support for serial ports for exynos4
- add suspend opp for exynos4412
- remove regulator-compatible usage for exynos4412-trats2

- enable EC vboot context support for Peach boards
- move display-timings node to DP for exynos5250-arndale, smdk5250 and smdk5420

- for exynos4412-odroid/odroidu3
  : unify voltage regulator style and
  : remove redundant pinctrl settings
  : add pwm-fan node and use it as a colling device

- for exynos5422-odroidxu3
  : fix power off method and LEDs

- dt-bindings
  : grounded AC0KB pin on S2MPS11
  : entry how to use PWM FAN as a cooling device

* tag 'samsung-dt-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung: (22 commits)
  ARM: dts: Use GPIO constants for flags cells in exynos5440 boards
  ARM: dts: Use GPIO constants for flags cells in exynos5420/5422/5800 boards
  ARM: dts: Use GPIO constants for flags cells in exynos4412 boards
  ARM: dts: Use GPIO constants for flags cells in exynos4120 boards
  ARM: dts: Use GPIO constants for flags cells in exynos3250 boards
  ARM: dts: Enable EC vboot context support on Peach boards
  ARM: dts: Remove regulator-compatible usage in exynos4412-trats2
  ARM: dts: Move display-timings node from fimd to dp in exynos5250-arndale, smdk5250 and smdk5420
  ARM: dts: Add Exynos5250 Snow Rev5+ support on exynos5250-snow-rev5
  ARM: dts: Unify voltage regulator style in exynos4412-odroid
  ARM: dts: Remove redundant pinctrl settings in exynos4412-odroid
  ARM: dts: Fix cpu compatible value for s3c2416
  ARM: dts: Add support Odroid XU4 board for exynos5422-odroidxu4
  ARM: dts: Split audio configuration to separate exynos5422-odroidxu3-audio
  ARM: dts: Fix power off method for exynos5422-odroidxu3-common
  dt-bindings: Document grounded ACOKB pin on S2MPS11
  ARM: dts: use pwm-fan device as a cooling device for exynos4412-odroidu3
  ARM: dts: Add pwm-fan node for exynos4412-odroidu3
  dt-bindings: Documentation entry to explain how to use PWM FAN as a cooling device
  ARM: dts: add suspend opp to exynos4412
  ...
parents 8ee57b81 df829b06
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1207 additions and 969 deletions
Documentation/devicetree/bindings/hwmon/pwm-fan.txt
View file @ b1ee27d4
...@@ -3,10 +3,35 @@ Bindings for a fan connected to the PWM lines ...@@ -3,10 +3,35 @@ Bindings for a fan connected to the PWM lines
Required properties: Required properties:
- compatible : "pwm-fan" - compatible : "pwm-fan"
- pwms : the PWM that is used to control the PWM fan - pwms : the PWM that is used to control the PWM fan
- cooling-levels : PWM duty cycle values in a range from 0 to 255
which correspond to thermal cooling states
Example: Example:
pwm-fan { fan0: pwm-fan {
compatible = "pwm-fan"; compatible = "pwm-fan";
status = "okay"; cooling-min-state = <0>;
cooling-max-state = <3>;
#cooling-cells = <2>;
pwms = <&pwm 0 10000 0>; pwms = <&pwm 0 10000 0>;
cooling-levels = <0 102 170 230>;
}; };
thermal-zones {
cpu_thermal: cpu-thermal {
thermal-sensors = <&tmu 0>;
polling-delay-passive = <0>;
polling-delay = <0>;
trips {
cpu_alert1: cpu-alert1 {
temperature = <100000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
};
cooling-maps {
map0 {
trip = <&cpu_alert1>;
cooling-device = <&fan0 0 1>;
};
};
};
Documentation/devicetree/bindings/mfd/s2mps11.txt
View file @ b1ee27d4
...@@ -15,6 +15,10 @@ Optional properties: ...@@ -15,6 +15,10 @@ Optional properties:
- interrupt-parent: Specifies the phandle of the interrupt controller to which - interrupt-parent: Specifies the phandle of the interrupt controller to which
the interrupts from s2mps11 are delivered to. the interrupts from s2mps11 are delivered to.
- interrupts: Interrupt specifiers for interrupt sources. - interrupts: Interrupt specifiers for interrupt sources.
- samsung,s2mps11-acokb-ground: Indicates that ACOKB pin of S2MPS11 PMIC is
connected to the ground so the PMIC must manually set PWRHOLD bit in CTRL1
register to turn off the power. Usually the ACOKB is pulled up to VBATT so
when PWRHOLD pin goes low, the rising ACOKB will trigger power off.
Optional nodes: Optional nodes:
- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768 - clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
......
arch/arm/boot/dts/Makefile
View file @ b1ee27d4
...@@ -118,6 +118,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ ...@@ -118,6 +118,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \
exynos5250-arndale.dtb \ exynos5250-arndale.dtb \
exynos5250-smdk5250.dtb \ exynos5250-smdk5250.dtb \
exynos5250-snow.dtb \ exynos5250-snow.dtb \
exynos5250-snow-rev5.dtb \
exynos5250-spring.dtb \ exynos5250-spring.dtb \
exynos5260-xyref5260.dtb \ exynos5260-xyref5260.dtb \
exynos5410-smdk5410.dtb \ exynos5410-smdk5410.dtb \
...@@ -126,6 +127,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \ ...@@ -126,6 +127,7 @@ dtb-$(CONFIG_ARCH_EXYNOS5) += \
exynos5420-smdk5420.dtb \ exynos5420-smdk5420.dtb \
exynos5422-odroidxu3.dtb \ exynos5422-odroidxu3.dtb \
exynos5422-odroidxu3-lite.dtb \ exynos5422-odroidxu3-lite.dtb \
exynos5422-odroidxu4.dtb \
exynos5440-sd5v1.dtb \ exynos5440-sd5v1.dtb \
exynos5440-ssdk5440.dtb \ exynos5440-ssdk5440.dtb \
exynos5800-peach-pi.dtb exynos5800-peach-pi.dtb
......
arch/arm/boot/dts/exynos3250-monk.dts
View file @ b1ee27d4
...@@ -52,13 +52,13 @@ vemmc_reg: voltage-regulator-0 { ...@@ -52,13 +52,13 @@ vemmc_reg: voltage-regulator-0 {
regulator-name = "V_EMMC_2.8V-fixed"; regulator-name = "V_EMMC_2.8V-fixed";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpk0 2 0>; gpio = <&gpk0 2 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
i2c_max77836: i2c-gpio-0 { i2c_max77836: i2c-gpio-0 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&gpd0 2 0>, <&gpd0 3 0>; gpios = <&gpd0 2 GPIO_ACTIVE_HIGH>, <&gpd0 3 GPIO_ACTIVE_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -266,14 +266,14 @@ ldo11_reg: LDO11 { ...@@ -266,14 +266,14 @@ ldo11_reg: LDO11 {
regulator-name = "V_EMMC_1.8V"; regulator-name = "V_EMMC_1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-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 { ldo12_reg: LDO12 {
regulator-name = "V_EMMC_2.8V"; regulator-name = "V_EMMC_2.8V";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-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 {
......
arch/arm/boot/dts/exynos3250-rinato.dts
View file @ b1ee27d4
...@@ -49,7 +49,7 @@ power_key { ...@@ -49,7 +49,7 @@ power_key {
i2c_max77836: i2c-gpio-0 { i2c_max77836: i2c-gpio-0 {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&gpd0 2 0>, <&gpd0 3 0>; gpios = <&gpd0 2 GPIO_ACTIVE_HIGH>, <&gpd0 3 GPIO_ACTIVE_HIGH>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -188,8 +188,8 @@ panel@0 { ...@@ -188,8 +188,8 @@ panel@0 {
reg = <0>; reg = <0>;
vdd3-supply = <&ldo16_reg>; vdd3-supply = <&ldo16_reg>;
vci-supply = <&ldo20_reg>; vci-supply = <&ldo20_reg>;
reset-gpios = <&gpe0 1 0>; reset-gpios = <&gpe0 1 GPIO_ACTIVE_HIGH>;
te-gpios = <&gpx0 6 0>; te-gpios = <&gpx0 6 GPIO_ACTIVE_HIGH>;
power-on-delay= <30>; power-on-delay= <30>;
power-off-delay= <120>; power-off-delay= <120>;
reset-delay = <5>; reset-delay = <5>;
...@@ -368,14 +368,14 @@ ldo11_reg: LDO11 { ...@@ -368,14 +368,14 @@ ldo11_reg: LDO11 {
regulator-name = "V_EMMC_1.8V"; regulator-name = "V_EMMC_1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-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 { ldo12_reg: LDO12 {
regulator-name = "V_EMMC_2.8V"; regulator-name = "V_EMMC_2.8V";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-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 {
......
arch/arm/boot/dts/exynos4.dtsi
View file @ b1ee27d4
...@@ -431,6 +431,8 @@ serial_0: serial@13800000 { ...@@ -431,6 +431,8 @@ serial_0: serial@13800000 {
interrupts = <0 52 0>; interrupts = <0 52 0>;
clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>; clocks = <&clock CLK_UART0>, <&clock CLK_SCLK_UART0>;
clock-names = "uart", "clk_uart_baud0"; clock-names = "uart", "clk_uart_baud0";
dmas = <&pdma0 15>, <&pdma0 16>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
...@@ -440,6 +442,8 @@ serial_1: serial@13810000 { ...@@ -440,6 +442,8 @@ serial_1: serial@13810000 {
interrupts = <0 53 0>; interrupts = <0 53 0>;
clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>; clocks = <&clock CLK_UART1>, <&clock CLK_SCLK_UART1>;
clock-names = "uart", "clk_uart_baud0"; clock-names = "uart", "clk_uart_baud0";
dmas = <&pdma1 15>, <&pdma1 16>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
...@@ -449,6 +453,8 @@ serial_2: serial@13820000 { ...@@ -449,6 +453,8 @@ serial_2: serial@13820000 {
interrupts = <0 54 0>; interrupts = <0 54 0>;
clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>; clocks = <&clock CLK_UART2>, <&clock CLK_SCLK_UART2>;
clock-names = "uart", "clk_uart_baud0"; clock-names = "uart", "clk_uart_baud0";
dmas = <&pdma0 17>, <&pdma0 18>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
...@@ -458,6 +464,8 @@ serial_3: serial@13830000 { ...@@ -458,6 +464,8 @@ serial_3: serial@13830000 {
interrupts = <0 55 0>; interrupts = <0 55 0>;
clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>; clocks = <&clock CLK_UART3>, <&clock CLK_SCLK_UART3>;
clock-names = "uart", "clk_uart_baud0"; clock-names = "uart", "clk_uart_baud0";
dmas = <&pdma1 17>, <&pdma1 18>;
dma-names = "rx", "tx";
status = "disabled"; status = "disabled";
}; };
......
arch/arm/boot/dts/exynos4210-origen.dts
View file @ b1ee27d4
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
/dts-v1/; /dts-v1/;
#include "exynos4210.dtsi" #include "exynos4210.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
...@@ -45,7 +46,7 @@ mmc_reg: regulator@0 { ...@@ -45,7 +46,7 @@ mmc_reg: regulator@0 {
regulator-name = "VMEM_VDD_2.8V"; regulator-name = "VMEM_VDD_2.8V";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpx1 1 0>; gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
}; };
...@@ -57,35 +58,35 @@ gpio_keys { ...@@ -57,35 +58,35 @@ gpio_keys {
up { up {
label = "Up"; label = "Up";
gpios = <&gpx2 0 1>; gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
linux,code = <KEY_UP>; linux,code = <KEY_UP>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
down { down {
label = "Down"; label = "Down";
gpios = <&gpx2 1 1>; gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
linux,code = <KEY_DOWN>; linux,code = <KEY_DOWN>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
back { back {
label = "Back"; label = "Back";
gpios = <&gpx1 7 1>; gpios = <&gpx1 7 GPIO_ACTIVE_LOW>;
linux,code = <KEY_BACK>; linux,code = <KEY_BACK>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
home { home {
label = "Home"; label = "Home";
gpios = <&gpx1 6 1>; gpios = <&gpx1 6 GPIO_ACTIVE_LOW>;
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
menu { menu {
label = "Menu"; label = "Menu";
gpios = <&gpx1 5 1>; gpios = <&gpx1 5 GPIO_ACTIVE_LOW>;
linux,code = <KEY_MENU>; linux,code = <KEY_MENU>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
...@@ -94,7 +95,7 @@ menu { ...@@ -94,7 +95,7 @@ menu {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
status { status {
gpios = <&gpx1 3 1>; gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
......
arch/arm/boot/dts/exynos4210-smdkv310.dts
View file @ b1ee27d4
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
/dts-v1/; /dts-v1/;
#include "exynos4210.dtsi" #include "exynos4210.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Samsung smdkv310 evaluation board based on Exynos4210"; model = "Samsung smdkv310 evaluation board based on Exynos4210";
...@@ -182,7 +183,7 @@ &serial_3 { ...@@ -182,7 +183,7 @@ &serial_3 {
}; };
&spi_2 { &spi_2 {
cs-gpios = <&gpc1 2 0>; cs-gpios = <&gpc1 2 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
w25x80@0 { w25x80@0 {
......
arch/arm/boot/dts/exynos4210-trats.dts
View file @ b1ee27d4
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
/dts-v1/; /dts-v1/;
#include "exynos4210.dtsi" #include "exynos4210.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Samsung Trats based on Exynos4210"; model = "Samsung Trats based on Exynos4210";
...@@ -39,7 +40,7 @@ vemmc_reg: regulator-0 { ...@@ -39,7 +40,7 @@ vemmc_reg: regulator-0 {
regulator-name = "VMEM_VDD_2.8V"; regulator-name = "VMEM_VDD_2.8V";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpk0 2 0>; gpio = <&gpk0 2 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
...@@ -48,7 +49,7 @@ tsp_reg: regulator-1 { ...@@ -48,7 +49,7 @@ tsp_reg: regulator-1 {
regulator-name = "TSP_FIXED_VOLTAGES"; regulator-name = "TSP_FIXED_VOLTAGES";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpl0 3 0>; gpio = <&gpl0 3 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
...@@ -57,7 +58,7 @@ cam_af_28v_reg: regulator-2 { ...@@ -57,7 +58,7 @@ cam_af_28v_reg: regulator-2 {
regulator-name = "8M_AF_2.8V_EN"; regulator-name = "8M_AF_2.8V_EN";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpk1 1 0>; gpio = <&gpk1 1 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
...@@ -66,7 +67,7 @@ cam_io_en_reg: regulator-3 { ...@@ -66,7 +67,7 @@ cam_io_en_reg: regulator-3 {
regulator-name = "CAM_IO_EN"; regulator-name = "CAM_IO_EN";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpe2 1 0>; gpio = <&gpe2 1 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
...@@ -75,7 +76,7 @@ cam_io_12v_reg: regulator-4 { ...@@ -75,7 +76,7 @@ cam_io_12v_reg: regulator-4 {
regulator-name = "8M_1.2V_EN"; regulator-name = "8M_1.2V_EN";
regulator-min-microvolt = <1200000>; regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
gpio = <&gpe2 5 0>; gpio = <&gpe2 5 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
...@@ -84,7 +85,7 @@ vt_core_15v_reg: regulator-5 { ...@@ -84,7 +85,7 @@ vt_core_15v_reg: regulator-5 {
regulator-name = "VT_CORE_1.5V"; regulator-name = "VT_CORE_1.5V";
regulator-min-microvolt = <1500000>; regulator-min-microvolt = <1500000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
gpio = <&gpe2 2 0>; gpio = <&gpe2 2 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
}; };
...@@ -93,21 +94,21 @@ gpio-keys { ...@@ -93,21 +94,21 @@ gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
vol-down-key { vol-down-key {
gpios = <&gpx2 1 1>; gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
linux,code = <114>; linux,code = <114>;
label = "volume down"; label = "volume down";
debounce-interval = <10>; debounce-interval = <10>;
}; };
vol-up-key { vol-up-key {
gpios = <&gpx2 0 1>; gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
linux,code = <115>; linux,code = <115>;
label = "volume up"; label = "volume up";
debounce-interval = <10>; debounce-interval = <10>;
}; };
power-key { power-key {
gpios = <&gpx2 7 1>; gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
linux,code = <116>; linux,code = <116>;
label = "power"; label = "power";
debounce-interval = <10>; debounce-interval = <10>;
...@@ -115,7 +116,7 @@ power-key { ...@@ -115,7 +116,7 @@ power-key {
}; };
ok-key { ok-key {
gpios = <&gpx3 5 1>; gpios = <&gpx3 5 GPIO_ACTIVE_LOW>;
linux,code = <352>; linux,code = <352>;
label = "ok"; label = "ok";
debounce-interval = <10>; debounce-interval = <10>;
...@@ -218,7 +219,7 @@ panel@0 { ...@@ -218,7 +219,7 @@ panel@0 {
compatible = "samsung,s6e8aa0"; compatible = "samsung,s6e8aa0";
vdd3-supply = <&vcclcd_reg>; vdd3-supply = <&vcclcd_reg>;
vci-supply = <&vlcd_reg>; vci-supply = <&vlcd_reg>;
reset-gpios = <&gpy4 5 0>; reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;
power-on-delay= <50>; power-on-delay= <50>;
reset-delay = <100>; reset-delay = <100>;
init-delay = <100>; init-delay = <100>;
...@@ -304,9 +305,9 @@ max8997_pmic@66 { ...@@ -304,9 +305,9 @@ max8997_pmic@66 {
max8997,pmic-ignore-gpiodvs-side-effect; max8997,pmic-ignore-gpiodvs-side-effect;
max8997,pmic-buck125-default-dvs-idx = <0>; max8997,pmic-buck125-default-dvs-idx = <0>;
max8997,pmic-buck125-dvs-gpios = <&gpx0 5 0>, max8997,pmic-buck125-dvs-gpios = <&gpx0 5 GPIO_ACTIVE_HIGH>,
<&gpx0 6 0>, <&gpx0 6 GPIO_ACTIVE_HIGH>,
<&gpl0 0 0>; <&gpl0 0 GPIO_ACTIVE_HIGH>;
max8997,pmic-buck1-dvs-voltage = <1350000>, <1300000>, max8997,pmic-buck1-dvs-voltage = <1350000>, <1300000>,
<1250000>, <1200000>, <1250000>, <1200000>,
......
arch/arm/boot/dts/exynos4210-universal_c210.dts
View file @ b1ee27d4
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
/dts-v1/; /dts-v1/;
#include "exynos4210.dtsi" #include "exynos4210.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Samsung Universal C210 based on Exynos4210 rev0"; model = "Samsung Universal C210 based on Exynos4210 rev0";
...@@ -65,7 +66,7 @@ vemmc_reg: voltage-regulator { ...@@ -65,7 +66,7 @@ vemmc_reg: voltage-regulator {
regulator-name = "VMEM_VDD_2_8V"; regulator-name = "VMEM_VDD_2_8V";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpe1 3 0>; gpio = <&gpe1 3 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
...@@ -73,21 +74,21 @@ gpio-keys { ...@@ -73,21 +74,21 @@ gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
vol-up-key { vol-up-key {
gpios = <&gpx2 0 1>; gpios = <&gpx2 0 GPIO_ACTIVE_LOW>;
linux,code = <115>; linux,code = <115>;
label = "volume up"; label = "volume up";
debounce-interval = <1>; debounce-interval = <1>;
}; };
vol-down-key { vol-down-key {
gpios = <&gpx2 1 1>; gpios = <&gpx2 1 GPIO_ACTIVE_LOW>;
linux,code = <114>; linux,code = <114>;
label = "volume down"; label = "volume down";
debounce-interval = <1>; debounce-interval = <1>;
}; };
config-key { config-key {
gpios = <&gpx2 2 1>; gpios = <&gpx2 2 GPIO_ACTIVE_LOW>;
linux,code = <171>; linux,code = <171>;
label = "config"; label = "config";
debounce-interval = <1>; debounce-interval = <1>;
...@@ -95,14 +96,14 @@ config-key { ...@@ -95,14 +96,14 @@ config-key {
}; };
camera-key { camera-key {
gpios = <&gpx2 3 1>; gpios = <&gpx2 3 GPIO_ACTIVE_LOW>;
linux,code = <212>; linux,code = <212>;
label = "camera"; label = "camera";
debounce-interval = <1>; debounce-interval = <1>;
}; };
power-key { power-key {
gpios = <&gpx2 7 1>; gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
linux,code = <116>; linux,code = <116>;
label = "power"; label = "power";
debounce-interval = <1>; debounce-interval = <1>;
...@@ -110,7 +111,7 @@ power-key { ...@@ -110,7 +111,7 @@ power-key {
}; };
ok-key { ok-key {
gpios = <&gpx3 5 1>; gpios = <&gpx3 5 GPIO_ACTIVE_LOW>;
linux,code = <352>; linux,code = <352>;
label = "ok"; label = "ok";
debounce-interval = <1>; debounce-interval = <1>;
...@@ -122,7 +123,7 @@ tsp_reg: voltage-regulator { ...@@ -122,7 +123,7 @@ tsp_reg: voltage-regulator {
regulator-name = "TSP_2_8V"; regulator-name = "TSP_2_8V";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpe2 3 0>; gpio = <&gpe2 3 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
...@@ -131,17 +132,17 @@ spi-lcd { ...@@ -131,17 +132,17 @@ spi-lcd {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
gpio-sck = <&gpy3 1 0>; gpio-sck = <&gpy3 1 GPIO_ACTIVE_HIGH>;
gpio-mosi = <&gpy3 3 0>; gpio-mosi = <&gpy3 3 GPIO_ACTIVE_HIGH>;
num-chipselects = <1>; num-chipselects = <1>;
cs-gpios = <&gpy4 3 0>; cs-gpios = <&gpy4 3 GPIO_ACTIVE_HIGH>;
lcd@0 { lcd@0 {
compatible = "samsung,ld9040"; compatible = "samsung,ld9040";
reg = <0>; reg = <0>;
vdd3-supply = <&ldo7_reg>; vdd3-supply = <&ldo7_reg>;
vci-supply = <&ldo17_reg>; vci-supply = <&ldo17_reg>;
reset-gpios = <&gpy4 5 0>; reset-gpios = <&gpy4 5 GPIO_ACTIVE_HIGH>;
spi-max-frequency = <1200000>; spi-max-frequency = <1200000>;
spi-cpol; spi-cpol;
spi-cpha; spi-cpha;
...@@ -218,13 +219,13 @@ hdmi_en: voltage-regulator-hdmi-5v { ...@@ -218,13 +219,13 @@ hdmi_en: voltage-regulator-hdmi-5v {
regulator-name = "HDMI_5V"; regulator-name = "HDMI_5V";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpe0 1 0>; gpio = <&gpe0 1 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
hdmi_ddc: i2c-ddc { hdmi_ddc: i2c-ddc {
compatible = "i2c-gpio"; compatible = "i2c-gpio";
gpios = <&gpe4 2 0 &gpe4 3 0>; gpios = <&gpe4 2 GPIO_ACTIVE_HIGH &gpe4 3 GPIO_ACTIVE_HIGH>;
i2c-gpio,delay-us = <100>; i2c-gpio,delay-us = <100>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -267,7 +268,7 @@ fimd_dpi_ep: endpoint { ...@@ -267,7 +268,7 @@ fimd_dpi_ep: endpoint {
}; };
&hdmi { &hdmi {
hpd-gpio = <&gpx3 7 0>; hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd>; pinctrl-0 = <&hdmi_hpd>;
hdmi-en-supply = <&hdmi_en>; hdmi-en-supply = <&hdmi_en>;
...@@ -311,7 +312,8 @@ vdd_arm_reg: pmic@60 { ...@@ -311,7 +312,8 @@ vdd_arm_reg: pmic@60 {
compatible = "maxim,max8952"; compatible = "maxim,max8952";
reg = <0x60>; reg = <0x60>;
max8952,vid-gpios = <&gpx0 3 0>, <&gpx0 4 0>; max8952,vid-gpios = <&gpx0 3 GPIO_ACTIVE_HIGH>,
<&gpx0 4 GPIO_ACTIVE_HIGH>;
max8952,default-mode = <0>; max8952,default-mode = <0>;
max8952,dvs-mode-microvolt = <1250000>, <1200000>, max8952,dvs-mode-microvolt = <1250000>, <1200000>,
<1050000>, <950000>; <1050000>, <950000>;
...@@ -330,13 +332,13 @@ pmic@66 { ...@@ -330,13 +332,13 @@ pmic@66 {
reg = <0x66>; reg = <0x66>;
max8998,pmic-buck1-default-dvs-idx = <0>; max8998,pmic-buck1-default-dvs-idx = <0>;
max8998,pmic-buck1-dvs-gpios = <&gpx0 5 0>, max8998,pmic-buck1-dvs-gpios = <&gpx0 5 GPIO_ACTIVE_HIGH>,
<&gpx0 6 0>; <&gpx0 6 GPIO_ACTIVE_HIGH>;
max8998,pmic-buck1-dvs-voltage = <1100000>, <1000000>, max8998,pmic-buck1-dvs-voltage = <1100000>, <1000000>,
<1100000>, <1000000>; <1100000>, <1000000>;
max8998,pmic-buck2-default-dvs-idx = <0>; max8998,pmic-buck2-default-dvs-idx = <0>;
max8998,pmic-buck2-dvs-gpio = <&gpe2 0 0>; max8998,pmic-buck2-dvs-gpio = <&gpe2 0 GPIO_ACTIVE_HIGH>;
max8998,pmic-buck2-dvs-voltage = <1200000>, <1100000>; max8998,pmic-buck2-dvs-voltage = <1200000>, <1100000>;
regulators { regulators {
...@@ -551,7 +553,7 @@ &sdhci_2 { ...@@ -551,7 +553,7 @@ &sdhci_2 {
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4>;
pinctrl-names = "default"; pinctrl-names = "default";
vmmc-supply = <&ldo5_reg>; vmmc-supply = <&ldo5_reg>;
cd-gpios = <&gpx3 4 0>; cd-gpios = <&gpx3 4 GPIO_ACTIVE_HIGH>;
cd-inverted; cd-inverted;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View file @ b1ee27d4
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/clock/maxim,max77686.h> #include <dt-bindings/clock/maxim,max77686.h>
#include "exynos4412.dtsi" #include "exynos4412.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
chosen { chosen {
...@@ -30,7 +31,7 @@ gpio_keys { ...@@ -30,7 +31,7 @@ gpio_keys {
power_key { power_key {
interrupt-parent = <&gpx1>; interrupt-parent = <&gpx1>;
interrupts = <3 0>; interrupts = <3 0>;
gpios = <&gpx1 3 1>; gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_POWER>; linux,code = <KEY_POWER>;
label = "power key"; label = "power key";
debounce-interval = <10>; debounce-interval = <10>;
...@@ -70,7 +71,7 @@ emmc_pwrseq: pwrseq { ...@@ -70,7 +71,7 @@ emmc_pwrseq: pwrseq {
pinctrl-0 = <&sd1_cd>; pinctrl-0 = <&sd1_cd>;
pinctrl-names = "default"; pinctrl-names = "default";
compatible = "mmc-pwrseq-emmc"; compatible = "mmc-pwrseq-emmc";
reset-gpios = <&gpk1 2 1>; reset-gpios = <&gpk1 2 GPIO_ACTIVE_LOW>;
}; };
camera { camera {
...@@ -181,7 +182,7 @@ &g2d { ...@@ -181,7 +182,7 @@ &g2d {
}; };
&hdmi { &hdmi {
hpd-gpio = <&gpx3 7 0>; hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd>; pinctrl-0 = <&hdmi_hpd>;
vdd-supply = <&ldo8_reg>; vdd-supply = <&ldo8_reg>;
...@@ -199,8 +200,6 @@ &hsotg { ...@@ -199,8 +200,6 @@ &hsotg {
}; };
&i2c_0 { &i2c_0 {
pinctrl-0 = <&i2c0_bus>;
pinctrl-names = "default";
samsung,i2c-sda-delay = <100>; samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <400000>; samsung,i2c-max-bus-freq = <400000>;
status = "okay"; status = "okay";
...@@ -209,9 +208,9 @@ usb3503: usb3503@08 { ...@@ -209,9 +208,9 @@ usb3503: usb3503@08 {
compatible = "smsc,usb3503"; compatible = "smsc,usb3503";
reg = <0x08>; reg = <0x08>;
intn-gpios = <&gpx3 0 0>; intn-gpios = <&gpx3 0 GPIO_ACTIVE_HIGH>;
connect-gpios = <&gpx3 4 0>; connect-gpios = <&gpx3 4 GPIO_ACTIVE_HIGH>;
reset-gpios = <&gpx3 5 0>; reset-gpios = <&gpx3 5 GPIO_ACTIVE_HIGH>;
initial-mode = <1>; initial-mode = <1>;
}; };
...@@ -276,15 +275,13 @@ ldo7_reg: LDO7 { ...@@ -276,15 +275,13 @@ ldo7_reg: LDO7 {
regulator-always-on; regulator-always-on;
}; };
ldo8_reg: ldo@8 { ldo8_reg: LDO8 {
regulator-compatible = "LDO8";
regulator-name = "VDD10_HDMI_1.0V"; regulator-name = "VDD10_HDMI_1.0V";
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1000000>; regulator-max-microvolt = <1000000>;
}; };
ldo10_reg: ldo@10 { ldo10_reg: LDO10 {
regulator-compatible = "LDO10";
regulator-name = "VDDQ_MIPIHSI_1.8V"; regulator-name = "VDDQ_MIPIHSI_1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
...@@ -424,8 +421,6 @@ buck8_reg: BUCK8 { ...@@ -424,8 +421,6 @@ buck8_reg: BUCK8 {
}; };
&i2c_1 { &i2c_1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_bus>;
status = "okay"; status = "okay";
max98090: max98090@10 { max98090: max98090@10 {
compatible = "maxim,max98090"; compatible = "maxim,max98090";
...@@ -440,8 +435,6 @@ max98090: max98090@10 { ...@@ -440,8 +435,6 @@ max98090: max98090@10 {
&i2c_2 { &i2c_2 {
status = "okay"; status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&i2c2_bus>;
}; };
&i2c_8 { &i2c_8 {
...@@ -490,7 +483,7 @@ &sdhci_2 { ...@@ -490,7 +483,7 @@ &sdhci_2 {
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
pinctrl-names = "default"; pinctrl-names = "default";
vmmc-supply = <&ldo4_reg &ldo21_reg>; vmmc-supply = <&ldo4_reg &ldo21_reg>;
cd-gpios = <&gpk2 2 0>; cd-gpios = <&gpk2 2 GPIO_ACTIVE_HIGH>;
cd-inverted; cd-inverted;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/exynos4412-odroidu3.dts
View file @ b1ee27d4
...@@ -27,11 +27,54 @@ leds { ...@@ -27,11 +27,54 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led1 { led1 {
label = "led1:heart"; label = "led1:heart";
gpios = <&gpc1 0 1>; gpios = <&gpc1 0 GPIO_ACTIVE_LOW>;
default-state = "on"; default-state = "on";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
}; };
fan0: pwm-fan {
compatible = "pwm-fan";
pwms = <&pwm 0 10000 0>;
cooling-min-state = <0>;
cooling-max-state = <3>;
#cooling-cells = <2>;
cooling-levels = <0 102 170 230>;
};
thermal-zones {
cpu_thermal: cpu-thermal {
cooling-maps {
map0 {
trip = <&cpu_alert1>;
cooling-device = <&cpu0 7 7>;
};
map1 {
trip = <&cpu_alert2>;
cooling-device = <&cpu0 13 13>;
};
map2 {
trip = <&cpu_alert0>;
cooling-device = <&fan0 0 1>;
};
map3 {
trip = <&cpu_alert1>;
cooling-device = <&fan0 1 2>;
};
map4 {
trip = <&cpu_alert2>;
cooling-device = <&fan0 2 3>;
};
};
};
};
};
&pwm {
pinctrl-0 = <&pwm0_out>;
pinctrl-names = "default";
samsung,pwm-outputs = <0>;
status = "okay";
}; };
&usb3503 { &usb3503 {
......
arch/arm/boot/dts/exynos4412-odroidx.dts
View file @ b1ee27d4
...@@ -26,13 +26,13 @@ leds { ...@@ -26,13 +26,13 @@ leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
led1 { led1 {
label = "led1:heart"; label = "led1:heart";
gpios = <&gpc1 0 1>; gpios = <&gpc1 0 GPIO_ACTIVE_LOW>;
default-state = "on"; default-state = "on";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led2 { led2 {
label = "led2:mmc0"; label = "led2:mmc0";
gpios = <&gpc1 2 1>; gpios = <&gpc1 2 GPIO_ACTIVE_LOW>;
default-state = "on"; default-state = "on";
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
...@@ -44,7 +44,7 @@ gpio_keys { ...@@ -44,7 +44,7 @@ gpio_keys {
home_key { home_key {
interrupt-parent = <&gpx2>; interrupt-parent = <&gpx2>;
interrupts = <2 0>; interrupts = <2 0>;
gpios = <&gpx2 2 0>; gpios = <&gpx2 2 GPIO_ACTIVE_HIGH>;
linux,code = <KEY_HOME>; linux,code = <KEY_HOME>;
label = "home key"; label = "home key";
debounce-interval = <10>; debounce-interval = <10>;
...@@ -57,7 +57,7 @@ regulator_p3v3 { ...@@ -57,7 +57,7 @@ regulator_p3v3 {
regulator-name = "p3v3_en"; regulator-name = "p3v3_en";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
gpio = <&gpa1 1 1>; gpio = <&gpa1 1 GPIO_ACTIVE_LOW>;
enable-active-high; enable-active-high;
regulator-always-on; regulator-always-on;
}; };
......
arch/arm/boot/dts/exynos4412-origen.dts
View file @ b1ee27d4
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
/dts-v1/; /dts-v1/;
#include "exynos4412.dtsi" #include "exynos4412.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
/ { / {
...@@ -45,7 +46,7 @@ mmc_reg: regulator@0 { ...@@ -45,7 +46,7 @@ mmc_reg: regulator@0 {
regulator-name = "VMEM_VDD_2.8V"; regulator-name = "VMEM_VDD_2.8V";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
gpio = <&gpx1 1 0>; gpio = <&gpx1 1 GPIO_ACTIVE_HIGH>;
enable-active-high; enable-active-high;
}; };
}; };
...@@ -107,13 +108,13 @@ s5m8767_pmic@66 { ...@@ -107,13 +108,13 @@ s5m8767_pmic@66 {
s5m8767,pmic-buck-default-dvs-idx = <3>; s5m8767,pmic-buck-default-dvs-idx = <3>;
s5m8767,pmic-buck-dvs-gpios = <&gpx2 3 0>, s5m8767,pmic-buck-dvs-gpios = <&gpx2 3 GPIO_ACTIVE_HIGH>,
<&gpx2 4 0>, <&gpx2 4 GPIO_ACTIVE_HIGH>,
<&gpx2 5 0>; <&gpx2 5 GPIO_ACTIVE_HIGH>;
s5m8767,pmic-buck-ds-gpios = <&gpm3 5 0>, s5m8767,pmic-buck-ds-gpios = <&gpm3 5 GPIO_ACTIVE_HIGH>,
<&gpm3 6 0>, <&gpm3 6 GPIO_ACTIVE_HIGH>,
<&gpm3 7 0>; <&gpm3 7 GPIO_ACTIVE_HIGH>;
s5m8767,pmic-buck2-dvs-voltage = <1250000>, <1200000>, s5m8767,pmic-buck2-dvs-voltage = <1250000>, <1200000>,
<1200000>, <1200000>, <1200000>, <1200000>,
......
arch/arm/boot/dts/exynos4412-tiny4412.dts
View file @ b1ee27d4
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
/dts-v1/; /dts-v1/;
#include "exynos4412.dtsi" #include "exynos4412.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "FriendlyARM TINY4412 board based on Exynos4412"; model = "FriendlyARM TINY4412 board based on Exynos4412";
...@@ -31,26 +32,26 @@ leds { ...@@ -31,26 +32,26 @@ leds {
led1 { led1 {
label = "led1"; label = "led1";
gpios = <&gpm4 0 1>; gpios = <&gpm4 0 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
linux,default-trigger = "heartbeat"; linux,default-trigger = "heartbeat";
}; };
led2 { led2 {
label = "led2"; label = "led2";
gpios = <&gpm4 1 1>; gpios = <&gpm4 1 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
led3 { led3 {
label = "led3"; label = "led3";
gpios = <&gpm4 2 1>; gpios = <&gpm4 2 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
}; };
led4 { led4 {
label = "led4"; label = "led4";
gpios = <&gpm4 3 1>; gpios = <&gpm4 3 GPIO_ACTIVE_LOW>;
default-state = "off"; default-state = "off";
linux,default-trigger = "mmc0"; linux,default-trigger = "mmc0";
}; };
......
arch/arm/boot/dts/exynos4412-trats2.dts
View file @ b1ee27d4
This diff is collapsed.
arch/arm/boot/dts/exynos4412.dtsi
View file @ b1ee27d4
...@@ -98,6 +98,7 @@ opp06 { ...@@ -98,6 +98,7 @@ opp06 {
opp-hz = /bits/ 64 <800000000>; opp-hz = /bits/ 64 <800000000>;
opp-microvolt = <1000000>; opp-microvolt = <1000000>;
clock-latency-ns = <200000>; clock-latency-ns = <200000>;
opp-suspend;
}; };
opp07 { opp07 {
opp-hz = /bits/ 64 <900000000>; opp-hz = /bits/ 64 <900000000>;
......
arch/arm/boot/dts/exynos5250-arndale.dts
View file @ b1ee27d4
...@@ -129,10 +129,6 @@ &dp { ...@@ -129,10 +129,6 @@ &dp {
samsung,color-depth = <1>; samsung,color-depth = <1>;
samsung,link-rate = <0x0a>; samsung,link-rate = <0x0a>;
samsung,lane-count = <4>; samsung,lane-count = <4>;
};
&fimd {
status = "okay";
display-timings { display-timings {
native-mode = <&timing0>; native-mode = <&timing0>;
...@@ -152,6 +148,10 @@ timing0: timing@0 { ...@@ -152,6 +148,10 @@ timing0: timing@0 {
}; };
}; };
&fimd {
status = "okay";
};
&hdmi { &hdmi {
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_LOW>; hpd-gpio = <&gpx3 7 GPIO_ACTIVE_LOW>;
vdd_osc-supply = <&ldo10_reg>; vdd_osc-supply = <&ldo10_reg>;
......
arch/arm/boot/dts/exynos5250-smdk5250.dts
View file @ b1ee27d4
...@@ -89,14 +89,6 @@ &dp { ...@@ -89,14 +89,6 @@ &dp {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&dp_hpd>; pinctrl-0 = <&dp_hpd>;
status = "okay"; status = "okay";
};
&ehci {
samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
};
&fimd {
status = "okay";
display-timings { display-timings {
native-mode = <&timing0>; native-mode = <&timing0>;
...@@ -116,6 +108,14 @@ timing0: timing@0 { ...@@ -116,6 +108,14 @@ timing0: timing@0 {
}; };
}; };
&ehci {
samsung,vbus-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
};
&fimd {
status = "okay";
};
&hdmi { &hdmi {
hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>; hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
}; };
......
arch/arm/boot/dts/exynos5250-snow-common.dtsi 0 → 100644
View file @ b1ee27d4
This diff is collapsed.
arch/arm/boot/dts/exynos5250-snow-rev5.dts 0 → 100644
View file @ b1ee27d4
/*
* Google Snow Rev 5+ board device tree source
*
* Copyright (c) 2012 Google, Inc
* Copyright (c) 2015 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* 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.
*/
/dts-v1/;
#include "exynos5250-snow-common.dtsi"
/ {
model = "Google Snow Rev 5+";
compatible = "google,snow-rev5", "samsung,exynos5250",
"samsung,exynos5";
sound {
compatible = "google,snow-audio-max98090";
samsung,model = "Snow-I2S-MAX98090";
samsung,audio-codec = <&max98090>;
};
};
&i2c_7 {
max98090: codec@10 {
compatible = "maxim,max98090";
reg = <0x10>;
interrupts = <4 IRQ_TYPE_NONE>;
interrupt-parent = <&gpx0>;
pinctrl-names = "default";
pinctrl-0 = <&max98090_irq>;
};
};
&pinctrl_0 {
max98090_irq: max98090-irq {
samsung,pins = "gpx0-4";
samsung,pin-function = <0>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
};
arch/arm/boot/dts/exynos5250-snow.dts
View file @ b1ee27d4
This diff is collapsed.
arch/arm/boot/dts/exynos5420-arndale-octa.dts
View file @ b1ee27d4
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
/dts-v1/; /dts-v1/;
#include "exynos5420.dtsi" #include "exynos5420.dtsi"
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
#include <dt-bindings/input/input.h> #include <dt-bindings/input/input.h>
#include <dt-bindings/clock/samsung,s2mps11.h> #include <dt-bindings/clock/samsung,s2mps11.h>
...@@ -44,7 +45,7 @@ gpio_keys { ...@@ -44,7 +45,7 @@ gpio_keys {
wakeup { wakeup {
label = "SW-TACT1"; label = "SW-TACT1";
gpios = <&gpx2 7 1>; gpios = <&gpx2 7 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WAKEUP>; linux,code = <KEY_WAKEUP>;
gpio-key,wakeup; gpio-key,wakeup;
}; };
......
arch/arm/boot/dts/exynos5420-peach-pit.dts
View file @ b1ee27d4
...@@ -94,7 +94,7 @@ usb300_vbus_reg: regulator-usb300 { ...@@ -94,7 +94,7 @@ usb300_vbus_reg: regulator-usb300 {
regulator-name = "P5.0V_USB3CON0"; regulator-name = "P5.0V_USB3CON0";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gph0 0 0>; gpio = <&gph0 0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb300_vbus_en>; pinctrl-0 = <&usb300_vbus_en>;
enable-active-high; enable-active-high;
...@@ -105,7 +105,7 @@ usb301_vbus_reg: regulator-usb301 { ...@@ -105,7 +105,7 @@ usb301_vbus_reg: regulator-usb301 {
regulator-name = "P5.0V_USB3CON1"; regulator-name = "P5.0V_USB3CON1";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gph0 1 0>; gpio = <&gph0 1 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb301_vbus_en>; pinctrl-0 = <&usb301_vbus_en>;
enable-active-high; enable-active-high;
...@@ -153,7 +153,7 @@ &dp { ...@@ -153,7 +153,7 @@ &dp {
samsung,color-depth = <1>; samsung,color-depth = <1>;
samsung,link-rate = <0x06>; samsung,link-rate = <0x06>;
samsung,lane-count = <2>; samsung,lane-count = <2>;
samsung,hpd-gpio = <&gpx2 6 0>; samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
ports { ports {
port@0 { port@0 {
...@@ -925,7 +925,7 @@ &spi_2 { ...@@ -925,7 +925,7 @@ &spi_2 {
status = "okay"; status = "okay";
num-cs = <1>; num-cs = <1>;
samsung,spi-src-clk = <0>; samsung,spi-src-clk = <0>;
cs-gpios = <&gpb1 2 0>; cs-gpios = <&gpb1 2 GPIO_ACTIVE_HIGH>;
cros_ec: cros-ec@0 { cros_ec: cros-ec@0 {
compatible = "google,cros-ec-spi"; compatible = "google,cros-ec-spi";
...@@ -935,6 +935,7 @@ cros_ec: cros-ec@0 { ...@@ -935,6 +935,7 @@ cros_ec: cros-ec@0 {
pinctrl-0 = <&ec_spi_cs &ec_irq>; pinctrl-0 = <&ec_spi_cs &ec_irq>;
reg = <0>; reg = <0>;
spi-max-frequency = <3125000>; spi-max-frequency = <3125000>;
google,has-vbc-nvram;
controller-data { controller-data {
samsung,spi-feedback-delay = <1>; samsung,spi-feedback-delay = <1>;
......
arch/arm/boot/dts/exynos5420-smdk5420.dts
View file @ b1ee27d4
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
/dts-v1/; /dts-v1/;
#include "exynos5420.dtsi" #include "exynos5420.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "Samsung SMDK5420 board based on EXYNOS5420"; model = "Samsung SMDK5420 board based on EXYNOS5420";
...@@ -69,7 +70,7 @@ usb300_vbus_reg: regulator-usb300 { ...@@ -69,7 +70,7 @@ usb300_vbus_reg: regulator-usb300 {
regulator-name = "VBUS0"; regulator-name = "VBUS0";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpg0 5 0>; gpio = <&gpg0 5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb300_vbus_en>; pinctrl-0 = <&usb300_vbus_en>;
enable-active-high; enable-active-high;
...@@ -80,7 +81,7 @@ usb301_vbus_reg: regulator-usb301 { ...@@ -80,7 +81,7 @@ usb301_vbus_reg: regulator-usb301 {
regulator-name = "VBUS1"; regulator-name = "VBUS1";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gpg1 4 0>; gpio = <&gpg1 4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb301_vbus_en>; pinctrl-0 = <&usb301_vbus_en>;
enable-active-high; enable-active-high;
...@@ -98,10 +99,7 @@ &dp { ...@@ -98,10 +99,7 @@ &dp {
samsung,link-rate = <0x0a>; samsung,link-rate = <0x0a>;
samsung,lane-count = <4>; samsung,lane-count = <4>;
status = "okay"; status = "okay";
};
&fimd {
status = "okay";
display-timings { display-timings {
native-mode = <&timing0>; native-mode = <&timing0>;
timing0: timing@0 { timing0: timing@0 {
...@@ -118,9 +116,13 @@ timing0: timing@0 { ...@@ -118,9 +116,13 @@ timing0: timing@0 {
}; };
}; };
&fimd {
status = "okay";
};
&hdmi { &hdmi {
status = "okay"; status = "okay";
hpd-gpio = <&gpx3 7 0>; hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>; pinctrl-0 = <&hdmi_hpd_irq>;
}; };
......
arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi 0 → 100644
View file @ b1ee27d4
/*
* Hardkernel Odroid XU3 Audio Codec device tree source
*
* Copyright (c) 2015 Krzysztof Kozlowski
* Copyright (c) 2014 Collabora Ltd.
* Copyright (c) 2013 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* 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.
*/
/ {
sound: sound {
compatible = "simple-audio-card";
simple-audio-card,name = "Odroid-XU3";
simple-audio-card,widgets =
"Headphone", "Headphone Jack",
"Speakers", "Speakers";
simple-audio-card,routing =
"Headphone Jack", "HPL",
"Headphone Jack", "HPR",
"Headphone Jack", "MICBIAS",
"IN1", "Headphone Jack",
"Speakers", "SPKL",
"Speakers", "SPKR";
simple-audio-card,format = "i2s";
simple-audio-card,bitclock-master = <&link0_codec>;
simple-audio-card,frame-master = <&link0_codec>;
simple-audio-card,cpu {
sound-dai = <&i2s0 0>;
system-clock-frequency = <19200000>;
};
link0_codec: simple-audio-card,codec {
sound-dai = <&max98090>;
clocks = <&i2s0 CLK_I2S_CDCLK>;
};
};
};
&hsi2c_5 {
status = "okay";
max98090: max98090@10 {
compatible = "maxim,max98090";
reg = <0x10>;
interrupt-parent = <&gpx3>;
interrupts = <2 0>;
clocks = <&i2s0 CLK_I2S_CDCLK>;
clock-names = "mclk";
#sound-dai-cells = <0>;
};
};
&i2s0 {
status = "okay";
};
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
View file @ b1ee27d4
...@@ -43,71 +43,7 @@ emmc_pwrseq: pwrseq { ...@@ -43,71 +43,7 @@ emmc_pwrseq: pwrseq {
pinctrl-0 = <&emmc_nrst_pin>; pinctrl-0 = <&emmc_nrst_pin>;
pinctrl-names = "default"; pinctrl-names = "default";
compatible = "mmc-pwrseq-emmc"; compatible = "mmc-pwrseq-emmc";
reset-gpios = <&gpd1 0 1>; reset-gpios = <&gpd1 0 GPIO_ACTIVE_LOW>;
};
pwmleds {
compatible = "pwm-leds";
greenled {
label = "green:mmc0";
pwms = <&pwm 1 2000000 0>;
pwm-names = "pwm1";
/*
* Green LED is much brighter than the others
* so limit its max brightness
*/
max_brightness = <127>;
linux,default-trigger = "mmc0";
};
blueled {
label = "blue:heartbeat";
pwms = <&pwm 2 2000000 0>;
pwm-names = "pwm2";
max_brightness = <255>;
linux,default-trigger = "heartbeat";
};
};
gpioleds {
compatible = "gpio-leds";
redled {
label = "red:microSD";
gpios = <&gpx2 3 GPIO_ACTIVE_HIGH>;
default-state = "off";
linux,default-trigger = "mmc1";
};
};
sound: sound {
compatible = "simple-audio-card";
simple-audio-card,name = "Odroid-XU3";
simple-audio-card,widgets =
"Headphone", "Headphone Jack",
"Speakers", "Speakers";
simple-audio-card,routing =
"Headphone Jack", "HPL",
"Headphone Jack", "HPR",
"Headphone Jack", "MICBIAS",
"IN1", "Headphone Jack",
"Speakers", "SPKL",
"Speakers", "SPKR";
simple-audio-card,format = "i2s";
simple-audio-card,bitclock-master = <&link0_codec>;
simple-audio-card,frame-master = <&link0_codec>;
simple-audio-card,cpu {
sound-dai = <&i2s0 0>;
system-clock-frequency = <19200000>;
};
link0_codec: simple-audio-card,codec {
sound-dai = <&max98090>;
clocks = <&i2s0 CLK_I2S_CDCLK>;
};
}; };
fan0: pwm-fan { fan0: pwm-fan {
...@@ -138,7 +74,7 @@ &fimd { ...@@ -138,7 +74,7 @@ &fimd {
&hdmi { &hdmi {
status = "okay"; status = "okay";
hpd-gpio = <&gpx3 7 0>; hpd-gpio = <&gpx3 7 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hdmi_hpd_irq>; pinctrl-0 = <&hdmi_hpd_irq>;
...@@ -160,6 +96,7 @@ s2mps11_pmic@66 { ...@@ -160,6 +96,7 @@ s2mps11_pmic@66 {
s2mps11,buck2-ramp-enable = <1>; s2mps11,buck2-ramp-enable = <1>;
s2mps11,buck3-ramp-enable = <1>; s2mps11,buck3-ramp-enable = <1>;
s2mps11,buck4-ramp-enable = <1>; s2mps11,buck4-ramp-enable = <1>;
samsung,s2mps11-acokb-ground;
interrupt-parent = <&gpx0>; interrupt-parent = <&gpx0>;
interrupts = <4 IRQ_TYPE_EDGE_FALLING>; interrupts = <4 IRQ_TYPE_EDGE_FALLING>;
...@@ -375,19 +312,6 @@ buck10_reg: BUCK10 { ...@@ -375,19 +312,6 @@ buck10_reg: BUCK10 {
}; };
}; };
&hsi2c_5 {
status = "okay";
max98090: max98090@10 {
compatible = "maxim,max98090";
reg = <0x10>;
interrupt-parent = <&gpx3>;
interrupts = <2 0>;
clocks = <&i2s0 CLK_I2S_CDCLK>;
clock-names = "mclk";
#sound-dai-cells = <0>;
};
};
&i2c_2 { &i2c_2 {
samsung,i2c-sda-delay = <100>; samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <66000>; samsung,i2c-max-bus-freq = <66000>;
...@@ -399,10 +323,6 @@ hdmiddc@50 { ...@@ -399,10 +323,6 @@ hdmiddc@50 {
}; };
}; };
&i2s0 {
status = "okay";
};
&mfc { &mfc {
samsung,mfc-r = <0x43000000 0x800000>; samsung,mfc-r = <0x43000000 0x800000>;
samsung,mfc-l = <0x51000000 0x800000>; samsung,mfc-l = <0x51000000 0x800000>;
...@@ -463,19 +383,6 @@ emmc_nrst_pin: emmc-nrst { ...@@ -463,19 +383,6 @@ emmc_nrst_pin: emmc-nrst {
}; };
}; };
&pwm {
/*
* PWM 0 -- fan
* PWM 1 -- Green LED
* PWM 2 -- Blue LED
* PWM 3 -- on MIPI connector for backlight
*/
pinctrl-0 = <&pwm0_out &pwm1_out &pwm2_out &pwm3_out>;
pinctrl-names = "default";
samsung,pwm-outputs = <0>;
status = "okay";
};
&tmu_cpu0 { &tmu_cpu0 {
vtmu-supply = <&ldo7_reg>; vtmu-supply = <&ldo7_reg>;
status = "okay"; status = "okay";
...@@ -511,9 +418,7 @@ &usbdrd_dwc3_0 { ...@@ -511,9 +418,7 @@ &usbdrd_dwc3_0 {
dr_mode = "host"; dr_mode = "host";
}; };
&usbdrd_dwc3_1 { /* usbdrd_dwc3_1 mode customized in each board */
dr_mode = "otg";
};
&usbdrd3_0 { &usbdrd3_0 {
vdd33-supply = <&ldo9_reg>; vdd33-supply = <&ldo9_reg>;
......
arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts
View file @ b1ee27d4
...@@ -13,8 +13,59 @@ ...@@ -13,8 +13,59 @@
/dts-v1/; /dts-v1/;
#include "exynos5422-odroidxu3-common.dtsi" #include "exynos5422-odroidxu3-common.dtsi"
#include "exynos5422-odroidxu3-audio.dtsi"
/ { / {
model = "Hardkernel Odroid XU3 Lite"; model = "Hardkernel Odroid XU3 Lite";
compatible = "hardkernel,odroid-xu3-lite", "samsung,exynos5800", "samsung,exynos5"; compatible = "hardkernel,odroid-xu3-lite", "samsung,exynos5800", "samsung,exynos5";
pwmleds {
compatible = "pwm-leds";
greenled {
label = "green:mmc0";
pwms = <&pwm 1 2000000 0>;
pwm-names = "pwm1";
/*
* Green LED is much brighter than the others
* so limit its max brightness
*/
max_brightness = <127>;
linux,default-trigger = "mmc0";
};
blueled {
label = "blue:heartbeat";
pwms = <&pwm 2 2000000 0>;
pwm-names = "pwm2";
max_brightness = <255>;
linux,default-trigger = "heartbeat";
};
};
gpioleds {
compatible = "gpio-leds";
redled {
label = "red:microSD";
gpios = <&gpx2 3 GPIO_ACTIVE_HIGH>;
default-state = "off";
linux,default-trigger = "mmc1";
};
};
};
&pwm {
/*
* PWM 0 -- fan
* PWM 1 -- Green LED
* PWM 2 -- Blue LED
* PWM 3 -- on MIPI connector for backlight
*/
pinctrl-0 = <&pwm0_out &pwm1_out &pwm2_out &pwm3_out>;
pinctrl-names = "default";
status = "okay";
};
&usbdrd_dwc3_1 {
dr_mode = "otg";
}; };
arch/arm/boot/dts/exynos5422-odroidxu3.dts
View file @ b1ee27d4
...@@ -12,10 +12,45 @@ ...@@ -12,10 +12,45 @@
/dts-v1/; /dts-v1/;
#include "exynos5422-odroidxu3-common.dtsi" #include "exynos5422-odroidxu3-common.dtsi"
#include "exynos5422-odroidxu3-audio.dtsi"
/ { / {
model = "Hardkernel Odroid XU3"; model = "Hardkernel Odroid XU3";
compatible = "hardkernel,odroid-xu3", "samsung,exynos5800", "samsung,exynos5"; compatible = "hardkernel,odroid-xu3", "samsung,exynos5800", "samsung,exynos5";
pwmleds {
compatible = "pwm-leds";
greenled {
label = "green:mmc0";
pwms = <&pwm 1 2000000 0>;
pwm-names = "pwm1";
/*
* Green LED is much brighter than the others
* so limit its max brightness
*/
max_brightness = <127>;
linux,default-trigger = "mmc0";
};
blueled {
label = "blue:heartbeat";
pwms = <&pwm 2 2000000 0>;
pwm-names = "pwm2";
max_brightness = <255>;
linux,default-trigger = "heartbeat";
};
};
gpioleds {
compatible = "gpio-leds";
redled {
label = "red:microSD";
gpios = <&gpx2 3 GPIO_ACTIVE_HIGH>;
default-state = "off";
linux,default-trigger = "mmc1";
};
};
}; };
&i2c_0 { &i2c_0 {
...@@ -49,3 +84,19 @@ ina231@45 { ...@@ -49,3 +84,19 @@ ina231@45 {
shunt-resistor = <10000>; shunt-resistor = <10000>;
}; };
}; };
&pwm {
/*
* PWM 0 -- fan
* PWM 1 -- Green LED
* PWM 2 -- Blue LED
* PWM 3 -- on MIPI connector for backlight
*/
pinctrl-0 = <&pwm0_out &pwm1_out &pwm2_out &pwm3_out>;
pinctrl-names = "default";
status = "okay";
};
&usbdrd_dwc3_1 {
dr_mode = "otg";
};
arch/arm/boot/dts/exynos5422-odroidxu4.dts 0 → 100644
View file @ b1ee27d4
/*
* Hardkernel Odroid XU4 board device tree source
*
* Copyright (c) 2015 Krzysztof Kozlowski
* Copyright (c) 2014 Collabora Ltd.
* Copyright (c) 2013-2015 Samsung Electronics Co., Ltd.
* http://www.samsung.com
*
* 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.
*/
/dts-v1/;
#include "exynos5422-odroidxu3-common.dtsi"
/ {
model = "Hardkernel Odroid XU4";
compatible = "hardkernel,odroid-xu4", "samsung,exynos5800", \
"samsung,exynos5";
pwmleds {
compatible = "pwm-leds";
blueled {
label = "blue:heartbeat";
pwms = <&pwm 2 2000000 0>;
pwm-names = "pwm2";
max_brightness = <255>;
linux,default-trigger = "heartbeat";
};
};
};
&pwm {
/*
* PWM 0 -- fan
* PWM 2 -- Blue LED
*/
pinctrl-0 = <&pwm0_out &pwm2_out>;
pinctrl-names = "default";
samsung,pwm-outputs = <0>, <2>;
status = "okay";
};
&usbdrd_dwc3_1 {
dr_mode = "host";
};
arch/arm/boot/dts/exynos5440-ssdk5440.dts
View file @ b1ee27d4
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
/dts-v1/; /dts-v1/;
#include "exynos5440.dtsi" #include "exynos5440.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ { / {
model = "SAMSUNG SSDK5440 board based on EXYNOS5440"; model = "SAMSUNG SSDK5440 board based on EXYNOS5440";
...@@ -29,12 +30,12 @@ xtal { ...@@ -29,12 +30,12 @@ xtal {
}; };
&pcie_0 { &pcie_0 {
reset-gpio = <&pin_ctrl 5 0>; reset-gpio = <&pin_ctrl 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
&pcie_1 { &pcie_1 {
reset-gpio = <&pin_ctrl 22 0>; reset-gpio = <&pin_ctrl 22 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/exynos5800-peach-pi.dts
View file @ b1ee27d4
...@@ -94,7 +94,7 @@ usb300_vbus_reg: regulator-usb300 { ...@@ -94,7 +94,7 @@ usb300_vbus_reg: regulator-usb300 {
regulator-name = "P5.0V_USB3CON0"; regulator-name = "P5.0V_USB3CON0";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gph0 0 0>; gpio = <&gph0 0 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb300_vbus_en>; pinctrl-0 = <&usb300_vbus_en>;
enable-active-high; enable-active-high;
...@@ -105,7 +105,7 @@ usb301_vbus_reg: regulator-usb301 { ...@@ -105,7 +105,7 @@ usb301_vbus_reg: regulator-usb301 {
regulator-name = "P5.0V_USB3CON1"; regulator-name = "P5.0V_USB3CON1";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
gpio = <&gph0 1 0>; gpio = <&gph0 1 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb301_vbus_en>; pinctrl-0 = <&usb301_vbus_en>;
enable-active-high; enable-active-high;
...@@ -147,7 +147,7 @@ &dp { ...@@ -147,7 +147,7 @@ &dp {
samsung,color-depth = <1>; samsung,color-depth = <1>;
samsung,link-rate = <0x0a>; samsung,link-rate = <0x0a>;
samsung,lane-count = <2>; samsung,lane-count = <2>;
samsung,hpd-gpio = <&gpx2 6 0>; samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
panel = <&panel>; panel = <&panel>;
}; };
...@@ -888,7 +888,7 @@ &spi_2 { ...@@ -888,7 +888,7 @@ &spi_2 {
status = "okay"; status = "okay";
num-cs = <1>; num-cs = <1>;
samsung,spi-src-clk = <0>; samsung,spi-src-clk = <0>;
cs-gpios = <&gpb1 2 0>; cs-gpios = <&gpb1 2 GPIO_ACTIVE_HIGH>;
cros_ec: cros-ec@0 { cros_ec: cros-ec@0 {
compatible = "google,cros-ec-spi"; compatible = "google,cros-ec-spi";
...@@ -898,6 +898,7 @@ cros_ec: cros-ec@0 { ...@@ -898,6 +898,7 @@ cros_ec: cros-ec@0 {
pinctrl-0 = <&ec_spi_cs &ec_irq>; pinctrl-0 = <&ec_spi_cs &ec_irq>;
reg = <0>; reg = <0>;
spi-max-frequency = <3125000>; spi-max-frequency = <3125000>;
google,has-vbc-nvram;
controller-data { controller-data {
samsung,spi-feedback-delay = <1>; samsung,spi-feedback-delay = <1>;
......
arch/arm/boot/dts/s3c2416.dtsi
View file @ b1ee27d4
...@@ -25,7 +25,7 @@ cpus { ...@@ -25,7 +25,7 @@ cpus {
#size-cells = <0>; #size-cells = <0>;
cpu { cpu {
compatible = "arm,arm926ejs"; compatible = "arm,arm926ej-s";
}; };
}; };
......
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