Changeset 38318


Ignore:
Timestamp:
2013-10-07T17:02:18+02:00 (4 years ago)
Author:
blogic
Message:

ralink: fix mt7620a pinmux

Signed-off-by: John Crispin <blogic@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ramips/patches-3.10/0122-pinmux.patch

    r38182 r38318  
    1515 create mode 100644 drivers/pinctrl/pinctrl-rt2880.c 
    1616 
    17 --- a/arch/mips/Kconfig 
    18 +++ b/arch/mips/Kconfig 
    19 @@ -446,6 +446,8 @@ config RALINK 
     17Index: linux-3.10.13/arch/mips/Kconfig 
     18=================================================================== 
     19--- linux-3.10.13.orig/arch/mips/Kconfig        2013-10-02 16:59:28.532051276 +0200 
     20+++ linux-3.10.13/arch/mips/Kconfig     2013-10-02 16:59:29.440051316 +0200 
     21@@ -446,6 +446,8 @@ 
    2022        select HAVE_MACH_CLKDEV 
    2123        select CLKDEV_LOOKUP 
     
    2628 config SGI_IP22 
    2729        bool "SGI IP22 (Indy/Indigo2)" 
    28 --- a/drivers/pinctrl/Kconfig 
    29 +++ b/drivers/pinctrl/Kconfig 
    30 @@ -114,6 +114,11 @@ config PINCTRL_LANTIQ 
     30Index: linux-3.10.13/drivers/pinctrl/Kconfig 
     31=================================================================== 
     32--- linux-3.10.13.orig/drivers/pinctrl/Kconfig  2013-09-27 02:18:49.000000000 +0200 
     33+++ linux-3.10.13/drivers/pinctrl/Kconfig       2013-10-02 16:59:29.440051316 +0200 
     34@@ -114,6 +114,11 @@ 
    3135        select PINMUX 
    3236        select PINCONF 
     
    4044        bool 
    4145        depends on SOC_FALCON 
    42 --- a/drivers/pinctrl/Makefile 
    43 +++ b/drivers/pinctrl/Makefile 
    44 @@ -45,6 +45,7 @@ obj-$(CONFIG_PINCTRL_EXYNOS5440)      += pinc 
     46Index: linux-3.10.13/drivers/pinctrl/Makefile 
     47=================================================================== 
     48--- linux-3.10.13.orig/drivers/pinctrl/Makefile 2013-09-27 02:18:49.000000000 +0200 
     49+++ linux-3.10.13/drivers/pinctrl/Makefile      2013-10-02 16:59:29.440051316 +0200 
     50@@ -45,6 +45,7 @@ 
    4551 obj-$(CONFIG_PINCTRL_S3C64XX)  += pinctrl-s3c64xx.o 
    4652 obj-$(CONFIG_PINCTRL_XWAY)     += pinctrl-xway.o 
     
    5056 obj-$(CONFIG_PLAT_ORION)        += mvebu/ 
    5157 obj-$(CONFIG_ARCH_SHMOBILE)    += sh-pfc/ 
    52 --- /dev/null 
    53 +++ b/drivers/pinctrl/pinctrl-rt2880.c 
     58Index: linux-3.10.13/drivers/pinctrl/pinctrl-rt2880.c 
     59=================================================================== 
     60--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     61+++ linux-3.10.13/drivers/pinctrl/pinctrl-rt2880.c      2013-10-02 18:24:18.556268869 +0200 
    5462@@ -0,0 +1,456 @@ 
    5563+/* 
     
    509517+ 
    510518+core_initcall_sync(rt2880_pinmux_init); 
    511 --- /dev/null 
    512 +++ b/arch/mips/include/asm/mach-ralink/pinmux.h 
     519Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/pinmux.h 
     520=================================================================== 
     521--- /dev/null   1970-01-01 00:00:00.000000000 +0000 
     522+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/pinmux.h    2013-10-02 16:59:29.444051317 +0200 
    513523@@ -0,0 +1,47 @@ 
    514524+/* 
     
    559569+ 
    560570+#endif 
    561 --- a/arch/mips/ralink/mt7620.c 
    562 +++ b/arch/mips/ralink/mt7620.c 
     571Index: linux-3.10.13/arch/mips/ralink/mt7620.c 
     572=================================================================== 
     573--- linux-3.10.13.orig/arch/mips/ralink/mt7620.c        2013-10-02 16:59:28.912051293 +0200 
     574+++ linux-3.10.13/arch/mips/ralink/mt7620.c     2013-10-02 18:23:35.940267055 +0200 
    563575@@ -17,6 +17,7 @@ 
    564576 #include <asm/mipsregs.h> 
     
    569581 #include "common.h" 
    570582  
    571 @@ -48,118 +49,40 @@ static int dram_type; 
     583@@ -48,118 +49,40 @@ 
    572584 /* the pll dividers */ 
    573585 static u32 mt7620_clk_divider[] = { 2, 3, 4, 8 }; 
     
    636648-               .gpio_last = 72, 
    637649-       }, {0} 
    638 +static struct rt2880_pmx_func i2c_grp[] =  { FUNC("i2c", 1, 1, 2) }; 
    639 +static struct rt2880_pmx_func spi_grp[] = { FUNC("spi", 1, 3, 4) }; 
     650+static struct rt2880_pmx_func i2c_grp[] =  { FUNC("i2c", 0, 1, 2) }; 
     651+static struct rt2880_pmx_func spi_grp[] = { FUNC("spi", 0, 3, 4) }; 
    640652+static struct rt2880_pmx_func uartf_grp[] = { 
    641653+       FUNC("uartf", MT7620_GPIO_MODE_UARTF, 7, 8), 
     
    695707-       .uart_shift = MT7620_GPIO_MODE_UART0_SHIFT, 
    696708-       .uart_mask = MT7620_GPIO_MODE_UART0_MASK, 
    697 +static struct rt2880_pmx_func uartlite_grp[] = { FUNC("uartlite", 1, 15, 2) }; 
    698 +static struct rt2880_pmx_func wdt_grp[] = { FUNC("wdt", 1, 17, 1) }; 
    699 +static struct rt2880_pmx_func mdio_grp[] = { FUNC("mdio", 1, 22, 2) }; 
    700 +static struct rt2880_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 1, 24, 12) }; 
    701 +static struct rt2880_pmx_func refclk_grp[] = { FUNC("spi refclk", 1, 37, 3) }; 
    702 +static struct rt2880_pmx_func ephy_grp[] = { FUNC("ephy", 1, 40, 5) }; 
    703 +static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 1, 60, 12) }; 
    704 +static struct rt2880_pmx_func wled_grp[] = { FUNC("wled", 1, 72, 1) }; 
     709+static struct rt2880_pmx_func uartlite_grp[] = { FUNC("uartlite", 0, 15, 2) }; 
     710+static struct rt2880_pmx_func wdt_grp[] = { FUNC("wdt", 0, 17, 1) }; 
     711+static struct rt2880_pmx_func mdio_grp[] = { FUNC("mdio", 0, 22, 2) }; 
     712+static struct rt2880_pmx_func rgmii1_grp[] = { FUNC("rgmii1", 0, 24, 12) }; 
     713+static struct rt2880_pmx_func refclk_grp[] = { FUNC("spi refclk", 0, 37, 3) }; 
     714+static struct rt2880_pmx_func ephy_grp[] = { FUNC("ephy", 0, 40, 5) }; 
     715+static struct rt2880_pmx_func rgmii2_grp[] = { FUNC("rgmii2", 0, 60, 12) }; 
     716+static struct rt2880_pmx_func wled_grp[] = { FUNC("wled", 0, 72, 1) }; 
    705717+ 
    706718+static struct rt2880_pmx_group mt7620a_pinmux_data[] = { 
     
    721733  
    722734 void __init ralink_clk_init(void) 
    723 @@ -281,4 +204,6 @@ void prom_soc_init(struct ralink_soc_inf 
     735@@ -281,4 +204,6 @@ 
    724736                (pmu0 & PMU_SW_SET) ? ("sw") : ("hw")); 
    725737        pr_info("Digital PMU set to %s control\n", 
     
    728740+       rt2880_pinmux_data = mt7620a_pinmux_data; 
    729741 } 
    730 --- a/arch/mips/ralink/rt305x.c 
    731 +++ b/arch/mips/ralink/rt305x.c 
     742Index: linux-3.10.13/arch/mips/ralink/rt305x.c 
     743=================================================================== 
     744--- linux-3.10.13.orig/arch/mips/ralink/rt305x.c        2013-10-02 16:59:29.140051302 +0200 
     745+++ linux-3.10.13/arch/mips/ralink/rt305x.c     2013-10-02 16:59:29.444051317 +0200 
    732746@@ -17,90 +17,71 @@ 
    733747 #include <asm/mipsregs.h> 
     
    879893  
    880894 static void rt305x_wdt_reset(void) 
    881 @@ -114,14 +95,6 @@ static void rt305x_wdt_reset(void) 
     895@@ -114,14 +95,6 @@ 
    882896        rt_sysc_w32(t, SYSC_REG_SYSTEM_CONFIG); 
    883897 } 
     
    894908 { 
    895909        void __iomem *sysc = (void __iomem *) KSEG1ADDR(RT305X_SYSC_BASE); 
    896 @@ -291,11 +264,14 @@ void prom_soc_init(struct ralink_soc_inf 
     910@@ -291,11 +264,14 @@ 
    897911        soc_info->mem_base = RT305X_SDRAM_BASE; 
    898912        if (soc_is_rt5350()) { 
     
    909923        } 
    910924 } 
    911 --- a/arch/mips/include/asm/mach-ralink/rt305x.h 
    912 +++ b/arch/mips/include/asm/mach-ralink/rt305x.h 
    913 @@ -125,24 +125,28 @@ static inline int soc_is_rt5350(void) 
     925Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x.h 
     926=================================================================== 
     927--- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/rt305x.h       2013-09-27 02:18:49.000000000 +0200 
     928+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/rt305x.h    2013-10-02 16:59:29.444051317 +0200 
     929@@ -125,24 +125,28 @@ 
    914930 #define RT305X_GPIO_GE0_TXD0           40 
    915931 #define RT305X_GPIO_GE0_RXCLK          51 
     
    955971 #define RT3352_SYSC_REG_SYSCFG0                0x010 
    956972 #define RT3352_SYSC_REG_SYSCFG1         0x014 
    957 --- a/arch/mips/include/asm/mach-ralink/mt7620.h 
    958 +++ b/arch/mips/include/asm/mach-ralink/mt7620.h 
     973Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/mt7620.h 
     974=================================================================== 
     975--- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/mt7620.h       2013-10-02 16:59:28.708051287 +0200 
     976+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/mt7620.h    2013-10-02 16:59:29.444051317 +0200 
    959977@@ -59,7 +59,6 @@ 
    960978 #define MT7620_DDR2_SIZE_MIN           32 
     
    9931011  
    9941012 #endif 
    995 --- a/arch/mips/include/asm/mach-ralink/rt3883.h 
    996 +++ b/arch/mips/include/asm/mach-ralink/rt3883.h 
     1013Index: linux-3.10.13/arch/mips/include/asm/mach-ralink/rt3883.h 
     1014=================================================================== 
     1015--- linux-3.10.13.orig/arch/mips/include/asm/mach-ralink/rt3883.h       2013-09-27 02:18:49.000000000 +0200 
     1016+++ linux-3.10.13/arch/mips/include/asm/mach-ralink/rt3883.h    2013-10-02 16:59:29.444051317 +0200 
    9971017@@ -112,8 +112,6 @@ 
    9981018 #define RT3883_CLKCFG1_PCI_CLK_EN      BIT(19) 
     
    10251045 #define RT3883_GPIO_MODE_PCI_MASK      0x7 
    10261046 #define RT3883_GPIO_MODE_PCI           (RT3883_GPIO_MODE_PCI_MASK << RT3883_GPIO_MODE_PCI_SHIFT) 
    1027 --- a/arch/mips/ralink/common.h 
    1028 +++ b/arch/mips/ralink/common.h 
     1047Index: linux-3.10.13/arch/mips/ralink/common.h 
     1048=================================================================== 
     1049--- linux-3.10.13.orig/arch/mips/ralink/common.h        2013-10-02 16:59:28.532051276 +0200 
     1050+++ linux-3.10.13/arch/mips/ralink/common.h     2013-10-02 16:59:29.444051317 +0200 
    10291051@@ -11,25 +11,6 @@ 
    10301052  
     
    10531075        unsigned char sys_type[RAMIPS_SYS_TYPE_LEN]; 
    10541076        unsigned char *compatible; 
    1055 --- a/arch/mips/ralink/rt3883.c 
    1056 +++ b/arch/mips/ralink/rt3883.c 
     1077Index: linux-3.10.13/arch/mips/ralink/rt3883.c 
     1078=================================================================== 
     1079--- linux-3.10.13.orig/arch/mips/ralink/rt3883.c        2013-09-27 02:18:49.000000000 +0200 
     1080+++ linux-3.10.13/arch/mips/ralink/rt3883.c     2013-10-02 16:59:29.444051317 +0200 
    10571081@@ -17,132 +17,50 @@ 
    10581082 #include <asm/mipsregs.h> 
     
    12261250  
    12271251 static void rt3883_wdt_reset(void) 
    1228 @@ -155,17 +73,6 @@ static void rt3883_wdt_reset(void) 
     1252@@ -155,17 +73,6 @@ 
    12291253        rt_sysc_w32(t, RT3883_SYSC_REG_SYSCFG1); 
    12301254 } 
     
    12441268 { 
    12451269        unsigned long cpu_rate, sys_rate; 
    1246 @@ -243,4 +150,6 @@ void prom_soc_init(struct ralink_soc_inf 
     1270@@ -243,4 +150,6 @@ 
    12471271        soc_info->mem_base = RT3883_SDRAM_BASE; 
    12481272        soc_info->mem_size_min = RT3883_MEM_SIZE_MIN; 
Note: See TracChangeset for help on using the changeset viewer.