Commit 599fb2ab authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.1/amd_sfh' into for-linus 

- reduce verbosity of amd_sfh driver (Basavaraj Natikar)
- better handling of devices with SFH1.1 (Basavaraj Natikar)
parents b320467e 68266bdc

drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c

+5 −3
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ static int amd_sfh1_1_hid_client_init(struct amd_mp2_dev *privdata) 
	amd_sfh1_1_set_desc_ops(mp2_ops);



	cl_data->num_hid_devices = amd_sfh_get_sensor_num(privdata, &cl_data->sensor_idx[0]);

	if (cl_data->num_hid_devices == 0)

		return -ENODEV;



	INIT_DELAYED_WORK(&cl_data->work, amd_sfh_work);

	INIT_DELAYED_WORK(&cl_data->work_buffer, amd_sfh_work_buffer);
@@ -286,13 +288,13 @@ int amd_sfh1_1_init(struct amd_mp2_dev *mp2) 


	phy_base <<= 21;

	if (!devm_request_mem_region(dev, phy_base, 128 * 1024, "amd_sfh")) {

		dev_err(dev, "can't reserve mmio registers\n");

		dev_dbg(dev, "can't reserve mmio registers\n");

		return -ENOMEM;

	}



	mp2->vsbase = devm_ioremap(dev, phy_base, 128 * 1024);

	if (!mp2->vsbase) {

		dev_err(dev, "failed to remap vsbase\n");

		dev_dbg(dev, "failed to remap vsbase\n");

		return -ENOMEM;

	}
@@ -301,7 +303,7 @@ int amd_sfh1_1_init(struct amd_mp2_dev *mp2) 


	memcpy_fromio(&binfo, mp2->vsbase, sizeof(struct sfh_base_info));

	if (binfo.sbase.fw_info.fw_ver == 0 || binfo.sbase.s_list.sl.sensors == 0) {

		dev_err(dev, "failed to get sensors\n");

		dev_dbg(dev, "failed to get sensors\n");

		return -EOPNOTSUPP;

	}

	dev_dbg(dev, "firmware version 0x%x\n", binfo.sbase.fw_info.fw_ver);