at91sam9x5ek: add 1-wire support and hardware detection support
Subsystems (2)
cover at91sam9x5ek: add 1-wire support and hardware detection support
HI,
This patch serie add the 1-wire support to the at91sam9x5ek
on sam9x5ek we have on each module and motherboard a 1-wire eeprom that describe the hardware revision and type
And on the Cogent Cpu Module we have some difference with teh others modules and some bug
So fix
Also use the 1-wire to generate a local mac address
This patch series depends on the pm9g45/pm9263/pm9261 v3
The following changes since commit 7fb0cb2ce2f7800341ab8de711dccbd2c4753c84:
pm9261: use w1 serial number to generate local mac address (2012-10-30 13:44:54 +0800)
are available in the git repository at:
git://git.jcrosoft.org/barebox.git delivery/at91sam9x5ek_w1
for you to fetch changes up to 4e088306b778a5f14c2503be54b061e60e27e6a0:
at91sam9x5ek: use w1 serial number to generate local mac address (2012-10-31 09:33:38 +0800)
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (4):
at91sam9x5ek: add 1-wire support
at91sam9x5ek: add hw detection support
at91sam9x5ek: add fixup for cogent cpu module
at91sam9x5ek: use w1 serial number to generate local mac address
arch/arm/boards/at91sam9x5ek/Makefile | 1 + arch/arm/boards/at91sam9x5ek/env/config | 1 + arch/arm/boards/at91sam9x5ek/hw_version.c | 272 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/boards/at91sam9x5ek/hw_version.h | 34 ++++++++++++++++++++++++++++ arch/arm/boards/at91sam9x5ek/init.c | 38 +++++++++++++++++++++++++++++++- arch/arm/configs/at91sam9x5ek_defconfig | 4 ++++ 6 files changed, 349 insertions(+), 1 deletion(-) create mode 100644 arch/arm/boards/at91sam9x5ek/hw_version.c create mode 100644 arch/arm/boards/at91sam9x5ek/hw_version.h
Best Regards,
J.
_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
PATCH 4/4 at91sam9x5ek: use w1 serial number to generate local mac address
In reply to Jean-Christophe PLAGNIOL-VILLARDThe OUI will be 'tml' => 76:6D:6C
--- arch/arm/boards/at91sam9x5ek/init.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
arch/arm/boards/at91sam9x5ek/init.c +10 -1
@@ -40,6 +40,7 @@#include <gpio_keys.h> #include <readkey.h> #include <linux/w1-gpio.h> +#include <w1_mac_address.h> #include "hw_version.h"
@@ -105,6 +106,14 @@ static struct at91_ether_platform_data macb_pdata = { .phy_addr = 0, }; +static void ek_add_device_eth (void ) +{ +if (w1_local_mac_address_register (0 ,"tml" ,"w1-2d-0" )) +w1_local_mac_address_register (0 ,"tml" ,"w1-23-0" ); + +at91_add_device_eth (0 , &macb_pdata); +} +/* * USB Host port */
@@ -160,7 +169,7 @@ static int at91sam9x5ek_devices_init(void) {ek_add_device_w1 ();ek_add_device_nand (); -at91_add_device_eth (0 , &macb_pdata); +ek_add_device_eth ();at91_add_device_usbh_ohci (&ek_usbh_data);ek_add_led ();
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 1/4 at91sam9x5ek: add 1-wire support
In reply to Jean-Christophe PLAGNIOL-VILLARD--- arch/arm/boards/at91sam9x5ek/init.c | 14 ++++++++++++++ arch/arm/configs/at91sam9x5ek_defconfig | 4 ++++ 2 files changed, 18 insertions(+)
arch/arm/boards/at91sam9x5ek/init.c +14 -0
@@ -38,6 +38,12 @@#include <mach/at91_rstc.h> #include <gpio_keys.h> #include <readkey.h> +#include <linux/w1-gpio.h> + +struct w1_gpio_platform_data w1_pdata = { + .pin =AT91_PIN_PB18 , + .is_open_drain =0 , +};static struct atmel_nand_data nand_pdata = { .ale =21 ,
@@ -130,8 +136,16 @@ static int at91sam9x5ek_mem_init(void) }mem_initcall (at91sam9x5ek_mem_init); +static void ek_add_device_w1 (void ) +{ +at91_set_gpio_input (w1_pdata.pin,0 ); +at91_set_multi_drive (w1_pdata.pin,1 ); +add_generic_device_res ("w1-gpio" ,DEVICE_ID_SINGLE ,NULL ,0 , &w1_pdata); +} +static int at91sam9x5ek_devices_init (void ) { +ek_add_device_w1 ();ek_add_device_nand ();at91_add_device_eth (0 , &macb_pdata);at91_add_device_usbh_ohci (&ek_usbh_data);
arch/arm/configs/at91sam9x5ek_defconfig +4 -0
@@ -65,6 +65,10 @@ CONFIG_LED=y CONFIG_LED_GPIO=y CONFIG_LED_TRIGGERS=y CONFIG_KEYBOARD_GPIO=y +CONFIG_W1=y +CONFIG_W1_MASTER_GPIO=y +CONFIG_W1_SLAVE_DS2431=y +CONFIG_W1_SLAVE_DS2433=y CONFIG_FS_FAT=y CONFIG_FS_FAT_WRITE=y CONFIG_FS_FAT_LFN=y
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 3/4 at91sam9x5ek: add fixup for cogent cpu module
The modules from cogent use a 1.8V nand
And have the mci card detect broken as they use the flash vdd as vdd for the cd which need > 2V
--- arch/arm/boards/at91sam9x5ek/hw_version.c | 32 +++++++++++++++++++++++++++++ arch/arm/boards/at91sam9x5ek/init.c | 9 ++++++++ 2 files changed, 41 insertions(+)
arch/arm/boards/at91sam9x5ek/hw_version.c +32 -0
@@ -19,6 +19,8 @@#include <fcntl.h> #include <libbb.h> #include <asm/armlinux.h> +#include <of.h> +#include <libfdt.h> #include "hw_version.h"
@@ -228,6 +230,33 @@ static void at91sam9x5ek_devices_detect_one(const char *name)dev_add_param_fixed (dev,"revision_id" , str); } +#define NODE_NAME_LEN 128 + +static int cm_cogent_fixup (struct fdt_header *fdt) +{ +int off, ret; +char node_name[NODE_NAME_LEN ]; + + off =fdt_node_offset_by_compatible (fdt,-1 ,"atmel,hsmci" ); + +while (off != -FDT_ERR_NOTFOUND ) { + off =fdt_subnode_offset (fdt, off,"slot" ); +fdt_get_path (fdt, off, node_name,NODE_NAME_LEN ); + ret =fdt_setprop (fdt, off,"broken-cd" ,NULL ,0 ); +if (ret <0 ) { +pr_err ("error %d while adding broken-cd property to node %s\n" , + ret, node_name); +return ret; + }else { +pr_debug ("add broken-cd property to node %s\n" , node_name); + } + + off =fdt_node_offset_by_compatible (fdt, off,"atmel,hsmci" ); + } + +return 0 ; +} +void at91sam9x5ek_devices_detect_hw (void ) {at91sam9x5ek_devices_detect_one ("/dev/ds24310" );
@@ -237,4 +266,7 @@ void at91sam9x5ek_devices_detect_hw(void)pr_info ("sn: 0x%x, rev: 0x%x\n" , sn, rev);armlinux_set_revision (rev);armlinux_set_serial (sn); + +if (at91sam9x5ek_cm_is_vendor (VENDOR_COGENT )) +of_register_fixup (cm_cogent_fixup); }
arch/arm/boards/at91sam9x5ek/init.c +9 -0
@@ -36,6 +36,7 @@#include <mach/io.h> #include <mach/at91_pmc.h> #include <mach/at91_rstc.h> +#include <mach/at91sam9x5_matrix.h> #include <gpio_keys.h> #include <readkey.h> #include <linux/w1-gpio.h>
@@ -88,6 +89,14 @@ static void ek_add_device_nand(void)/* configure chip-select 3 (NAND) */ sam9_smc_configure (3 , &cm_nand_smc_config); +if (at91sam9x5ek_cm_is_vendor (VENDOR_COGENT )) { +unsigned long csa; + + csa =at91_sys_read (AT91_MATRIX_EBICSA ); + csa |=AT91_MATRIX_EBI_VDDIOMSEL_1_8V ; +at91_sys_write (AT91_MATRIX_EBICSA , csa); + } +at91_add_device_nand (&nand_pdata); }
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
PATCH 2/4 at91sam9x5ek: add hw detection support
In reply to Jean-Christophe PLAGNIOL-VILLARDfor bootp specify the module version via client_id as %{BOARD}-%{VERISON}
--- arch/arm/boards/at91sam9x5ek/Makefile | 1 + arch/arm/boards/at91sam9x5ek/env/config | 1 + arch/arm/boards/at91sam9x5ek/hw_version.c | 240 +++++++++++++++++++++++++++++ arch/arm/boards/at91sam9x5ek/hw_version.h | 34 ++++ arch/arm/boards/at91sam9x5ek/init.c | 4 + 5 files changed, 280 insertions(+) create mode 100644 arch/arm/boards/at91sam9x5ek/hw_version.c create mode 100644 arch/arm/boards/at91sam9x5ek/hw_version.h
arch/arm/boards/at91sam9x5ek/Makefile +1 -0
@@ -1 +1,2 @@ obj-y += init.o +obj-y += hw_version.o
arch/arm/boards/at91sam9x5ek/env/config +1 -0
@@ -4,6 +4,7 @@ # use 'none' if you want to skip kernel ip autoconfiguration ip=dhcp-barebox global.dhcp.vendor_id=barebox-at91sam9x5ek +global.dhcp.client_id="${at91sam9x5cm.board}-${at91sam9x5cm.vendor}" # or set your networking parameters here #eth0.ipaddr=a.b.c.d
arch/arm/boards/at91sam9x5ek/hw_version.c new file +240 -0
240 lines not on this page · raw message
arch/arm/boards/at91sam9x5ek/hw_version.h new file +34 -0
@@ -0,0 +1,34 @@ +/* +* Copyright (C) 2012 Jean-Christophe PLAGNIOL-VILLARD <[email protected]> +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License as +* published by the Free Software Foundation; either version 2 of +* the License, or (at your option) any later version. +* +* This program is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU General Public License for more details. +* +* +*/ + +#ifndef __HW_REVISION_H__ +#define __HW_REVISION_H__ + +enum vendor_id { +VENDOR_UNKNOWN =0 , +VENDOR_EMBEST =1 , +VENDOR_FLEX =2 , +VENDOR_RONETIX =3 , +VENDOR_COGENT =4 , +VENDOR_PDA =5 , +}; + +bool at91sam9x5ek_cm_is_vendor (enum vendor_id vid); +bool at91sam9x5ek_ek_is_vendor (enum vendor_id vid); +bool at91sam9x5ek_dm_is_vendor (enum vendor_id vid); +void at91sam9x5ek_devices_detect_hw (void ); + +#endif /* __HW_REVISION_H__ */
arch/arm/boards/at91sam9x5ek/init.c +4 -0
@@ -40,6 +40,8 @@#include <readkey.h> #include <linux/w1-gpio.h> +#include "hw_version.h" +struct w1_gpio_platform_data w1_pdata = { .pin =AT91_PIN_PB18 , .is_open_drain =0 ,
@@ -141,6 +143,8 @@ static void ek_add_device_w1(void)at91_set_gpio_input (w1_pdata.pin,0 );at91_set_multi_drive (w1_pdata.pin,1 );add_generic_device_res ("w1-gpio" ,DEVICE_ID_SINGLE ,NULL ,0 , &w1_pdata); + +at91sam9x5ek_devices_detect_hw (); }static int at91sam9x5ek_devices_init (void )
Signature · 7 lines
1.7.10.4 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Quoted 20 lines · Jean-Christophe PLAGNIOL-VILLARD
HI,
This patch serie add the 1-wire support to the at91sam9x5ek
on sam9x5ek we have on each module and motherboard a 1-wire eeprom that describe the hardware revision and type
And on the Cogent Cpu Module we have some difference with teh others modules and some bug
So fix
Also use the 1-wire to generate a local mac address
This patch series depends on the pm9g45/pm9263/pm9261 v3
The following changes since commit
7fb0cb2ce2f7800341ab8de711dccbd2c4753c84:pm9261: use w1 serial number to generate local mac address (2012-10-30 13:44:54 +0800)
Quoted 7 lines
are available in the git repository at:
git://git.jcrosoft.org/barebox.gitdelivery/at91sam9x5ek_w1for you to fetch changes up to
4e088306b778a5f14c2503be54b061e60e27e6a0:at91sam9x5ek: use w1 serial number to generate local mac address (2012-10-31 09:33:38 +0800)
Also applied
Sascha
Signature · 9 lines
Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox