diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-18 10:28:45 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-18 10:28:45 +0300 |
| commit | a4a1fb15c5377ce5a3e2e26ca0332063a366514b (patch) | |
| tree | 14a6b0a84ffde891f4b073223a8321580db3997c /include/dt-bindings | |
| parent | 0d28c6007148d62887add28514730e3b7b633b76 (diff) | |
| parent | 64783ea7de0bff3de77cfdff1ed76428c288faac (diff) | |
| download | linux-a4a1fb15c5377ce5a3e2e26ca0332063a366514b.tar.xz | |
Merge tag 'sti-dt-for-4.10-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/dt
STi dts update:
Change sound card name for B2120
Enable sound card for B2260
Remove stih415-clks.h
Identify critical clocks for STiH407
Fix typo in stih407-pinctrl.dtsi
* tag 'sti-dt-for-4.10-round2' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
ARM: dts: STiHxxx-b2120: change sound card name
ARM: dts: STiH410-B2260: enable sound card
ARM: dts: remove stih415-clks.h
ARM: dts: stih407-clocks: Identify critical clocks
ARM: dts: STiH407: DT fix s/interrupts-names/interrupt-names/
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/dt-bindings')
| -rw-r--r-- | include/dt-bindings/clock/stih415-clks.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/include/dt-bindings/clock/stih415-clks.h b/include/dt-bindings/clock/stih415-clks.h deleted file mode 100644 index d80caa68aebd..000000000000 --- a/include/dt-bindings/clock/stih415-clks.h +++ /dev/null @@ -1,16 +0,0 @@ -/* - * This header provides constants clk index STMicroelectronics - * STiH415 SoC. - */ -#ifndef _CLK_STIH415 -#define _CLK_STIH415 - -/* CLOCKGEN A0 */ -#define CLK_ICN_REG 0 -#define CLK_ETH1_PHY 4 - -/* CLOCKGEN A1 */ -#define CLK_ICN_IF_2 0 -#define CLK_GMAC0_PHY 3 - -#endif |