aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSricharan R <r.sricharan@ti.com>2013-06-10 02:45:20 -0400
committerTony Lindgren <tony@atomide.com>2013-06-12 12:41:46 -0400
commit09182ab11b49b67d04598b19eb89cf0bbd672a60 (patch)
treeaa5a8d55ba21d05fef85cdf914931590f78a0838
parentb38911f3472be89551bfca740adf0009562b9873 (diff)
ARM: OMAP4: hwmod data: Remove irq entries from mcspi, mmc hwmods
Commit '3b9b10151c6838af52244cec4af41a938bb5b7ec' cleaned up the data file to remove all irq and dma entries for all hwmods, which are now populated by DT. But mcspi and mmc irq, dma entries were retained since MMC, NFS boot was not working. Since it is root caused to be an issue with only DMA entries [1], irq can be safely removed. [1] http://www.mail-archive.com/linux-omap@vger.kernel.org/msg90115.html Signed-off-by: Sricharan R <r.sricharan@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_44xx_data.c54
1 files changed, 0 insertions, 54 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index c8d49570694a..d04b5e60fdbe 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -1801,11 +1801,6 @@ static struct omap_hwmod_class omap44xx_mcspi_hwmod_class = {
1801}; 1801};
1802 1802
1803/* mcspi1 */ 1803/* mcspi1 */
1804static struct omap_hwmod_irq_info omap44xx_mcspi1_irqs[] = {
1805 { .irq = 65 + OMAP44XX_IRQ_GIC_START },
1806 { .irq = -1 }
1807};
1808
1809static struct omap_hwmod_dma_info omap44xx_mcspi1_sdma_reqs[] = { 1804static struct omap_hwmod_dma_info omap44xx_mcspi1_sdma_reqs[] = {
1810 { .name = "tx0", .dma_req = 34 + OMAP44XX_DMA_REQ_START }, 1805 { .name = "tx0", .dma_req = 34 + OMAP44XX_DMA_REQ_START },
1811 { .name = "rx0", .dma_req = 35 + OMAP44XX_DMA_REQ_START }, 1806 { .name = "rx0", .dma_req = 35 + OMAP44XX_DMA_REQ_START },
@@ -1827,7 +1822,6 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = {
1827 .name = "mcspi1", 1822 .name = "mcspi1",
1828 .class = &omap44xx_mcspi_hwmod_class, 1823 .class = &omap44xx_mcspi_hwmod_class,
1829 .clkdm_name = "l4_per_clkdm", 1824 .clkdm_name = "l4_per_clkdm",
1830 .mpu_irqs = omap44xx_mcspi1_irqs,
1831 .sdma_reqs = omap44xx_mcspi1_sdma_reqs, 1825 .sdma_reqs = omap44xx_mcspi1_sdma_reqs,
1832 .main_clk = "func_48m_fclk", 1826 .main_clk = "func_48m_fclk",
1833 .prcm = { 1827 .prcm = {
@@ -1841,11 +1835,6 @@ static struct omap_hwmod omap44xx_mcspi1_hwmod = {
1841}; 1835};
1842 1836
1843/* mcspi2 */ 1837/* mcspi2 */
1844static struct omap_hwmod_irq_info omap44xx_mcspi2_irqs[] = {
1845 { .irq = 66 + OMAP44XX_IRQ_GIC_START },
1846 { .irq = -1 }
1847};
1848
1849static struct omap_hwmod_dma_info omap44xx_mcspi2_sdma_reqs[] = { 1838static struct omap_hwmod_dma_info omap44xx_mcspi2_sdma_reqs[] = {
1850 { .name = "tx0", .dma_req = 42 + OMAP44XX_DMA_REQ_START }, 1839 { .name = "tx0", .dma_req = 42 + OMAP44XX_DMA_REQ_START },
1851 { .name = "rx0", .dma_req = 43 + OMAP44XX_DMA_REQ_START }, 1840 { .name = "rx0", .dma_req = 43 + OMAP44XX_DMA_REQ_START },
@@ -1863,7 +1852,6 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = {
1863 .name = "mcspi2", 1852 .name = "mcspi2",
1864 .class = &omap44xx_mcspi_hwmod_class, 1853 .class = &omap44xx_mcspi_hwmod_class,
1865 .clkdm_name = "l4_per_clkdm", 1854 .clkdm_name = "l4_per_clkdm",
1866 .mpu_irqs = omap44xx_mcspi2_irqs,
1867 .sdma_reqs = omap44xx_mcspi2_sdma_reqs, 1855 .sdma_reqs = omap44xx_mcspi2_sdma_reqs,
1868 .main_clk = "func_48m_fclk", 1856 .main_clk = "func_48m_fclk",
1869 .prcm = { 1857 .prcm = {
@@ -1877,11 +1865,6 @@ static struct omap_hwmod omap44xx_mcspi2_hwmod = {
1877}; 1865};
1878 1866
1879/* mcspi3 */ 1867/* mcspi3 */
1880static struct omap_hwmod_irq_info omap44xx_mcspi3_irqs[] = {
1881 { .irq = 91 + OMAP44XX_IRQ_GIC_START },
1882 { .irq = -1 }
1883};
1884
1885static struct omap_hwmod_dma_info omap44xx_mcspi3_sdma_reqs[] = { 1868static struct omap_hwmod_dma_info omap44xx_mcspi3_sdma_reqs[] = {
1886 { .name = "tx0", .dma_req = 14 + OMAP44XX_DMA_REQ_START }, 1869 { .name = "tx0", .dma_req = 14 + OMAP44XX_DMA_REQ_START },
1887 { .name = "rx0", .dma_req = 15 + OMAP44XX_DMA_REQ_START }, 1870 { .name = "rx0", .dma_req = 15 + OMAP44XX_DMA_REQ_START },
@@ -1899,7 +1882,6 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = {
1899 .name = "mcspi3", 1882 .name = "mcspi3",
1900 .class = &omap44xx_mcspi_hwmod_class, 1883 .class = &omap44xx_mcspi_hwmod_class,
1901 .clkdm_name = "l4_per_clkdm", 1884 .clkdm_name = "l4_per_clkdm",
1902 .mpu_irqs = omap44xx_mcspi3_irqs,
1903 .sdma_reqs = omap44xx_mcspi3_sdma_reqs, 1885 .sdma_reqs = omap44xx_mcspi3_sdma_reqs,
1904 .main_clk = "func_48m_fclk", 1886 .main_clk = "func_48m_fclk",
1905 .prcm = { 1887 .prcm = {
@@ -1913,11 +1895,6 @@ static struct omap_hwmod omap44xx_mcspi3_hwmod = {
1913}; 1895};
1914 1896
1915/* mcspi4 */ 1897/* mcspi4 */
1916static struct omap_hwmod_irq_info omap44xx_mcspi4_irqs[] = {
1917 { .irq = 48 + OMAP44XX_IRQ_GIC_START },
1918 { .irq = -1 }
1919};
1920
1921static struct omap_hwmod_dma_info omap44xx_mcspi4_sdma_reqs[] = { 1898static struct omap_hwmod_dma_info omap44xx_mcspi4_sdma_reqs[] = {
1922 { .name = "tx0", .dma_req = 69 + OMAP44XX_DMA_REQ_START }, 1899 { .name = "tx0", .dma_req = 69 + OMAP44XX_DMA_REQ_START },
1923 { .name = "rx0", .dma_req = 70 + OMAP44XX_DMA_REQ_START }, 1900 { .name = "rx0", .dma_req = 70 + OMAP44XX_DMA_REQ_START },
@@ -1933,7 +1910,6 @@ static struct omap_hwmod omap44xx_mcspi4_hwmod = {
1933 .name = "mcspi4", 1910 .name = "mcspi4",
1934 .class = &omap44xx_mcspi_hwmod_class, 1911 .class = &omap44xx_mcspi_hwmod_class,
1935 .clkdm_name = "l4_per_clkdm", 1912 .clkdm_name = "l4_per_clkdm",
1936 .mpu_irqs = omap44xx_mcspi4_irqs,
1937 .sdma_reqs = omap44xx_mcspi4_sdma_reqs, 1913 .sdma_reqs = omap44xx_mcspi4_sdma_reqs,
1938 .main_clk = "func_48m_fclk", 1914 .main_clk = "func_48m_fclk",
1939 .prcm = { 1915 .prcm = {
@@ -1969,11 +1945,6 @@ static struct omap_hwmod_class omap44xx_mmc_hwmod_class = {
1969}; 1945};
1970 1946
1971/* mmc1 */ 1947/* mmc1 */
1972static struct omap_hwmod_irq_info omap44xx_mmc1_irqs[] = {
1973 { .irq = 83 + OMAP44XX_IRQ_GIC_START },
1974 { .irq = -1 }
1975};
1976
1977static struct omap_hwmod_dma_info omap44xx_mmc1_sdma_reqs[] = { 1948static struct omap_hwmod_dma_info omap44xx_mmc1_sdma_reqs[] = {
1978 { .name = "tx", .dma_req = 60 + OMAP44XX_DMA_REQ_START }, 1949 { .name = "tx", .dma_req = 60 + OMAP44XX_DMA_REQ_START },
1979 { .name = "rx", .dma_req = 61 + OMAP44XX_DMA_REQ_START }, 1950 { .name = "rx", .dma_req = 61 + OMAP44XX_DMA_REQ_START },
@@ -1989,7 +1960,6 @@ static struct omap_hwmod omap44xx_mmc1_hwmod = {
1989 .name = "mmc1", 1960 .name = "mmc1",
1990 .class = &omap44xx_mmc_hwmod_class, 1961 .class = &omap44xx_mmc_hwmod_class,
1991 .clkdm_name = "l3_init_clkdm", 1962 .clkdm_name = "l3_init_clkdm",
1992 .mpu_irqs = omap44xx_mmc1_irqs,
1993 .sdma_reqs = omap44xx_mmc1_sdma_reqs, 1963 .sdma_reqs = omap44xx_mmc1_sdma_reqs,
1994 .main_clk = "hsmmc1_fclk", 1964 .main_clk = "hsmmc1_fclk",
1995 .prcm = { 1965 .prcm = {
@@ -2003,11 +1973,6 @@ static struct omap_hwmod omap44xx_mmc1_hwmod = {
2003}; 1973};
2004 1974
2005/* mmc2 */ 1975/* mmc2 */
2006static struct omap_hwmod_irq_info omap44xx_mmc2_irqs[] = {
2007 { .irq = 86 + OMAP44XX_IRQ_GIC_START },
2008 { .irq = -1 }
2009};
2010
2011static struct omap_hwmod_dma_info omap44xx_mmc2_sdma_reqs[] = { 1976static struct omap_hwmod_dma_info omap44xx_mmc2_sdma_reqs[] = {
2012 { .name = "tx", .dma_req = 46 + OMAP44XX_DMA_REQ_START }, 1977 { .name = "tx", .dma_req = 46 + OMAP44XX_DMA_REQ_START },
2013 { .name = "rx", .dma_req = 47 + OMAP44XX_DMA_REQ_START }, 1978 { .name = "rx", .dma_req = 47 + OMAP44XX_DMA_REQ_START },
@@ -2018,7 +1983,6 @@ static struct omap_hwmod omap44xx_mmc2_hwmod = {
2018 .name = "mmc2", 1983 .name = "mmc2",
2019 .class = &omap44xx_mmc_hwmod_class, 1984 .class = &omap44xx_mmc_hwmod_class,
2020 .clkdm_name = "l3_init_clkdm", 1985 .clkdm_name = "l3_init_clkdm",
2021 .mpu_irqs = omap44xx_mmc2_irqs,
2022 .sdma_reqs = omap44xx_mmc2_sdma_reqs, 1986 .sdma_reqs = omap44xx_mmc2_sdma_reqs,
2023 .main_clk = "hsmmc2_fclk", 1987 .main_clk = "hsmmc2_fclk",
2024 .prcm = { 1988 .prcm = {
@@ -2031,11 +1995,6 @@ static struct omap_hwmod omap44xx_mmc2_hwmod = {
2031}; 1995};
2032 1996
2033/* mmc3 */ 1997/* mmc3 */
2034static struct omap_hwmod_irq_info omap44xx_mmc3_irqs[] = {
2035 { .irq = 94 + OMAP44XX_IRQ_GIC_START },
2036 { .irq = -1 }
2037};
2038
2039static struct omap_hwmod_dma_info omap44xx_mmc3_sdma_reqs[] = { 1998static struct omap_hwmod_dma_info omap44xx_mmc3_sdma_reqs[] = {
2040 { .name = "tx", .dma_req = 76 + OMAP44XX_DMA_REQ_START }, 1999 { .name = "tx", .dma_req = 76 + OMAP44XX_DMA_REQ_START },
2041 { .name = "rx", .dma_req = 77 + OMAP44XX_DMA_REQ_START }, 2000 { .name = "rx", .dma_req = 77 + OMAP44XX_DMA_REQ_START },
@@ -2046,7 +2005,6 @@ static struct omap_hwmod omap44xx_mmc3_hwmod = {
2046 .name = "mmc3", 2005 .name = "mmc3",
2047 .class = &omap44xx_mmc_hwmod_class, 2006 .class = &omap44xx_mmc_hwmod_class,
2048 .clkdm_name = "l4_per_clkdm", 2007 .clkdm_name = "l4_per_clkdm",
2049 .mpu_irqs = omap44xx_mmc3_irqs,
2050 .sdma_reqs = omap44xx_mmc3_sdma_reqs, 2008 .sdma_reqs = omap44xx_mmc3_sdma_reqs,
2051 .main_clk = "func_48m_fclk", 2009 .main_clk = "func_48m_fclk",
2052 .prcm = { 2010 .prcm = {
@@ -2059,11 +2017,6 @@ static struct omap_hwmod omap44xx_mmc3_hwmod = {
2059}; 2017};
2060 2018
2061/* mmc4 */ 2019/* mmc4 */
2062static struct omap_hwmod_irq_info omap44xx_mmc4_irqs[] = {
2063 { .irq = 96 + OMAP44XX_IRQ_GIC_START },
2064 { .irq = -1 }
2065};
2066
2067static struct omap_hwmod_dma_info omap44xx_mmc4_sdma_reqs[] = { 2020static struct omap_hwmod_dma_info omap44xx_mmc4_sdma_reqs[] = {
2068 { .name = "tx", .dma_req = 56 + OMAP44XX_DMA_REQ_START }, 2021 { .name = "tx", .dma_req = 56 + OMAP44XX_DMA_REQ_START },
2069 { .name = "rx", .dma_req = 57 + OMAP44XX_DMA_REQ_START }, 2022 { .name = "rx", .dma_req = 57 + OMAP44XX_DMA_REQ_START },
@@ -2074,7 +2027,6 @@ static struct omap_hwmod omap44xx_mmc4_hwmod = {
2074 .name = "mmc4", 2027 .name = "mmc4",
2075 .class = &omap44xx_mmc_hwmod_class, 2028 .class = &omap44xx_mmc_hwmod_class,
2076 .clkdm_name = "l4_per_clkdm", 2029 .clkdm_name = "l4_per_clkdm",
2077 .mpu_irqs = omap44xx_mmc4_irqs,
2078 .sdma_reqs = omap44xx_mmc4_sdma_reqs, 2030 .sdma_reqs = omap44xx_mmc4_sdma_reqs,
2079 .main_clk = "func_48m_fclk", 2031 .main_clk = "func_48m_fclk",
2080 .prcm = { 2032 .prcm = {
@@ -2087,11 +2039,6 @@ static struct omap_hwmod omap44xx_mmc4_hwmod = {
2087}; 2039};
2088 2040
2089/* mmc5 */ 2041/* mmc5 */
2090static struct omap_hwmod_irq_info omap44xx_mmc5_irqs[] = {
2091 { .irq = 59 + OMAP44XX_IRQ_GIC_START },
2092 { .irq = -1 }
2093};
2094
2095static struct omap_hwmod_dma_info omap44xx_mmc5_sdma_reqs[] = { 2042static struct omap_hwmod_dma_info omap44xx_mmc5_sdma_reqs[] = {
2096 { .name = "tx", .dma_req = 58 + OMAP44XX_DMA_REQ_START }, 2043 { .name = "tx", .dma_req = 58 + OMAP44XX_DMA_REQ_START },
2097 { .name = "rx", .dma_req = 59 + OMAP44XX_DMA_REQ_START }, 2044 { .name = "rx", .dma_req = 59 + OMAP44XX_DMA_REQ_START },
@@ -2102,7 +2049,6 @@ static struct omap_hwmod omap44xx_mmc5_hwmod = {
2102 .name = "mmc5", 2049 .name = "mmc5",
2103 .class = &omap44xx_mmc_hwmod_class, 2050 .class = &omap44xx_mmc_hwmod_class,
2104 .clkdm_name = "l4_per_clkdm", 2051 .clkdm_name = "l4_per_clkdm",
2105 .mpu_irqs = omap44xx_mmc5_irqs,
2106 .sdma_reqs = omap44xx_mmc5_sdma_reqs, 2052 .sdma_reqs = omap44xx_mmc5_sdma_reqs,
2107 .main_clk = "func_48m_fclk", 2053 .main_clk = "func_48m_fclk",
2108 .prcm = { 2054 .prcm = {