diff options
| -rw-r--r-- | drivers/media/video/rk_camsys/camsys_internal.h | 1 | ||||
| -rw-r--r-- | drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c | 1 | ||||
| -rw-r--r-- | drivers/video/rockchip/lcdc/rk322x_lcdc.c | 1 | ||||
| -rw-r--r-- | drivers/video/rockchip/lcdc/rk3368_lcdc.c | 1 | ||||
| -rw-r--r-- | drivers/video/rockchip/lcdc/rk_vop_lite.c | 1 | ||||
| -rwxr-xr-x | include/linux/rockchip/iomap.h | 228 | ||||
| -rw-r--r-- | net/rfkill/rfkill-wlan.c | 1 |
7 files changed, 0 insertions, 234 deletions
diff --git a/drivers/media/video/rk_camsys/camsys_internal.h b/drivers/media/video/rk_camsys/camsys_internal.h index 2f3051b47a2c..ae7f5271f47c 100644 --- a/drivers/media/video/rk_camsys/camsys_internal.h +++ b/drivers/media/video/rk_camsys/camsys_internal.h @@ -30,7 +30,6 @@ #include <linux/log2.h> #include <linux/gpio.h> #include <linux/rockchip/cpu.h> -#include <linux/rockchip/iomap.h> #include <linux/rockchip/grf.h> #include <asm/uaccess.h> #include <linux/of.h> diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c index 09dcedb8df9a..87842211c3c9 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c +++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2.c @@ -8,7 +8,6 @@ #include <linux/of_gpio.h> #include <linux/rockchip/cpu.h> #include <linux/rockchip/grf.h> -#include <linux/rockchip/iomap.h> #include <linux/mfd/syscon.h> #if defined(CONFIG_DEBUG_FS) #include <linux/uaccess.h> diff --git a/drivers/video/rockchip/lcdc/rk322x_lcdc.c b/drivers/video/rockchip/lcdc/rk322x_lcdc.c index c670d98236d1..191064a4e9fc 100644 --- a/drivers/video/rockchip/lcdc/rk322x_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk322x_lcdc.c @@ -32,7 +32,6 @@ #include <linux/rockchip-iovmm.h> #include <asm/div64.h> #include <linux/uaccess.h> -#include <linux/rockchip/iomap.h> #include <linux/rockchip/grf.h> #include <linux/rockchip/common.h> #include <dt-bindings/clock/rk_system_status.h> diff --git a/drivers/video/rockchip/lcdc/rk3368_lcdc.c b/drivers/video/rockchip/lcdc/rk3368_lcdc.c index 9fdc1a7adeeb..ba69798a877d 100644 --- a/drivers/video/rockchip/lcdc/rk3368_lcdc.c +++ b/drivers/video/rockchip/lcdc/rk3368_lcdc.c @@ -30,7 +30,6 @@ #include <asm/div64.h> #include <linux/uaccess.h> #include <linux/rockchip/cpu.h> -#include <linux/rockchip/iomap.h> #include <linux/rockchip/grf.h> #include <linux/rockchip/common.h> #include <dt-bindings/clock/rk_system_status.h> diff --git a/drivers/video/rockchip/lcdc/rk_vop_lite.c b/drivers/video/rockchip/lcdc/rk_vop_lite.c index 71bd69cb5cfd..cf9d70562499 100644 --- a/drivers/video/rockchip/lcdc/rk_vop_lite.c +++ b/drivers/video/rockchip/lcdc/rk_vop_lite.c @@ -32,7 +32,6 @@ #include <asm/div64.h> #include <linux/uaccess.h> #include <linux/rockchip/cpu.h> -#include <linux/rockchip/iomap.h> #include <linux/rockchip/grf.h> #include <linux/rockchip/common.h> #include <dt-bindings/clock/rk_system_status.h> diff --git a/include/linux/rockchip/iomap.h b/include/linux/rockchip/iomap.h deleted file mode 100755 index e6ffe50e78c3..000000000000 --- a/include/linux/rockchip/iomap.h +++ /dev/null @@ -1,228 +0,0 @@ -#ifndef __MACH_ROCKCHIP_IOMAP_H -#define __MACH_ROCKCHIP_IOMAP_H - -#ifndef __ASSEMBLY__ -#include <asm/io.h> -#endif - -#ifdef IOMEM -#define RK_IO_ADDRESS(x) IOMEM(0xFED00000 + x) -#else -#define RK_IO_ADDRESS(x) ((void __force __iomem *)(0xFED00000 + x)) -#endif - -#define RK_CRU_VIRT RK_IO_ADDRESS(0x00000000) -#define RK_GRF_VIRT RK_IO_ADDRESS(0x00010000) -#define RK_SGRF_VIRT (RK_GRF_VIRT + 0x1000) -#define RK_PMU_VIRT RK_IO_ADDRESS(0x00020000) -#define RK_ROM_VIRT RK_IO_ADDRESS(0x00030000) -#define RK_EFUSE_VIRT RK_IO_ADDRESS(0x00040000) -#define RK_GPIO_VIRT(n) RK_IO_ADDRESS(0x00050000 + (n) * 0x1000) -#define RK_DEBUG_UART_VIRT RK_IO_ADDRESS(0x00060000) -#define RK_CPU_AXI_BUS_VIRT RK_IO_ADDRESS(0x00070000) -#define RK_TIMER_VIRT RK_IO_ADDRESS(0x00080000) -#define RK_PWM_VIRT RK_IO_ADDRESS(0x00088000) -#define RK_GIC_VIRT RK_IO_ADDRESS(0x00090000) -#define RK_BOOTRAM_VIRT RK_IO_ADDRESS(0x000a0000) -#define RK_DDR_VIRT RK_IO_ADDRESS(0x000d0000) - -#define RK3188_CRU_PHYS 0x20000000 -#define RK3188_CRU_SIZE SZ_4K -#define RK3188_GRF_PHYS 0x20008000 -#define RK3188_GRF_SIZE SZ_4K -#define RK3188_PMU_PHYS 0x20004000 -#define RK3188_PMU_SIZE SZ_4K -#define RK3188_ROM_PHYS 0x10120000 -#define RK3188_ROM_SIZE SZ_16K -#define RK3188_EFUSE_PHYS 0x20010000 -#define RK3188_EFUSE_SIZE SZ_4K -#define RK3188_GPIO0_PHYS 0x2000a000 -#define RK3188_GPIO1_PHYS 0x2003c000 -#define RK3188_GPIO2_PHYS 0x2003e000 -#define RK3188_GPIO3_PHYS 0x20080000 -#define RK3188_GPIO_SIZE SZ_4K -#define RK3188_CPU_AXI_BUS_PHYS 0x10128000 -#define RK3188_CPU_AXI_BUS_SIZE SZ_32K -#define RK3188_TIMER0_PHYS 0x20038000 -#define RK3188_TIMER3_PHYS 0x2000e000 -#define RK3188_TIMER_SIZE SZ_4K -#define RK3188_DDR_PCTL_PHYS 0x20020000 -#define RK3188_DDR_PCTL_SIZE SZ_4K -#define RK3188_DDR_PUBL_PHYS 0x20040000 -#define RK3188_DDR_PUBL_SIZE SZ_4K -#define RK3188_UART0_PHYS 0x10124000 -#define RK3188_UART1_PHYS 0x10126000 -#define RK3188_UART2_PHYS 0x20064000 -#define RK3188_UART3_PHYS 0x20068000 -#define RK3188_UART_SIZE SZ_4K - -#define RK3288_CRU_PHYS 0xFF760000 -#define RK3288_CRU_SIZE SZ_4K -#define RK3288_GRF_PHYS 0xFF770000 -#define RK3288_GRF_SIZE SZ_4K -#define RK3288_SGRF_PHYS 0xFF740000 -#define RK3288_SGRF_SIZE SZ_4K -#define RK3288_PMU_PHYS 0xFF730000 -#define RK3288_PMU_SIZE SZ_4K -#define RK3288_ROM_PHYS 0xFFFD0000 -#define RK3288_ROM_SIZE (SZ_16K + SZ_4K) -#define RK3288_EFUSE_PHYS 0xFFB40000 -#define RK3288_EFUSE_SIZE SZ_4K -#define RK3288_GPIO0_PHYS 0xFF750000 -#define RK3288_GPIO1_PHYS 0xFF780000 -#define RK3288_GPIO2_PHYS 0xFF790000 -#define RK3288_GPIO3_PHYS 0xFF7A0000 -#define RK3288_GPIO4_PHYS 0xFF7B0000 -#define RK3288_GPIO5_PHYS 0xFF7C0000 -#define RK3288_GPIO6_PHYS 0xFF7D0000 -#define RK3288_GPIO7_PHYS 0xFF7E0000 -#define RK3288_GPIO8_PHYS 0xFF7F0000 -#define RK3288_GPIO_SIZE SZ_4K -#define RK3288_SERVICE_CORE_PHYS 0XFFA80000 -#define RK3288_SERVICE_CORE_SIZE SZ_4K -#define RK3288_SERVICE_DMAC_PHYS 0XFFA90000 -#define RK3288_SERVICE_DMAC_SIZE SZ_4K -#define RK3288_SERVICE_GPU_PHYS 0XFFAA0000 -#define RK3288_SERVICE_GPU_SIZE SZ_4K -#define RK3288_SERVICE_PERI_PHYS 0XFFAB0000 -#define RK3288_SERVICE_PERI_SIZE SZ_4K -#define RK3288_SERVICE_BUS_PHYS 0XFFAC0000 -#define RK3288_SERVICE_BUS_SIZE SZ_16K -#define RK3288_SERVICE_VIO_PHYS 0XFFAD0000 -#define RK3288_SERVICE_VIO_SIZE SZ_4K -#define RK3288_SERVICE_VIDEO_PHYS 0XFFAE0000 -#define RK3288_SERVICE_VIDEO_SIZE SZ_4K -#define RK3288_SERVICE_HEVC_PHYS 0XFFAF0000 -#define RK3288_SERVICE_HEVC_SIZE SZ_4K -#define RK3288_TIMER0_PHYS 0xFF6B0000 -#define RK3288_TIMER6_PHYS 0xFF810000 -#define RK3288_TIMER_SIZE SZ_4K -#define RK3288_DDR_PCTL0_PHYS 0xFF610000 -#define RK3288_DDR_PCTL1_PHYS 0xFF630000 -#define RK3288_DDR_PCTL_SIZE SZ_4K -#define RK3288_DDR_PUBL0_PHYS 0xFF620000 -#define RK3288_DDR_PUBL1_PHYS 0xFF640000 -#define RK3288_DDR_PUBL_SIZE SZ_4K -#define RK3288_UART_BT_PHYS 0xFF180000 -#define RK3288_UART_BB_PHYS 0xFF190000 -#define RK3288_UART_DBG_PHYS 0xFF690000 -#define RK3288_UART_GPS_PHYS 0xFF1B0000 -#define RK3288_UART_EXP_PHYS 0xFF1C0000 -#define RK3288_UART_SIZE SZ_4K -#define RK3288_GIC_DIST_PHYS 0xFFC01000 -#define RK3288_GIC_DIST_SIZE SZ_4K -#define RK3288_GIC_CPU_PHYS 0xFFC02000 -#define RK3288_GIC_CPU_SIZE SZ_4K -#define RK3288_BOOTRAM_PHYS 0xFF720000 -#define RK3288_BOOTRAM_SIZE SZ_4K -#define RK3288_IMEM_PHYS 0xFF700000 -#define RK3288_IMEM_SZIE 0x00018000 - -#define RK3036_IMEM_PHYS 0x10080000 -#define RK3036_IMEM_SIZE SZ_8K -#define RK3036_ROM_PHYS 0x10100000 -#define RK3036_ROM_SIZE SZ_16K -#define RK3036_CPU_AXI_BUS_PHYS 0x10128000 -#define RK3036_CPU_AXI_BUS_SIZE SZ_32K -#define RK3036_GIC_DIST_PHYS 0x10139000 -#define RK3036_GIC_DIST_SIZE SZ_4K -#define RK3036_GIC_CPU_PHYS 0x1013a000 -#define RK3036_GIC_CPU_SIZE SZ_4K -#define RK3036_CRU_PHYS 0x20000000 -#define RK3036_CRU_SIZE SZ_4K -#define RK3036_DDR_PCTL_PHYS 0x20004000 -#define RK3036_DDR_PCTL_SIZE SZ_4K -#define RK3036_GRF_PHYS 0x20008000 -#define RK3036_GRF_SIZE SZ_4K -#define RK3036_DDR_PHY_PHYS 0x2000a000 -#define RK3036_DDR_PHY_SIZE SZ_4K -#define RK3036_TIMER_PHYS 0x20044000 -#define RK3036_TIMER_SIZE SZ_4K -#define RK3036_UART0_PHYS 0x20060000 -#define RK3036_UART1_PHYS 0x20064000 -#define RK3036_UART2_PHYS 0x20068000 -#define RK3036_UART_SIZE SZ_4K -#define RK3036_GPIO0_PHYS 0x2007c000 -#define RK3036_GPIO1_PHYS 0x20080000 -#define RK3036_GPIO2_PHYS 0x20084000 -#define RK3036_GPIO_SIZE SZ_4K -#define RK3036_EFUSE_PHYS 0x20090000 -#define RK3036_EFUSE_SIZE SZ_4K -#define RK3036_PWM_PHYS 0x20050000 -#define RK3036_PWM_SIZE SZ_16K - -#define RK312X_IMEM_PHYS RK3036_IMEM_PHYS -#define RK312X_IMEM_SIZE RK3036_IMEM_SIZE -#define RK312X_ROM_PHYS RK3036_ROM_PHYS -#define RK312X_ROM_SIZE RK3036_ROM_SIZE -#define RK312X_CPU_AXI_BUS_PHYS RK3036_CPU_AXI_BUS_PHYS -#define RK312X_CPU_AXI_BUS_SIZE RK3036_CPU_AXI_BUS_SIZE -#define RK312X_GIC_DIST_PHYS RK3036_GIC_DIST_PHYS -#define RK312X_GIC_DIST_SIZE RK3036_GIC_DIST_SIZE -#define RK312X_GIC_CPU_PHYS RK3036_GIC_CPU_PHYS -#define RK312X_GIC_CPU_SIZE RK3036_GIC_CPU_SIZE -#define RK312X_CRU_PHYS RK3036_CRU_PHYS -#define RK312X_CRU_SIZE RK3036_CRU_SIZE -#define RK312X_DDR_PCTL_PHYS RK3036_DDR_PCTL_PHYS -#define RK312X_DDR_PCTL_SIZE RK3036_DDR_PCTL_SIZE -#define RK312X_GRF_PHYS RK3036_GRF_PHYS -#define RK312X_GRF_SIZE RK3036_GRF_SIZE -#define RK312X_DDR_PHY_PHYS RK3036_DDR_PHY_PHYS -#define RK312X_DDR_PHY_SIZE RK3036_DDR_PHY_SIZE -#define RK312X_TIMER_PHYS RK3036_TIMER_PHYS -#define RK312X_TIMER_SIZE RK3036_TIMER_SIZE -#define RK312X_UART0_PHYS RK3036_UART0_PHYS -#define RK312X_UART1_PHYS RK3036_UART1_PHYS -#define RK312X_UART2_PHYS RK3036_UART2_PHYS -#define RK312X_UART_SIZE RK3036_UART_SIZE -#define RK312X_GPIO0_PHYS RK3036_GPIO0_PHYS -#define RK312X_GPIO1_PHYS RK3036_GPIO1_PHYS -#define RK312X_GPIO2_PHYS RK3036_GPIO2_PHYS -#define RK312X_GPIO3_PHYS 0x20088000 -#define RK312X_GPIO_SIZE RK3036_GPIO_SIZE -#define RK312X_EFUSE_PHYS RK3036_EFUSE_PHYS -#define RK312X_EFUSE_SIZE RK3036_EFUSE_SIZE -#define RK312X_PMU_PHYS 0x100a0000 -#define RK312X_PMU_SIZE SZ_64K -#define RK312X_PWM_PHYS 0x20050000 -#define RK312X_PWM_SIZE SZ_16K - -#define RK3228_IMEM_PHYS RK3036_IMEM_PHYS -#define RK3228_IMEM_SIZE SZ_32K -#define RK3228_ROM_PHYS RK3036_ROM_PHYS -#define RK3228_ROM_SIZE RK3036_ROM_SIZE -#define RK3228_CPU_AXI_BUS_PHYS 0x31000000 -#define RK3228_CPU_AXI_BUS_SIZE SZ_32K -#define RK3228_GIC_DIST_PHYS 0x32011000 -#define RK3228_GIC_DIST_SIZE SZ_4K -#define RK3228_GIC_CPU_PHYS 0x32012000 -#define RK3228_GIC_CPU_SIZE SZ_4K -#define RK3228_CRU_PHYS 0x110e0000 -#define RK3228_CRU_SIZE SZ_4K -#define RK3228_DDR_PCTL_PHYS 0x11200000 -#define RK3228_DDR_PCTL_SIZE SZ_4K -#define RK3228_GRF_PHYS 0x11000000 -#define RK3228_GRF_SIZE SZ_4K -#define RK3228_SGRF_PHYS 0x10140000 -#define RK3228_SGRF_SIZE SZ_4K -#define RK3228_DDR_PHY_PHYS 0x12000000 -#define RK3228_DDR_PHY_SIZE SZ_4K -#define RK3228_TIMER_PHYS 0x110c0000 -#define RK3228_TIMER_SIZE SZ_4K -#define RK3228_STIMER_PHYS 0x110d0000 -#define RK3228_STIMER_SIZE SZ_4K -#define RK3228_UART0_PHYS 0x11010000 -#define RK3228_UART1_PHYS 0x11020000 -#define RK3228_UART2_PHYS 0x11030000 -#define RK3228_UART_SIZE SZ_4K -#define RK3228_GPIO0_PHYS 0x11110000 -#define RK3228_GPIO1_PHYS 0x11120000 -#define RK3228_GPIO2_PHYS 0x11130000 -#define RK3228_GPIO3_PHYS 0x11140000 -#define RK3228_GPIO_SIZE SZ_4K -#define RK3228_EFUSE_PHYS 0x11040000 -#define RK3228_EFUSE_SIZE SZ_4K -#define RK3228_PWM_PHYS 0x110b0000 -#define RK3228_PWM_SIZE SZ_16K - -#endif diff --git a/net/rfkill/rfkill-wlan.c b/net/rfkill/rfkill-wlan.c index dc4312068a1c..416af40fed80 100644 --- a/net/rfkill/rfkill-wlan.c +++ b/net/rfkill/rfkill-wlan.c @@ -31,7 +31,6 @@ #include <linux/proc_fs.h> #include <linux/uaccess.h> #include <linux/gpio.h> -#include <linux/rockchip/iomap.h> #include <dt-bindings/gpio/gpio.h> #include <linux/skbuff.h> #include <linux/fb.h> |