Skip to content

L
linux
Commit 057b670d authored by Olof Johansson's avatar Olof Johansson
Browse files
Options

Merge tag 'renesas-dt-for-v4.8' of... 

Merge tag 'renesas-dt-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Renesas ARM Based SoC DT Updates for v4.8

* Fix W=1 dtc warnings
* Reverence both DMA controllers on R-Car Gen 2 SoCs
* Remove nonexistent thermal sensor clock from r8a7794 SoC
* Correct unit names for cpu nodes on r8a7790 SoC
* Add MMCIF0 to r8a7793 SoC
* RTS/CTS hardware flow control for kzm9g and bockw boards

* tag 'renesas-dt-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (30 commits)
  ARM: dts: silk: Fix W=1 dtc warnings
  ARM: dts: porter: Fix W=1 dtc warnings
  ARM: dts: marzen: Fix W=1 dtc warnings
  ARM: dts: lager: Fix W=1 dtc warnings
  ARM: dts: kzm9g: Fix W=1 dtc warnings
  ARM: dts: kzm9d: Fix W=1 dtc warnings
  ARM: dts: koelsch: Fix W=1 dtc warnings
  ARM: dts: gose: Fix W=1 dtc warnings
  ARM: dts: genmai: Fix W=1 dtc warnings
  ARM: dts: bockw: Fix W=1 dtc warnings
  ARM: dts: armadillo800eva: Fix W=1 dtc warnings
  ARM: dts: ape6evm: Fix W=1 dtc warnings
  ARM: dts: sh73a0: Fix W=1 dtc warnings
  ARM: dts: r8a7794: Fix W=1 dtc warnings
  ARM: dts: r8a7793: Fix W=1 dtc warnings
  ARM: dts: r8a7791: Fix W=1 dtc warnings
  ARM: dts: r8a7790: Fix W=1 dtc warnings
  ARM: dts: r8a7778: Fix W=1 dtc warnings
  ARM: dts: r8a7740: Fix W=1 dtc warnings
  ARM: dts: r8a73a4: Fix W=1 dtc warnings
  ...
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 95eb940c b6960f19
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 564 additions and 431 deletions
arch/arm/boot/dts/emev2-kzm9d.dts
View file @ 057b670d
......@@ -18,7 +18,7 @@ / {
model = "EMEV2 KZM9D Board";
compatible = "renesas,kzm9d", "renesas,emev2";
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x8000000>;
};
......@@ -33,28 +33,28 @@ gpio_keys {
#address-cells = <1>;
#size-cells = <0>;
button@1 {
one {
debounce_interval = <50>;
wakeup-source;
label = "DSW2-1";
linux,code = <KEY_1>;
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
};
button@2 {
two {
debounce_interval = <50>;
wakeup-source;
label = "DSW2-2";
linux,code = <KEY_2>;
gpios = <&gpio0 15 GPIO_ACTIVE_HIGH>;
};
button@3 {
three {
debounce_interval = <50>;
wakeup-source;
label = "DSW2-3";
linux,code = <KEY_3>;
gpios = <&gpio0 16 GPIO_ACTIVE_HIGH>;
};
button@4 {
four {
debounce_interval = <50>;
wakeup-source;
label = "DSW2-4";
......@@ -63,7 +63,7 @@ button@4 {
};
};
reg_1p8v: regulator@0 {
reg_1p8v: regulator-1p8v {
compatible = "regulator-fixed";
regulator-name = "fixed-1.8V";
regulator-min-microvolt = <1800000>;
......@@ -72,7 +72,7 @@ reg_1p8v: regulator@0 {
regulator-boot-on;
};
reg_3p3v: regulator@1 {
reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
......@@ -104,7 +104,7 @@ &iic1 {
};
&pfc {
uart1_pins: serial@e1030000 {
uart1_pins: uart1 {
groups = "uart1_ctrl", "uart1_data";
function = "uart1";
};
......
arch/arm/boot/dts/emev2.dtsi
View file @ 057b670d
......@@ -69,25 +69,25 @@ c32ki: c32ki {
clock-frequency = <32768>;
#clock-cells = <0>;
};
iic0_sclkdiv: iic0_sclkdiv {
iic0_sclkdiv: iic0_sclkdiv@624,0 {
compatible = "renesas,emev2-smu-clkdiv";
reg = <0x624 0>;
clocks = <&pll3_fo>;
#clock-cells = <0>;
};
iic0_sclk: iic0_sclk {
iic0_sclk: iic0_sclk@48c,1 {
compatible = "renesas,emev2-smu-gclk";
reg = <0x48c 1>;
clocks = <&iic0_sclkdiv>;
#clock-cells = <0>;
};
iic1_sclkdiv: iic1_sclkdiv {
iic1_sclkdiv: iic1_sclkdiv@624,16 {
compatible = "renesas,emev2-smu-clkdiv";
reg = <0x624 16>;
clocks = <&pll3_fo>;
#clock-cells = <0>;
};
iic1_sclk: iic1_sclk {
iic1_sclk: iic1_sclk@490,1 {
compatible = "renesas,emev2-smu-gclk";
reg = <0x490 1>;
clocks = <&iic1_sclkdiv>;
......@@ -100,55 +100,55 @@ pll3_fo: pll3_fo {
clock-mult = <7000>;
#clock-cells = <0>;
};
usia_u0_sclkdiv: usia_u0_sclkdiv {
usia_u0_sclkdiv: usia_u0_sclkdiv@610,0 {
compatible = "renesas,emev2-smu-clkdiv";
reg = <0x610 0>;
clocks = <&pll3_fo>;
#clock-cells = <0>;
};
usib_u1_sclkdiv: usib_u1_sclkdiv {
usib_u1_sclkdiv: usib_u1_sclkdiv@65c,0 {
compatible = "renesas,emev2-smu-clkdiv";
reg = <0x65c 0>;
clocks = <&pll3_fo>;
#clock-cells = <0>;
};
usib_u2_sclkdiv: usib_u2_sclkdiv {
usib_u2_sclkdiv: usib_u2_sclkdiv@65c,16 {
compatible = "renesas,emev2-smu-clkdiv";
reg = <0x65c 16>;
clocks = <&pll3_fo>;
#clock-cells = <0>;
};
usib_u3_sclkdiv: usib_u3_sclkdiv {
usib_u3_sclkdiv: usib_u3_sclkdiv@660,0 {
compatible = "renesas,emev2-smu-clkdiv";
reg = <0x660 0>;
clocks = <&pll3_fo>;
#clock-cells = <0>;
};
usia_u0_sclk: usia_u0_sclk {
usia_u0_sclk: usia_u0_sclk@4a0,1 {
compatible = "renesas,emev2-smu-gclk";
reg = <0x4a0 1>;
clocks = <&usia_u0_sclkdiv>;
#clock-cells = <0>;
};
usib_u1_sclk: usib_u1_sclk {
usib_u1_sclk: usib_u1_sclk@4b8,1 {
compatible = "renesas,emev2-smu-gclk";
reg = <0x4b8 1>;
clocks = <&usib_u1_sclkdiv>;
#clock-cells = <0>;
};
usib_u2_sclk: usib_u2_sclk {
usib_u2_sclk: usib_u2_sclk@4bc,1 {
compatible = "renesas,emev2-smu-gclk";
reg = <0x4bc 1>;
clocks = <&usib_u2_sclkdiv>;
#clock-cells = <0>;
};
usib_u3_sclk: usib_u3_sclk {
usib_u3_sclk: usib_u3_sclk@4c0,1 {
compatible = "renesas,emev2-smu-gclk";
reg = <0x4c0 1>;
clocks = <&usib_u3_sclkdiv>;
#clock-cells = <0>;
};
sti_sclk: sti_sclk {
sti_sclk: sti_sclk@528,1 {
compatible = "renesas,emev2-smu-gclk";
reg = <0x528 1>;
clocks = <&c32ki>;
......
arch/arm/boot/dts/r7s72100-genmai.dts
View file @ 057b670d
......@@ -25,7 +25,7 @@ chosen {
stdout-path = &scif2;
};
memory {
memory@8000000 {
device_type = "memory";
reg = <0x08000000 0x08000000>;
};
......
arch/arm/boot/dts/r8a73a4-ape6evm.dts
View file @ 057b670d
......@@ -36,7 +36,7 @@ memory@200000000 {
reg = <2 0x00000000 0 0x40000000>;
};
vcc_mmc0: regulator@0 {
vcc_mmc0: regulator-mmc0 {
compatible = "regulator-fixed";
regulator-name = "MMC0 Vcc";
regulator-min-microvolt = <2800000>;
......@@ -44,7 +44,7 @@ vcc_mmc0: regulator@0 {
regulator-always-on;
};
vcc_sdhi0: regulator@1 {
vcc_sdhi0: regulator-sdhi0 {
compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
......@@ -56,7 +56,7 @@ vcc_sdhi0: regulator@1 {
};
/* Common 1.8V and 3.3V rails, used by several devices on APE6EVM */
ape6evm_fixed_1v8: regulator@2 {
ape6evm_fixed_1v8: regulator-1v8 {
compatible = "regulator-fixed";
regulator-name = "1V8";
regulator-min-microvolt = <1800000>;
......@@ -64,7 +64,7 @@ ape6evm_fixed_1v8: regulator@2 {
regulator-always-on;
};
ape6evm_fixed_3v3: regulator@3 {
ape6evm_fixed_3v3: regulator-3v3 {
compatible = "regulator-fixed";
regulator-name = "3V3";
regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/r8a73a4.dtsi
View file @ 057b670d
......@@ -31,6 +31,24 @@ cpu0: cpu@0 {
power-domains = <&pd_a2sl>;
next-level-cache = <&L2_CA15>;
};
L2_CA15: cache-controller@0 {
compatible = "cache";
reg = <0>;
clocks = <&cpg_clocks R8A73A4_CLK_Z>;
power-domains = <&pd_a3sm>;
cache-unified;
cache-level = <2>;
};
L2_CA7: cache-controller@100 {
compatible = "cache";
reg = <0x100>;
clocks = <&cpg_clocks R8A73A4_CLK_Z2>;
power-domains = <&pd_a3km>;
cache-unified;
cache-level = <2>;
};
};
ptm {
......@@ -46,22 +64,6 @@ timer {
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
};
L2_CA15: cache-controller@0 {
compatible = "cache";
clocks = <&cpg_clocks R8A73A4_CLK_Z>;
power-domains = <&pd_a3sm>;
cache-unified;
cache-level = <2>;
};
L2_CA7: cache-controller@1 {
compatible = "cache";
clocks = <&cpg_clocks R8A73A4_CLK_Z2>;
power-domains = <&pd_a3km>;
cache-unified;
cache-level = <2>;
};
dbsc1: memory-controller@e6790000 {
compatible = "renesas,dbsc-r8a73a4";
reg = <0 0xe6790000 0 0x10000>;
......
arch/arm/boot/dts/r8a7740-armadillo800eva.dts
View file @ 057b670d
......@@ -28,12 +28,12 @@ chosen {
stdout-path = &scifa1;
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x20000000>;
};
reg_3p3v: regulator@0 {
reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
......@@ -42,7 +42,7 @@ reg_3p3v: regulator@0 {
regulator-boot-on;
};
vcc_sdhi0: regulator@1 {
vcc_sdhi0: regulator-vcc-sdhi0 {
compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
......@@ -53,7 +53,7 @@ vcc_sdhi0: regulator@1 {
enable-active-high;
};
vccq_sdhi0: regulator@2 {
vccq_sdhi0: regulator-vccq-sdhi0 {
compatible = "regulator-gpio";
regulator-name = "SDHI0 VccQ";
......@@ -69,7 +69,7 @@ vccq_sdhi0: regulator@2 {
enable-active-high;
};
reg_5p0v: regulator@3 {
reg_5p0v: regulator-5p0v {
compatible = "regulator-fixed";
regulator-name = "fixed-5.0V";
regulator-min-microvolt = <5000000>;
......@@ -127,7 +127,7 @@ led6 {
};
};
i2c2: i2c@2 {
i2c2: i2c-2 {
#address-cells = <1>;
#size-cells = <0>;
compatible = "i2c-gpio";
......
arch/arm/boot/dts/r8a7740.dtsi
View file @ 057b670d
......@@ -39,7 +39,7 @@ gic: interrupt-controller@c2800000 {
<0xc2000000 0x1000>;
};
L2: cache-controller {
L2: cache-controller@f0100000 {
compatible = "arm,pl310-cache";
reg = <0xf0100000 0x1000>;
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
......
arch/arm/boot/dts/r8a7778-bockw.dts
View file @ 057b670d
......@@ -32,12 +32,12 @@ chosen {
stdout-path = "serial0:115200n8";
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x10000000>;
};
fixedregulator3v3: fixedregulator@0 {
fixedregulator3v3: regulator-3v3 {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
......@@ -223,6 +223,7 @@ &scif0 {
pinctrl-0 = <&scif0_pins>;
pinctrl-names = "default";
uart-has-rtscts;
status = "okay";
};
......
arch/arm/boot/dts/r8a7778.dtsi
View file @ 057b670d
......@@ -276,23 +276,23 @@ rcar_sound: sound@ffd90000 {
status = "disabled";
rcar_sound,src {
src3: src@3 { };
src4: src@4 { };
src5: src@5 { };
src6: src@6 { };
src7: src@7 { };
src8: src@8 { };
src9: src@9 { };
src3: src-3 { };
src4: src-4 { };
src5: src-5 { };
src6: src-6 { };
src7: src-7 { };
src8: src-8 { };
src9: src-9 { };
};
rcar_sound,ssi {
ssi3: ssi@3 { interrupts = <GIC_SPI 0x85 IRQ_TYPE_LEVEL_HIGH>; };
ssi4: ssi@4 { interrupts = <GIC_SPI 0x85 IRQ_TYPE_LEVEL_HIGH>; };
ssi5: ssi@5 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi6: ssi@6 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi7: ssi@7 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi8: ssi@8 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi9: ssi@9 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi3: ssi-3 { interrupts = <GIC_SPI 0x85 IRQ_TYPE_LEVEL_HIGH>; };
ssi4: ssi-4 { interrupts = <GIC_SPI 0x85 IRQ_TYPE_LEVEL_HIGH>; };
ssi5: ssi-5 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi6: ssi-6 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi7: ssi-7 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi8: ssi-8 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
ssi9: ssi-9 { interrupts = <GIC_SPI 0x86 IRQ_TYPE_LEVEL_HIGH>; };
};
};
......
arch/arm/boot/dts/r8a7779-marzen.dts
View file @ 057b670d
......@@ -28,12 +28,12 @@ chosen {
stdout-path = &scif2;
};
memory {
memory@60000000 {
device_type = "memory";
reg = <0x60000000 0x40000000>;
};
fixedregulator3v3: fixedregulator@0 {
fixedregulator3v3: regulator-3v3 {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
......
arch/arm/boot/dts/r8a7790-lager.dts
View file @ 057b670d
......@@ -76,28 +76,28 @@ lbsc {
keyboard {
compatible = "gpio-keys";
button@1 {
one {
linux,code = <KEY_1>;
label = "SW2-1";
wakeup-source;
debounce-interval = <20>;
gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
};
button@2 {
two {
linux,code = <KEY_2>;
label = "SW2-2";
wakeup-source;
debounce-interval = <20>;
gpios = <&gpio1 24 GPIO_ACTIVE_LOW>;
};
button@3 {
three {
linux,code = <KEY_3>;
label = "SW2-3";
wakeup-source;
debounce-interval = <20>;
gpios = <&gpio1 26 GPIO_ACTIVE_LOW>;
};
button@4 {
four {
linux,code = <KEY_4>;
label = "SW2-4";
wakeup-source;
......@@ -119,7 +119,7 @@ led8 {
};
};
fixedregulator3v3: fixedregulator@0 {
fixedregulator3v3: regulator-3v3 {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
......@@ -128,7 +128,7 @@ fixedregulator3v3: fixedregulator@0 {
regulator-always-on;
};
vcc_sdhi0: regulator@1 {
vcc_sdhi0: regulator-vcc-sdhi0 {
compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
......@@ -139,7 +139,7 @@ vcc_sdhi0: regulator@1 {
enable-active-high;
};
vccq_sdhi0: regulator@2 {
vccq_sdhi0: regulator-vccq-sdhi0 {
compatible = "regulator-gpio";
regulator-name = "SDHI0 VccQ";
......@@ -152,7 +152,7 @@ vccq_sdhi0: regulator@2 {
1800000 0>;
};
vcc_sdhi2: regulator@3 {
vcc_sdhi2: regulator-vcc-sdhi2 {
compatible = "regulator-fixed";
regulator-name = "SDHI2 Vcc";
......@@ -163,7 +163,7 @@ vcc_sdhi2: regulator@3 {
enable-active-high;
};
vccq_sdhi2: regulator@4 {
vccq_sdhi2: regulator-vccq-sdhi2 {
compatible = "regulator-gpio";
regulator-name = "SDHI2 VccQ";
......@@ -263,7 +263,7 @@ x13_clk: x13-clock {
* instantiate the slave device at runtime according to the documentation.
* You can then communicate with the slave via IIC3.
*/
i2cexio: i2c@8 {
i2cexio: i2c-8 {
compatible = "i2c-demux-pinctrl";
i2c-parent = <&iic0>, <&i2c0>;
i2c-bus-name = "i2c-exio";
......
arch/arm/boot/dts/r8a7790.dtsi
View file @ 057b670d
This diff is collapsed.
arch/arm/boot/dts/r8a7791-koelsch.dts
View file @ 057b670d
......@@ -170,7 +170,7 @@ led8 {
};
};
vcc_sdhi0: regulator@0 {
vcc_sdhi0: regulator-vcc-sdhi0 {
compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
......@@ -181,7 +181,7 @@ vcc_sdhi0: regulator@0 {
enable-active-high;
};
vccq_sdhi0: regulator@1 {
vccq_sdhi0: regulator-vccq-sdhi0 {
compatible = "regulator-gpio";
regulator-name = "SDHI0 VccQ";
......@@ -194,7 +194,7 @@ vccq_sdhi0: regulator@1 {
1800000 0>;
};
vcc_sdhi1: regulator@2 {
vcc_sdhi1: regulator-vcc-sdhi1 {
compatible = "regulator-fixed";
regulator-name = "SDHI1 Vcc";
......@@ -205,7 +205,7 @@ vcc_sdhi1: regulator@2 {
enable-active-high;
};
vccq_sdhi1: regulator@3 {
vccq_sdhi1: regulator-vccq-sdhi1 {
compatible = "regulator-gpio";
regulator-name = "SDHI1 VccQ";
......@@ -218,7 +218,7 @@ vccq_sdhi1: regulator@3 {
1800000 0>;
};
vcc_sdhi2: regulator@4 {
vcc_sdhi2: regulator-vcc-sdhi2 {
compatible = "regulator-fixed";
regulator-name = "SDHI2 Vcc";
......@@ -229,7 +229,7 @@ vcc_sdhi2: regulator@4 {
enable-active-high;
};
vccq_sdhi2: regulator@5 {
vccq_sdhi2: regulator-vccq-sdhi2 {
compatible = "regulator-gpio";
regulator-name = "SDHI2 VccQ";
......
arch/arm/boot/dts/r8a7791-porter.dts
View file @ 057b670d
......@@ -46,7 +46,7 @@ memory@200000000 {
reg = <2 0x00000000 0 0x40000000>;
};
vcc_sdhi0: regulator@0 {
vcc_sdhi0: regulator-vcc-sdhi0 {
compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
......@@ -55,7 +55,7 @@ vcc_sdhi0: regulator@0 {
regulator-always-on;
};
vccq_sdhi0: regulator@1 {
vccq_sdhi0: regulator-vccq-sdhi0 {
compatible = "regulator-gpio";
regulator-name = "SDHI0 VccQ";
......@@ -68,7 +68,7 @@ vccq_sdhi0: regulator@1 {
1800000 0>;
};
vcc_sdhi2: regulator@2 {
vcc_sdhi2: regulator-vcc-sdhi2 {
compatible = "regulator-fixed";
regulator-name = "SDHI2 Vcc";
......@@ -77,7 +77,7 @@ vcc_sdhi2: regulator@2 {
regulator-always-on;
};
vccq_sdhi2: regulator@3 {
vccq_sdhi2: regulator-vccq-sdhi2 {
compatible = "regulator-gpio";
regulator-name = "SDHI2 VccQ";
......
arch/arm/boot/dts/r8a7791.dtsi
View file @ 057b670d
This diff is collapsed.
arch/arm/boot/dts/r8a7793-gose.dts
View file @ 057b670d
......@@ -158,7 +158,7 @@ led8 {
};
};
vcc_sdhi0: regulator@0 {
vcc_sdhi0: regulator-vcc-sdhi0 {
compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
......@@ -169,7 +169,7 @@ vcc_sdhi0: regulator@0 {
enable-active-high;
};
vccq_sdhi0: regulator@1 {
vccq_sdhi0: regulator-vccq-sdhi0 {
compatible = "regulator-gpio";
regulator-name = "SDHI0 VccQ";
......@@ -182,7 +182,7 @@ vccq_sdhi0: regulator@1 {
1800000 0>;
};
vcc_sdhi1: regulator@2 {
vcc_sdhi1: regulator-vcc-sdhi1 {
compatible = "regulator-fixed";
regulator-name = "SDHI1 Vcc";
......@@ -193,7 +193,7 @@ vcc_sdhi1: regulator@2 {
enable-active-high;
};
vccq_sdhi1: regulator@3 {
vccq_sdhi1: regulator-vccq-sdhi1 {
compatible = "regulator-gpio";
regulator-name = "SDHI1 VccQ";
......@@ -206,7 +206,7 @@ vccq_sdhi1: regulator@3 {
1800000 0>;
};
vcc_sdhi2: regulator@4 {
vcc_sdhi2: regulator-vcc-sdhi2 {
compatible = "regulator-fixed";
regulator-name = "SDHI2 Vcc";
......@@ -217,7 +217,7 @@ vcc_sdhi2: regulator@4 {
enable-active-high;
};
vccq_sdhi2: regulator@5 {
vccq_sdhi2: regulator-vccq-sdhi2 {
compatible = "regulator-gpio";
regulator-name = "SDHI2 VccQ";
......
arch/arm/boot/dts/r8a7793.dtsi
View file @ 057b670d
This diff is collapsed.
arch/arm/boot/dts/r8a7794-silk.dts
View file @ 057b670d
......@@ -32,7 +32,7 @@ memory@40000000 {
reg = <0 0x40000000 0 0x40000000>;
};
d3_3v: regulator@0 {
d3_3v: regulator-d3-3v {
compatible = "regulator-fixed";
regulator-name = "D3.3V";
regulator-min-microvolt = <3300000>;
......@@ -41,7 +41,7 @@ d3_3v: regulator@0 {
regulator-always-on;
};
vcc_sdhi1: regulator@3 {
vcc_sdhi1: regulator-vcc-sdhi1 {
compatible = "regulator-fixed";
regulator-name = "SDHI1 Vcc";
......@@ -52,7 +52,7 @@ vcc_sdhi1: regulator@3 {
enable-active-high;
};
vccq_sdhi1: regulator@4 {
vccq_sdhi1: regulator-vccq-sdhi1 {
compatible = "regulator-gpio";
regulator-name = "SDHI1 VccQ";
......
arch/arm/boot/dts/r8a7794.dtsi
View file @ 057b670d
This diff is collapsed.
arch/arm/boot/dts/sh73a0-kzm9g.dts
View file @ 057b670d
......@@ -43,12 +43,12 @@ chosen {
stdout-path = &scifa4;
};
memory {
memory@40000000 {
device_type = "memory";
reg = <0x40000000 0x20000000>;
};
reg_1p8v: regulator@0 {
reg_1p8v: regulator-1p8v {
compatible = "regulator-fixed";
regulator-name = "fixed-1.8V";
regulator-min-microvolt = <1800000>;
......@@ -57,7 +57,7 @@ reg_1p8v: regulator@0 {
regulator-boot-on;
};
reg_3p3v: regulator@1 {
reg_3p3v: regulator-3p3v {
compatible = "regulator-fixed";
regulator-name = "fixed-3.3V";
regulator-min-microvolt = <3300000>;
......@@ -66,7 +66,7 @@ reg_3p3v: regulator@1 {
regulator-boot-on;
};
vmmc_sdhi0: regulator@2 {
vmmc_sdhi0: regulator-vmmc-sdhi0 {
compatible = "regulator-fixed";
regulator-name = "SDHI0 Vcc";
regulator-min-microvolt = <3300000>;
......@@ -75,7 +75,7 @@ vmmc_sdhi0: regulator@2 {
enable-active-high;
};
vmmc_sdhi2: regulator@3 {
vmmc_sdhi2: regulator-vmmc-sdhi2 {
compatible = "regulator-fixed";
regulator-name = "SDHI2 Vcc";
regulator-min-microvolt = <3300000>;
......@@ -378,6 +378,7 @@ &scifa4 {
pinctrl-0 = <&scifa4_pins>;
pinctrl-names = "default";
uart-has-rtscts;
status = "okay";
};
......
arch/arm/boot/dts/sh73a0.dtsi
View file @ 057b670d
......@@ -55,7 +55,7 @@ gic: interrupt-controller@f0001000 {
<0xf0000100 0x100>;
};
L2: cache-controller {
L2: cache-controller@f0100000 {
compatible = "arm,pl310-cache";
reg = <0xf0100000 0x1000>;
interrupts = <GIC_SPI 44 IRQ_TYPE_LEVEL_HIGH>;
......
include/dt-bindings/clock/r8a7794-clock.h
View file @ 057b670d
......@@ -67,7 +67,6 @@
#define R8A7794_CLK_IRQC 7
/* MSTP5 */
#define R8A7794_CLK_THERMAL 22
#define R8A7794_CLK_PWM 23
/* MSTP7 */
......
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