/* * Copyright (c) 2013-2014 Hisilicon Limited. * Copyright (c) 2013-2014 Linaro Limited. * * Author: Haojian Zhuang * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * */ #ifndef __DTS_HIP04_CLOCK_H #define __DTS_HIP04_CLOCK_H #define HIP04_NONE_CLOCK 0 /* fixed rate & fixed factor clocks */ #define HIP04_OSC50M 1 #define HIP04_CLK_50M 2 #define HIP04_CLK_168M 3 #define HIP04_NR_CLKS 64 #endif /* __DTS_HIP04_CLOCK_H */ cted'>master net-next plumbingsTobias Klauser
summaryrefslogtreecommitdiff
path: root/include/dt-bindings/iio
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
committerDavid S. Miller <davem@davemloft.net>2017-02-07 16:29:30 -0500
commit3efa70d78f218e4c9276b0bac0545e5184c1c47b (patch)
treef4abe2f05e173023d2a262afd4aebb1e89fe6985 /include/dt-bindings/iio
parent76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)
parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/dt-bindings/iio')