]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branches 'next/fixes-non-critical', 'next/soc' and 'next/dt' into for-next
authorOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 06:55:56 +0000 (22:55 -0800)
committerOlof Johansson <olof@lixom.net>
Thu, 9 Jan 2014 07:42:47 +0000 (23:42 -0800)
* next/fixes-non-critical:
  irqchip: sirf: set IRQ_LEVEL status_flags

* next/soc:
  ARM: ux500: Enable system suspend with WFI support
  ARM: ux500: turn on PRINTK_TIME in u8500_defconfig
  rename ARCH_BCM to ARCH_BCM_MOBILE (clocksource)
  ARM: bcm_defconfig: Unset CONFIG_CRYPTO_ANSI_CPRNG
  ARM: bcm_defconfig: Do not expect appended DTB
  ARM: bcm_defconfig: CONFIG_OABI_COMPAT default off

* next/dt:
  Revert "ARM: shmobile: r8a7791: Add SSI clocks in device tree"
  Revert "ARM: shmobile: r8a7790: Add SSI clocks in device tree"
  ARM: ux500: regulators: Remove dead code for SD-card regulator
  ARM: ux500: Configure regulator for I/O voltage for SD-card slot
  ARM: ux500: Refactor common DT configs for sdi[n] devices
  ARM: ux500: delete U8540 UART auxdata

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2  3  4 
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/r8a7790.dtsi

index a54f72c7ca3e1083673983f6f88a29904f3178db,0000000000000000000000000000000000000000,0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..6f22ee18606c19db93132221a5a302df872bd3bc
mode 100644,000000,000000,000000..100644
--- /dev/null
--- /dev/null
--- /dev/null
@@@@@ -1,226 -1,0 -1,0 -1,0 +1,229 @@@@@
 +++Contents of arm-soc branches contained in for-next
 +++
 +++dependencies:
 +++
 +++depends/asoc-dma
 +++    git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git asoc-dma-v3.14
 +++depends/dma-defer-probe
 +++    git://git.infradead.org/users/vkoul/slave-dma.git topic/defer_probe
 +++depends/dma-of
 +++    git://git.infradead.org/users/vkoul/slave-dma.git topic/of
 +++depends/tegra-clk
 +++    git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git clk-tegra-for-3.14
 +++
 +++next/fixes-non-critical
 +++    samsung/fixes
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-fixes
 +++    samsung/fixes2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-fixes-2
 +++    u300/misc
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git tags/u300-for-arm-soc-1
 +++
 +++    patch ARM: bcm2835: Fix grammar in help message                                     
