Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1161a0d5 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-dt-bindings2-for-v4.13' of...

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

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

* Document:
  - Add Renesas H3-based Salvator-XS board DT bindings
  - Add iW-RainboW-G20D-Qseven-RZG1M board
  - Add iW-RainboW-G20M-Qseven-RZG1M system on module
  - Update R-Car Gen3 ULCB board part numbers
* Add clock bit definitions for r7s72100 SoC

* tag 'renesas-dt-bindings2-for-v4.13' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas

:
  ARM: shmobile: Document Renesas H3-based Salvator-XS board DT bindings
  ARM: shmobile: Update R-Car Gen3 ULCB board part numbers
  ARM: shmobile: document iW-RainboW-G20D-Qseven-RZG1M board
  ARM: shmobile: document iW-RainboW-G20M-Qseven-RZG1M system on module
  ARM: dts: r7s72100: add clock bit definitions

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 878e9173 521ec12e
Loading
Loading
Loading
Loading
+9 −2
Original line number Diff line number Diff line
@@ -59,10 +59,15 @@ Boards:
    compatible = "renesas,gr-peach", "renesas,r7s72100"
  - Gose (RTP0RC7793SEB00010S)
    compatible = "renesas,gose", "renesas,r8a7793"
  - H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKB00010S)
  - H3ULCB (R-Car Starter Kit Premier, RTP0RC7795SKBX0010SA00 (H3 ES1.1))
    H3ULCB (R-Car Starter Kit Premier, RTP0RC77951SKBX010SA00 (H3 ES2.0))
    compatible = "renesas,h3ulcb", "renesas,r8a7795";
  - Henninger
    compatible = "renesas,henninger", "renesas,r8a7791"
  - iWave Systems RZ/G1M Qseven Development Platform (iW-RainboW-G20D-Qseven)
    compatible = "iwave,g20d", "iwave,g20m", "renesas,r8a7743"
  - iWave Systems RZ/G1M Qseven System On Module (iW-RainboW-G20M-Qseven)
    compatible = "iwave,g20m", "renesas,r8a7743"
  - Koelsch (RTP0RC7791SEB00010S)
    compatible = "renesas,koelsch", "renesas,r8a7791"
  - Kyoto Microcomputer Co. KZM-A9-Dual
@@ -71,7 +76,7 @@ Boards:
    compatible = "renesas,kzm9g", "renesas,sh73a0"
  - Lager (RTP0RC7790SEB00010S)
    compatible = "renesas,lager", "renesas,r8a7790"
  - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKB00010S)
  - M3ULCB (R-Car Starter Kit Pro, RTP0RC7796SKBX0010SA09 (M3 ES1.0))
    compatible = "renesas,m3ulcb", "renesas,r8a7796";
  - Marzen (R0P7779A00010S)
    compatible = "renesas,marzen", "renesas,r8a7779"
@@ -83,6 +88,8 @@ Boards:
    compatible = "renesas,salvator-x", "renesas,r8a7795";
  - Salvator-X (RTP0RC7796SIPB0011S)
    compatible = "renesas,salvator-x", "renesas,r8a7796";
  - Salvator-XS (Salvator-X 2nd version, RTP0RC7795SIPB0012S)
    compatible = "renesas,salvator-xs", "renesas,r8a7795";
  - SILK (RTP0RC7794LCB00011S)
    compatible = "renesas,silk", "renesas,r8a7794"
  - SK-RZG1E (YR8A77450S000BE)
+51 −0
Original line number Diff line number Diff line
@@ -12,8 +12,18 @@

#define R7S72100_CLK_PLL	0

/* MSTP2 */
#define R7S72100_CLK_CORESIGHT	0

/* MSTP3 */
#define R7S72100_CLK_IEBUS	7
#define R7S72100_CLK_IRDA	6
#define R7S72100_CLK_LIN0	5
#define R7S72100_CLK_LIN1	4
#define R7S72100_CLK_MTU2	3
#define R7S72100_CLK_CAN	2
#define R7S72100_CLK_ADCPWR	1
#define R7S72100_CLK_PWM	0

/* MSTP4 */
#define R7S72100_CLK_SCIF0	7
@@ -26,25 +36,51 @@
#define R7S72100_CLK_SCIF7	0

/* MSTP5 */
#define R7S72100_CLK_SCI0	7
#define R7S72100_CLK_SCI1	6
#define R7S72100_CLK_SG0	5
#define R7S72100_CLK_SG1	4
#define R7S72100_CLK_SG2	3
#define R7S72100_CLK_SG3	2
#define R7S72100_CLK_OSTM0	1
#define R7S72100_CLK_OSTM1	0

/* MSTP6 */
#define R7S72100_CLK_ADC	7
#define R7S72100_CLK_CEU	6
#define R7S72100_CLK_DOC0	5
#define R7S72100_CLK_DOC1	4
#define R7S72100_CLK_DRC0	3
#define R7S72100_CLK_DRC1	2
#define R7S72100_CLK_JCU	1
#define R7S72100_CLK_RTC	0

/* MSTP7 */
#define R7S72100_CLK_VDEC0	7
#define R7S72100_CLK_VDEC1	6
#define R7S72100_CLK_ETHER	4
#define R7S72100_CLK_NAND	3
#define R7S72100_CLK_USB0	1
#define R7S72100_CLK_USB1	0

/* MSTP8 */
#define R7S72100_CLK_IMR0	7
#define R7S72100_CLK_IMR1	6
#define R7S72100_CLK_IMRDISP	5
#define R7S72100_CLK_MMCIF	4
#define R7S72100_CLK_MLB	3
#define R7S72100_CLK_ETHAVB	2
#define R7S72100_CLK_SCUX	1

/* MSTP9 */
#define R7S72100_CLK_I2C0	7
#define R7S72100_CLK_I2C1	6
#define R7S72100_CLK_I2C2	5
#define R7S72100_CLK_I2C3	4
#define R7S72100_CLK_SPIBSC0	3
#define R7S72100_CLK_SPIBSC1	2
#define R7S72100_CLK_VDC50	1	/* and LVDS */
#define R7S72100_CLK_VDC51	0

/* MSTP10 */
#define R7S72100_CLK_SPI0	7
@@ -52,6 +88,17 @@
#define R7S72100_CLK_SPI2	5
#define R7S72100_CLK_SPI3	4
#define R7S72100_CLK_SPI4	3
#define R7S72100_CLK_CDROM	2
#define R7S72100_CLK_SPDIF	1
#define R7S72100_CLK_RGPVG2	0

/* MSTP11 */
#define R7S72100_CLK_SSI0	5
#define R7S72100_CLK_SSI1	4
#define R7S72100_CLK_SSI2	3
#define R7S72100_CLK_SSI3	2
#define R7S72100_CLK_SSI4	1
#define R7S72100_CLK_SSI5	0

/* MSTP12 */
#define R7S72100_CLK_SDHI00	3
@@ -59,4 +106,8 @@
#define R7S72100_CLK_SDHI10	1
#define R7S72100_CLK_SDHI11	0

/* MSTP13 */
#define R7S72100_CLK_PIX1	2
#define R7S72100_CLK_PIX0	1

#endif /* __DT_BINDINGS_CLOCK_R7S72100_H__ */