Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Swap DT aliases from underscore to hyphen. #5662

Merged
merged 4 commits into from
Oct 19, 2023
Merged

Swap DT aliases from underscore to hyphen. #5662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e12390b
drm/connector: Change DRM card alias from underscore to hyphen
6by9 Oct 19, 2023
d5a4a77
dt: Alter alias names from _ to - for drm_dsiN
6by9 Oct 19, 2023
79b9f4f
drm/fb_helper: Change query for FB designation from drm_fb to drm-fb
6by9 Oct 19, 2023
e60fe38
dt: Alter alias names from _ to - for drm_fbN_* overrides
6by9 Oct 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions arch/arm/boot/dts/bcm2712-rpi-5-b.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -787,8 +787,8 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
gpio4 = &pinctrl_aon;
usb0 = &rp1_usb0;
usb1 = &rp1_usb1;
drm_dsi1 = &dsi0;
drm_dsi2 = &dsi1;
drm-dsi1 = &dsi0;
drm-dsi2 = &dsi1;
};

__overrides__ {
Expand Down Expand Up @@ -824,17 +824,17 @@ spi10_cs_pins: &spi10_cs_gpio1 {};
act_led_trigger = <&act_led>, "linux,default-trigger";
pwr_led_activelow = <&pwr_led>, "gpios:8";
pwr_led_trigger = <&pwr_led>, "linux,default-trigger";
drm_fb0_rp1_dsi0 = <&aliases>, "drm_fb0=",&dsi0;
drm_fb0_rp1_dsi1 = <&aliases>, "drm_fb0=",&dsi1;
drm_fb0_rp1_dpi = <&aliases>, "drm_fb0=",&dpi;
drm_fb0_vc4 = <&aliases>, "drm_fb0=",&vc4;
drm_fb1_rp1_dsi0 = <&aliases>, "drm_fb1=",&dsi0;
drm_fb1_rp1_dsi1 = <&aliases>, "drm_fb1=",&dsi1;
drm_fb1_rp1_dpi = <&aliases>, "drm_fb1=",&dpi;
drm_fb1_vc4 = <&aliases>, "drm_fb1=",&vc4;
drm_fb2_rp1_dsi0 = <&aliases>, "drm_fb2=",&dsi0;
drm_fb2_rp1_dsi1 = <&aliases>, "drm_fb2=",&dsi1;
drm_fb2_rp1_dpi = <&aliases>, "drm_fb2=",&dpi;
drm_fb2_vc4 = <&aliases>, "drm_fb2=",&vc4;
drm_fb0_rp1_dsi0 = <&aliases>, "drm-fb0=",&dsi0;
drm_fb0_rp1_dsi1 = <&aliases>, "drm-fb0=",&dsi1;
drm_fb0_rp1_dpi = <&aliases>, "drm-fb0=",&dpi;
drm_fb0_vc4 = <&aliases>, "drm-fb0=",&vc4;
drm_fb1_rp1_dsi0 = <&aliases>, "drm-fb1=",&dsi0;
drm_fb1_rp1_dsi1 = <&aliases>, "drm-fb1=",&dsi1;
drm_fb1_rp1_dpi = <&aliases>, "drm-fb1=",&dpi;
drm_fb1_vc4 = <&aliases>, "drm-fb1=",&vc4;
drm_fb2_rp1_dsi0 = <&aliases>, "drm-fb2=",&dsi0;
drm_fb2_rp1_dsi1 = <&aliases>, "drm-fb2=",&dsi1;
drm_fb2_rp1_dpi = <&aliases>, "drm-fb2=",&dpi;
drm_fb2_vc4 = <&aliases>, "drm-fb2=",&vc4;
};
};
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_connector.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ static struct drm_conn_prop_enum_list drm_connector_enum_list[] = {
};

#define MAX_DT_NODE_NAME_LEN 20
#define DT_DRM_NODE_PREFIX "drm_"
#define DT_DRM_NODE_PREFIX "drm-"

static void drm_connector_get_of_name(int type, char *node_name, int length)
{
Expand Down
4 changes: 2 additions & 2 deletions drivers/gpu/drm/drm_fb_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1967,11 +1967,11 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper,
* register the fbdev emulation instance in kernel_fb_helper_list. */
mutex_unlock(&fb_helper->lock);

id = of_alias_get_highest_id("drm_fb");
id = of_alias_get_highest_id("drm-fb");
if (id >= 0)
fb_set_lowest_dynamic_fb(id + 1);

id = of_alias_get_id(dev->dev->of_node, "drm_fb");
id = of_alias_get_id(dev->dev->of_node, "drm-fb");
if (id >= 0) {
info->node = id;
info->custom_fb_num = true;
Expand Down
Loading