ARM i.MX: get rid of imx-regs.h
- remove now unused __REG definitions - include individual SoC register files instead of imx-regs.h - move IMX_GPIO_NR to generic.h - finally remove imx-regs.h Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer
parent
ee372b8f28
commit
b1b76f6027
|
|
@ -23,7 +23,7 @@
|
|||
#include <net.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx51-regs.h>
|
||||
#include <fec.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <asm/armlinux.h>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <init.h>
|
||||
#include <mci.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx51-regs.h>
|
||||
#include <mach/iomux-mx51.h>
|
||||
#include <mach/devices-imx51.h>
|
||||
#include <generated/mach-types.h>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
#include <init.h>
|
||||
#include <driver.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <asm/barebox-arm.h>
|
||||
#include <asm-generic/sections.h>
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <mach/imx-flash-header.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
||||
void __naked __flash_header_start go(void)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <io.h>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <net.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <fec.h>
|
||||
#include <notifier.h>
|
||||
#include <mach/gpio.h>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include <config.h>
|
||||
#include <asm-generic/memory_layout.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
|
||||
#include <mach/gpio.h>
|
||||
#include <mach/imx-nand.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <mach/iomux-mx35.h>
|
||||
#include <mach/iomux-v3.h>
|
||||
#include <mach/imx-ipu-fb.h>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include <common.h>
|
||||
#include <mach/imx-flash-header.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
||||
void __naked __flash_header_start go(void)
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <asm/cache-l2x0.h>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <net.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx51-regs.h>
|
||||
#include <fec.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <asm/armlinux.h>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <init.h>
|
||||
#include <driver.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <asm-generic/sections.h>
|
||||
#include <asm/barebox-arm.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
|
||||
#include <asm-generic/memory_layout.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
#include <mach/gpio.h>
|
||||
#include <mach/weim.h>
|
||||
#include <mach/imx-nand.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <mach/iomux-mx35.h>
|
||||
#include <mach/iomux-v3.h>
|
||||
#include <mach/imx-ipu-fb.h>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
#include <common.h>
|
||||
#include <mach/imx-flash-header.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
||||
void __naked __flash_header_start go(void)
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <asm/cache-l2x0.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx51-regs.h>
|
||||
#include <fec.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <asm/armlinux.h>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <generated/mach-types.h>
|
||||
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx53-regs.h>
|
||||
#include <mach/iomux-mx53.h>
|
||||
#include <mach/devices-imx53.h>
|
||||
#include <mach/generic.h>
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
|
||||
#include <generated/mach-types.h>
|
||||
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx53-regs.h>
|
||||
#include <mach/iomux-mx53.h>
|
||||
#include <mach/devices-imx53.h>
|
||||
#include <mach/generic.h>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx6-regs.h>
|
||||
#include <fec.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <asm/armlinux.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx6-regs.h>
|
||||
#include <fec.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <asm/armlinux.h>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
#include <driver.h>
|
||||
#include <environment.h>
|
||||
#include <fs.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <io.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <asm/cache-l2x0.h>
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
|
||||
#include <mach/gpio.h>
|
||||
#include <mach/spi.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/iomux-mx27.h>
|
||||
#include <mach/imx-nand.h>
|
||||
#include <mach/imx-pll.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <asm/cache-l2x0.h>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
#include <config.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <linux/linkage.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <net.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx21-regs.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <asm-generic/sections.h>
|
||||
#include <asm/barebox-arm.h>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
#include <config.h>
|
||||
#include <asm-generic/memory_layout.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx21-regs.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
||||
.section ".text_bare_init","ax"
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <net.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <io.h>
|
||||
#include <fec.h>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
||||
#define writel(val, reg) \
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#include <init.h>
|
||||
#include <driver.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <asm-generic/sections.h>
|
||||
#include <asm/barebox-arm.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <io.h>
|
||||
#include <mach/imx-nand.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx51-regs.h>
|
||||
#include <fec.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <asm/armlinux.h>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
|
||||
#include <generated/mach-types.h>
|
||||
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx53-regs.h>
|
||||
#include <mach/iomux-mx53.h>
|
||||
#include <mach/devices-imx53.h>
|
||||
#include <mach/generic.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx31-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
#include <mach/esdctl.h>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
#include <fs.h>
|
||||
#include <environment.h>
|
||||
#include <usb/ulpi.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx31-regs.h>
|
||||
#include <mach/iomux-mx31.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <asm-generic/sections.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <io.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <net.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <fec.h>
|
||||
#include <notifier.h>
|
||||
#include <mach/gpio.h>
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <init.h>
|
||||
#include <sizes.h>
|
||||
#include <platform_ide.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/iomux-mx27.h>
|
||||
#include <mach/weim.h>
|
||||
#include <mach/gpio.h>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
*/
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <mach/esdctl.h>
|
||||
#include <asm/cache-l2x0.h>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include <environment.h>
|
||||
#include <fs.h>
|
||||
#include <sizes.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <io.h>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
#include <config.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/imx-pll.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
#include <net.h>
|
||||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <fec.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <asm/armlinux.h>
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
* GNU General Public License for more details.
|
||||
*/
|
||||
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx1-regs.h>
|
||||
#include <asm/barebox-arm-head.h>
|
||||
|
||||
#define CPU200
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
#include <init.h>
|
||||
#include <environment.h>
|
||||
#include <generated/mach-types.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx1-regs.h>
|
||||
#include <asm/armlinux.h>
|
||||
#include <mach/gpio.h>
|
||||
#include <mach/weim.h>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
#include <asm/mmu.h>
|
||||
#include <generated/mach-types.h>
|
||||
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx53-regs.h>
|
||||
#include <mach/iomux-mx53.h>
|
||||
#include <mach/devices-imx53.h>
|
||||
#include <mach/generic.h>
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@
|
|||
#include <io.h>
|
||||
#include <linux/clkdev.h>
|
||||
#include <linux/err.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx51-regs.h>
|
||||
#include <mach/imx53-regs.h>
|
||||
|
||||
#include "clk.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#include <io.h>
|
||||
#include <linux/clkdev.h>
|
||||
#include <linux/err.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <malloc.h>
|
||||
#include <asm-generic/div64.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
#include <io.h>
|
||||
#include <linux/clkdev.h>
|
||||
#include <linux/err.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <malloc.h>
|
||||
#include <clock.h>
|
||||
#include <asm-generic/div64.h>
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@
|
|||
#include <linux/clk.h>
|
||||
#include <linux/err.h>
|
||||
#include <notifier.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <io.h>
|
||||
|
||||
/* Part 1: Registers */
|
||||
|
|
|
|||
|
|
@ -17,7 +17,11 @@
|
|||
#include <linux/mtd/nand.h>
|
||||
#include <mach/imx-nand.h>
|
||||
#include <mach/generic.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx21-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/imx31-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
|
||||
static void __bare_init noinline imx_nandboot_wait_op_done(void *regs)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@
|
|||
#include <common.h>
|
||||
#include <errno.h>
|
||||
#include <io.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <gpio.h>
|
||||
#include <init.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <io.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx1-regs.h>
|
||||
#include <mach/weim.h>
|
||||
#include <mach/iomux-v1.h>
|
||||
#include <reset_source.h>
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <io.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx21-regs.h>
|
||||
#include <mach/weim.h>
|
||||
#include <mach/iomux-v1.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <mach/iim.h>
|
||||
#include <io.h>
|
||||
#include <mach/weim.h>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
#include <init.h>
|
||||
#include <sizes.h>
|
||||
#include <io.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx31-regs.h>
|
||||
#include <mach/weim.h>
|
||||
|
||||
void imx31_setup_weimcs(size_t cs, unsigned upper, unsigned lower,
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@
|
|||
#include <init.h>
|
||||
#include <io.h>
|
||||
#include <mach/weim.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <mach/iim.h>
|
||||
#include <mach/revision.h>
|
||||
#include <mach/generic.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <environment.h>
|
||||
#include <io.h>
|
||||
#include <mach/imx5.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx51-regs.h>
|
||||
#include <mach/revision.h>
|
||||
#include <mach/clock-imx51_53.h>
|
||||
#include <mach/generic.h>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
#include <notifier.h>
|
||||
#include <sizes.h>
|
||||
#include <mach/imx5.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx53-regs.h>
|
||||
#include <mach/revision.h>
|
||||
#include <mach/clock-imx51_53.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx31-regs.h>
|
||||
#include <mach/devices.h>
|
||||
|
||||
static inline struct device_d *imx31_add_spi0(struct spi_imx_master *pdata)
|
||||
|
|
|
|||
|
|
@ -19,6 +19,10 @@ int imx_25_35_boot_save_loc(unsigned int ctrl, unsigned int type);
|
|||
void imx_27_boot_save_loc(void __iomem *sysctrl_base);
|
||||
int imx51_boot_save_loc(void __iomem *src_base);
|
||||
|
||||
/* There's a off-by-one betweem the gpio bank number and the gpiochip */
|
||||
/* range e.g. GPIO_1_5 is gpio 5 under linux */
|
||||
#define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr))
|
||||
|
||||
#ifdef CONFIG_ARCH_IMX1
|
||||
#define cpu_is_mx1() (1)
|
||||
#else
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
/*
|
||||
*
|
||||
* (c) 2007 Pengutronix, Sascha Hauer <s.hauer@pengutronix.de>
|
||||
*
|
||||
* See file CREDITS for list of people who contributed to this
|
||||
* project.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
*/
|
||||
|
||||
#ifndef _IMX_REGS_H
|
||||
#define _IMX_REGS_H
|
||||
|
||||
/* ------------------------------------------------------------------------
|
||||
* Motorola IMX system registers
|
||||
* ------------------------------------------------------------------------
|
||||
*/
|
||||
|
||||
# ifndef __ASSEMBLY__
|
||||
# define __REG(x) (*((volatile u32 *)(x)))
|
||||
# define __REG16(x) (*(volatile u16 *)(x))
|
||||
# define __REG2(x,y) (*(volatile u32 *)((u32)&__REG(x) + (y)))
|
||||
# else
|
||||
# define __REG(x) (x)
|
||||
# define __REG16(x) (x)
|
||||
# define __REG2(x,y) ((x)+(y))
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_ARCH_IMX1
|
||||
# include <mach/imx1-regs.h>
|
||||
#elif defined CONFIG_ARCH_IMX21
|
||||
# include <mach/imx21-regs.h>
|
||||
#elif defined CONFIG_ARCH_IMX27
|
||||
# include <mach/imx27-regs.h>
|
||||
#elif defined CONFIG_ARCH_IMX31
|
||||
# include <mach/imx31-regs.h>
|
||||
#elif defined CONFIG_ARCH_IMX35
|
||||
# include <mach/imx35-regs.h>
|
||||
#elif defined CONFIG_ARCH_IMX25
|
||||
# include <mach/imx25-regs.h>
|
||||
#elif defined CONFIG_ARCH_IMX51
|
||||
# include <mach/imx51-regs.h>
|
||||
#elif defined CONFIG_ARCH_IMX53
|
||||
# include <mach/imx53-regs.h>
|
||||
#elif defined CONFIG_ARCH_IMX6
|
||||
# include <mach/imx6-regs.h>
|
||||
#else
|
||||
# error "unknown i.MX soc type"
|
||||
#endif
|
||||
|
||||
/* There's a off-by-one betweem the gpio bank number and the gpiochip */
|
||||
/* range e.g. GPIO_1_5 is gpio 5 under linux */
|
||||
#define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr))
|
||||
|
||||
#endif /* _IMX_REGS_H */
|
||||
|
|
@ -18,7 +18,6 @@
|
|||
#include <init.h>
|
||||
#include <io.h>
|
||||
#include <mach/iomux-v3.h>
|
||||
#include <mach/imx-regs.h>
|
||||
|
||||
static void __iomem *base;
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,10 @@
|
|||
|
||||
#include <common.h>
|
||||
#include <mach/generic.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx21-regs.h>
|
||||
#include <mach/imx25-regs.h>
|
||||
#include <mach/imx27-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <io.h>
|
||||
|
||||
#define RCSR_NFC_FMS (1 << 8)
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@
|
|||
#include <linux/mtd/nand.h>
|
||||
#include <mach/generic.h>
|
||||
#include <mach/imx-nand.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <io.h>
|
||||
#include <errno.h>
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
#include <asm/mmu.h>
|
||||
|
||||
#include <mach/generic.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/clock.h>
|
||||
#ifndef CONFIG_ARCH_MXS
|
||||
# include <mach/iim.h>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@
|
|||
*/
|
||||
|
||||
#include <common.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <driver.h>
|
||||
#include <init.h>
|
||||
#include <malloc.h>
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <io.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <mach/imx35-regs.h>
|
||||
#include <fb.h>
|
||||
#include <mach/imxfb.h>
|
||||
#include <malloc.h>
|
||||
|
|
|
|||
|
|
@ -24,7 +24,6 @@
|
|||
#include <init.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/err.h>
|
||||
#include <mach/imx-regs.h>
|
||||
#include <asm-generic/div64.h>
|
||||
|
||||
#define LCDC_SSA 0x00
|
||||
|
|
|
|||
Loading…
Reference in New Issue