Commit 0300e6d6 authored by Brady Norander's avatar Brady Norander Committed by Alex Deucher
Browse files

drm/amdgpu: use static ids for ACP platform devs 



mfd_add_hotplug_devices() assigns child platform devices with
PLATFORM_DEVID_AUTO, but the ACP machine drivers expect the platform
device names to never change. Use mfd_add_devices() instead and give
each cell a unique id.

Signed-off-by: default avatarBrady Norander <bradynorander@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c8e7e3c2

drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c

+8 −2
Original line number Diff line number Diff line
@@ -302,17 +302,19 @@ static int acp_hw_init(struct amdgpu_ip_block *ip_block) 
		adev->acp.acp_res[2].end = adev->acp.acp_res[2].start;



		adev->acp.acp_cell[0].name = "acp_audio_dma";

		adev->acp.acp_cell[0].id = 0;

		adev->acp.acp_cell[0].num_resources = 3;

		adev->acp.acp_cell[0].resources = &adev->acp.acp_res[0];

		adev->acp.acp_cell[0].platform_data = &adev->asic_type;

		adev->acp.acp_cell[0].pdata_size = sizeof(adev->asic_type);



		adev->acp.acp_cell[1].name = "designware-i2s";

		adev->acp.acp_cell[1].id = 1;

		adev->acp.acp_cell[1].num_resources = 1;

		adev->acp.acp_cell[1].resources = &adev->acp.acp_res[1];

		adev->acp.acp_cell[1].platform_data = &i2s_pdata[0];

		adev->acp.acp_cell[1].pdata_size = sizeof(struct i2s_platform_data);

		r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell, 2);

		r = mfd_add_devices(adev->acp.parent, 0, adev->acp.acp_cell, 2, NULL, 0, NULL);

		if (r)

			goto failure;

		r = device_for_each_child(adev->acp.parent, &adev->acp.acp_genpd->gpd,
@@ -410,30 +412,34 @@ static int acp_hw_init(struct amdgpu_ip_block *ip_block) 
		adev->acp.acp_res[4].end = adev->acp.acp_res[4].start;



		adev->acp.acp_cell[0].name = "acp_audio_dma";

		adev->acp.acp_cell[0].id = 0;

		adev->acp.acp_cell[0].num_resources = 5;

		adev->acp.acp_cell[0].resources = &adev->acp.acp_res[0];

		adev->acp.acp_cell[0].platform_data = &adev->asic_type;

		adev->acp.acp_cell[0].pdata_size = sizeof(adev->asic_type);



		adev->acp.acp_cell[1].name = "designware-i2s";

		adev->acp.acp_cell[1].id = 1;

		adev->acp.acp_cell[1].num_resources = 1;

		adev->acp.acp_cell[1].resources = &adev->acp.acp_res[1];

		adev->acp.acp_cell[1].platform_data = &i2s_pdata[0];

		adev->acp.acp_cell[1].pdata_size = sizeof(struct i2s_platform_data);



		adev->acp.acp_cell[2].name = "designware-i2s";

		adev->acp.acp_cell[2].id = 2;

		adev->acp.acp_cell[2].num_resources = 1;

		adev->acp.acp_cell[2].resources = &adev->acp.acp_res[2];

		adev->acp.acp_cell[2].platform_data = &i2s_pdata[1];

		adev->acp.acp_cell[2].pdata_size = sizeof(struct i2s_platform_data);



		adev->acp.acp_cell[3].name = "designware-i2s";

		adev->acp.acp_cell[3].id = 3;

		adev->acp.acp_cell[3].num_resources = 1;

		adev->acp.acp_cell[3].resources = &adev->acp.acp_res[3];

		adev->acp.acp_cell[3].platform_data = &i2s_pdata[2];

		adev->acp.acp_cell[3].pdata_size = sizeof(struct i2s_platform_data);



		r = mfd_add_hotplug_devices(adev->acp.parent, adev->acp.acp_cell, ACP_DEVS);

		r = mfd_add_devices(adev->acp.parent, 0, adev->acp.acp_cell, ACP_DEVS, NULL, 0, NULL);

		if (r)

			goto failure;