mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 16:52:14 +02:00
ARM: dts: uniphier: sync DT with Linux 4.19-rc1
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
@@ -54,12 +54,13 @@
|
||||
sound {
|
||||
compatible = "audio-graph-card";
|
||||
label = "UniPhier LD11";
|
||||
widgets = "Headphone", "Headphone Jack";
|
||||
widgets = "Headphone", "Headphones";
|
||||
dais = <&i2s_port2
|
||||
&i2s_port3
|
||||
&i2s_port4
|
||||
&spdif_port0
|
||||
&comp_spdif_port0>;
|
||||
hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
spdif-out {
|
||||
|
@@ -407,7 +407,7 @@
|
||||
reg = <0x5a000000 0x400>;
|
||||
interrupts = <0 78 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_emmc_1v8>;
|
||||
pinctrl-0 = <&pinctrl_emmc>;
|
||||
clocks = <&sys_clk 4>;
|
||||
resets = <&sys_rst 4>;
|
||||
bus-width = <8>;
|
||||
|
@@ -54,12 +54,13 @@
|
||||
sound {
|
||||
compatible = "audio-graph-card";
|
||||
label = "UniPhier LD20";
|
||||
widgets = "Headphone", "Headphone Jack";
|
||||
widgets = "Headphone", "Headphones";
|
||||
dais = <&i2s_port2
|
||||
&i2s_port3
|
||||
&i2s_port4
|
||||
&spdif_port0
|
||||
&comp_spdif_port0>;
|
||||
hp-det-gpio = <&gpio UNIPHIER_GPIO_IRQ(0) GPIO_ACTIVE_LOW>;
|
||||
};
|
||||
|
||||
spdif-out {
|
||||
|
@@ -58,6 +58,7 @@
|
||||
clocks = <&sys_clk 32>;
|
||||
enable-method = "psci";
|
||||
operating-points-v2 = <&cluster0_opp>;
|
||||
#cooling-cells = <2>;
|
||||
};
|
||||
|
||||
cpu2: cpu@100 {
|
||||
@@ -77,6 +78,7 @@
|
||||
clocks = <&sys_clk 33>;
|
||||
enable-method = "psci";
|
||||
operating-points-v2 = <&cluster1_opp>;
|
||||
#cooling-cells = <2>;
|
||||
};
|
||||
};
|
||||
|
||||
@@ -512,7 +514,7 @@
|
||||
reg = <0x5a000000 0x400>;
|
||||
interrupts = <0 78 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_emmc_1v8>;
|
||||
pinctrl-0 = <&pinctrl_emmc>;
|
||||
clocks = <&sys_clk 4>;
|
||||
resets = <&sys_rst 4>;
|
||||
bus-width = <8>;
|
||||
|
@@ -247,9 +247,8 @@
|
||||
status = "disabled";
|
||||
reg = <0x5a500000 0x200>;
|
||||
interrupts = <0 78 4>;
|
||||
pinctrl-names = "default", "1.8v";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_emmc>;
|
||||
pinctrl-1 = <&pinctrl_emmc_1v8>;
|
||||
clocks = <&mio_clk 1>;
|
||||
reset-names = "host", "bridge";
|
||||
resets = <&mio_rst 1>, <&mio_rst 4>;
|
||||
|
@@ -56,11 +56,6 @@
|
||||
function = "emmc";
|
||||
};
|
||||
|
||||
pinctrl_emmc_1v8: emmc-1v8 {
|
||||
groups = "emmc", "emmc_dat8";
|
||||
function = "emmc";
|
||||
};
|
||||
|
||||
pinctrl_ether_mii: ether-mii {
|
||||
groups = "ether_mii";
|
||||
function = "ether_mii";
|
||||
|
@@ -281,9 +281,8 @@
|
||||
status = "disabled";
|
||||
reg = <0x5a500000 0x200>;
|
||||
interrupts = <0 78 4>;
|
||||
pinctrl-names = "default", "1.8v";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_emmc>;
|
||||
pinctrl-1 = <&pinctrl_emmc_1v8>;
|
||||
clocks = <&mio_clk 1>;
|
||||
reset-names = "host", "bridge";
|
||||
resets = <&mio_rst 1>, <&mio_rst 4>;
|
||||
|
@@ -36,6 +36,7 @@
|
||||
enable-method = "psci";
|
||||
next-level-cache = <&l2>;
|
||||
operating-points-v2 = <&cpu_opp>;
|
||||
#cooling-cells = <2>;
|
||||
};
|
||||
|
||||
cpu2: cpu@2 {
|
||||
@@ -46,6 +47,7 @@
|
||||
enable-method = "psci";
|
||||
next-level-cache = <&l2>;
|
||||
operating-points-v2 = <&cpu_opp>;
|
||||
#cooling-cells = <2>;
|
||||
};
|
||||
|
||||
cpu3: cpu@3 {
|
||||
@@ -56,6 +58,7 @@
|
||||
enable-method = "psci";
|
||||
next-level-cache = <&l2>;
|
||||
operating-points-v2 = <&cpu_opp>;
|
||||
#cooling-cells = <2>;
|
||||
};
|
||||
};
|
||||
|
||||
|
@@ -327,7 +327,7 @@
|
||||
reg = <0x5a000000 0x400>;
|
||||
interrupts = <0 78 4>;
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_emmc_1v8>;
|
||||
pinctrl-0 = <&pinctrl_emmc>;
|
||||
clocks = <&sys_clk 4>;
|
||||
resets = <&sys_rst 4>;
|
||||
bus-width = <8>;
|
||||
|
@@ -251,9 +251,8 @@
|
||||
status = "disabled";
|
||||
reg = <0x5a500000 0x200>;
|
||||
interrupts = <0 78 4>;
|
||||
pinctrl-names = "default", "1.8v";
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&pinctrl_emmc>;
|
||||
pinctrl-1 = <&pinctrl_emmc_1v8>;
|
||||
clocks = <&mio_clk 1>;
|
||||
reset-names = "host", "bridge";
|
||||
resets = <&mio_rst 1>, <&mio_rst 4>;
|
||||
|
Reference in New Issue
Block a user