shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

delete RK3288_GRF_GPIO0_D_IOMUX according to new datasheet

Browse Source
This commit is contained in:
luowei
2014-03-28 17:13:25 +08:00
parent bac05d3187
commit 551fcbfe9f
4 changed files with 6 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk3288-pinctrl.dtsi
View File

@@ -17,7 +17,7 @@
gpio0: gpio0@ff750000 {
compatible = "rockchip,rk3288-gpio-bank0";
reg = <0xff750000 0x100>,
<0xff730084 0x10>,
<0xff730084 0x0c>,
<0xff730064 0x0c>,
<0xff730070 0x0c>;
reg-names = "base", "mux_bank0", "pull_bank0", "drv_bank0";

7
drivers/pinctrl/pinctrl-rockchip.c
View File

@@ -346,7 +346,7 @@ static ssize_t pinctrl_show_regs(struct file *file, char __user *user_buf,
len += snprintf(buf + len, PINCTRL_REGS_BUFSIZE - len,
"=================================\n");
for(i=0; i<0x10; i=i+4)
for(i=0; i<0x0c; i=i+4)
{
value = readl_relaxed(bank0->reg_mux_bank0 + i);
len += snprintf(buf + len, PINCTRL_REGS_BUFSIZE - len, "MUX_BANK0[0x%p+0x%x]=0x%08x\n",(int *)bank0->reg_mux_bank0, i, value);
@@ -654,7 +654,10 @@ static int rockchip_set_rk32_mux(struct rockchip_pin_bank *bank, int pin, int mu
case 0:
//pmu
reg = bank->reg_mux_bank0;
bits = 2;
if((m.mux.goff == 0x0a) || (m.mux.goff == 0x0b) || (m.mux.goff == 0x0c))
{
bits = 2;
}
rk32_iomux_bit_op(bank, pin, mux, reg, bits);
break;

15
include/dt-bindings/pinctrl/rockchip-rk3288.h
View File

@@ -54,21 +54,6 @@
#define GPIO0_C2 0x0c20
/* GPIO0_D */
#define GPIO0_D0 0x0d00
#define LCDC0_HSYNC_GPIO0D 0x0d01
#define GPIO0_D1 0x0d10
#define LCDC0_VSYNC_GPIO0D 0x0d11
#define GPIO0_D2 0x0d20
#define LCDC0_DEN_GPIO0D 0x0d21
#define GPIO0_D3 0x0d30
#define LCDC0_DCLK_GPIO0D 0x0d31
/* GPIO1_A */
/* GPIO1_B */
/* GPIO1_C */

1
include/linux/rockchip/grf.h
View File

@@ -110,7 +110,6 @@
#define RK3288_GRF_GPIO0_A_IOMUX 0x0084
#define RK3288_GRF_GPIO0_B_IOMUX 0x0088
#define RK3288_GRF_GPIO0_C_IOMUX 0x008c
#define RK3288_GRF_GPIO0_D_IOMUX 0x0090
#define RK3288_GRF_GPIO1D_IOMUX 0x000c
#define RK3288_GRF_GPIO2A_IOMUX 0x0010