mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 06:10:56 +00:00
Code Issues Releases Wiki Activity

Second Round of Renesas ARM Based SoC DT Updates for v4.21

Browse source 
* RZ/G1N (r8a7744) SoC
   - Describe in DT: SYS-DMAC, GPIO, Ethernet AVB, SMP, [H]SCIF{A|B},
     I2C, USB 2.0 and 3.0 hosts, USB-DMAC, HSUSB, RWDT, Audio, CAN, IRQC,
     thermal, CMT, VIN, VSP, IPMMU, PMU, TPU, QSPI MSIOF, and PCIE
   - iWave G20D-Q7 board
     - Initial support
     - Enable eMMC, SDHI and SPIO NOR support
   - Add camera daughterboard
 
 * RZ/G1M (r8a7743) SoC
   - Remove legacy "renesas,rcar-thermal" compatibility
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE4nzZofWswv9L/nKF189kaWo3T74FAlwJfHEACgkQ189kaWo3
 T74jMxAAsdHY2LYOaNTJwuttITl1nuq8BxHfHyW4vM8VnVm/BL0DbTVibLgOUkP+
 pUPAFwoJhXVvX3aM0n7miXk8BH+YHyX4+rBP5HWnbF79p4Z1f6tqLpUJ0s4xIfk6
 foU6LiQiHgMgrImPolJmwGMvmZj4IzC+Od1Id34ElqMW5KZALmg4m3AEFUie7Kp7
 3/qwDteKB9kiI26oRGRzj72LlBtA7+uVwdwnMIOce6SjFpyUFDgOelyIwF91gz37
 r97wyeON6CfsAUbGOCR915JonuWoPtLPKaJweuTftsmgJqYbIm6X38G6V8u4eCui
 /AQwTrSFD5q9SrDOxW9e/KRFKEayFig4O9QkZIEBFpJDzLNgSseNydCidC9TznrA
 11uK5ryPL1DLur/Fh5L5cxQ9VM+eaquS5TpvsPzZn/aNRHFtbPBfYY15we1Z9SJ1
 NwTJZAtdaFjpKe7jOMM8iEUSqXKXMg6ue5EMBXVPqrhdld+JrTku9ju+/DlKDwM8
 QrJwioeyY7Lrw/rRohO0cvbP98WYGfbEG6iPaW+nTTiNX0TgOMHw3qDNADKPUYYg
 LXdRnGASIOAT1yC4MwPTqh5u9r9cxjo086YD5ETvMNjg/NZHMDlN13LFOV6uHeXa
 nhP+4aq41+C9CbGYzP7iTtmFUf2BDJ6CE50I4Lx9C/F6i03T1Qk=
 =cq6J
 -----END PGP SIGNATURE-----

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

Second Round of Renesas ARM Based SoC DT Updates for v4.21

* RZ/G1N (r8a7744) SoC
  - Describe in DT: SYS-DMAC, GPIO, Ethernet AVB, SMP, [H]SCIF{A|B},
    I2C, USB 2.0 and 3.0 hosts, USB-DMAC, HSUSB, RWDT, Audio, CAN, IRQC,
    thermal, CMT, VIN, VSP, IPMMU, PMU, TPU, QSPI MSIOF, and PCIE
  - iWave G20D-Q7 board
    - Initial support
    - Enable eMMC, SDHI and SPIO NOR support
  - Add camera daughterboard

* RZ/G1M (r8a7743) SoC
  - Remove legacy "renesas,rcar-thermal" compatibility

* tag 'renesas-arm-dt2-for-v4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (34 commits)
  ARM: dts: r8a7744-iwg20m: Add SPI NOR support
  ARM: dts: iwg20d-q7-common: Move cmt/rwdt node out of RZ/G1M SOM
  ARM: dts: r8a7744: Add PCIe Controller device node
  ARM: dts: r8a7744: Add xhci support
  ARM: dts: r8a7744: Add MSIOF[012] support
  ARM: dts: r8a7744: Add QSPI support
  ARM: dts: r8a7744-iwg20d-q7-dbcm-ca: Add device tree for camera DB
  ARM: dts: r8a7744: Add TPU support
  ARM: dts: r8a7744: Add PWM SoC support
  ARM: dts: r8a7744: Add IPMMU DT nodes
  ARM: dts: r8a7744: Add VSP support
  ARM: dts: r8a7744: add VIN dt support
  ARM: dts: r8a7744: Add CMT SoC specific support
  ARM: dts: r8a7744: Add thermal device to DT
  ARM: dts: r8a7744: Add IRQC support
  ARM: dts: r8a7744: Add CAN support
  ARM: dts: r8a7744: Add audio support
  ARM: dts: r8a7744: Add RWDT node
  ARM: dts: r8a7744: Add USB-DMAC and HSUSB device nodes
  ARM: dts: r8a7744: USB 2.0 host support
  ...

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2018-12-11 08:03:48 -08:00
commit 857f002133
8 changed files with 1875 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/Makefile
View file