++++    patch irqchip: sirf: set IRQ_LEVEL status_flags
 +++
 +++next/cleanup
 +++    renesas/cleanup
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup-for-v3.14
 +++    mvebu/soc
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.14
 +++    at91/sama5-ccf
 +++            git://github.com/at91linux/linux-at91.git tags/at91-cleanup
 +++    patches
 +++            ARM: at91: remove redundant dependency
 +++            ARM: clean up cache handling in platform code
 +++            ARM: pxa: Remove unused variables
 +++            ARM: pxa: remove IRQF_DISABLED
 +++            ARM: mmp: build sram driver alone
 +++    patch
 +++            ARM: at91: remove AT91_PROGRAMMABLE_CLOCKS configuration option
 +++    zynq/cleanup
 +++            git://git.xilinx.com/linux-xlnx.git tags/zynq-cleanup-for-3.14
 +++    samsung/cleanup
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-cleanup
 +++    tegra/dma-reset-rework
 +++            based on depends/asoc-dma
 +++            based on depends/dma-defer-probe
 +++            based on depends/dma-of
 +++            based on depends/tegra-clk
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git clk-tegra-for-3.14
 +++    samsung/cleanup2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-cleanup-2
 +++    renesas/cleanup2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-cleanup2-for-v3.14
 +++    renesas/drivers-sci
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci-for-v3.14
 +++    qcom/fixes
 +++            patch ARM: msm: trout: fix uninit var warning
 +++    renesas/drivers-sci2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci2-for-v3.14
 +++    mvebu/soc-2
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-soc-3.14-20
 +++
 +++next/soc
 +++    patches
 +++            ARM: ep93xx: remove deprecated IRQF_DISABLED
 +++            ARM: ep93xx: use soc bus
 +++    soc/sched_clock
 +++            local branch: rebased onto tip/timers-core-for-linus for dependencies
 +++    patch
 +++            ARM: at91: sama5d3: add support for sama5d36 chip
 +++    berlin/soc
 +++            https://github.com/shesselba/linux-berlin.git tags/berlin-3.14
 +++    efm32/soc
 +++            git://git.pengutronix.de/git/ukl/linux.git tags/efm32
 +++    keystone/soc
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git for_3.14/soc
 +++    renesas/soc
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc-for-v3.14
 +++    patch
 +++            ARM: moxart: add MOXA ART SoC platform files
 +++            MAINTAINERS: take maintainership for Energy Micro efm32 SoCs
 +++    samsung/dev
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dev
 +++    tegra/powergate
 +++            based on tegra/dma-reset-rework
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-powergate
 +++    tegra/soc
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-soc
 +++    renesas/soc2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc2-for-v3.14
 +++    qcom/soc
 +++            contains qcom/fixes
 +++            patch ARM: msm: Add support for MSM8974 SoC
 +++            patch ARM: msm: Simplify ARCH_MSM_DT config
 +++    renesas/soc3
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-soc3-for-v3.14
 +++    imx/soc
 +++            git://git.linaro.org/people/shawnguo/linux-2.6.git tags/imx-soc-3.14
 +++    hisi/soc
 +++            local branch: v12 series + khilman fixups + rename series
