ARM: AM33xx: Remove the unused voltagedomain data (63b0420c) · Commits · 戴 / test

arch/arm/mach-omap2/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -125,7 +125,6 @@ obj-$(CONFIG_ARCH_OMAP3) += voltagedomains3xxx_data.o
		obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common)
		obj-$(CONFIG_ARCH_OMAP4) += voltagedomains44xx_data.o
		obj-$(CONFIG_SOC_AM33XX) += $(voltagedomain-common)
		obj-$(CONFIG_SOC_AM33XX) += voltagedomains33xx_data.o
		obj-$(CONFIG_SOC_OMAP5) += $(voltagedomain-common)

		# OMAP powerdomain framework

+0 −1

Original line number	Diff line number	Diff line
		@@ -577,7 +577,6 @@ void __init am33xx_init_early(void)
		omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE), NULL);
		omap3xxx_check_revision();
		ti81xx_check_features();
		am33xx_voltagedomains_init();
		am33xx_powerdomains_init();
		am33xx_clockdomains_init();
		am33xx_hwmod_init();

+7 −0

Original line number	Diff line number	Diff line
		@@ -320,6 +320,12 @@ static int am33xx_pwrdm_wait_transition(struct powerdomain *pwrdm)
		return 0;
		}

		static int am33xx_check_vcvp(void)
		{
		/* No VC/VP on am33xx devices */
		return 0;
		}

		struct pwrdm_ops am33xx_pwrdm_operations = {
		.pwrdm_set_next_pwrst = am33xx_pwrdm_set_next_pwrst,
		.pwrdm_read_next_pwrst = am33xx_pwrdm_read_next_pwrst,
		@@ -335,4 +341,5 @@ struct pwrdm_ops am33xx_pwrdm_operations = {
		.pwrdm_set_mem_onst = am33xx_pwrdm_set_mem_onst,
		.pwrdm_set_mem_retst = am33xx_pwrdm_set_mem_retst,
		.pwrdm_wait_transition = am33xx_pwrdm_wait_transition,
		.pwrdm_has_voltdm = am33xx_check_vcvp,
		};

+0 −1

Original line number	Diff line number	Diff line
		@@ -169,7 +169,6 @@ int omap_voltage_late_init(void);

		extern void omap2xxx_voltagedomains_init(void);
		extern void omap3xxx_voltagedomains_init(void);
		extern void am33xx_voltagedomains_init(void);
		extern void omap44xx_voltagedomains_init(void);

		struct voltagedomain voltdm_lookup(const char name);

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		/*
		* AM33XX voltage domain data
		*
		* Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
		*
		* 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 version 2.
		*
		* This program is distributed "as is" WITHOUT ANY WARRANTY of any
		* kind, whether express or implied; without even the implied warranty
		* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*/

		#include <linux/kernel.h>
		#include <linux/init.h>

		#include "voltage.h"

		static struct voltagedomain am33xx_voltdm_mpu = {
		.name = "mpu",
		};

		static struct voltagedomain am33xx_voltdm_core = {
		.name = "core",
		};

		static struct voltagedomain am33xx_voltdm_rtc = {
		.name = "rtc",
		};

		static struct voltagedomain *voltagedomains_am33xx[] __initdata = {
		&am33xx_voltdm_mpu,
		&am33xx_voltdm_core,
		&am33xx_voltdm_rtc,
		NULL,
		};

		void __init am33xx_voltagedomains_init(void)
		{
		voltdm_init(voltagedomains_am33xx);
		}