@ -836,6 +836,8 @@ dtb-$(CONFIG_ARCH_RENESAS) += \
r8a7743-iwg20d-q7.dtb \
r8a7743-iwg20d-q7-dbcm-ca.dtb \
r8a7743-sk-rzg1m.dtb \
r8a7744-iwg20d-q7.dtb \
r8a7744-iwg20d-q7-dbcm-ca.dtb \
r8a7745-iwg22d-sodimm.dtb \
r8a7745-iwg22d-sodimm-dbhd-ca.dtb \
r8a7745-sk-rzg1e.dtb \

9
arch/arm/boot/dts/iwg20d-q7-common.dtsi
View file

@ -116,6 +116,10 @@ &can0 {
status = "okay";
};
&cmt0 {
status = "okay";
};
&hsusb {
status = "okay";
pinctrl-0 = <&usb0_pins>;
@ -230,6 +234,11 @@ dai0 {
};
};
&rwdt {
timeout-sec = <60>;
status = "okay";
};
&scif0 {
pinctrl-0 = <&scif0_pins>;
pinctrl-names = "default";

9
arch/arm/boot/dts/r8a7743-iwg20m.dtsi
View file

@ -31,10 +31,6 @@ reg_3p3v: 3p3v {
};
};
&cmt0 {
status = "okay";
};
&extal_clk {
clock-frequency = <20000000>;
};
@ -88,11 +84,6 @@ flash: flash@0 {
};
};
&rwdt {
timeout-sec = <60>;
status = "okay";
};
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default";

3
arch/arm/boot/dts/r8a7743.dtsi
View file

@ -348,8 +348,7 @@ irqc: interrupt-controller@e61c0000 {
thermal: thermal@e61f0000 {
compatible = "renesas,thermal-r8a7743",
"renesas,rcar-gen2-thermal",
"renesas,rcar-thermal";
"renesas,rcar-gen2-thermal";
reg = <0 0xe61f0000 0 0x10>, <0 0xe61f0100 0 0x38>;
interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&cpg CPG_MOD 522>;

17
arch/arm/boot/dts/r8a7744-iwg20d-q7-dbcm-ca.dts Normal file
View file

@ -0,0 +1,17 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source for the iWave Systems RZ/G1N Qseven board development
* platform with camera daughter board
*
* Copyright (C) 2018 Renesas Electronics Corp.
*/
/dts-v1/;
#include "r8a7744-iwg20m.dtsi"
#include "iwg20d-q7-common.dtsi"
#include "iwg20d-q7-dbcm-ca.dtsi"
/ {
model = "iWave Systems RZ/G1N Qseven development platform with camera add-on";
compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7744";
};

15
arch/arm/boot/dts/r8a7744-iwg20d-q7.dts Normal file
View file

@ -0,0 +1,15 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source for the iWave-RZ/G1N Qseven board
*
* Copyright (C) 2018 Renesas Electronics Corp.
*/
/dts-v1/;
#include "r8a7744-iwg20m.dtsi"
#include "iwg20d-q7-common.dtsi"
/ {
model = "iWave Systems RainboW-G20D-Qseven board based on RZ/G1N";
compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7744";
};

90
arch/arm/boot/dts/r8a7744-iwg20m.dtsi Normal file
View file

@ -0,0 +1,90 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Device Tree Source for the iWave RZ/G1N Qseven SOM
*
* Copyright (C) 2018 Renesas Electronics Corp.
*/
#include "r8a7744.dtsi"
#include <dt-bindings/gpio/gpio.h>
/ {
compatible = "iwave,g20m", "renesas,r8a7744";
memory@40000000 {
device_type = "memory";
reg = <0 0x40000000 0 0x40000000>;
};
reg_3p3v: 3p3v {
compatible = "regulator-fixed";
regulator-name = "3P3V";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-always-on;
regulator-boot-on;
};
};
&extal_clk {
clock-frequency = <20000000>;
};
&pfc {
mmcif0_pins: mmc {
groups = "mmc_data8_b", "mmc_ctrl";
function = "mmc";
};
qspi_pins: qspi {
groups = "qspi_ctrl", "qspi_data2";
function = "qspi";
};
sdhi0_pins: sd0 {
groups = "sdhi0_data4", "sdhi0_ctrl";
function = "sdhi0";
power-source = <3300>;
};
};
&mmcif0 {
pinctrl-0 = <&mmcif0_pins>;
pinctrl-names = "default";
vmmc-supply = <&reg_3p3v>;
bus-width = <8>;
non-removable;
status = "okay";
};
&qspi {
pinctrl-0 = <&qspi_pins>;
pinctrl-names = "default";
status = "okay";
/* WARNING - This device contains the bootloader. Handle with care. */
flash: flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <50000000>;
spi-tx-bus-width = <2>;
spi-rx-bus-width = <2>;
m25p,fast-read;
spi-cpol;
spi-cpha;
};
};
&sdhi0 {
pinctrl-0 = <&sdhi0_pins>;
pinctrl-names = "default";
vmmc-supply = <&reg_3p3v>;
vqmmc-supply = <&reg_3p3v>;
cd-gpios = <&gpio7 11 GPIO_ACTIVE_LOW>;
status = "okay";
};

1741
arch/arm/boot/dts/r8a7744.dtsi Normal file
View file

File diff suppressed because it is too large Load diff