Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC DT updates from Kevin Hilman: "As usual, quite a few device-tree updates in ARM land. There was one minor churn in DTs due to relicensing under a dual-license, and lots of little additions of new peripherals, features etc, but nothing really exciting to call to your attention. Some higlights, focsuing on support for new SoCs and boards: - AT91: new boards: Overkiz, Acme Systems' Arietta G25 - tegra: HDA support - bcm: new platforms: Buffalo WXR-1900DHP, SmartRG SR400ac, ASUS RT-AC87U - mvebu: new platforms: Compulab CM-A510, Armada 385-based Linksys boards, DLink DNS-327L - OMAP: new platforms: Baltos IR5221, LogicPD Torpedo, Toby-Churchill SL50 - ARM: added support for Juno r1 board - sunxi: A33 SoC support; new boards: A23 EVB, SinA33, GA10H-A33, Mele A1000G - imx: i.MX7D SoC support; new boards: Armadeus Systems APF6, Gateworks GW5510, and aristainetos2 boards - hisilicon: hi6220 SoC support; new boards: 96boards hikey" * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (462 commits) ARM: hisi: revert changes from hisi/hip04-dt branch ARM: nomadik: set proper compatible for accelerometer ARM64: juno: add GPIO keys ARM: at91/dt: sama5d4: fix dma conf for aes, sha and tdes nodes ARM: dts: Introduce STM32F429 MCU ARM: socfpga: dts: enable ethernet for Arria10 devkit ARM: dts: k2l: fix the netcp range size ARM: dts: k2e: fix the netcp range size ARM: dts: k2hk: fix the netcp range size ARM: dts: k2l-evm: Add device bindings for netcp driver ARM: dts: k2e-evm: Add device bindings for netcp driver ARM: dts: k2hk-evm: Add device bindings for netcp driver ARM: BCM5301X: Add DT for Asus RT-AC87U ARM: BCM5301X: add IRQ numbers for PCIe controller ARM: BCM5301X: add NAND flash chip description arm64: dts: Add dts files for Hisilicon Hi6220 SoC clk: hi6220: Document devicetree bindings for hi6220 clock arm64: hi6220: Document devicetree bindings for Hisilicon hi6220 SoC ARM: at91/dt: sama5d4ek: mci0 uses slot 0 ARM: at91/dt: kizbox: fix mismatch LED PWM device ...
This commit is contained in:
@@ -54,6 +54,7 @@
|
||||
#define R8A73A4_CLK_IIC3 11
|
||||
#define R8A73A4_CLK_IIC4 10
|
||||
#define R8A73A4_CLK_IIC5 9
|
||||
#define R8A73A4_CLK_IRQC 7
|
||||
|
||||
/* MSTP5 */
|
||||
#define R8A73A4_CLK_THERMAL 22
|
||||
|
@@ -79,6 +79,9 @@
|
||||
#define R8A7790_CLK_USBDMAC0 30
|
||||
#define R8A7790_CLK_USBDMAC1 31
|
||||
|
||||
/* MSTP4 */
|
||||
#define R8A7790_CLK_IRQC 7
|
||||
|
||||
/* MSTP5 */
|
||||
#define R8A7790_CLK_AUDIO_DMAC1 1
|
||||
#define R8A7790_CLK_AUDIO_DMAC0 2
|
||||
|
@@ -70,6 +70,9 @@
|
||||
#define R8A7791_CLK_USBDMAC0 30
|
||||
#define R8A7791_CLK_USBDMAC1 31
|
||||
|
||||
/* MSTP4 */
|
||||
#define R8A7791_CLK_IRQC 7
|
||||
|
||||
/* MSTP5 */
|
||||
#define R8A7791_CLK_AUDIO_DMAC1 1
|
||||
#define R8A7791_CLK_AUDIO_DMAC0 2
|
||||
|
@@ -60,6 +60,9 @@
|
||||
#define R8A7794_CLK_USBDMAC0 30
|
||||
#define R8A7794_CLK_USBDMAC1 31
|
||||
|
||||
/* MSTP4 */
|
||||
#define R8A7794_CLK_IRQC 7
|
||||
|
||||
/* MSTP5 */
|
||||
#define R8A7794_CLK_THERMAL 22
|
||||
#define R8A7794_CLK_PWM 23
|
||||
|
23
include/dt-bindings/clock/samsung,s2mps11.h
Normal file
23
include/dt-bindings/clock/samsung,s2mps11.h
Normal file
@@ -0,0 +1,23 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Markus Reichl
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* Device Tree binding constants clocks for the Samsung S2MPS11 PMIC.
|
||||
*/
|
||||
|
||||
#ifndef _DT_BINDINGS_CLOCK_SAMSUNG_S2MPS11_CLOCK_H
|
||||
#define _DT_BINDINGS_CLOCK_SAMSUNG_S2MPS11_CLOCK_H
|
||||
|
||||
/* Fixed rate clocks. */
|
||||
|
||||
#define S2MPS11_CLK_AP 0
|
||||
#define S2MPS11_CLK_CP 1
|
||||
#define S2MPS11_CLK_BT 2
|
||||
|
||||
/* Total number of clocks. */
|
||||
#define S2MPS11_CLKS_NUM (S2MPS11_CLK_BT + 1)
|
||||
|
||||
#endif /* _DT_BINDINGS_CLOCK_SAMSUNG_S2MPS11_CLOCK_H */
|
Reference in New Issue
Block a user