Skip to content

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

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

Merge "Samsung Device Tree updates and improvements for v4.7" from Krzysztof Kozlowski:

1. Enable accelerated AES (Security SubSystem) on Exynos4412-based boards.
2. Enable HDMI CEC on Exynos4412-based Odroid.
3. Add regulator supplies for eMMC/SD on Odroid XU3/XU4.
4. Fix DTC unit name warnings.
5. Merge topic branch of new Artik5 board.

* tag 'samsung-dt-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: s5p: Fix DTC unit name warnings in SMDKv210 board
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos5440
  ARM: dts: exynos: Fix DTC unit name warnings in SMDK5420
  ARM: dts: exynos: Fix DTC unit name warnings in Peach Pit
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos542x
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos5250
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos4x12
  ARM: dts: exynos: Fix DTC unit name warnings in Trats2 board
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos4
  ARM: dts: exynos: Fix DTC unit name warnings in Exynos3250
  ARM: dts: exynos: Fix DTC unit name warnings in cros-adc-thermistors
  ARM: dts: exynos: Add eMMC and SD regulator supplies to Odroid XU3/XU4
  ARM: dts: exynos: Enable the HDMI CEC device on Exynos4412 Odroid boards
  ARM: dts: exynos: Add node for the HDMI CEC device to exynos4
  ARM: dts: exynos: Add HDMI CEC pin definition to exynos4 pinctrl
  ARM: dts: exynos: Enable SSS on Odroid X/X2/U3 family
  ARM: dts: exynos: Enable SSS on Trats2
  ARM: dts: exynos: Add Security SubSystem node to Exynos4