++++    ux500/core
++++            git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-core-v3.14
 +++    
 +++next/dt
 +++    ux500/dt
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson tags/ux500-devicetree-v3.14-1
 +++    mvebu/dt
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14
 +++    sti/dt
 +++            http://git.stlinux.com/devel/kernel/linux-sti.git tags/DT-for-v3.14-part-1
 +++    mvebu/dt-2
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-2            
 +++    patch
 +++            ARM: at91: sama5d3/dt: add sama5d36ek dts files (based on next/cleanup for dependencies)
 +++    at91/dt
 +++            git://github.com/at91linux/linux-at91.git tags/at91-dt
 +++    integrator/dt
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-v3.14-1
 +++    patches
 +++            ARM: pxa: add PWM nodes to pxa27x.dtsi
 +++    nomadik/dt
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git tags/nomadik-dt-v3.14
 +++    mvebu/dt-3
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-3
 +++    mvebu/dt-4
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-4
 +++    keystone/dt
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git tags/keystone-dts
 +++    renesas/dt
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt-for-v3.14
 +++    zynq/dt
 +++            git://git.xilinx.com/linux-xlnx.git tags/zynq-dt-for-3.14
 +++    patch
 +++            ARM: moxart: add MOXA ART SoC device tree files
 +++    samsung/dt
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt
 +++    at91/dt-2
 +++            git://github.com/at91linux/linux-at91.git tags/at91-dt2
 +++    samsung/dt2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-2
 +++    tegra/dt
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-dt
 +++    tegra/dt2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-dt-2
 +++    renesas/dt2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt2-for-v3.14
 +++    qcom/dt
 +++            contains qcom/fixes and qcom/soc
 +++            patch ARM: dts: MSM8974: Add restart node
 +++            patch ARM: dts: MSM8974: Add MMIO architected timer node
 +++    mvebu/dt-5
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-dt-3.14-5
 +++    sunxi/dt
 +++            https://github.com/mripard/linux.git tags/sunxi-dt-for-3.14
 +++    patch ARM: bcm2835: add USB controller to device tree                               
 +++    renesas/dt3
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-dt3-for-v3.14
 +++            depends on depends/clk-next-shmobile
 +++            depends on depends/clksource-shmobile
 +++            depends on depends/pinctrl-for-next
 +++    samsung/dt3
 +++             git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-dt-3
 +++
 +++next/boards
 +++    renesas/defconfig
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig-for-v3.14
 +++    mvebu/defconfig
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14
 +++    patch
 +++            ARM: multi_v7_defconfig: Fix STi support
 +++    omap/board-removal
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.14/board-removal-safe
 +++    samsung/defconfig
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-defconfig
 +++    mvebu/defconfig-2
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-defconfig-3.14-2
 +++    tegra/defconfig
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-defconfig
 +++    tegra/defconfig2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-defconfig-2
 +++    samsung/defconfig2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-defconfig-2
 +++    renesas/boards
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards-for-v3.14
 +++    renesas/defconfig2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-defconfig2-for-v3.14
 +++    qcom/boards
 +++            contains qcom/fixes, qcom/soc and qcom/dt
 +++            patch ARM: msm: Add support for APQ8074 Dragonboard
 +++            patch defconfig: msm_defconfig: Enable CONFIG_ARCH_MSM8974
 +++            patch ARM: msm_defconfig: Enable restart driver
 +++    renesas/boards2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-boards2-for-v3.14
 +++    patch ARM: bcm2835: bcm2835_defconfig updates   
 +++
 +++next/drivers
 +++    mvebu/drivers
 +++            git://git.infradead.org/linux-mvebu.git tags/mvebu-drivers-3.14
 +++    samsung/s3c64xx-dmaengine
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git tags/s3c64xx-dmaengine
 +++    renesas/drivers-usb
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-usb-r8a66597-hcd-for-v3.14
 +++    at91/drivers
 +++            git://github.com/at91linux/linux-at91.git tags/at91-drivers
 +++            Contains at91/dt
 +++    samsung/irq
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git tags/samsung-irq
 +++    tegra/trusted-foundations
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-for-3.14-trusted-foundations
 +++    sunxi/drivers
 +++            https://github.com/mripard/linux.git tags/sunxi-drivers-for-3.14
 +++    renesas/drivers-irqchip
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-irqc-for-v3.14
 +++    renesas/sh-sci
 +++            contains renesas/drivers-sci2
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-soc-for-v3.14
 +++    renesas/sci3
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git tags/renesas-sh-sci3-for-v3.14
 +++    davinci/gpio
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci.git tags/davinci-for-v3.14/gpio
 +++    sunxi/core
 +++             https://github.com/mripard/linux.git tags/sunxi-core-for-3.14
 +++             based on sunxi/drivers
 +++    integrator/core
 +++            git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git tags/integrator-for-v3.14
 +++
 +++Patches only in for-next, not in any topic branch due to conflicts:
 +++
 +++ARM: multi_v7: copy most options from tegra_defconfig
