/* * Copyright (c) 2016 HiSilicon Technologies Co., Ltd. * * 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, see . */ #ifndef __DTS_HISTB_CLOCK_H #define __DTS_HISTB_CLOCK_H /* clocks provided by core CRG */ #define HISTB_OSC_CLK 0 #define HISTB_APB_CLK 1 #define HISTB_AHB_CLK 2 #define HISTB_UART1_CLK 3 #define HISTB_UART2_CLK 4 #define HISTB_UART3_CLK 5 #define HISTB_I2C0_CLK 6 #define HISTB_I2C1_CLK 7 #define HISTB_I2C2_CLK 8 #define HISTB_I2C3_CLK 9 #define HISTB_I2C4_CLK 10 #define HISTB_I2C5_CLK 11 #define HISTB_SPI0_CLK 12 #define HISTB_SPI1_CLK 13 #define HISTB_SPI2_CLK 14 #define HISTB_SCI_CLK 15 #define HISTB_FMC_CLK 16 #define HISTB_MMC_BIU_CLK 17 #define HISTB_MMC_CIU_CLK 18 #define HISTB_MMC_DRV_CLK 19 #define HISTB_MMC_SAMPLE_CLK 20 #define HISTB_SDIO0_BIU_CLK 21 #define HISTB_SDIO0_CIU_CLK 22 #define HISTB_SDIO0_DRV_CLK 23 #define HISTB_SDIO0_SAMPLE_CLK 24 #define HISTB_PCIE_AUX_CLK 25 #define HISTB_PCIE_PIPE_CLK 26 #define HISTB_PCIE_SYS_CLK 27 #define HISTB_PCIE_BUS_CLK 28 #define HISTB_ETH0_MAC_CLK 29 #define HISTB_ETH0_MACIF_CLK 30 #define HISTB_ETH1_MAC_CLK 31 #define HISTB_ETH1_MACIF_CLK 32 #define HISTB_COMBPHY1_CLK 33 /* clocks provided by mcu CRG */ #define HISTB_MCE_CLK 1 #define HISTB_IR_CLK 2 #define HISTB_TIMER01_CLK 3 #define HISTB_LEDC_CLK 4 #define HISTB_UART0_CLK 5 #define HISTB_LSADC_CLK 6 #endif /* __DTS_HISTB_CLOCK_H */ ref='/cgit.cgi/linux/net-next.git/commit/net/dccp/minisocks.c?h=nds-private-remove&id=3efa70d78f218e4c9276b0bac0545e5184c1c47b'>commitdiff
path: root/net/dccp/minisocks.c
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 /net/dccp/minisocks.c
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 'net/dccp/minisocks.c')