Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53a321ea authored by Matt Wagantall's avatar Matt Wagantall
Browse files

soc: qcom: remove use of cpu_is_*() macros from all qcom drivers 



These macros are left over from legacy targets which are no longer
supported by the current kernel.  Remove their use.

Change-Id: Iffe6ef1186ece67d925087aae0dc1014f68a6ee2
Signed-off-by: default avatarMatt Wagantall <mattw@codeaurora.org>
parent 60389836

drivers/char/diag/diagfwd.c

+1 −4
Original line number Diff line number Diff line
@@ -167,9 +167,6 @@ int chk_apps_master(void) 
{

	if (driver->use_device_tree)

		return 1;

	else if (soc_class_is_msm8960() || soc_class_is_msm8930() ||

		 soc_class_is_apq8064() || cpu_is_msm9615())

		return 1;

	else

		return 0;

}
@@ -804,7 +801,7 @@ int diag_process_apps_pkt(unsigned char *buf, int len) 
		return len;

	}

	/* Check for download command */

	else if ((cpu_is_msm8x60() || chk_apps_master()) && (*buf == 0x3A)) {

	else if ((chk_apps_master()) && (*buf == 0x3A)) {

		/* send response back */

		driver->apps_rsp_buf[0] = *buf;

		diag_send_rsp(driver->apps_rsp_buf, 1);

drivers/gpu/drm/msm/adreno/adreno_device.c

+0 −40
Original line number Diff line number Diff line
@@ -187,46 +187,6 @@ static int adreno_bind(struct device *dev, struct device *master, void *data) 
#else

	struct kgsl_device_platform_data *pdata = dev->platform_data;

	uint32_t version = socinfo_get_version();

	if (cpu_is_apq8064ab()) {

		config.fast_rate = 450000000;

		config.slow_rate = 27000000;

		config.bus_freq  = 4;

		config.rev = ADRENO_REV(3, 2, 1, 0);

	} else if (cpu_is_apq8064()) {

		config.fast_rate = 400000000;

		config.slow_rate = 27000000;

		config.bus_freq  = 4;



		if (SOCINFO_VERSION_MAJOR(version) == 2)

			config.rev = ADRENO_REV(3, 2, 0, 2);

		else if ((SOCINFO_VERSION_MAJOR(version) == 1) &&

				(SOCINFO_VERSION_MINOR(version) == 1))

			config.rev = ADRENO_REV(3, 2, 0, 1);

		else

			config.rev = ADRENO_REV(3, 2, 0, 0);



	} else if (cpu_is_msm8960ab()) {

		config.fast_rate = 400000000;

		config.slow_rate = 320000000;

		config.bus_freq  = 4;



		if (SOCINFO_VERSION_MINOR(version) == 0)

			config.rev = ADRENO_REV(3, 2, 1, 0);

		else

			config.rev = ADRENO_REV(3, 2, 1, 1);



	} else if (cpu_is_msm8930()) {

		config.fast_rate = 400000000;

		config.slow_rate = 27000000;

		config.bus_freq  = 3;



		if ((SOCINFO_VERSION_MAJOR(version) == 1) &&

			(SOCINFO_VERSION_MINOR(version) == 2))

			config.rev = ADRENO_REV(3, 0, 5, 2);

		else

			config.rev = ADRENO_REV(3, 0, 5, 0);



	}

#  ifdef CONFIG_MSM_BUS_SCALING

	config.bus_scale_table = pdata->bus_scale_table;

#  endif

drivers/gpu/drm/msm/hdmi/hdmi.c

+0 −42
Original line number Diff line number Diff line
@@ -325,48 +325,6 @@ static int hdmi_bind(struct device *dev, struct device *master, void *data) 
	static const char *hpd_clk_names[] = {

			"core_clk", "master_iface_clk", "slave_iface_clk",

	};

	if (cpu_is_apq8064()) {

		static const char *hpd_reg_names[] = {"8921_hdmi_mvs"};

		config.phy_init      = hdmi_phy_8960_init;

		config.mmio_name     = "hdmi_msm_hdmi_addr";

		config.hpd_reg_names = hpd_reg_names;

		config.hpd_reg_cnt   = ARRAY_SIZE(hpd_reg_names);

		config.hpd_clk_names = hpd_clk_names;

		config.hpd_clk_cnt   = ARRAY_SIZE(hpd_clk_names);

		config.ddc_clk_gpio  = 70;

		config.ddc_data_gpio = 71;

		config.hpd_gpio      = 72;

		config.mux_en_gpio   = -1;

		config.mux_sel_gpio  = -1;

	} else if (cpu_is_msm8960() || cpu_is_msm8960ab()) {

		static const char *hpd_reg_names[] = {"8921_hdmi_mvs"};

		config.phy_init      = hdmi_phy_8960_init;

		config.mmio_name     = "hdmi_msm_hdmi_addr";

		config.hpd_reg_names = hpd_reg_names;

		config.hpd_reg_cnt   = ARRAY_SIZE(hpd_reg_names);

		config.hpd_clk_names = hpd_clk_names;

		config.hpd_clk_cnt   = ARRAY_SIZE(hpd_clk_names);

		config.ddc_clk_gpio  = 100;

		config.ddc_data_gpio = 101;

		config.hpd_gpio      = 102;

		config.mux_en_gpio   = -1;

		config.mux_sel_gpio  = -1;

	} else if (cpu_is_msm8x60()) {

		static const char *hpd_reg_names[] = {

				"8901_hdmi_mvs", "8901_mpp0"

		};

		config.phy_init      = hdmi_phy_8x60_init;

		config.mmio_name     = "hdmi_msm_hdmi_addr";

		config.hpd_reg_names = hpd_reg_names;

		config.hpd_reg_cnt   = ARRAY_SIZE(hpd_reg_names);

		config.hpd_clk_names = hpd_clk_names;

		config.hpd_clk_cnt   = ARRAY_SIZE(hpd_clk_names);

		config.ddc_clk_gpio  = 170;

		config.ddc_data_gpio = 171;

		config.hpd_gpio      = 172;

		config.mux_en_gpio   = -1;

		config.mux_sel_gpio  = -1;

	}

#endif

	dev->platform_data = &config;

	set_hdmi_pdev(dev_get_drvdata(master), to_platform_device(dev));

drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c

+1 −4
Original line number Diff line number Diff line
@@ -495,9 +495,6 @@ static struct mdp4_platform_config *mdp4_get_config(struct platform_device *dev) 
	config.max_clk = 266667000;

	config.iommu = iommu_domain_alloc(&platform_bus_type);

#else

	if (cpu_is_apq8064())

		config.max_clk = 266667000;

	else

	config.max_clk = 200000000;



	config.iommu = msm_get_iommu_domain(DISPLAY_READ_DOMAIN);

drivers/misc/qcom/qdsp6v2/audio_multi_aac.c

+6 −8
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
 *

 * Copyright (C) 2008 Google, Inc.

 * Copyright (C) 2008 HTC Corporation

 * Copyright (c) 2011-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2011-2015, The Linux Foundation. All rights reserved.

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and
@@ -108,14 +108,12 @@ static long audio_ioctl_shared(struct file *file, unsigned int cmd, 
			pr_err("cmd media format block failed\n");

			break;

		}

		if (!cpu_is_msm8x60()) {

		rc = q6asm_set_encdec_chan_map(audio->ac, 2);

		if (rc < 0) {

			pr_err("%s: cmd set encdec_chan_map failed\n",

				__func__);

			break;

		}

		}

		rc = audio_aio_enable(audio);

		audio->eos_rsp = 0;

		audio->eos_flag = 0;