mirror of
https://github.com/u-boot/u-boot.git
synced 2025-04-30 08:07:59 +00:00
Merge branch 'master-sync-dts-663' of https://source.denx.de/u-boot/custodians/u-boot-sh
This commit is contained in:
commit
697758e7c8
15 changed files with 61 additions and 8 deletions
|
@ -239,7 +239,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
keyboard_pins: keyboard {
|
keyboard_pins: keyboard {
|
||||||
pins = "GP_3_10", "GP_3_11", "GP_3_12", "GP_3_15", "GP_11_02";
|
pins = "GP_3_10", "GP_3_11", "GP_3_12", "GP_3_15", "GP_11_2";
|
||||||
bias-pull-up;
|
bias-pull-up;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -145,7 +145,7 @@
|
||||||
status = "okay";
|
status = "okay";
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
|
|
||||||
hdmi@39{
|
hdmi@39 {
|
||||||
compatible = "adi,adv7511w";
|
compatible = "adi,adv7511w";
|
||||||
#sound-dai-cells = <0>;
|
#sound-dai-cells = <0>;
|
||||||
reg = <0x39>;
|
reg = <0x39>;
|
||||||
|
|
|
@ -76,7 +76,7 @@
|
||||||
enable-method = "psci";
|
enable-method = "psci";
|
||||||
cpu-idle-states = <&CPU_SLEEP_0>;
|
cpu-idle-states = <&CPU_SLEEP_0>;
|
||||||
dynamic-power-coefficient = <277>;
|
dynamic-power-coefficient = <277>;
|
||||||
clocks =<&cpg CPG_CORE R8A77990_CLK_Z2>;
|
clocks = <&cpg CPG_CORE R8A77990_CLK_Z2>;
|
||||||
operating-points-v2 = <&cluster1_opp>;
|
operating-points-v2 = <&cluster1_opp>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
next-level-cache = <&L2_CA53>;
|
next-level-cache = <&L2_CA53>;
|
||||||
enable-method = "psci";
|
enable-method = "psci";
|
||||||
cpu-idle-states = <&CPU_SLEEP_0>;
|
cpu-idle-states = <&CPU_SLEEP_0>;
|
||||||
clocks =<&cpg CPG_CORE R8A77990_CLK_Z2>;
|
clocks = <&cpg CPG_CORE R8A77990_CLK_Z2>;
|
||||||
operating-points-v2 = <&cluster1_opp>;
|
operating-points-v2 = <&cluster1_opp>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-License-Identifier: (GPL-2.0 or MIT)
|
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
|
||||||
/*
|
/*
|
||||||
* Device Tree Source for the Spider CPU board
|
* Device Tree Source for the Spider CPU board
|
||||||
*
|
*
|
||||||
|
@ -6,6 +6,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <dt-bindings/gpio/gpio.h>
|
#include <dt-bindings/gpio/gpio.h>
|
||||||
|
#include <dt-bindings/leds/common.h>
|
||||||
|
|
||||||
#include "r8a779f0.dtsi"
|
#include "r8a779f0.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
|
@ -22,6 +24,24 @@
|
||||||
stdout-path = "serial0:1843200n8";
|
stdout-path = "serial0:1843200n8";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
leds {
|
||||||
|
compatible = "gpio-leds";
|
||||||
|
|
||||||
|
led-7 {
|
||||||
|
gpios = <&gpio0 11 GPIO_ACTIVE_HIGH>;
|
||||||
|
color = <LED_COLOR_ID_GREEN>;
|
||||||
|
function = LED_FUNCTION_INDICATOR;
|
||||||
|
function-enumerator = <7>;
|
||||||
|
};
|
||||||
|
|
||||||
|
led-8 {
|
||||||
|
gpios = <&gpio0 14 GPIO_ACTIVE_HIGH>;
|
||||||
|
color = <LED_COLOR_ID_GREEN>;
|
||||||
|
function = LED_FUNCTION_INDICATOR;
|
||||||
|
function-enumerator = <8>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
memory@48000000 {
|
memory@48000000 {
|
||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
/* first 128MB is reserved for secure area. */
|
/* first 128MB is reserved for secure area. */
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-License-Identifier: (GPL-2.0 or MIT)
|
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
|
||||||
/*
|
/*
|
||||||
* Device Tree Source for the Spider CPU and BreakOut boards
|
* Device Tree Source for the Spider CPU and BreakOut boards
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// SPDX-License-Identifier: (GPL-2.0 or MIT)
|
// SPDX-License-Identifier: (GPL-2.0 OR MIT)
|
||||||
/*
|
/*
|
||||||
* Device Tree Source for the R-Car S4-8 (R8A779F0) SoC
|
* Device Tree Source for the R-Car S4-8 (R8A779F0) SoC
|
||||||
*
|
*
|
||||||
|
@ -466,6 +466,21 @@
|
||||||
#thermal-sensor-cells = <1>;
|
#thermal-sensor-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
intc_ex: interrupt-controller@e61c0000 {
|
||||||
|
compatible = "renesas,intc-ex-r8a779f0", "renesas,irqc";
|
||||||
|
#interrupt-cells = <2>;
|
||||||
|
interrupt-controller;
|
||||||
|
reg = <0 0xe61c0000 0 0x200>;
|
||||||
|
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 4 IRQ_TYPE_LEVEL_HIGH>,
|
||||||
|
<GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
clocks = <&cpg CPG_CORE R8A779F0_CLK_CL16M>;
|
||||||
|
power-domains = <&sysc R8A779F0_PD_ALWAYS_ON>;
|
||||||
|
};
|
||||||
|
|
||||||
tmu0: timer@e61e0000 {
|
tmu0: timer@e61e0000 {
|
||||||
compatible = "renesas,tmu-r8a779f0", "renesas,tmu";
|
compatible = "renesas,tmu-r8a779f0", "renesas,tmu";
|
||||||
reg = <0 0xe61e0000 0 0x30>;
|
reg = <0 0xe61e0000 0 0x30>;
|
||||||
|
|
|
@ -75,6 +75,7 @@ static const struct cpg_core_clk r8a774a1_core_clks[] __initconst = {
|
||||||
/* Core Clock Outputs */
|
/* Core Clock Outputs */
|
||||||
DEF_GEN3_Z("z", R8A774A1_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
DEF_GEN3_Z("z", R8A774A1_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
||||||
DEF_GEN3_Z("z2", R8A774A1_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL2, 2, 0),
|
DEF_GEN3_Z("z2", R8A774A1_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL2, 2, 0),
|
||||||
|
DEF_GEN3_Z("zg", R8A774A1_CLK_ZG, CLK_TYPE_GEN3_ZG, CLK_PLL4, 4, 24),
|
||||||
DEF_FIXED("ztr", R8A774A1_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
DEF_FIXED("ztr", R8A774A1_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
||||||
DEF_FIXED("ztrd2", R8A774A1_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
DEF_FIXED("ztrd2", R8A774A1_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
||||||
DEF_FIXED("zt", R8A774A1_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
DEF_FIXED("zt", R8A774A1_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
||||||
|
@ -122,6 +123,7 @@ static const struct cpg_core_clk r8a774a1_core_clks[] __initconst = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct mssr_mod_clk r8a774a1_mod_clks[] __initconst = {
|
static const struct mssr_mod_clk r8a774a1_mod_clks[] __initconst = {
|
||||||
|
DEF_MOD("3dge", 112, R8A774A1_CLK_ZG),
|
||||||
DEF_MOD("tmu4", 121, R8A774A1_CLK_S0D6),
|
DEF_MOD("tmu4", 121, R8A774A1_CLK_S0D6),
|
||||||
DEF_MOD("tmu3", 122, R8A774A1_CLK_S3D2),
|
DEF_MOD("tmu3", 122, R8A774A1_CLK_S3D2),
|
||||||
DEF_MOD("tmu2", 123, R8A774A1_CLK_S3D2),
|
DEF_MOD("tmu2", 123, R8A774A1_CLK_S3D2),
|
||||||
|
@ -212,6 +214,7 @@ static const struct mssr_mod_clk r8a774a1_mod_clks[] __initconst = {
|
||||||
DEF_MOD("rpc-if", 917, R8A774A1_CLK_RPCD2),
|
DEF_MOD("rpc-if", 917, R8A774A1_CLK_RPCD2),
|
||||||
DEF_MOD("i2c6", 918, R8A774A1_CLK_S0D6),
|
DEF_MOD("i2c6", 918, R8A774A1_CLK_S0D6),
|
||||||
DEF_MOD("i2c5", 919, R8A774A1_CLK_S0D6),
|
DEF_MOD("i2c5", 919, R8A774A1_CLK_S0D6),
|
||||||
|
DEF_MOD("adg", 922, R8A774A1_CLK_S0D4),
|
||||||
DEF_MOD("iic-pmic", 926, R8A774A1_CLK_CP),
|
DEF_MOD("iic-pmic", 926, R8A774A1_CLK_CP),
|
||||||
DEF_MOD("i2c4", 927, R8A774A1_CLK_S0D6),
|
DEF_MOD("i2c4", 927, R8A774A1_CLK_S0D6),
|
||||||
DEF_MOD("i2c3", 928, R8A774A1_CLK_S0D6),
|
DEF_MOD("i2c3", 928, R8A774A1_CLK_S0D6),
|
||||||
|
|
|
@ -72,6 +72,7 @@ static const struct cpg_core_clk r8a774b1_core_clks[] __initconst = {
|
||||||
|
|
||||||
/* Core Clock Outputs */
|
/* Core Clock Outputs */
|
||||||
DEF_GEN3_Z("z", R8A774B1_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
DEF_GEN3_Z("z", R8A774B1_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
||||||
|
DEF_GEN3_Z("zg", R8A774B1_CLK_ZG, CLK_TYPE_GEN3_ZG, CLK_PLL4, 4, 24),
|
||||||
DEF_FIXED("ztr", R8A774B1_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
DEF_FIXED("ztr", R8A774B1_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
||||||
DEF_FIXED("ztrd2", R8A774B1_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
DEF_FIXED("ztrd2", R8A774B1_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
||||||
DEF_FIXED("zt", R8A774B1_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
DEF_FIXED("zt", R8A774B1_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
||||||
|
@ -119,6 +120,7 @@ static const struct cpg_core_clk r8a774b1_core_clks[] __initconst = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct mssr_mod_clk r8a774b1_mod_clks[] __initconst = {
|
static const struct mssr_mod_clk r8a774b1_mod_clks[] __initconst = {
|
||||||
|
DEF_MOD("3dge", 112, R8A774B1_CLK_ZG),
|
||||||
DEF_MOD("tmu4", 121, R8A774B1_CLK_S0D6),
|
DEF_MOD("tmu4", 121, R8A774B1_CLK_S0D6),
|
||||||
DEF_MOD("tmu3", 122, R8A774B1_CLK_S3D2),
|
DEF_MOD("tmu3", 122, R8A774B1_CLK_S3D2),
|
||||||
DEF_MOD("tmu2", 123, R8A774B1_CLK_S3D2),
|
DEF_MOD("tmu2", 123, R8A774B1_CLK_S3D2),
|
||||||
|
@ -208,6 +210,7 @@ static const struct mssr_mod_clk r8a774b1_mod_clks[] __initconst = {
|
||||||
DEF_MOD("rpc-if", 917, R8A774B1_CLK_RPCD2),
|
DEF_MOD("rpc-if", 917, R8A774B1_CLK_RPCD2),
|
||||||
DEF_MOD("i2c6", 918, R8A774B1_CLK_S0D6),
|
DEF_MOD("i2c6", 918, R8A774B1_CLK_S0D6),
|
||||||
DEF_MOD("i2c5", 919, R8A774B1_CLK_S0D6),
|
DEF_MOD("i2c5", 919, R8A774B1_CLK_S0D6),
|
||||||
|
DEF_MOD("adg", 922, R8A774B1_CLK_S0D4),
|
||||||
DEF_MOD("iic-pmic", 926, R8A774B1_CLK_CP),
|
DEF_MOD("iic-pmic", 926, R8A774B1_CLK_CP),
|
||||||
DEF_MOD("i2c4", 927, R8A774B1_CLK_S0D6),
|
DEF_MOD("i2c4", 927, R8A774B1_CLK_S0D6),
|
||||||
DEF_MOD("i2c3", 928, R8A774B1_CLK_S0D6),
|
DEF_MOD("i2c3", 928, R8A774B1_CLK_S0D6),
|
||||||
|
|
|
@ -211,6 +211,7 @@ static const struct mssr_mod_clk r8a774c0_mod_clks[] __initconst = {
|
||||||
DEF_MOD("rpc-if", 917, R8A774C0_CLK_RPCD2),
|
DEF_MOD("rpc-if", 917, R8A774C0_CLK_RPCD2),
|
||||||
DEF_MOD("i2c6", 918, R8A774C0_CLK_S3D2),
|
DEF_MOD("i2c6", 918, R8A774C0_CLK_S3D2),
|
||||||
DEF_MOD("i2c5", 919, R8A774C0_CLK_S3D2),
|
DEF_MOD("i2c5", 919, R8A774C0_CLK_S3D2),
|
||||||
|
DEF_MOD("adg", 922, R8A774C0_CLK_ZA2),
|
||||||
DEF_MOD("iic-pmic", 926, R8A774C0_CLK_CP),
|
DEF_MOD("iic-pmic", 926, R8A774C0_CLK_CP),
|
||||||
DEF_MOD("i2c4", 927, R8A774C0_CLK_S3D2),
|
DEF_MOD("i2c4", 927, R8A774C0_CLK_S3D2),
|
||||||
DEF_MOD("i2c3", 928, R8A774C0_CLK_S3D2),
|
DEF_MOD("i2c3", 928, R8A774C0_CLK_S3D2),
|
||||||
|
|
|
@ -76,6 +76,7 @@ static const struct cpg_core_clk r8a774e1_core_clks[] __initconst = {
|
||||||
/* Core Clock Outputs */
|
/* Core Clock Outputs */
|
||||||
DEF_GEN3_Z("z", R8A774E1_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
DEF_GEN3_Z("z", R8A774E1_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
||||||
DEF_GEN3_Z("z2", R8A774E1_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL2, 2, 0),
|
DEF_GEN3_Z("z2", R8A774E1_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL2, 2, 0),
|
||||||
|
DEF_GEN3_Z("zg", R8A774E1_CLK_ZG, CLK_TYPE_GEN3_ZG, CLK_PLL4, 4, 24),
|
||||||
DEF_FIXED("ztr", R8A774E1_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
DEF_FIXED("ztr", R8A774E1_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
||||||
DEF_FIXED("ztrd2", R8A774E1_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
DEF_FIXED("ztrd2", R8A774E1_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
||||||
DEF_FIXED("zt", R8A774E1_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
DEF_FIXED("zt", R8A774E1_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
||||||
|
@ -124,6 +125,7 @@ static const struct cpg_core_clk r8a774e1_core_clks[] __initconst = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct mssr_mod_clk r8a774e1_mod_clks[] __initconst = {
|
static const struct mssr_mod_clk r8a774e1_mod_clks[] __initconst = {
|
||||||
|
DEF_MOD("3dge", 112, R8A774E1_CLK_ZG),
|
||||||
DEF_MOD("fdp1-1", 118, R8A774E1_CLK_S0D1),
|
DEF_MOD("fdp1-1", 118, R8A774E1_CLK_S0D1),
|
||||||
DEF_MOD("fdp1-0", 119, R8A774E1_CLK_S0D1),
|
DEF_MOD("fdp1-0", 119, R8A774E1_CLK_S0D1),
|
||||||
DEF_MOD("tmu4", 121, R8A774E1_CLK_S0D6),
|
DEF_MOD("tmu4", 121, R8A774E1_CLK_S0D6),
|
||||||
|
@ -221,7 +223,7 @@ static const struct mssr_mod_clk r8a774e1_mod_clks[] __initconst = {
|
||||||
DEF_MOD("rpc-if", 917, R8A774E1_CLK_RPCD2),
|
DEF_MOD("rpc-if", 917, R8A774E1_CLK_RPCD2),
|
||||||
DEF_MOD("i2c6", 918, R8A774E1_CLK_S0D6),
|
DEF_MOD("i2c6", 918, R8A774E1_CLK_S0D6),
|
||||||
DEF_MOD("i2c5", 919, R8A774E1_CLK_S0D6),
|
DEF_MOD("i2c5", 919, R8A774E1_CLK_S0D6),
|
||||||
DEF_MOD("adg", 922, R8A774E1_CLK_S0D1),
|
DEF_MOD("adg", 922, R8A774E1_CLK_S0D4),
|
||||||
DEF_MOD("iic-pmic", 926, R8A774E1_CLK_CP),
|
DEF_MOD("iic-pmic", 926, R8A774E1_CLK_CP),
|
||||||
DEF_MOD("i2c4", 927, R8A774E1_CLK_S0D6),
|
DEF_MOD("i2c4", 927, R8A774E1_CLK_S0D6),
|
||||||
DEF_MOD("i2c3", 928, R8A774E1_CLK_S0D6),
|
DEF_MOD("i2c3", 928, R8A774E1_CLK_S0D6),
|
||||||
|
|
|
@ -80,6 +80,7 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {
|
||||||
/* Core Clock Outputs */
|
/* Core Clock Outputs */
|
||||||
DEF_GEN3_Z("z", R8A7796_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
DEF_GEN3_Z("z", R8A7796_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
||||||
DEF_GEN3_Z("z2", R8A7796_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL2, 2, 0),
|
DEF_GEN3_Z("z2", R8A7796_CLK_Z2, CLK_TYPE_GEN3_Z, CLK_PLL2, 2, 0),
|
||||||
|
DEF_GEN3_Z("zg", R8A7796_CLK_ZG, CLK_TYPE_GEN3_ZG, CLK_PLL4, 4, 24),
|
||||||
DEF_FIXED("ztr", R8A7796_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
DEF_FIXED("ztr", R8A7796_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
||||||
DEF_FIXED("ztrd2", R8A7796_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
DEF_FIXED("ztrd2", R8A7796_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
||||||
DEF_FIXED("zt", R8A7796_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
DEF_FIXED("zt", R8A7796_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
||||||
|
@ -129,6 +130,7 @@ static const struct cpg_core_clk r8a7796_core_clks[] __initconst = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct mssr_mod_clk r8a7796_mod_clks[] __initdata = {
|
static struct mssr_mod_clk r8a7796_mod_clks[] __initdata = {
|
||||||
|
DEF_MOD("3dge", 112, R8A7796_CLK_ZG),
|
||||||
DEF_MOD("fdp1-0", 119, R8A7796_CLK_S0D1),
|
DEF_MOD("fdp1-0", 119, R8A7796_CLK_S0D1),
|
||||||
DEF_MOD("tmu4", 121, R8A7796_CLK_S0D6),
|
DEF_MOD("tmu4", 121, R8A7796_CLK_S0D6),
|
||||||
DEF_MOD("tmu3", 122, R8A7796_CLK_S3D2),
|
DEF_MOD("tmu3", 122, R8A7796_CLK_S3D2),
|
||||||
|
@ -235,6 +237,7 @@ static struct mssr_mod_clk r8a7796_mod_clks[] __initdata = {
|
||||||
DEF_MOD("rpc-if", 917, R8A7796_CLK_RPCD2),
|
DEF_MOD("rpc-if", 917, R8A7796_CLK_RPCD2),
|
||||||
DEF_MOD("i2c6", 918, R8A7796_CLK_S0D6),
|
DEF_MOD("i2c6", 918, R8A7796_CLK_S0D6),
|
||||||
DEF_MOD("i2c5", 919, R8A7796_CLK_S0D6),
|
DEF_MOD("i2c5", 919, R8A7796_CLK_S0D6),
|
||||||
|
DEF_MOD("adg", 922, R8A7796_CLK_S0D4),
|
||||||
DEF_MOD("i2c-dvfs", 926, R8A7796_CLK_CP),
|
DEF_MOD("i2c-dvfs", 926, R8A7796_CLK_CP),
|
||||||
DEF_MOD("i2c4", 927, R8A7796_CLK_S0D6),
|
DEF_MOD("i2c4", 927, R8A7796_CLK_S0D6),
|
||||||
DEF_MOD("i2c3", 928, R8A7796_CLK_S0D6),
|
DEF_MOD("i2c3", 928, R8A7796_CLK_S0D6),
|
||||||
|
|
|
@ -76,6 +76,7 @@ static const struct cpg_core_clk r8a77965_core_clks[] __initconst = {
|
||||||
|
|
||||||
/* Core Clock Outputs */
|
/* Core Clock Outputs */
|
||||||
DEF_GEN3_Z("z", R8A77965_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
DEF_GEN3_Z("z", R8A77965_CLK_Z, CLK_TYPE_GEN3_Z, CLK_PLL0, 2, 8),
|
||||||
|
DEF_GEN3_Z("zg", R8A77965_CLK_ZG, CLK_TYPE_GEN3_ZG, CLK_PLL4, 4, 24),
|
||||||
DEF_FIXED("ztr", R8A77965_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
DEF_FIXED("ztr", R8A77965_CLK_ZTR, CLK_PLL1_DIV2, 6, 1),
|
||||||
DEF_FIXED("ztrd2", R8A77965_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
DEF_FIXED("ztrd2", R8A77965_CLK_ZTRD2, CLK_PLL1_DIV2, 12, 1),
|
||||||
DEF_FIXED("zt", R8A77965_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
DEF_FIXED("zt", R8A77965_CLK_ZT, CLK_PLL1_DIV2, 4, 1),
|
||||||
|
@ -125,6 +126,7 @@ static const struct cpg_core_clk r8a77965_core_clks[] __initconst = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = {
|
static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = {
|
||||||
|
DEF_MOD("3dge", 112, R8A77965_CLK_ZG),
|
||||||
DEF_MOD("fdp1-0", 119, R8A77965_CLK_S0D1),
|
DEF_MOD("fdp1-0", 119, R8A77965_CLK_S0D1),
|
||||||
DEF_MOD("tmu4", 121, R8A77965_CLK_S0D6),
|
DEF_MOD("tmu4", 121, R8A77965_CLK_S0D6),
|
||||||
DEF_MOD("tmu3", 122, R8A77965_CLK_S3D2),
|
DEF_MOD("tmu3", 122, R8A77965_CLK_S3D2),
|
||||||
|
@ -236,6 +238,7 @@ static const struct mssr_mod_clk r8a77965_mod_clks[] __initconst = {
|
||||||
DEF_MOD("rpc-if", 917, R8A77965_CLK_RPCD2),
|
DEF_MOD("rpc-if", 917, R8A77965_CLK_RPCD2),
|
||||||
DEF_MOD("i2c6", 918, R8A77965_CLK_S0D6),
|
DEF_MOD("i2c6", 918, R8A77965_CLK_S0D6),
|
||||||
DEF_MOD("i2c5", 919, R8A77965_CLK_S0D6),
|
DEF_MOD("i2c5", 919, R8A77965_CLK_S0D6),
|
||||||
|
DEF_MOD("adg", 922, R8A77965_CLK_S0D4),
|
||||||
DEF_MOD("i2c-dvfs", 926, R8A77965_CLK_CP),
|
DEF_MOD("i2c-dvfs", 926, R8A77965_CLK_CP),
|
||||||
DEF_MOD("i2c4", 927, R8A77965_CLK_S0D6),
|
DEF_MOD("i2c4", 927, R8A77965_CLK_S0D6),
|
||||||
DEF_MOD("i2c3", 928, R8A77965_CLK_S0D6),
|
DEF_MOD("i2c3", 928, R8A77965_CLK_S0D6),
|
||||||
|
|
|
@ -224,6 +224,7 @@ static const struct mssr_mod_clk r8a77990_mod_clks[] __initconst = {
|
||||||
DEF_MOD("rpc-if", 917, R8A77990_CLK_RPCD2),
|
DEF_MOD("rpc-if", 917, R8A77990_CLK_RPCD2),
|
||||||
DEF_MOD("i2c6", 918, R8A77990_CLK_S3D2),
|
DEF_MOD("i2c6", 918, R8A77990_CLK_S3D2),
|
||||||
DEF_MOD("i2c5", 919, R8A77990_CLK_S3D2),
|
DEF_MOD("i2c5", 919, R8A77990_CLK_S3D2),
|
||||||
|
DEF_MOD("adg", 922, R8A77990_CLK_ZA2),
|
||||||
DEF_MOD("i2c-dvfs", 926, R8A77990_CLK_CP),
|
DEF_MOD("i2c-dvfs", 926, R8A77990_CLK_CP),
|
||||||
DEF_MOD("i2c4", 927, R8A77990_CLK_S3D2),
|
DEF_MOD("i2c4", 927, R8A77990_CLK_S3D2),
|
||||||
DEF_MOD("i2c3", 928, R8A77990_CLK_S3D2),
|
DEF_MOD("i2c3", 928, R8A77990_CLK_S3D2),
|
||||||
|
|
|
@ -181,6 +181,7 @@ static const struct mssr_mod_clk r8a77995_mod_clks[] __initconst = {
|
||||||
DEF_MOD("can-if1", 915, R8A77995_CLK_S3D4),
|
DEF_MOD("can-if1", 915, R8A77995_CLK_S3D4),
|
||||||
DEF_MOD("can-if0", 916, R8A77995_CLK_S3D4),
|
DEF_MOD("can-if0", 916, R8A77995_CLK_S3D4),
|
||||||
DEF_MOD("rpc-if", 917, R8A77995_CLK_RPCD2),
|
DEF_MOD("rpc-if", 917, R8A77995_CLK_RPCD2),
|
||||||
|
DEF_MOD("adg", 922, R8A77995_CLK_ZA2),
|
||||||
DEF_MOD("i2c3", 928, R8A77995_CLK_S3D2),
|
DEF_MOD("i2c3", 928, R8A77995_CLK_S3D2),
|
||||||
DEF_MOD("i2c2", 929, R8A77995_CLK_S3D2),
|
DEF_MOD("i2c2", 929, R8A77995_CLK_S3D2),
|
||||||
DEF_MOD("i2c1", 930, R8A77995_CLK_S3D2),
|
DEF_MOD("i2c1", 930, R8A77995_CLK_S3D2),
|
||||||
|
|
|
@ -24,6 +24,7 @@ enum rcar_gen3_clk_types {
|
||||||
CLK_TYPE_GEN3_R,
|
CLK_TYPE_GEN3_R,
|
||||||
CLK_TYPE_GEN3_MDSEL, /* Select parent/divider using mode pin */
|
CLK_TYPE_GEN3_MDSEL, /* Select parent/divider using mode pin */
|
||||||
CLK_TYPE_GEN3_Z,
|
CLK_TYPE_GEN3_Z,
|
||||||
|
CLK_TYPE_GEN3_ZG,
|
||||||
CLK_TYPE_GEN3_OSC, /* OSC EXTAL predivider and fixed divider */
|
CLK_TYPE_GEN3_OSC, /* OSC EXTAL predivider and fixed divider */
|
||||||
CLK_TYPE_GEN3_RCKSEL, /* Select parent/divider using RCKCR.CKSEL */
|
CLK_TYPE_GEN3_RCKSEL, /* Select parent/divider using RCKCR.CKSEL */
|
||||||
CLK_TYPE_GEN3_RPCSRC,
|
CLK_TYPE_GEN3_RPCSRC,
|
||||||
|
|
Loading…
Add table
Reference in a new issue