diff options
-rw-r--r-- | sound/aoa/codecs/snd-aoa-codec-onyx.c | 2 | ||||
-rw-r--r-- | sound/aoa/codecs/snd-aoa-codec-tas.c | 4 | ||||
-rw-r--r-- | sound/aoa/core/snd-aoa-gpio-feature.c | 6 | ||||
-rw-r--r-- | sound/aoa/fabrics/snd-aoa-fabric-layout.c | 6 | ||||
-rw-r--r-- | sound/aoa/soundbus/core.c | 2 | ||||
-rw-r--r-- | sound/aoa/soundbus/i2sbus/i2sbus-core.c | 5 | ||||
-rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 12 | ||||
-rw-r--r-- | sound/oss/dmasound/tas_common.c | 2 | ||||
-rw-r--r-- | sound/ppc/pmac.c | 14 | ||||
-rw-r--r-- | sound/ppc/tumbler.c | 20 |
10 files changed, 37 insertions, 36 deletions
diff --git a/sound/aoa/codecs/snd-aoa-codec-onyx.c b/sound/aoa/codecs/snd-aoa-codec-onyx.c index bf7f03121fe7..7f980be5d060 100644 --- a/sound/aoa/codecs/snd-aoa-codec-onyx.c +++ b/sound/aoa/codecs/snd-aoa-codec-onyx.c | |||
@@ -1064,7 +1064,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter) | |||
1064 | if (device_is_compatible(dev, "pcm3052")) { | 1064 | if (device_is_compatible(dev, "pcm3052")) { |
1065 | const u32 *addr; | 1065 | const u32 *addr; |
1066 | printk(KERN_DEBUG PFX "found pcm3052\n"); | 1066 | printk(KERN_DEBUG PFX "found pcm3052\n"); |
1067 | addr = get_property(dev, "reg", NULL); | 1067 | addr = of_get_property(dev, "reg", NULL); |
1068 | if (!addr) | 1068 | if (!addr) |
1069 | return -ENODEV; | 1069 | return -ENODEV; |
1070 | return onyx_create(adapter, dev, (*addr)>>1); | 1070 | return onyx_create(adapter, dev, (*addr)>>1); |
diff --git a/sound/aoa/codecs/snd-aoa-codec-tas.c b/sound/aoa/codecs/snd-aoa-codec-tas.c index ed6bdb073d83..ceca38486eae 100644 --- a/sound/aoa/codecs/snd-aoa-codec-tas.c +++ b/sound/aoa/codecs/snd-aoa-codec-tas.c | |||
@@ -941,7 +941,7 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) | |||
941 | if (device_is_compatible(dev, "tas3004")) { | 941 | if (device_is_compatible(dev, "tas3004")) { |
942 | const u32 *addr; | 942 | const u32 *addr; |
943 | printk(KERN_DEBUG PFX "found tas3004\n"); | 943 | printk(KERN_DEBUG PFX "found tas3004\n"); |
944 | addr = get_property(dev, "reg", NULL); | 944 | addr = of_get_property(dev, "reg", NULL); |
945 | if (!addr) | 945 | if (!addr) |
946 | continue; | 946 | continue; |
947 | return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f); | 947 | return tas_create(adapter, dev, ((*addr) >> 1) & 0x7f); |
@@ -953,7 +953,7 @@ static int tas_i2c_attach(struct i2c_adapter *adapter) | |||
953 | const u32 *_addr; | 953 | const u32 *_addr; |
954 | u32 addr; | 954 | u32 addr; |
955 | printk(KERN_DEBUG PFX "found 'deq' node\n"); | 955 | printk(KERN_DEBUG PFX "found 'deq' node\n"); |
956 | _addr = (u32 *) get_property(dev, "i2c-address", NULL); | 956 | _addr = of_get_property(dev, "i2c-address", NULL); |
957 | if (!_addr) | 957 | if (!_addr) |
958 | continue; | 958 | continue; |
959 | addr = ((*_addr) >> 1) & 0x7f; | 959 | addr = ((*_addr) >> 1) & 0x7f; |
diff --git a/sound/aoa/core/snd-aoa-gpio-feature.c b/sound/aoa/core/snd-aoa-gpio-feature.c index d34e5db64780..805dcbff2257 100644 --- a/sound/aoa/core/snd-aoa-gpio-feature.c +++ b/sound/aoa/core/snd-aoa-gpio-feature.c | |||
@@ -71,7 +71,7 @@ static struct device_node *get_gpio(char *name, | |||
71 | if (!gpio) | 71 | if (!gpio) |
72 | return NULL; | 72 | return NULL; |
73 | while ((np = of_get_next_child(gpio, np))) { | 73 | while ((np = of_get_next_child(gpio, np))) { |
74 | audio_gpio = get_property(np, "audio-gpio", NULL); | 74 | audio_gpio = of_get_property(np, "audio-gpio", NULL); |
75 | if (!audio_gpio) | 75 | if (!audio_gpio) |
76 | continue; | 76 | continue; |
77 | if (strcmp(audio_gpio, name) == 0) | 77 | if (strcmp(audio_gpio, name) == 0) |
@@ -84,7 +84,7 @@ static struct device_node *get_gpio(char *name, | |||
84 | return NULL; | 84 | return NULL; |
85 | } | 85 | } |
86 | 86 | ||
87 | reg = get_property(np, "reg", NULL); | 87 | reg = of_get_property(np, "reg", NULL); |
88 | if (!reg) | 88 | if (!reg) |
89 | return NULL; | 89 | return NULL; |
90 | 90 | ||
@@ -96,7 +96,7 @@ static struct device_node *get_gpio(char *name, | |||
96 | if (*gpioptr < 0x50) | 96 | if (*gpioptr < 0x50) |
97 | *gpioptr += 0x50; | 97 | *gpioptr += 0x50; |
98 | 98 | ||
99 | reg = get_property(np, "audio-gpio-active-state", NULL); | 99 | reg = of_get_property(np, "audio-gpio-active-state", NULL); |
100 | if (!reg) | 100 | if (!reg) |
101 | /* Apple seems to default to 1, but | 101 | /* Apple seems to default to 1, but |
102 | * that doesn't seem right at least on most | 102 | * that doesn't seem right at least on most |
diff --git a/sound/aoa/fabrics/snd-aoa-fabric-layout.c b/sound/aoa/fabrics/snd-aoa-fabric-layout.c index 7e3880901c61..98806283d1b2 100644 --- a/sound/aoa/fabrics/snd-aoa-fabric-layout.c +++ b/sound/aoa/fabrics/snd-aoa-fabric-layout.c | |||
@@ -732,7 +732,7 @@ static int check_codec(struct aoa_codec *codec, | |||
732 | if (codec->node && (strcmp(codec->node->name, "codec") == 0)) { | 732 | if (codec->node && (strcmp(codec->node->name, "codec") == 0)) { |
733 | snprintf(propname, sizeof(propname), | 733 | snprintf(propname, sizeof(propname), |
734 | "platform-%s-codec-ref", codec->name); | 734 | "platform-%s-codec-ref", codec->name); |
735 | ref = get_property(ldev->sound, propname, NULL); | 735 | ref = of_get_property(ldev->sound, propname, NULL); |
736 | if (!ref) { | 736 | if (!ref) { |
737 | printk(KERN_INFO "snd-aoa-fabric-layout: " | 737 | printk(KERN_INFO "snd-aoa-fabric-layout: " |
738 | "required property %s not present\n", propname); | 738 | "required property %s not present\n", propname); |
@@ -946,7 +946,7 @@ static struct aoa_fabric layout_fabric = { | |||
946 | static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) | 946 | static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) |
947 | { | 947 | { |
948 | struct device_node *sound = NULL; | 948 | struct device_node *sound = NULL; |
949 | unsigned int *layout_id; | 949 | const unsigned int *layout_id; |
950 | struct layout *layout; | 950 | struct layout *layout; |
951 | struct layout_dev *ldev = NULL; | 951 | struct layout_dev *ldev = NULL; |
952 | int err; | 952 | int err; |
@@ -962,7 +962,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev) | |||
962 | } | 962 | } |
963 | if (!sound) return -ENODEV; | 963 | if (!sound) return -ENODEV; |
964 | 964 | ||
965 | layout_id = (unsigned int *) get_property(sound, "layout-id", NULL); | 965 | layout_id = of_get_property(sound, "layout-id", NULL); |
966 | if (!layout_id) | 966 | if (!layout_id) |
967 | goto outnodev; | 967 | goto outnodev; |
968 | printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n", | 968 | printk(KERN_INFO "snd-aoa-fabric-layout: found bus with layout %d\n", |
diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c index 45680b5ebc35..6f004f70e308 100644 --- a/sound/aoa/soundbus/core.c +++ b/sound/aoa/soundbus/core.c | |||
@@ -96,7 +96,7 @@ static int soundbus_uevent(struct device *dev, char **envp, int num_envp, | |||
96 | * it's not really legal to split it out with commas. We split it | 96 | * it's not really legal to split it out with commas. We split it |
97 | * up using a number of environment variables instead. */ | 97 | * up using a number of environment variables instead. */ |
98 | 98 | ||
99 | compat = get_property(of->node, "compatible", &cplen); | 99 | compat = of_get_property(of->node, "compatible", &cplen); |
100 | while (compat && cplen > 0) { | 100 | while (compat && cplen > 0) { |
101 | envp[i++] = scratch; | 101 | envp[i++] = scratch; |
102 | length = scnprintf (scratch, buffer_size, | 102 | length = scnprintf (scratch, buffer_size, |
diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-core.c b/sound/aoa/soundbus/i2sbus/i2sbus-core.c index bbe50a0fa115..79fc4bc09e5e 100644 --- a/sound/aoa/soundbus/i2sbus/i2sbus-core.c +++ b/sound/aoa/soundbus/i2sbus/i2sbus-core.c | |||
@@ -141,7 +141,7 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index, | |||
141 | rc = of_address_to_resource(parent, pindex, res); | 141 | rc = of_address_to_resource(parent, pindex, res); |
142 | if (rc) | 142 | if (rc) |
143 | goto bail; | 143 | goto bail; |
144 | reg = get_property(np, "reg", NULL); | 144 | reg = of_get_property(np, "reg", NULL); |
145 | if (reg == NULL) { | 145 | if (reg == NULL) { |
146 | rc = -ENXIO; | 146 | rc = -ENXIO; |
147 | goto bail; | 147 | goto bail; |
@@ -188,7 +188,8 @@ static int i2sbus_add_dev(struct macio_dev *macio, | |||
188 | } | 188 | } |
189 | } | 189 | } |
190 | if (i == 1) { | 190 | if (i == 1) { |
191 | const u32 *layout_id = get_property(sound, "layout-id", NULL); | 191 | const u32 *layout_id = |
192 | of_get_property(sound, "layout-id", NULL); | ||
192 | if (layout_id) { | 193 | if (layout_id) { |
193 | layout = *layout_id; | 194 | layout = *layout_id; |
194 | snprintf(dev->sound.modalias, 32, | 195 | snprintf(dev->sound.modalias, 32, |
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 7aa4d43ae6cd..977b91cea603 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
@@ -357,7 +357,7 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int* | |||
357 | while(np != 0) { | 357 | while(np != 0) { |
358 | if (name) { | 358 | if (name) { |
359 | const char *property = | 359 | const char *property = |
360 | get_property(np,"audio-gpio",NULL); | 360 | of_get_property(np,"audio-gpio",NULL); |
361 | if (property != 0 && strcmp(property,name) == 0) | 361 | if (property != 0 && strcmp(property,name) == 0) |
362 | break; | 362 | break; |
363 | } else if (compatible && device_is_compatible(np, compatible)) | 363 | } else if (compatible && device_is_compatible(np, compatible)) |
@@ -366,11 +366,11 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int* | |||
366 | } | 366 | } |
367 | if (!np) | 367 | if (!np) |
368 | return -ENODEV; | 368 | return -ENODEV; |
369 | pp = get_property(np, "AAPL,address", NULL); | 369 | pp = of_get_property(np, "AAPL,address", NULL); |
370 | if (!pp) | 370 | if (!pp) |
371 | return -ENODEV; | 371 | return -ENODEV; |
372 | *gpio_addr = (*pp) & 0x0000ffff; | 372 | *gpio_addr = (*pp) & 0x0000ffff; |
373 | pp = get_property(np, "audio-gpio-active-state", NULL); | 373 | pp = of_get_property(np, "audio-gpio-active-state", NULL); |
374 | if (pp) | 374 | if (pp) |
375 | *gpio_pol = *pp; | 375 | *gpio_pol = *pp; |
376 | else | 376 | else |
@@ -2977,16 +2977,16 @@ printk("dmasound_pmac: Awacs/Screamer Codec Mfct: %d Rev %d\n", mfg, rev); | |||
2977 | 2977 | ||
2978 | sound_device_id = 0; | 2978 | sound_device_id = 0; |
2979 | /* device ID appears post g3 b&w */ | 2979 | /* device ID appears post g3 b&w */ |
2980 | prop = get_property(info, "device-id", NULL); | 2980 | prop = of_get_property(info, "device-id", NULL); |
2981 | if (prop != 0) | 2981 | if (prop != 0) |
2982 | sound_device_id = *prop; | 2982 | sound_device_id = *prop; |
2983 | 2983 | ||
2984 | /* look for a property saying what sample rates | 2984 | /* look for a property saying what sample rates |
2985 | are available */ | 2985 | are available */ |
2986 | 2986 | ||
2987 | prop = get_property(info, "sample-rates", &l); | 2987 | prop = of_get_property(info, "sample-rates", &l); |
2988 | if (prop == 0) | 2988 | if (prop == 0) |
2989 | prop = get_property(info, "output-frame-rates", &l); | 2989 | prop = of_get_property(info, "output-frame-rates", &l); |
2990 | 2990 | ||
2991 | /* if it's there use it to set up frame rates */ | 2991 | /* if it's there use it to set up frame rates */ |
2992 | init_frame_rates(prop, l) ; | 2992 | init_frame_rates(prop, l) ; |
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c index 5e2c0aed5472..11257600d6d0 100644 --- a/sound/oss/dmasound/tas_common.c +++ b/sound/oss/dmasound/tas_common.c | |||
@@ -200,7 +200,7 @@ tas_init(int driver_id, const char *driver_name) | |||
200 | tas_node = find_devices("deq"); | 200 | tas_node = find_devices("deq"); |
201 | if (tas_node == NULL) | 201 | if (tas_node == NULL) |
202 | return -ENODEV; | 202 | return -ENODEV; |
203 | paddr = get_property(tas_node, "i2c-address", NULL); | 203 | paddr = of_get_property(tas_node, "i2c-address", NULL); |
204 | if (paddr) { | 204 | if (paddr) { |
205 | tas_i2c_address = (*paddr) >> 1; | 205 | tas_i2c_address = (*paddr) >> 1; |
206 | printk(KERN_INFO "using i2c address: 0x%x from device-tree\n", | 206 | printk(KERN_INFO "using i2c address: 0x%x from device-tree\n", |
diff --git a/sound/ppc/pmac.c b/sound/ppc/pmac.c index c64af55865d4..5e829683d1ad 100644 --- a/sound/ppc/pmac.c +++ b/sound/ppc/pmac.c | |||
@@ -864,7 +864,8 @@ static void __init detect_byte_swap(struct snd_pmac *chip) | |||
864 | static int __init snd_pmac_detect(struct snd_pmac *chip) | 864 | static int __init snd_pmac_detect(struct snd_pmac *chip) |
865 | { | 865 | { |
866 | struct device_node *sound = NULL; | 866 | struct device_node *sound = NULL; |
867 | unsigned int *prop, l; | 867 | const unsigned int *prop; |
868 | unsigned int l; | ||
868 | struct macio_chip* macio; | 869 | struct macio_chip* macio; |
869 | 870 | ||
870 | if (!machine_is(powermac)) | 871 | if (!machine_is(powermac)) |
@@ -923,10 +924,10 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) | |||
923 | } | 924 | } |
924 | if (! sound) | 925 | if (! sound) |
925 | return -ENODEV; | 926 | return -ENODEV; |
926 | prop = (unsigned int *) get_property(sound, "sub-frame", NULL); | 927 | prop = of_get_property(sound, "sub-frame", NULL); |
927 | if (prop && *prop < 16) | 928 | if (prop && *prop < 16) |
928 | chip->subframe = *prop; | 929 | chip->subframe = *prop; |
929 | prop = (unsigned int *) get_property(sound, "layout-id", NULL); | 930 | prop = of_get_property(sound, "layout-id", NULL); |
930 | if (prop) { | 931 | if (prop) { |
931 | /* partly deprecate snd-powermac, for those machines | 932 | /* partly deprecate snd-powermac, for those machines |
932 | * that have a layout-id property for now */ | 933 | * that have a layout-id property for now */ |
@@ -967,7 +968,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) | |||
967 | chip->freq_table = tumbler_freqs; | 968 | chip->freq_table = tumbler_freqs; |
968 | chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ | 969 | chip->control_mask = MASK_IEPC | 0x11; /* disable IEE */ |
969 | } | 970 | } |
970 | prop = (unsigned int *)get_property(sound, "device-id", NULL); | 971 | prop = of_get_property(sound, "device-id", NULL); |
971 | if (prop) | 972 | if (prop) |
972 | chip->device_id = *prop; | 973 | chip->device_id = *prop; |
973 | chip->has_iic = (find_devices("perch") != NULL); | 974 | chip->has_iic = (find_devices("perch") != NULL); |
@@ -997,10 +998,9 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) | |||
997 | 998 | ||
998 | /* look for a property saying what sample rates | 999 | /* look for a property saying what sample rates |
999 | are available */ | 1000 | are available */ |
1000 | prop = (unsigned int *) get_property(sound, "sample-rates", &l); | 1001 | prop = of_get_property(sound, "sample-rates", &l); |
1001 | if (! prop) | 1002 | if (! prop) |
1002 | prop = (unsigned int *) get_property(sound, | 1003 | prop = of_get_property(sound, "output-frame-rates", &l); |
1003 | "output-frame-rates", &l); | ||
1004 | if (prop) { | 1004 | if (prop) { |
1005 | int i; | 1005 | int i; |
1006 | chip->freqs_ok = 0; | 1006 | chip->freqs_ok = 0; |
diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 8f074c7936e6..8e01b558131d 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c | |||
@@ -1037,7 +1037,7 @@ static struct device_node *find_audio_device(const char *name) | |||
1037 | return NULL; | 1037 | return NULL; |
1038 | 1038 | ||
1039 | for (np = np->child; np; np = np->sibling) { | 1039 | for (np = np->child; np; np = np->sibling) { |
1040 | const char *property = get_property(np, "audio-gpio", NULL); | 1040 | const char *property = of_get_property(np, "audio-gpio", NULL); |
1041 | if (property && strcmp(property, name) == 0) | 1041 | if (property && strcmp(property, name) == 0) |
1042 | return np; | 1042 | return np; |
1043 | } | 1043 | } |
@@ -1077,9 +1077,9 @@ static long tumbler_find_device(const char *device, const char *platform, | |||
1077 | return -ENODEV; | 1077 | return -ENODEV; |
1078 | } | 1078 | } |
1079 | 1079 | ||
1080 | base = get_property(node, "AAPL,address", NULL); | 1080 | base = of_get_property(node, "AAPL,address", NULL); |
1081 | if (! base) { | 1081 | if (! base) { |
1082 | base = get_property(node, "reg", NULL); | 1082 | base = of_get_property(node, "reg", NULL); |
1083 | if (!base) { | 1083 | if (!base) { |
1084 | DBG("(E) cannot find address for device %s !\n", device); | 1084 | DBG("(E) cannot find address for device %s !\n", device); |
1085 | snd_printd("cannot find address for device %s\n", device); | 1085 | snd_printd("cannot find address for device %s\n", device); |
@@ -1093,7 +1093,7 @@ static long tumbler_find_device(const char *device, const char *platform, | |||
1093 | 1093 | ||
1094 | gp->addr = addr & 0x0000ffff; | 1094 | gp->addr = addr & 0x0000ffff; |
1095 | /* Try to find the active state, default to 0 ! */ | 1095 | /* Try to find the active state, default to 0 ! */ |
1096 | base = get_property(node, "audio-gpio-active-state", NULL); | 1096 | base = of_get_property(node, "audio-gpio-active-state", NULL); |
1097 | if (base) { | 1097 | if (base) { |
1098 | gp->active_state = *base; | 1098 | gp->active_state = *base; |
1099 | gp->active_val = (*base) ? 0x5 : 0x4; | 1099 | gp->active_val = (*base) ? 0x5 : 0x4; |
@@ -1108,7 +1108,7 @@ static long tumbler_find_device(const char *device, const char *platform, | |||
1108 | * as we don't yet have an interpreter for these things | 1108 | * as we don't yet have an interpreter for these things |
1109 | */ | 1109 | */ |
1110 | if (platform) | 1110 | if (platform) |
1111 | prop = get_property(node, platform, NULL); | 1111 | prop = of_get_property(node, platform, NULL); |
1112 | if (prop) { | 1112 | if (prop) { |
1113 | if (prop[3] == 0x9 && prop[4] == 0x9) { | 1113 | if (prop[3] == 0x9 && prop[4] == 0x9) { |
1114 | gp->active_val = 0xd; | 1114 | gp->active_val = 0xd; |
@@ -1310,7 +1310,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1310 | { | 1310 | { |
1311 | int i, err; | 1311 | int i, err; |
1312 | struct pmac_tumbler *mix; | 1312 | struct pmac_tumbler *mix; |
1313 | u32 *paddr; | 1313 | const u32 *paddr; |
1314 | struct device_node *tas_node, *np; | 1314 | struct device_node *tas_node, *np; |
1315 | char *chipname; | 1315 | char *chipname; |
1316 | 1316 | ||
@@ -1331,9 +1331,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1331 | 1331 | ||
1332 | for (np = chip->node->child; np; np = np->sibling) { | 1332 | for (np = chip->node->child; np; np = np->sibling) { |
1333 | if (!strcmp(np->name, "sound")) { | 1333 | if (!strcmp(np->name, "sound")) { |
1334 | if (get_property(np, "has-anded-reset", NULL)) | 1334 | if (of_get_property(np, "has-anded-reset", NULL)) |
1335 | mix->anded_reset = 1; | 1335 | mix->anded_reset = 1; |
1336 | if (get_property(np, "layout-id", NULL)) | 1336 | if (of_get_property(np, "layout-id", NULL)) |
1337 | mix->reset_on_sleep = 0; | 1337 | mix->reset_on_sleep = 0; |
1338 | break; | 1338 | break; |
1339 | } | 1339 | } |
@@ -1348,9 +1348,9 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) | |||
1348 | if (tas_node == NULL) | 1348 | if (tas_node == NULL) |
1349 | return -ENODEV; | 1349 | return -ENODEV; |
1350 | 1350 | ||
1351 | paddr = (u32 *)get_property(tas_node, "i2c-address", NULL); | 1351 | paddr = of_get_property(tas_node, "i2c-address", NULL); |
1352 | if (paddr == NULL) | 1352 | if (paddr == NULL) |
1353 | paddr = (u32 *)get_property(tas_node, "reg", NULL); | 1353 | paddr = of_get_property(tas_node, "reg", NULL); |
1354 | if (paddr) | 1354 | if (paddr) |
1355 | mix->i2c.addr = (*paddr) >> 1; | 1355 | mix->i2c.addr = (*paddr) >> 1; |
1356 | else | 1356 | else |