rockchip: video: Use ofnode_decode_display_timing() to parse timing
Subsystems (2)
PATCH 1/2 rockchip: video: Use ofnode_decode_display_timing() to parse timing
Use ofnode_decode_display_timing() instead of fdtdec_decode_display_timing() to parse display timing, so that we can support live DT.
---
drivers/video/rockchip/rk_lvds.c | 3 +-- drivers/video/rockchip/rk_mipi.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/video/rockchip/rk_lvds.c +1 -2
@@ -160,8 +160,7 @@ int rk_lvds_enable(struct udevice *dev, int panel_bpp,int rk_lvds_read_timing (struct udevice *dev,struct display_timing *timing) { -if (fdtdec_decode_display_timing - (gd->fdt_blob,dev_of_offset (dev),0 , timing)) { +if (ofnode_decode_display_timing (dev_ofnode (dev),0 , timing)) {debug ("%s: Failed to decode display timing\n" , __func__);return -EINVAL ; }
drivers/video/rockchip/rk_mipi.c +1 -2
@@ -29,8 +29,7 @@ int rk_mipi_read_timing(struct udevice *dev, {int ret; - ret =fdtdec_decode_display_timing (gd->fdt_blob,dev_of_offset (dev), -0 , timing); + ret =ofnode_decode_display_timing (dev_ofnode (dev),0 , timing);if (ret) {debug ("%s: Failed to decode display timing (ret=%d)\n" , __func__, ret);
Signature · 1 line
2.17.1
PATCH 2/2 rockchip: video: Convert to use APIs which support live DT
Use ofnode_ or dev_ APIs instead of fdt_ and fdtdec_ APIs so that the driver can support live DT.
---
drivers/video/rockchip/rk3288_mipi.c | 1 - drivers/video/rockchip/rk3399_mipi.c | 1 - drivers/video/rockchip/rk_edp.c | 2 +- drivers/video/rockchip/rk_lvds.c | 10 ++++------ drivers/video/rockchip/rk_mipi.c | 11 +++++------ 5 files changed, 10 insertions(+), 15 deletions(-)
drivers/video/rockchip/rk3288_mipi.c +0 -1
@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h"
drivers/video/rockchip/rk3399_mipi.c +0 -1
@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h"
drivers/video/rockchip/rk_edp.c +1 -1
@@ -995,7 +995,7 @@ static int rk_edp_ofdata_to_platdata(struct udevice *dev) {struct rk_edp_priv *priv =dev_get_priv (dev); - priv->regs = (struct rk3288_edp *)devfdt_get_addr (dev); + priv->regs =dev_read_addr_ptr (dev); priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF );return 0 ;
drivers/video/rockchip/rk_lvds.c +4 -6
@@ -171,13 +171,11 @@ int rk_lvds_read_timing(struct udevice *dev, struct display_timing *timing)static int rk_lvds_ofdata_to_platdata (struct udevice *dev) {struct rk_lvds_priv *priv =dev_get_priv (dev); -const void *blob = gd->fdt_blob; -int node =dev_of_offset (dev);int ret; - priv->regs = (void *)devfdt_get_addr (dev); + priv->regs =dev_read_addr_ptr (dev); priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); - ret =fdtdec_get_int (blob, node,"rockchip,output" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,output" ,-1 );if (ret !=-1 ) { priv->output = ret;debug ("LVDS output : %d\n" , ret);
@@ -186,7 +184,7 @@ static int rk_lvds_ofdata_to_platdata(struct udevice *dev) priv->output =LVDS_OUTPUT_RGB ; } - ret =fdtdec_get_int (blob, node,"rockchip,data-mapping" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,data-mapping" ,-1 );if (ret !=-1 ) { priv->format = ret;debug ("LVDS data-mapping : %d\n" , ret);
@@ -195,7 +193,7 @@ static int rk_lvds_ofdata_to_platdata(struct udevice *dev) priv->format =LVDS_FORMAT_JEIDA ; } - ret =fdtdec_get_int (blob, node,"rockchip,data-width" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,data-width" ,-1 );if (ret !=-1 ) {debug ("LVDS data-width : %d\n" , ret);if (ret ==24 ) {
drivers/video/rockchip/rk_mipi.c +5 -6
@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h"
@@ -76,7 +75,7 @@ static void rk_mipi_dsi_write(uintptr_t regs, u32 reg, u32 val)int rk_mipi_dsi_enable (struct udevice *dev,const struct display_timing *timing) { -int node, timing_node; +ofnode node, timing_node;int val;struct rk_mipi_priv *priv =dev_get_priv (dev);uintptr_t regs = priv->regs;
@@ -119,10 +118,10 @@ int rk_mipi_dsi_enable(struct udevice *dev,rk_mipi_dsi_write (regs,VID_PKT_SIZE ,0x4b0 );/* Set dpi color coding depth 24 bit */ - timing_node =fdt_subnode_offset (gd->fdt_blob,dev_of_offset (dev), -"display-timings" ); - node =fdt_first_subnode (gd->fdt_blob, timing_node); - val =fdtdec_get_int (gd->fdt_blob, node,"bits-per-pixel" ,-1 ); + timing_node =ofnode_find_subnode (dev->node,"display-timings" ); + node =ofnode_first_subnode (timing_node); + + val =ofnode_read_u32_default (node,"bits-per-pixel" ,-1 );switch (val) {case 16 :rk_mipi_dsi_write (regs,DPI_COLOR_CODING ,DPI_16BIT_CFG_1 );
Signature · 1 line
2.17.1
PATCH 2/2 rockchip: video: Convert to use APIs which support live DT
Hi Kever,
Quoted 58 lines · Kever Yang
Use
ofnode_ordev_APIs instead offdt_andfdtdec_APIs so that the driver can support live DT.Signed-off-by Kever Yang <[email protected]>---
drivers/video/rockchip/rk3288_mipi.c | 1 - drivers/video/rockchip/rk3399_mipi.c | 1 - drivers/video/rockchip/rk_edp.c | 2 +- drivers/video/rockchip/rk_lvds.c | 10 ++++------ drivers/video/rockchip/rk_mipi.c | 11 +++++------ 5 files changed, 10 insertions(+), 15 deletions(-)drivers/video/rockchip/rk3288_mipi.c +0
-1@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h" drivers/video/rockchip/rk3399_mipi.c +0
-1@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h" drivers/video/rockchip/rk_edp.c +1
-1@@ -995,7 +995,7 @@ static int rk_edp_ofdata_to_platdata(struct udevice *dev) {struct rk_edp_priv *priv =dev_get_priv (dev); - priv->regs = (struct rk3288_edp *)devfdt_get_addr (dev); + priv->regs =dev_read_addr_ptr (dev); priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF );return 0 ;drivers/video/rockchip/rk_lvds.c +0
-0@@ -171,13 +171,11 @@ int rk_lvds_read_timing(struct udevice *dev, struct display_timing *timing)static int rk_lvds_ofdata_to_platdata (struct udevice *dev) {
drivers/video/rockchip/rk_lvds.c int rk_lvds_read_timing(struct udevice *dev, struct display_timing *timing) · line 178
Quoted 10 lines
drivers/video/rockchip/rk_lvds.c +2
-4struct rk_lvds_priv *priv =dev_get_priv (dev); -const void *blob = gd->fdt_blob; -int node =dev_of_offset (dev);int ret; - priv->regs = (void *)devfdt_get_addr (dev); + priv->regs =dev_read_addr_ptr (dev); priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); - ret =fdtdec_get_int (blob, node,"rockchip,output" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,output" ,-1 );
if (!dev_read_s32(...) {
drivers/video/rockchip/rk_lvds.c static int rk_lvds_ofdata_to_platdata(struct udevice *dev) · line 188
Quoted 10 lines
drivers/video/rockchip/rk_lvds.c +1
-1if (ret !=-1 ) { priv->output = ret;debug ("LVDS output : %d\n" , ret);@@ -186,7 +184,7 @@ static int rk_lvds_ofdata_to_platdata(struct udevice *dev) priv->output =LVDS_OUTPUT_RGB ; } - ret =fdtdec_get_int (blob, node,"rockchip,data-mapping" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,data-mapping" ,-1 );if (ret !=-1 ) {
Same here
drivers/video/rockchip/rk_lvds.c static int rk_lvds_ofdata_to_platdata(struct udevice *dev) · line 196
Quoted 8 lines
drivers/video/rockchip/rk_lvds.c +1
-1priv->format = ret;debug ("LVDS data-mapping : %d\n" , ret);@@ -195,7 +193,7 @@ static int rk_lvds_ofdata_to_platdata(struct udevice *dev) priv->format =LVDS_FORMAT_JEIDA ; } - ret =fdtdec_get_int (blob, node,"rockchip,data-width" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,data-width" ,-1 );
and here
Quoted 40 lines
drivers/video/rockchip/rk_lvds.c +0
-0if (ret !=-1 ) {debug ("LVDS data-width : %d\n" , ret);if (ret ==24 ) {drivers/video/rockchip/rk_mipi.c +5
-7@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h" @@ -76,7 +75,7 @@ static void rk_mipi_dsi_write(uintptr_t regs, u32 reg, u32 val)int rk_mipi_dsi_enable (struct udevice *dev,const struct display_timing *timing) { -int node, timing_node; +ofnode node, timing_node;int val;struct rk_mipi_priv *priv =dev_get_priv (dev);uintptr_t regs = priv->regs;@@ -119,10 +118,10 @@ int rk_mipi_dsi_enable(struct udevice *dev,rk_mipi_dsi_write (regs,VID_PKT_SIZE ,0x4b0 );/* Set dpi color coding depth 24 bit */ - timing_node =fdt_subnode_offset (gd->fdt_blob,dev_of_offset (dev), -"display-timings" ); - node =fdt_first_subnode (gd->fdt_blob, timing_node); - val =fdtdec_get_int (gd->fdt_blob, node,"bits-per-pixel" ,-1 ); + timing_node =ofnode_find_subnode (dev->node,"display-timings" ); + node =ofnode_first_subnode (timing_node); + + val =ofnode_read_u32_default (node,"bits-per-pixel" ,-1 );switch (val) {case 16 :rk_mipi_dsi_write (regs,DPI_COLOR_CODING ,DPI_16BIT_CFG_1 ); --
Quoted 2 lines
2.17.1
Regards,
Simon
PATCH 2/2 rockchip: video: Convert to use APIs which support live DT
Quoted 126 lines · Simon Glass
Hi Kever,
Quoted 58 lines · Kever Yang
Use
ofnode_ordev_APIs instead offdt_andfdtdec_APIs so that the driver can support live DT.Signed-off-by Kever Yang <[email protected]>---
drivers/video/rockchip/rk3288_mipi.c | 1 - drivers/video/rockchip/rk3399_mipi.c | 1 - drivers/video/rockchip/rk_edp.c | 2 +- drivers/video/rockchip/rk_lvds.c | 10 ++++------ drivers/video/rockchip/rk_mipi.c | 11 +++++------ 5 files changed, 10 insertions(+), 15 deletions(-)drivers/video/rockchip/rk3288_mipi.c +0
-1@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h" drivers/video/rockchip/rk3399_mipi.c +0
-1@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h" drivers/video/rockchip/rk_edp.c +1
-1@@ -995,7 +995,7 @@ static int rk_edp_ofdata_to_platdata(struct udevice *dev) {struct rk_edp_priv *priv =dev_get_priv (dev); - priv->regs = (struct rk3288_edp *)devfdt_get_addr (dev); + priv->regs =dev_read_addr_ptr (dev); priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF );return 0 ;drivers/video/rockchip/rk_lvds.c +0
-0@@ -171,13 +171,11 @@ int rk_lvds_read_timing(struct udevice *dev, struct display_timing *timing)static int rk_lvds_ofdata_to_platdata (struct udevice *dev) {drivers/video/rockchip/rk_lvds.c int rk_lvds_read_timing(struct udevice *dev, struct display_timing *timing) · line 178
Quoted 10 lines
drivers/video/rockchip/rk_lvds.c +2
-4struct rk_lvds_priv *priv =dev_get_priv (dev); -const void *blob = gd->fdt_blob; -int node =dev_of_offset (dev);int ret; - priv->regs = (void *)devfdt_get_addr (dev); + priv->regs =dev_read_addr_ptr (dev); priv->grf =syscon_get_first_range (ROCKCHIP_SYSCON_GRF ); - ret =fdtdec_get_int (blob, node,"rockchip,output" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,output" ,-1 );if (!dev_read_s32(...) {
drivers/video/rockchip/rk_lvds.c static int rk_lvds_ofdata_to_platdata(struct udevice *dev) · line 188
Quoted 10 lines
drivers/video/rockchip/rk_lvds.c +1
-1if (ret !=-1 ) { priv->output = ret;debug ("LVDS output : %d\n" , ret);@@ -186,7 +184,7 @@ static int rk_lvds_ofdata_to_platdata(struct udevice *dev) priv->output =LVDS_OUTPUT_RGB ; } - ret =fdtdec_get_int (blob, node,"rockchip,data-mapping" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,data-mapping" ,-1 );if (ret !=-1 ) {Same here
drivers/video/rockchip/rk_lvds.c static int rk_lvds_ofdata_to_platdata(struct udevice *dev) · line 196
Quoted 8 lines
drivers/video/rockchip/rk_lvds.c +1
-1priv->format = ret;debug ("LVDS data-mapping : %d\n" , ret);@@ -195,7 +193,7 @@ static int rk_lvds_ofdata_to_platdata(struct udevice *dev) priv->format =LVDS_FORMAT_JEIDA ; } - ret =fdtdec_get_int (blob, node,"rockchip,data-width" ,-1 ); + ret =dev_read_s32_default (dev,"rockchip,data-width" ,-1 );and here
Quoted 27 lines
drivers/video/rockchip/rk_lvds.c +0
-0if (ret !=-1 ) {debug ("LVDS data-width : %d\n" , ret);if (ret ==24 ) {drivers/video/rockchip/rk_mipi.c +1
-2@@ -8,7 +8,6 @@#include <clk.h> #include <display.h> #include <dm.h> -#include <fdtdec.h> #include <panel.h> #include <regmap.h> #include "rk_mipi.h" @@ -76,7 +75,7 @@ static void rk_mipi_dsi_write(uintptr_t regs, u32 reg, u32 val)int rk_mipi_dsi_enable (struct udevice *dev,const struct display_timing *timing) { -int node, timing_node; +ofnode node, timing_node;int val;struct rk_mipi_priv *priv =dev_get_priv (dev);uintptr_t regs = priv->regs;@@ -119,10 +118,10 @@ int rk_mipi_dsi_enable(struct udevice *dev,rk_mipi_dsi_write (regs,VID_PKT_SIZE ,0x4b0 );
Quoted 15 lines
Quoted 13 lines
drivers/video/rockchip/rk_mipi.c +4
-5/* Set dpi color coding depth 24 bit */ - timing_node =fdt_subnode_offset (gd->fdt_blob,dev_of_offset (dev), -"display-timings" ); - node =fdt_first_subnode (gd->fdt_blob, timing_node); - val =fdtdec_get_int (gd->fdt_blob, node,"bits-per-pixel" ,-1 ); + timing_node =ofnode_find_subnode (dev->node,"display-timings" ); + node =ofnode_first_subnode (timing_node); + + val =ofnode_read_u32_default (node,"bits-per-pixel" ,-1 );switch (val) {case 16 :rk_mipi_dsi_write (regs,DPI_COLOR_CODING ,DPI_16BIT_CFG_1 ); --Quoted 2 lines
2.17.1
Sorry, but this patch is better than the alternative v2 now that I see the contortions that need to be used.
- Simon
PATCH 1/2 rockchip: video: Use ofnode_decode_display_timing() to parse timing
In reply to Kever YangQuoted 11 lines · Kever Yang
Use
ofnode_decode_display_timing()instead offdtdec_decode_display_timing()to parse display timing, so that we can support live DT.Signed-off-by Kever Yang <[email protected]>---
drivers/video/rockchip/rk_lvds.c | 3 +-- drivers/video/rockchip/rk_mipi.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-)