Skip to contentSkip to conversation

ARM: omap1: osk: use device properties for at24 eeprom

PATCH In review Bartosz Golaszewski 2 participants 2 messages Apr 4, 2018 – May 1, 2018

Subsystems (3)
Arm (32-bit) Arm sub-architectures OMAP1 support
lore
Share & tools
lore

Bartosz Golaszewski

author
#0 lore raw

PATCH 1/1 ARM: omap1: osk: use device properties for at24 eeprom

We want to work towards phasing out the at24_platform_data structure. There are few users and its contents can be represented using generic device properties. Using device properties only will allow us to significantly simplify the at24 configuration code.

Remove the at24_platform_data structure and replace it with an array of property entries. Drop the byte_len/size property, as the model name already implies the EEPROM's size.

Signed-off-by Bartosz Golaszewski <[email protected]>
---
 arch/arm/mach-omap1/board-osk.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/mach-omap1/board-osk.c +5 -5
index c66372ed29e2..9ffa8d755a59 100644
@@ -303,22 +303,22 @@ static const struct omap_lcd_config osk_lcd_config __initconst = {
 #ifdef	CONFIG_OMAP_OSK_MISTRAL
 
 #include <linux/input.h>
-#include <linux/platform_data/at24.h>
+#include <linux/property.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 
 #include <linux/platform_data/keypad-omap.h>
 
-static struct at24_platform_data at24c04 = {
-	.byte_len	= SZ_4K / 8,
-	.page_size	= 16,
+static const struct property_entry mistral_at24_properties[] = {
+	PROPERTY_ENTRY_U32("pagesize", 16),
+	{ }
 };
 
 static struct i2c_board_info __initdata mistral_i2c_board_info[] = {
 	{
 		/* NOTE:  powered from LCD supply */
 		I2C_BOARD_INFO("24c04", 0x50),
-		.platform_data	= &at24c04,
+		.properties = mistral_at24_properties,
 	},
 	/* TODO when driver support is ready:
 	 *  - optionally ov9640 camera sensor at 0x30
Signature · 1 line
2.16.3
reviewer
#1 lore raw
Quoted 10 lines · Bartosz Golaszewski

We want to work towards phasing out the at24_platform_data structure. There are few users and its contents can be represented using generic device properties. Using device properties only will allow us to significantly simplify the at24 configuration code.

Remove the at24_platform_data structure and replace it with an array of property entries. Drop the byte_len/size property, as the model name already implies the EEPROM's size.

Signed-off-by Bartosz Golaszewski <[email protected]>

Applying into omap-for-v4.18/omap1 thanks.

Tony