index cff444cb81d80667a81226c71a0eee949f5d8e95,ee845fad939b895a1bfb907c6597f9f916d926f8,ee845fad939b895a1bfb907c6597f9f916d926f8,a1791250bf4b354148961f867568a5879ff0cd43..f48487c2a970aa6020d7400dfa3fbc2c710855cc
                        <0 0xf1002000 0 0x1000>,
                        <0 0xf1004000 0 0x2000>,
                        <0 0xf1006000 0 0x2000>;
 --             interrupts = <1 9 0xf04>;
 ++             interrupts = <1 9 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
        };
    
 ---    gpio0: gpio@ffc40000 {
 +++    gpio0: gpio@e6050000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 ---            reg = <0 0xffc40000 0 0x2c>;
 +++            reg = <0 0xe6050000 0 0x50>;
                interrupt-parent = <&gic>;
 --             interrupts = <0 4 0x4>;
 ++             interrupts = <0 4 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 0 32>;
                interrupt-controller;
        };
    
 ---    gpio1: gpio@ffc41000 {
 +++    gpio1: gpio@e6051000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 ---            reg = <0 0xffc41000 0 0x2c>;
 +++            reg = <0 0xe6051000 0 0x50>;
                interrupt-parent = <&gic>;
 --             interrupts = <0 5 0x4>;
 ++             interrupts = <0 5 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 32 32>;
                interrupt-controller;
        };
    
 ---    gpio2: gpio@ffc42000 {
 +++    gpio2: gpio@e6052000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 ---            reg = <0 0xffc42000 0 0x2c>;
 +++            reg = <0 0xe6052000 0 0x50>;
                interrupt-parent = <&gic>;
 --             interrupts = <0 6 0x4>;
 ++             interrupts = <0 6 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 64 32>;
                interrupt-controller;
        };
    
 ---    gpio3: gpio@ffc43000 {
 +++    gpio3: gpio@e6053000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 ---            reg = <0 0xffc43000 0 0x2c>;
 +++            reg = <0 0xe6053000 0 0x50>;
                interrupt-parent = <&gic>;
 --             interrupts = <0 7 0x4>;
 ++             interrupts = <0 7 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 96 32>;
                interrupt-controller;
        };
    
 ---    gpio4: gpio@ffc44000 {
 +++    gpio4: gpio@e6054000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 ---            reg = <0 0xffc44000 0 0x2c>;
 +++            reg = <0 0xe6054000 0 0x50>;
                interrupt-parent = <&gic>;
 --             interrupts = <0 8 0x4>;
 ++             interrupts = <0 8 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 128 32>;
                interrupt-controller;
        };
    
 ---    gpio5: gpio@ffc45000 {
 +++    gpio5: gpio@e6055000 {
                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
 ---            reg = <0 0xffc45000 0 0x2c>;
 +++            reg = <0 0xe6055000 0 0x50>;
                interrupt-parent = <&gic>;
 --             interrupts = <0 9 0x4>;
 ++             interrupts = <0 9 IRQ_TYPE_LEVEL_HIGH>;
                #gpio-cells = <2>;
                gpio-controller;
                gpio-ranges = <&pfc 0 160 32>;
                reg = <0 0xe6060000 0 0x250>;
        };
    
 --     sdhi0: sdhi@ee100000 {
 ++     sdhi0: sd@ee100000 {
                compatible = "renesas,sdhi-r8a7790";
 ---            reg = <0 0xee100000 0 0x100>;
 +++            reg = <0 0xee100000 0 0x200>;
                interrupt-parent = <&gic>;
 --             interrupts = <0 165 4>;
 ++             interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
 ++             clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
                cap-sd-highspeed;
                status = "disabled";
        };
    
 --     sdhi1: sdhi@ee120000 {
 ++     sdhi1: sd@ee120000 {
                compatible = "renesas,sdhi-r8a7790";
 ---            reg = <0 0xee120000 0 0x100>;
 +++            reg = <0 0xee120000 0 0x200>;
                interrupt-parent = <&gic>;
 --             interrupts = <0 166 4>;
 ++             interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
 ++             clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
                cap-sd-highspeed;
                status = "disabled";
        };
                cap-sd-highspeed;
                status = "disabled";
        };
-               mstp10_clks: mstp10_clks@e6150998 {
-                       compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
-                       reg = <0 0xe6150998 0 4>, <0 0xe61509a8 0 4>;
-                       clocks = <&p_clk>, <&mstp10_clks R8A7790_CLK_SSI>,
-                                <&mstp10_clks R8A7790_CLK_SSI>, <&mstp10_clks R8A7790_CLK_SSI>,
-                                <&mstp10_clks R8A7790_CLK_SSI>, <&mstp10_clks R8A7790_CLK_SSI>,
-                                <&mstp10_clks R8A7790_CLK_SSI>, <&mstp10_clks R8A7790_CLK_SSI>,
-                                <&mstp10_clks R8A7790_CLK_SSI>, <&mstp10_clks R8A7790_CLK_SSI>,
-                                <&mstp10_clks R8A7790_CLK_SSI>;
-                       #clock-cells = <1>;
-                       renesas,clock-indices = <
-                               R8A7790_CLK_SSI R8A7790_CLK_SSI9 R8A7790_CLK_SSI8
-                               R8A7790_CLK_SSI7 R8A7790_CLK_SSI6 R8A7790_CLK_SSI5
-                               R8A7790_CLK_SSI4 R8A7790_CLK_SSI3 R8A7790_CLK_SSI2
-                               R8A7790_CLK_SSI1 R8A7790_CLK_SSI0
-                       >;
-                       clock-output-names =
-                               "ssi", "ssi9", "ssi8", "ssi7", "ssi6", "ssi5",
-                               "ssi4", "ssi3", "ssi2", "ssi1", "ssi0";
-               };
 ++ 
 ++     clocks {
 ++             #address-cells = <2>;
 ++             #size-cells = <2>;
 ++             ranges;
 ++ 
 ++             /* External root clock */
 ++             extal_clk: extal_clk {
 ++                     compatible = "fixed-clock";
 ++                     #clock-cells = <0>;
 ++                     /* This value must be overriden by the board. */
 ++                     clock-frequency = <0>;
 ++                     clock-output-names = "extal";
 ++             };
 ++ 
 ++             /* Special CPG clocks */
 ++             cpg_clocks: cpg_clocks@e6150000 {
 ++                     compatible = "renesas,r8a7790-cpg-clocks",
 ++                                  "renesas,rcar-gen2-cpg-clocks";
 ++                     reg = <0 0xe6150000 0 0x1000>;
 ++                     clocks = <&extal_clk>;
 ++                     #clock-cells = <1>;
 ++                     clock-output-names = "main", "pll0", "pll1", "pll3",
 ++                                          "lb", "qspi", "sdh", "sd0", "sd1",
 ++                                          "z";
 ++             };
 ++ 
 ++             /* Variable factor clocks */
 ++             sd2_clk: sd2_clk@e6150078 {
 ++                     compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
 ++                     reg = <0 0xe6150078 0 4>;
 ++                     clocks = <&pll1_div2_clk>;
 ++                     #clock-cells = <0>;
 ++                     clock-output-names = "sd2";
 ++             };
 ++             sd3_clk: sd3_clk@e615007c {
 ++                     compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
 ++                     reg = <0 0xe615007c 0 4>;
 ++                     clocks = <&pll1_div2_clk>;
 ++                     #clock-cells = <0>;
 ++                     clock-output-names = "sd3";
 ++             };
 ++             mmc0_clk: mmc0_clk@e6150240 {
 ++                     compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
 ++                     reg = <0 0xe6150240 0 4>;
 ++                     clocks = <&pll1_div2_clk>;
 ++                     #clock-cells = <0>;
 ++                     clock-output-names = "mmc0";
 ++             };
 ++             mmc1_clk: mmc1_clk@e6150244 {
 ++                     compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
 ++                     reg = <0 0xe6150244 0 4>;
 ++                     clocks = <&pll1_div2_clk>;
 ++                     #clock-cells = <0>;
 ++                     clock-output-names = "mmc1";
 ++             };
 ++             ssp_clk: ssp_clk@e6150248 {
 ++                     compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
 ++                     reg = <0 0xe6150248 0 4>;
 ++                     clocks = <&pll1_div2_clk>;
 ++                     #clock-cells = <0>;
 ++                     clock-output-names = "ssp";
 ++             };
 ++             ssprs_clk: ssprs_clk@e615024c {
 ++                     compatible = "renesas,r8a7790-div6-clock", "renesas,cpg-div6-clock";
 ++                     reg = <0 0xe615024c 0 4>;
 ++                     clocks = <&pll1_div2_clk>;
 ++                     #clock-cells = <0>;
 ++                     clock-output-names = "ssprs";
 ++             };
 ++ 
 ++             /* Fixed factor clocks */
 ++             pll1_div2_clk: pll1_div2_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <2>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "pll1_div2";
 ++             };
 ++             z2_clk: z2_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <2>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "z2";
 ++             };
 ++             zg_clk: zg_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <3>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "zg";
 ++             };
 ++             zx_clk: zx_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <3>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "zx";
 ++             };
 ++             zs_clk: zs_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <6>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "zs";
 ++             };
 ++             hp_clk: hp_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <12>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "hp";
 ++             };
 ++             i_clk: i_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <2>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "i";
 ++             };
 ++             b_clk: b_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <12>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "b";
 ++             };
 ++             p_clk: p_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <24>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "p";
 ++             };
 ++             cl_clk: cl_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <48>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "cl";
 ++             };
 ++             m2_clk: m2_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <8>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "m2";
 ++             };
 ++             imp_clk: imp_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <4>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "imp";
 ++             };
 ++             rclk_clk: rclk_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <(48 * 1024)>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "rclk";
 ++             };
 ++             oscclk_clk: oscclk_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL1>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <(12 * 1024)>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "oscclk";
 ++             };
 ++             zb3_clk: zb3_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL3>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <4>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "zb3";
 ++             };
 ++             zb3d2_clk: zb3d2_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL3>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <8>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "zb3d2";
 ++             };
 ++             ddr_clk: ddr_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&cpg_clocks R8A7790_CLK_PLL3>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <8>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "ddr";
 ++             };
 ++             mp_clk: mp_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&pll1_div2_clk>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <15>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "mp";
 ++             };
 ++             cp_clk: cp_clk {
 ++                     compatible = "fixed-factor-clock";
 ++                     clocks = <&extal_clk>;
 ++                     #clock-cells = <0>;
 ++                     clock-div = <2>;
 ++                     clock-mult = <1>;
 ++                     clock-output-names = "cp";
 ++             };
 ++ 
 ++             /* Gate clocks */
 ++             mstp0_clks: mstp0_clks@e6150130 {
 ++                     compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 ++                     reg = <0 0xe6150130 0 4>, <0 0xe6150030 0 4>;
 ++                     clocks = <&mp_clk>;
 ++                     #clock-cells = <1>;
 ++                     renesas,clock-indices = <R8A7790_CLK_MSIOF0>;
 ++                     clock-output-names = "msiof0";
 ++             };
 ++             mstp1_clks: mstp1_clks@e6150134 {
 ++                     compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 ++                     reg = <0 0xe6150134 0 4>, <0 0xe6150038 0 4>;
 ++                     clocks = <&p_clk>, <&p_clk>, <&p_clk>, <&rclk_clk>,
 ++                              <&cp_clk>, <&zs_clk>, <&zs_clk>, <&zs_clk>,
 ++                              <&zs_clk>;
 ++                     #clock-cells = <1>;
 ++                     renesas,clock-indices = <
 ++                             R8A7790_CLK_TMU1 R8A7790_CLK_TMU3 R8A7790_CLK_TMU2
 ++                             R8A7790_CLK_CMT0 R8A7790_CLK_TMU0 R8A7790_CLK_VSP1_DU1
 ++                             R8A7790_CLK_VSP1_DU0 R8A7790_CLK_VSP1_RT R8A7790_CLK_VSP1_SY
 ++                     >;
 ++                     clock-output-names =
 ++                             "tmu1", "tmu3", "tmu2", "cmt0", "tmu0", "vsp1-du1",
 ++                             "vsp1-du0", "vsp1-rt", "vsp1-sy";
 ++             };
 ++             mstp2_clks: mstp2_clks@e6150138 {
 ++                     compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 ++                     reg = <0 0xe6150138 0 4>, <0 0xe6150040 0 4>;
 ++                     clocks = <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>,
 ++                              <&mp_clk>, <&mp_clk>, <&mp_clk>, <&mp_clk>;
 ++                     #clock-cells = <1>;
 ++                     renesas,clock-indices = <
 ++                             R8A7790_CLK_SCIFA2 R8A7790_CLK_SCIFA1 R8A7790_CLK_SCIFA0
 ++                             R8A7790_CLK_MSIOF2 R8A7790_CLK_SCIFB0 R8A7790_CLK_SCIFB1
 ++                             R8A7790_CLK_MSIOF1 R8A7790_CLK_MSIOF3 R8A7790_CLK_SCIFB2
 ++                     >;
 ++                     clock-output-names =
 ++                             "scifa2", "scifa1", "scifa0", "msiof2", "scifb0",
 ++                             "scifb1", "msiof1", "msiof3", "scifb2";
 ++             };
 ++             mstp3_clks: mstp3_clks@e615013c {
 ++                     compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 ++                     reg = <0 0xe615013c 0 4>, <0 0xe6150048 0 4>;
 ++                     clocks = <&cp_clk>, <&mmc1_clk>, <&sd3_clk>, <&sd2_clk>,
 ++                              <&cpg_clocks R8A7790_CLK_SD1>, <&cpg_clocks R8A7790_CLK_SD0>,
 ++                              <&mmc0_clk>, <&rclk_clk>;
 ++                     #clock-cells = <1>;
 ++                     renesas,clock-indices = <
 ++                             R8A7790_CLK_TPU0 R8A7790_CLK_MMCIF1 R8A7790_CLK_SDHI3
 ++                             R8A7790_CLK_SDHI2 R8A7790_CLK_SDHI1 R8A7790_CLK_SDHI0
 ++                             R8A7790_CLK_MMCIF0 R8A7790_CLK_CMT1
 ++                     >;
 ++                     clock-output-names =
 ++                             "tpu0", "mmcif1", "sdhi3", "sdhi2",
 ++                             "sdhi1", "sdhi0", "mmcif0", "cmt1";
 ++             };
 ++             mstp5_clks: mstp5_clks@e6150144 {
 ++                     compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 ++                     reg = <0 0xe6150144 0 4>, <0 0xe615003c 0 4>;
 ++                     clocks = <&extal_clk>, <&p_clk>;
 ++                     #clock-cells = <1>;
 ++                     renesas,clock-indices = <R8A7790_CLK_THERMAL R8A7790_CLK_PWM>;
 ++                     clock-output-names = "thermal", "pwm";
 ++             };
 ++             mstp7_clks: mstp7_clks@e615014c {
 ++                     compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 ++                     reg = <0 0xe615014c 0 4>, <0 0xe61501c4 0 4>;
 ++                     clocks = <&mp_clk>, <&mp_clk>, <&zs_clk>, <&zs_clk>, <&p_clk>,
 ++                              <&p_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>, <&zx_clk>,
 ++                              <&zx_clk>;
 ++                     #clock-cells = <1>;
 ++                     renesas,clock-indices = <
 ++                             R8A7790_CLK_EHCI R8A7790_CLK_HSUSB R8A7790_CLK_HSCIF1
 ++                             R8A7790_CLK_HSCIF0 R8A7790_CLK_SCIF1 R8A7790_CLK_SCIF0
 ++                             R8A7790_CLK_DU2 R8A7790_CLK_DU1 R8A7790_CLK_DU0
 ++                             R8A7790_CLK_LVDS1 R8A7790_CLK_LVDS0
 ++                     >;
 ++                     clock-output-names =
 ++                             "ehci", "hsusb", "hscif1", "hscif0", "scif1",
 ++                             "scif0", "du2", "du1", "du0", "lvds1", "lvds0";
 ++             };
 ++             mstp8_clks: mstp8_clks@e6150990 {
 ++                     compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 ++                     reg = <0 0xe6150990 0 4>, <0 0xe61509a0 0 4>;
 ++                     clocks = <&p_clk>;
 ++                     #clock-cells = <1>;
 ++                     renesas,clock-indices = <R8A7790_CLK_ETHER>;
 ++                     clock-output-names = "ether";
 ++             };
 ++             mstp9_clks: mstp9_clks@e6150994 {
 ++                     compatible = "renesas,r8a7790-mstp-clocks", "renesas,cpg-mstp-clocks";
 ++                     reg = <0 0xe6150994 0 4>, <0 0xe61509a4 0 4>;
 ++                     clocks = <&p_clk>, <&p_clk>, <&cpg_clocks R8A7790_CLK_QSPI>,
 ++                              <&p_clk>, <&p_clk>, <&p_clk>, <&p_clk>;
 ++                     #clock-cells = <1>;
 ++                     renesas,clock-indices = <
 ++                             R8A7790_CLK_RCAN1 R8A7790_CLK_RCAN0 R8A7790_CLK_QSPI_MOD
 ++                             R8A7790_CLK_I2C3 R8A7790_CLK_I2C2 R8A7790_CLK_I2C1
 ++                             R8A7790_CLK_I2C0
 ++                     >;
 ++                     clock-output-names =
 ++                             "rcan1", "rcan0", "qspi_mod", "i2c3", "i2c2", "i2c1", "i2c0";
 ++             };
 ++     };
    };