macintosh: Use of_property_read_reg() to parse "reg"
PATCH 1/1 macintosh: Use of_property_read_reg() to parse "reg"
Use the recently added of_property_read_reg() helper to get the untranslated "reg" address value.
Signed-off-by Rob Herring <[email protected]>
--- drivers/macintosh/smu.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
drivers/macintosh/smu.c +7 -8
@@ -33,7 +33,8 @@#include <linux/delay.h> #include <linux/poll.h> #include <linux/mutex.h> -#include <linux/of_device.h> +#include <linux/of.h> +#include <linux/of_address.h> #include <linux/of_irq.h> #include <linux/of_platform.h> #include <linux/slab.h>
@@ -470,7 +471,7 @@ EXPORT_SYMBOL(smu_present);int __init smu_init (void ) {struct device_node *np; -const u32 *data; +u64 data;int ret =0 ; np =of_find_node_by_type (NULL ,"smu" );
@@ -514,8 +515,7 @@ int __init smu_init (void) ret = -ENXIO ; goto fail_bootmem; } - data =of_get_property (smu->db_node,"reg" ,NULL ); -if (data ==NULL ) { +if (of_property_read_reg (smu->db_node,0 , &data,NULL )) {printk (KERN_ERR "SMU: Can't find doorbell GPIO address !\n" ); ret = -ENXIO ; goto fail_db_node;
@@ -525,7 +525,7 @@ int __init smu_init (void)* and ack. GPIOs are at 0x50, best would be to find that out * in the device-tree though. */ - smu->doorbell = *data; + smu->doorbell = data;if (smu->doorbell <0x50 ) smu->doorbell +=0x50 ;
@@ -534,13 +534,12 @@ int __init smu_init (void) smu->msg_node =of_find_node_by_name (NULL ,"smu-interrupt" );if (smu->msg_node ==NULL )break ; - data =of_get_property (smu->msg_node,"reg" ,NULL ); -if (data ==NULL ) { +if (of_property_read_reg (smu->msg_node,0 , &data,NULL )) {of_node_put (smu->msg_node); smu->msg_node =NULL ;break ; } - smu->msg = *data; + smu->msg = data;if (smu->msg <0x50 ) smu->msg +=0x50 ; }while (0 );
Signature · 1 line
2.39.2
Michael Ellerman
AppliedQuoted 4 lines · Rob Herring
Use the recently added
of_property_read_reg()helper to get the untranslated "reg" address value.
Applied to powerpc/next.
[1/1] macintosh: Use of_property_read_reg() to parse "reg"
https://git.kernel.org/powerpc/c/6f3bdbbeafbbcb1a6540307e4eaee10ecae4f9a5
cheers