ARM: mx25: Print silicon revision on boot (d27536c6) · Commits · e / devices / android_kernel_teracube_2e

arch/arm/mach-imx/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@ obj-$(CONFIG_IMX_HAVE_DMA_V1) += dma-v1.o
		obj-$(CONFIG_ARCH_MX1) += clock-imx1.o mm-imx1.o
		obj-$(CONFIG_MACH_MX21) += clock-imx21.o mm-imx21.o

		obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o
		obj-$(CONFIG_ARCH_MX25) += clock-imx25.o mm-imx25.o ehci-imx25.o cpu-imx25.o

		obj-$(CONFIG_MACH_MX27) += cpu-imx27.o pm-imx27.o
		obj-$(CONFIG_MACH_MX27) += clock-imx27.o mm-imx27.o ehci-imx27.o

+6 −0

Original line number	Diff line number	Diff line
		@@ -263,6 +263,7 @@ DEFINE_CLOCK(audmux_clk, 0, CCM_CGCR1, 0, NULL, NULL, NULL);
		DEFINE_CLOCK(csi_clk, 0, CCM_CGCR1, 4, get_rate_csi, NULL, &csi_per_clk);
		DEFINE_CLOCK(can1_clk, 0, CCM_CGCR1, 2, get_rate_ipg, NULL, NULL);
		DEFINE_CLOCK(can2_clk, 1, CCM_CGCR1, 3, get_rate_ipg, NULL, NULL);
		DEFINE_CLOCK(iim_clk, 0, CCM_CGCR1, 26, NULL, NULL, NULL);

		#define _REGISTER_CLOCK(d, n, c) \
		{ \
		@@ -310,6 +311,7 @@ static struct clk_lookup lookups[] = {
		_REGISTER_CLOCK("flexcan.1", NULL, can2_clk)
		/* i.mx25 has the i.mx35 type sdma */
		_REGISTER_CLOCK("imx35-sdma", NULL, sdma_clk)
		_REGISTER_CLOCK(NULL, "iim", iim_clk)
		};

		int __init mx25_clocks_init(void)
		@@ -334,6 +336,10 @@ int __init mx25_clocks_init(void)
		/* Clock source for gpt is ahb_div */
		__raw_writel(__raw_readl(CRM_BASE+0x64) & ~(1 << 5), CRM_BASE + 0x64);

		clk_enable(&iim_clk);
		imx_print_silicon_rev("i.MX25", mx25_revision());
		clk_disable(&iim_clk);

		mxc_timer_init(&gpt_clk, MX25_IO_ADDRESS(MX25_GPT1_BASE_ADDR), 54);

		return 0;

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		/*
		* MX25 CPU type detection
		*
		* Copyright (c) 2009 Daniel Mack <daniel@caiaq.de>
		* Copyright (C) 2011 Freescale Semiconductor, Inc. All Rights Reserved
		*
		* 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.
		*/
		#include <linux/module.h>
		#include <linux/io.h>
		#include <mach/hardware.h>
		#include <mach/iim.h>

		static int mx25_cpu_rev = -1;

		static int mx25_read_cpu_rev(void)
		{
		u32 rev;

		rev = __raw_readl(MX25_IO_ADDRESS(MX25_IIM_BASE_ADDR + MXC_IIMSREV));
		switch (rev) {
		case 0x00:
		return IMX_CHIP_REVISION_1_0;
		case 0x01:
		return IMX_CHIP_REVISION_1_1;
		default:
		return IMX_CHIP_REVISION_UNKNOWN;
		}
		}

		int mx25_revision(void)
		{
		if (mx25_cpu_rev == -1)
		mx25_cpu_rev = mx25_read_cpu_rev();

		return mx25_cpu_rev;
		}
		EXPORT_SYMBOL(mx25_revision);

+4 −0