Merge tag 'renesas-dt-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Pull "Renesas ARM Based SoC DT Updates for v3.19" from Simon Horman:
* Add Add SoC-specific SATA compatible property to r8a7779
* Enable DMA for MMCIF on r8a7791 and r8a7790
* Enable USB-PHY, HS-USB and USB3.0 on r8a7791 and r8a7790
* Enable TMU timer via DT on r8a7778
* Enable CMT timer via DT on r8a73a4
* Add MMP and {SR}GX clocks to r8a7791 and r8a7790
* Correct scifa2 clock index on r8a7740
* Add missing INTCA for irqpin on r8a7740
* tag 'renesas-dt-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (34 commits)
ARM: shmobile: r8a7779 dtsi: Add SoC-specific SATA compatible property
ARM: shmobile: r8a7791: Reference DMA channels in MMCIF DT node
ARM: shmobile: r8a7790: Reference DMA channels in MMCIF DT nodes
ARM: shmobile: r8a7791: Add MMCIF0 DT node
ARM: shmobile: r8a7790: Rename mmcif node to mmc
ARM: shmobile: r8a7778: Add SoC-specific TMU compatible property
ARM: shmobile: r8a73a4: Add SoC-specific CMT compatible property
ARM: shmobile: henninger: enable HS-USB
ARM: shmobile: koelsch: enable HS-USB
ARM: shmobile: r8a7791: add HS-USB device node
ARM: shmobile: lager: enable HS-USB
ARM: shmobile: r8a7790: add HS-USB device node
ARM: shmobile: r8a7791: add USB3.0 device node
ARM: shmobile: lager: enable USB3.0
ARM: shmobile: r8a7790: add USB3.0 device node
ARM: shmobile: r8a7794: Add arch_timer to device tree
ARM: shmobile: bockw-reference: Initialise TMU device using DT
ARM: shmobile: r8a7778: Add TMU nodes
ARM: shmobile: armadillo800eva dts: Enable TMU0
ARM: shmobile: r8a7740 dtsi: Add TMU0 and TMU1 device nodes
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -40,6 +40,7 @@
|
||||
|
||||
/* MSTP2 */
|
||||
#define R8A7740_CLK_SCIFA6 30
|
||||
#define R8A7740_CLK_INTCA 29
|
||||
#define R8A7740_CLK_SCIFA7 22
|
||||
#define R8A7740_CLK_DMAC1 18
|
||||
#define R8A7740_CLK_DMAC2 17
|
||||
|
||||
@@ -26,8 +26,18 @@
|
||||
#define R8A7790_CLK_MSIOF0 0
|
||||
|
||||
/* MSTP1 */
|
||||
#define R8A7790_CLK_JPU 6
|
||||
#define R8A7790_CLK_VCP1 0
|
||||
#define R8A7790_CLK_VCP0 1
|
||||
#define R8A7790_CLK_VPC1 2
|
||||
#define R8A7790_CLK_VPC0 3
|
||||
#define R8A7790_CLK_JPU 6
|
||||
#define R8A7790_CLK_SSP1 9
|
||||
#define R8A7790_CLK_TMU1 11
|
||||
#define R8A7790_CLK_3DG 12
|
||||
#define R8A7790_CLK_2DDMAC 15
|
||||
#define R8A7790_CLK_FDP1_2 17
|
||||
#define R8A7790_CLK_FDP1_1 18
|
||||
#define R8A7790_CLK_FDP1_0 19
|
||||
#define R8A7790_CLK_TMU3 21
|
||||
#define R8A7790_CLK_TMU2 22
|
||||
#define R8A7790_CLK_CMT0 24
|
||||
|
||||
@@ -25,8 +25,15 @@
|
||||
#define R8A7791_CLK_MSIOF0 0
|
||||
|
||||
/* MSTP1 */
|
||||
#define R8A7791_CLK_JPU 6
|
||||
#define R8A7791_CLK_VCP0 1
|
||||
#define R8A7791_CLK_VPC0 3
|
||||
#define R8A7791_CLK_JPU 6
|
||||
#define R8A7791_CLK_SSP1 9
|
||||
#define R8A7791_CLK_TMU1 11
|
||||
#define R8A7791_CLK_3DG 12
|
||||
#define R8A7791_CLK_2DDMAC 15
|
||||
#define R8A7791_CLK_FDP1_1 18
|
||||
#define R8A7791_CLK_FDP1_0 19
|
||||
#define R8A7791_CLK_TMU3 21
|
||||
#define R8A7791_CLK_TMU2 22
|
||||
#define R8A7791_CLK_CMT0 24
|
||||
|
||||
Reference in New Issue
Block a user