parents 036f8d06 06e520c4
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 48 deletions
arch/arm/boot/dts/cros-adc-thermistors.dtsi
View file @ 9744426e
...@@ -13,28 +13,28 @@ ...@@ -13,28 +13,28 @@
*/ */
&adc { &adc {
ncp15wb473@3 { thermistor3 {
compatible = "murata,ncp15wb473"; compatible = "murata,ncp15wb473";
pullup-uv = <1800000>; pullup-uv = <1800000>;
pullup-ohm = <47000>; pullup-ohm = <47000>;
pulldown-ohm = <0>; pulldown-ohm = <0>;
io-channels = <&adc 3>; io-channels = <&adc 3>;
}; };
ncp15wb473@4 { thermistor4 {
compatible = "murata,ncp15wb473"; compatible = "murata,ncp15wb473";
pullup-uv = <1800000>; pullup-uv = <1800000>;
pullup-ohm = <47000>; pullup-ohm = <47000>;
pulldown-ohm = <0>; pulldown-ohm = <0>;
io-channels = <&adc 4>; io-channels = <&adc 4>;
}; };
ncp15wb473@5 { thermistor5 {
compatible = "murata,ncp15wb473"; compatible = "murata,ncp15wb473";
pullup-uv = <1800000>; pullup-uv = <1800000>;
pullup-ohm = <47000>; pullup-ohm = <47000>;
pulldown-ohm = <0>; pulldown-ohm = <0>;
io-channels = <&adc 5>; io-channels = <&adc 5>;
}; };
ncp15wb473@6 { thermistor6 {
compatible = "murata,ncp15wb473"; compatible = "murata,ncp15wb473";
pullup-uv = <1800000>; pullup-uv = <1800000>;
pullup-ohm = <47000>; pullup-ohm = <47000>;
......
arch/arm/boot/dts/exynos3250.dtsi
View file @ 9744426e
...@@ -155,7 +155,7 @@ pmu_system_controller: system-controller@10020000 { ...@@ -155,7 +155,7 @@ pmu_system_controller: system-controller@10020000 {
interrupt-parent = <&gic>; interrupt-parent = <&gic>;
}; };
mipi_phy: video-phy@10020710 { mipi_phy: video-phy {
compatible = "samsung,s5pv210-mipi-video-phy"; compatible = "samsung,s5pv210-mipi-video-phy";
#phy-cells = <1>; #phy-cells = <1>;
syscon = <&pmu_system_controller>; syscon = <&pmu_system_controller>;
......
arch/arm/boot/dts/exynos4.dtsi
View file @ 9744426e
...@@ -82,7 +82,7 @@ sromc@12570000 { ...@@ -82,7 +82,7 @@ sromc@12570000 {
reg = <0x12570000 0x14>; reg = <0x12570000 0x14>;
}; };
mipi_phy: video-phy@10020710 { mipi_phy: video-phy {
compatible = "samsung,s5pv210-mipi-video-phy"; compatible = "samsung,s5pv210-mipi-video-phy";
#phy-cells = <1>; #phy-cells = <1>;
syscon = <&pmu_system_controller>; syscon = <&pmu_system_controller>;
...@@ -743,6 +743,18 @@ hdmi: hdmi@12D00000 { ...@@ -743,6 +743,18 @@ hdmi: hdmi@12D00000 {
status = "disabled"; status = "disabled";
}; };
hdmicec: cec@100B0000 {
compatible = "samsung,s5p-cec";
reg = <0x100B0000 0x200>;
interrupts = <0 114 0>;
clocks = <&clock CLK_HDMI_CEC>;
clock-names = "hdmicec";
samsung,syscon-phandle = <&pmu_system_controller>;
pinctrl-names = "default";
pinctrl-0 = <&hdmi_cec>;
status = "disabled";
};
mixer: mixer@12C10000 { mixer: mixer@12C10000 {
compatible = "samsung,exynos4210-mixer"; compatible = "samsung,exynos4210-mixer";
interrupts = <0 91 0>; interrupts = <0 91 0>;
...@@ -969,6 +981,15 @@ sysmmu_fimd0: sysmmu@11E20000 { ...@@ -969,6 +981,15 @@ sysmmu_fimd0: sysmmu@11E20000 {
#iommu-cells = <0>; #iommu-cells = <0>;
}; };
sss: sss@10830000 {
compatible = "samsung,exynos4210-secss";
reg = <0x10830000 0x300>;
interrupts = <0 112 0>;
clocks = <&clock CLK_SSS>;
clock-names = "secss";
status = "disabled";
};
prng: rng@10830400 { prng: rng@10830400 {
compatible = "samsung,exynos4-rng"; compatible = "samsung,exynos4-rng";
reg = <0x10830400 0x200>; reg = <0x10830400 0x200>;
......
arch/arm/boot/dts/exynos4210-pinctrl.dtsi
View file @ 9744426e
...@@ -820,6 +820,13 @@ cam_port_a_clk_idle: cam-port-a-clk-idle { ...@@ -820,6 +820,13 @@ cam_port_a_clk_idle: cam-port-a-clk-idle {
samsung,pin-pud = <1>; samsung,pin-pud = <1>;
samsung,pin-drv = <0>; samsung,pin-drv = <0>;
}; };
hdmi_cec: hdmi-cec {
samsung,pins = "gpx3-6";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
}; };
pinctrl@03860000 { pinctrl@03860000 {
......
arch/arm/boot/dts/exynos4412-odroid-common.dtsi
View file @ 9744426e
...@@ -188,6 +188,10 @@ &hdmi { ...@@ -188,6 +188,10 @@ &hdmi {
status = "okay"; status = "okay";
}; };
&hdmicec {
status = "okay";
};
&hsotg { &hsotg {
dr_mode = "peripheral"; dr_mode = "peripheral";
status = "okay"; status = "okay";
...@@ -492,6 +496,10 @@ &serial_1 { ...@@ -492,6 +496,10 @@ &serial_1 {
status = "okay"; status = "okay";
}; };
&sss {
status = "okay";
};
&tmu { &tmu {
vtmu-supply = <&ldo10_reg>; vtmu-supply = <&ldo10_reg>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/exynos4412-trats2.dts
View file @ 9744426e
...@@ -146,13 +146,13 @@ max77693@66 { ...@@ -146,13 +146,13 @@ max77693@66 {
reg = <0x66>; reg = <0x66>;
regulators { regulators {
esafeout1_reg: ESAFEOUT1@1 { esafeout1_reg: ESAFEOUT1 {
regulator-name = "ESAFEOUT1"; regulator-name = "ESAFEOUT1";
}; };
esafeout2_reg: ESAFEOUT2@2 { esafeout2_reg: ESAFEOUT2 {
regulator-name = "ESAFEOUT2"; regulator-name = "ESAFEOUT2";
}; };
charger_reg: CHARGER@0 { charger_reg: CHARGER {
regulator-name = "CHARGER"; regulator-name = "CHARGER";
regulator-min-microamp = <60000>; regulator-min-microamp = <60000>;
regulator-max-microamp = <2580000>; regulator-max-microamp = <2580000>;
...@@ -251,7 +251,7 @@ sound { ...@@ -251,7 +251,7 @@ sound {
"SPK", "SPKOUTRP"; "SPK", "SPKOUTRP";
}; };
thermistor-ap@0 { thermistor-ap {
compatible = "ntc,ncp15wb473"; compatible = "ntc,ncp15wb473";
pullup-uv = <1800000>; /* VCC_1.8V_AP */ pullup-uv = <1800000>; /* VCC_1.8V_AP */
pullup-ohm = <100000>; /* 100K */ pullup-ohm = <100000>; /* 100K */
...@@ -259,7 +259,7 @@ thermistor-ap@0 { ...@@ -259,7 +259,7 @@ thermistor-ap@0 {
io-channels = <&adc 1>; /* AP temperature */ io-channels = <&adc 1>; /* AP temperature */
}; };
thermistor-battery@1 { thermistor-battery {
compatible = "ntc,ncp15wb473"; compatible = "ntc,ncp15wb473";
pullup-uv = <1800000>; /* VCC_1.8V_AP */ pullup-uv = <1800000>; /* VCC_1.8V_AP */
pullup-ohm = <100000>; /* 100K */ pullup-ohm = <100000>; /* 100K */
...@@ -1276,7 +1276,7 @@ &spi_1 { ...@@ -1276,7 +1276,7 @@ &spi_1 {
cs-gpios = <&gpb 5 GPIO_ACTIVE_HIGH>; cs-gpios = <&gpb 5 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
s5c73m3_spi: s5c73m3 { s5c73m3_spi: s5c73m3@0 {
compatible = "samsung,s5c73m3"; compatible = "samsung,s5c73m3";
spi-max-frequency = <50000000>; spi-max-frequency = <50000000>;
reg = <0>; reg = <0>;
...@@ -1286,6 +1286,10 @@ controller-data { ...@@ -1286,6 +1286,10 @@ controller-data {
}; };
}; };
&sss {
status = "okay";
};
&tmu { &tmu {
vtmu-supply = <&ldo10_reg>; vtmu-supply = <&ldo10_reg>;
status = "okay"; status = "okay";
......
arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
View file @ 9744426e
...@@ -885,6 +885,13 @@ fimc_is_uart: fimc-is-uart { ...@@ -885,6 +885,13 @@ fimc_is_uart: fimc-is-uart {
samsung,pin-pud = <0>; samsung,pin-pud = <0>;
samsung,pin-drv = <0>; samsung,pin-drv = <0>;
}; };
hdmi_cec: hdmi-cec {
samsung,pins = "gpx3-6";
samsung,pin-function = <3>;
samsung,pin-pud = <0>;
samsung,pin-drv = <0>;
};
}; };
pinctrl_2: pinctrl@03860000 { pinctrl_2: pinctrl@03860000 {
......
arch/arm/boot/dts/exynos4x12.dtsi
View file @ 9744426e
...@@ -179,7 +179,7 @@ fimc_is: fimc-is@12000000 { ...@@ -179,7 +179,7 @@ fimc_is: fimc-is@12000000 {
ranges; ranges;
status = "disabled"; status = "disabled";
pmu { pmu@10020000 {
reg = <0x10020000 0x3000>; reg = <0x10020000 0x3000>;
}; };
......
arch/arm/boot/dts/exynos5250-arndale.dts
View file @ 9744426e
...@@ -133,7 +133,7 @@ &dp { ...@@ -133,7 +133,7 @@ &dp {
display-timings { display-timings {
native-mode = <&timing0>; native-mode = <&timing0>;
timing0: timing@0 { timing0: timing {
/* 2560x1600 DP panel */ /* 2560x1600 DP panel */
clock-frequency = <50000>; clock-frequency = <50000>;
hactive = <2560>; hactive = <2560>;
......
arch/arm/boot/dts/exynos5250-smdk5250.dts
View file @ 9744426e
...@@ -29,7 +29,7 @@ chosen { ...@@ -29,7 +29,7 @@ chosen {
bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc"; bootargs = "root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC2,115200 init=/linuxrc";
}; };
vdd: fixed-regulator@0 { vdd: fixed-regulator-vdd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vdd-supply"; regulator-name = "vdd-supply";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
...@@ -37,7 +37,7 @@ vdd: fixed-regulator@0 { ...@@ -37,7 +37,7 @@ vdd: fixed-regulator@0 {
regulator-always-on; regulator-always-on;
}; };
dbvdd: fixed-regulator@1 { dbvdd: fixed-regulator-dbvdd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "dbvdd-supply"; regulator-name = "dbvdd-supply";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
...@@ -45,7 +45,7 @@ dbvdd: fixed-regulator@1 { ...@@ -45,7 +45,7 @@ dbvdd: fixed-regulator@1 {
regulator-always-on; regulator-always-on;
}; };
spkvdd: fixed-regulator@2 { spkvdd: fixed-regulator-spkvdd {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "spkvdd-supply"; regulator-name = "spkvdd-supply";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
...@@ -93,7 +93,7 @@ &dp { ...@@ -93,7 +93,7 @@ &dp {
display-timings { display-timings {
native-mode = <&timing0>; native-mode = <&timing0>;
timing0: timing@0 { timing0: timing {
/* 1280x800 */ /* 1280x800 */
clock-frequency = <50000>; clock-frequency = <50000>;
hactive = <1280>; hactive = <1280>;
......
arch/arm/boot/dts/exynos5250-snow-common.dtsi
View file @ 9744426e
...@@ -84,7 +84,7 @@ battery: sbs-battery@b { ...@@ -84,7 +84,7 @@ battery: sbs-battery@b {
sbs,poll-retry-count = <1>; sbs,poll-retry-count = <1>;
}; };
cros_ec: embedded-controller { cros_ec: embedded-controller@1e {
compatible = "google,cros-ec-i2c"; compatible = "google,cros-ec-i2c";
reg = <0x1e>; reg = <0x1e>;
interrupts = <6 IRQ_TYPE_NONE>; interrupts = <6 IRQ_TYPE_NONE>;
...@@ -94,7 +94,7 @@ cros_ec: embedded-controller { ...@@ -94,7 +94,7 @@ cros_ec: embedded-controller {
wakeup-source; wakeup-source;
}; };
power-regulator { power-regulator@48 {
compatible = "ti,tps65090"; compatible = "ti,tps65090";
reg = <0x48>; reg = <0x48>;
...@@ -244,7 +244,7 @@ &dp { ...@@ -244,7 +244,7 @@ &dp {
samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>; samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>;
ports { ports {
port@0 { port0 {
dp_out: endpoint { dp_out: endpoint {
remote-endpoint = <&bridge_in>; remote-endpoint = <&bridge_in>;
}; };
...@@ -428,7 +428,7 @@ &i2c_1 { ...@@ -428,7 +428,7 @@ &i2c_1 {
samsung,i2c-sda-delay = <100>; samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <378000>; samsung,i2c-max-bus-freq = <378000>;
trackpad { trackpad@67 {
reg = <0x67>; reg = <0x67>;
compatible = "cypress,cyapa"; compatible = "cypress,cyapa";
interrupts = <2 IRQ_TYPE_NONE>; interrupts = <2 IRQ_TYPE_NONE>;
...@@ -487,13 +487,13 @@ ptn3460: lvds-bridge@20 { ...@@ -487,13 +487,13 @@ ptn3460: lvds-bridge@20 {
edid-emulation = <5>; edid-emulation = <5>;
ports { ports {
port@0 { port0 {
bridge_out: endpoint { bridge_out: endpoint {
remote-endpoint = <&panel_in>; remote-endpoint = <&panel_in>;
}; };
}; };
port@1 { port1 {
bridge_in: endpoint { bridge_in: endpoint {
remote-endpoint = <&dp_out>; remote-endpoint = <&dp_out>;
}; };
......
arch/arm/boot/dts/exynos5250-spring.dts
View file @ 9744426e
...@@ -383,7 +383,7 @@ &i2c_4 { ...@@ -383,7 +383,7 @@ &i2c_4 {
samsung,i2c-sda-delay = <100>; samsung,i2c-sda-delay = <100>;
samsung,i2c-max-bus-freq = <66000>; samsung,i2c-max-bus-freq = <66000>;
cros_ec: embedded-controller { cros_ec: embedded-controller@1e {
compatible = "google,cros-ec-i2c"; compatible = "google,cros-ec-i2c";
reg = <0x1e>; reg = <0x1e>;
interrupts = <6 IRQ_TYPE_NONE>; interrupts = <6 IRQ_TYPE_NONE>;
......
arch/arm/boot/dts/exynos5250.dtsi
View file @ 9744426e
...@@ -596,7 +596,7 @@ i2s2: i2s@12D70000 { ...@@ -596,7 +596,7 @@ i2s2: i2s@12D70000 {
pinctrl-0 = <&i2s2_bus>; pinctrl-0 = <&i2s2_bus>;
}; };
usb@12000000 { usb_dwc3 {
compatible = "samsung,exynos5250-dwusb3"; compatible = "samsung,exynos5250-dwusb3";
clocks = <&clock CLK_USB3>; clocks = <&clock CLK_USB3>;
clock-names = "usbdrd30"; clock-names = "usbdrd30";
...@@ -604,7 +604,7 @@ usb@12000000 { ...@@ -604,7 +604,7 @@ usb@12000000 {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
usbdrd_dwc3: dwc3 { usbdrd_dwc3: dwc3@12000000 {
compatible = "synopsys,dwc3"; compatible = "synopsys,dwc3";
reg = <0x12000000 0x10000>; reg = <0x12000000 0x10000>;
interrupts = <0 72 0>; interrupts = <0 72 0>;
...@@ -763,7 +763,7 @@ gsc_3: gsc@13e30000 { ...@@ -763,7 +763,7 @@ gsc_3: gsc@13e30000 {
iommu = <&sysmmu_gsc3>; iommu = <&sysmmu_gsc3>;
}; };
hdmi: hdmi { hdmi: hdmi@14530000 {
compatible = "samsung,exynos4212-hdmi"; compatible = "samsung,exynos4212-hdmi";
reg = <0x14530000 0x70000>; reg = <0x14530000 0x70000>;
power-domains = <&pd_disp1>; power-domains = <&pd_disp1>;
...@@ -776,7 +776,7 @@ hdmi: hdmi { ...@@ -776,7 +776,7 @@ hdmi: hdmi {
samsung,syscon-phandle = <&pmu_system_controller>; samsung,syscon-phandle = <&pmu_system_controller>;
}; };
mixer { mixer@14450000 {
compatible = "samsung,exynos5250-mixer"; compatible = "samsung,exynos5250-mixer";
reg = <0x14450000 0x10000>; reg = <0x14450000 0x10000>;
power-domains = <&pd_disp1>; power-domains = <&pd_disp1>;
...@@ -787,7 +787,7 @@ mixer { ...@@ -787,7 +787,7 @@ mixer {
iommus = <&sysmmu_tv>; iommus = <&sysmmu_tv>;
}; };
dp_phy: video-phy@10040720 { dp_phy: video-phy {
compatible = "samsung,exynos5250-dp-video-phy"; compatible = "samsung,exynos5250-dp-video-phy";
samsung,pmu-syscon = <&pmu_system_controller>; samsung,pmu-syscon = <&pmu_system_controller>;
#phy-cells = <0>; #phy-cells = <0>;
......
arch/arm/boot/dts/exynos5420-peach-pit.dts
View file @ 9744426e
...@@ -165,7 +165,7 @@ &dp { ...@@ -165,7 +165,7 @@ &dp {
samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>; samsung,hpd-gpio = <&gpx2 6 GPIO_ACTIVE_HIGH>;
ports { ports {
port@0 { port0 {
dp_out: endpoint { dp_out: endpoint {
remote-endpoint = <&bridge_in>; remote-endpoint = <&bridge_in>;
}; };
...@@ -633,13 +633,13 @@ ps8625: lvds-bridge@48 { ...@@ -633,13 +633,13 @@ ps8625: lvds-bridge@48 {
use-external-pwm; use-external-pwm;
ports { ports {
port@0 { port0 {
bridge_out: endpoint { bridge_out: endpoint {
remote-endpoint = <&panel_in>; remote-endpoint = <&panel_in>;
}; };
}; };
port@1 { port1 {
bridge_in: endpoint { bridge_in: endpoint {
remote-endpoint = <&dp_out>; remote-endpoint = <&dp_out>;
}; };
......
arch/arm/boot/dts/exynos5420-smdk5420.dts
View file @ 9744426e
...@@ -111,7 +111,7 @@ &dp { ...@@ -111,7 +111,7 @@ &dp {
display-timings { display-timings {
native-mode = <&timing0>; native-mode = <&timing0>;
timing0: timing@0 { timing0: timing {
clock-frequency = <50000>; clock-frequency = <50000>;
hactive = <2560>; hactive = <2560>;
vactive = <1600>; vactive = <1600>;
......
arch/arm/boot/dts/exynos5420.dtsi
View file @ 9744426e
...@@ -551,13 +551,13 @@ pwm: pwm@12dd0000 { ...@@ -551,13 +551,13 @@ pwm: pwm@12dd0000 {
clock-names = "timers"; clock-names = "timers";
}; };
dp_phy: video-phy@10040728 { dp_phy: dp-video-phy {
compatible = "samsung,exynos5420-dp-video-phy"; compatible = "samsung,exynos5420-dp-video-phy";
samsung,pmu-syscon = <&pmu_system_controller>; samsung,pmu-syscon = <&pmu_system_controller>;
#phy-cells = <0>; #phy-cells = <0>;
}; };
mipi_phy: video-phy@10040714 { mipi_phy: mipi-video-phy {
compatible = "samsung,s5pv210-mipi-video-phy"; compatible = "samsung,s5pv210-mipi-video-phy";
syscon = <&pmu_system_controller>; syscon = <&pmu_system_controller>;
#phy-cells = <1>; #phy-cells = <1>;
...@@ -913,7 +913,7 @@ sss: sss@10830000 { ...@@ -913,7 +913,7 @@ sss: sss@10830000 {
clock-names = "secss"; clock-names = "secss";
}; };
usbdrd3_0: usb@12000000 { usbdrd3_0: usb3-0 {
compatible = "samsung,exynos5250-dwusb3"; compatible = "samsung,exynos5250-dwusb3";
clocks = <&clock CLK_USBD300>; clocks = <&clock CLK_USBD300>;
clock-names = "usbdrd30"; clock-names = "usbdrd30";
...@@ -921,7 +921,7 @@ usbdrd3_0: usb@12000000 { ...@@ -921,7 +921,7 @@ usbdrd3_0: usb@12000000 {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
usbdrd_dwc3_0: dwc3 { usbdrd_dwc3_0: dwc3@12000000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x12000000 0x10000>; reg = <0x12000000 0x10000>;
interrupts = <0 72 0>; interrupts = <0 72 0>;
...@@ -939,7 +939,7 @@ usbdrd_phy0: phy@12100000 { ...@@ -939,7 +939,7 @@ usbdrd_phy0: phy@12100000 {
#phy-cells = <1>; #phy-cells = <1>;
}; };
usbdrd3_1: usb@12400000 { usbdrd3_1: usb3-1 {
compatible = "samsung,exynos5250-dwusb3"; compatible = "samsung,exynos5250-dwusb3";
clocks = <&clock CLK_USBD301>; clocks = <&clock CLK_USBD301>;
clock-names = "usbdrd30"; clock-names = "usbdrd30";
...@@ -947,7 +947,7 @@ usbdrd3_1: usb@12400000 { ...@@ -947,7 +947,7 @@ usbdrd3_1: usb@12400000 {
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
usbdrd_dwc3_1: dwc3 { usbdrd_dwc3_1: dwc3@12400000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg = <0x12400000 0x10000>; reg = <0x12400000 0x10000>;
interrupts = <0 73 0>; interrupts = <0 73 0>;
......
arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi
View file @ 9744426e
...@@ -121,10 +121,9 @@ ldo1_reg: LDO1 { ...@@ -121,10 +121,9 @@ ldo1_reg: LDO1 {
}; };
ldo3_reg: LDO3 { ldo3_reg: LDO3 {
regulator-name = "vdd_ldo3"; regulator-name = "vddq_mmc0";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on;
}; };
ldo5_reg: LDO5 { ldo5_reg: LDO5 {
...@@ -184,10 +183,9 @@ ldo12_reg: LDO12 { ...@@ -184,10 +183,9 @@ ldo12_reg: LDO12 {
}; };
ldo13_reg: LDO13 { ldo13_reg: LDO13 {
regulator-name = "vdd_ldo13"; regulator-name = "vddq_mmc2";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-always-on;
}; };
ldo15_reg: LDO15 { ldo15_reg: LDO15 {
...@@ -211,11 +209,16 @@ ldo17_reg: LDO17 { ...@@ -211,11 +209,16 @@ ldo17_reg: LDO17 {
regulator-always-on; regulator-always-on;
}; };
ldo18_reg: LDO18 {
regulator-name = "vdd_emmc_1V8";
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
};
ldo19_reg: LDO19 { ldo19_reg: LDO19 {
regulator-name = "vdd_sd"; regulator-name = "vdd_sd";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-always-on;
}; };
ldo24_reg: LDO24 { ldo24_reg: LDO24 {
...@@ -347,6 +350,8 @@ &mmc_0 { ...@@ -347,6 +350,8 @@ &mmc_0 {
cap-mmc-highspeed; cap-mmc-highspeed;
mmc-hs200-1_8v; mmc-hs200-1_8v;
mmc-hs400-1_8v; mmc-hs400-1_8v;
vmmc-supply = <&ldo18_reg>;
vqmmc-supply = <&ldo3_reg>;
}; };
&mmc_2 { &mmc_2 {
...@@ -359,6 +364,8 @@ &mmc_2 { ...@@ -359,6 +364,8 @@ &mmc_2 {
pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>; pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus1 &sd2_bus4>;
bus-width = <4>; bus-width = <4>;
cap-sd-highspeed; cap-sd-highspeed;
vmmc-supply = <&ldo19_reg>;
vqmmc-supply = <&ldo13_reg>;
}; };
&pinctrl_0 { &pinctrl_0 {
......
arch/arm/boot/dts/exynos5440.dtsi
View file @ 9744426e
...@@ -132,7 +132,7 @@ spi_0: spi@D0000 { ...@@ -132,7 +132,7 @@ spi_0: spi@D0000 {
clock-names = "spi", "spi_busclk0"; clock-names = "spi", "spi_busclk0";
}; };
pin_ctrl: pinctrl { pin_ctrl: pinctrl@E0000 {
compatible = "samsung,exynos5440-pinctrl"; compatible = "samsung,exynos5440-pinctrl";
reg = <0xE0000 0x1000>; reg = <0xE0000 0x1000>;
interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>,
...@@ -205,7 +205,7 @@ amba { ...@@ -205,7 +205,7 @@ amba {
ranges; ranges;
}; };
rtc { rtc@130000 {
compatible = "samsung,s3c6410-rtc"; compatible = "samsung,s3c6410-rtc";
reg = <0x130000 0x1000>; reg = <0x130000 0x1000>;
interrupts = <0 17 0>, <0 16 0>; interrupts = <0 17 0>, <0 16 0>;
......
arch/arm/boot/dts/s5pv210-smdkv210.dts
View file @ 9744426e
...@@ -197,7 +197,7 @@ &fimd { ...@@ -197,7 +197,7 @@ &fimd {
display-timings { display-timings {
native-mode = <&timing0>; native-mode = <&timing0>;
timing0: timing@0 { timing0: timing {
/* 800x480@60Hz */ /* 800x480@60Hz */
clock-frequency = <24373920>; clock-frequency = <24373920>;
hactive = <800>; hactive = <800>;
......
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