diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-01-11 22:34:48 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-01-11 22:34:48 +0100 |
| commit | 304e4bae3bea4f0ec9780bbe71d13ad4a36fd01c (patch) | |
| tree | 3cdcb97c2fc7426d5714be901d9b8bf3baeb97a8 | |
| parent | 30a46c42a38d0357941e9a104721e6d36a88dc6a (diff) | |
colibri_t30: migrate to proper machine type
After having registered the following proper machine type migrate to
actually using it.
http://www.arm.linux.org.uk/developer/machines/list.php?id=4493
While at it clean-out some obsolete Cardhu specific device-tree
nodes resp. properties and clean-up the mach-types header file as well.
| -rw-r--r-- | arch/arm/include/asm/mach-types.h | 23 | ||||
| -rw-r--r-- | board/toradex/colibri_t30/colibri_t30.dts | 13 |
2 files changed, 21 insertions, 15 deletions
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h index 1ed94b5c34..34f63b22ca 100644 --- a/arch/arm/include/asm/mach-types.h +++ b/arch/arm/include/asm/mach-types.h @@ -3275,7 +3275,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_CWME9210 3320 #define MACH_TYPE_CWME9210JS 3321 #define MACH_TYPE_PGS_SITARA 3322 -#define MACH_TYPE_COLIBRI_TEGRA2 3323 +#define MACH_TYPE_COLIBRI_T20 3323 #define MACH_TYPE_W21 3324 #define MACH_TYPE_POLYSAT1 3325 #define MACH_TYPE_DATAWAY 3326 @@ -3578,6 +3578,7 @@ extern unsigned int __machine_arch_type; #define MACH_TYPE_ASYMPTOTE 3624 #define MACH_TYPE_BST2BRD 3625 #define MACH_TYPE_TX335S 3626 +#define MACH_TYPE_COLIBRI_T30 4493 #ifdef CONFIG_ARCH_EBSA110 # ifdef machine_arch_type @@ -42735,16 +42736,16 @@ extern unsigned int __machine_arch_type; # define machine_is_pgs_v1() (0) #endif -#ifdef CONFIG_MACH_COLIBRI_TEGRA2 +#ifdef CONFIG_MACH_COLIBRI_T20 # ifdef machine_arch_type # undef machine_arch_type # define machine_arch_type __machine_arch_type # else -# define machine_arch_type MACH_TYPE_COLIBRI_TEGRA2 +# define machine_arch_type MACH_TYPE_COLIBRI_T20 # endif -# define machine_is_colibri_tegra2() (machine_arch_type == MACH_TYPE_COLIBRI_TEGRA2) +# define machine_is_colibri_t20() (machine_arch_type == MACH_TYPE_COLIBRI_T20) #else -# define machine_is_colibri_tegra2() (0) +# define machine_is_colibri_t20() (0) #endif #ifdef CONFIG_MACH_W21 @@ -46371,6 +46372,18 @@ extern unsigned int __machine_arch_type; # define machine_is_tx335s() (0) #endif +#ifdef CONFIG_MACH_COLIBRI_T30 +# ifdef machine_arch_type +# undef machine_arch_type +# define machine_arch_type __machine_arch_type +# else +# define machine_arch_type MACH_TYPE_COLIBRI_T30 +# endif +# define machine_is_colibri_t30() (machine_arch_type == MACH_TYPE_COLIBRI_T30) +#else +# define machine_is_colibri_t30() (0) +#endif + /* * These have not yet been registered */ diff --git a/board/toradex/colibri_t30/colibri_t30.dts b/board/toradex/colibri_t30/colibri_t30.dts index 9587027dae..763f70f081 100644 --- a/board/toradex/colibri_t30/colibri_t30.dts +++ b/board/toradex/colibri_t30/colibri_t30.dts @@ -8,10 +8,7 @@ compatible = "toradex,colibri_t30", "nvidia,tegra30"; config { - silent_console = <0>; - odmdata = <0x300d8011>; - hwid = "ARM CARDHU TEST 6666"; - machine-arch-id = <3436>; + machine-arch-id = <4493>; }; aliases { @@ -30,10 +27,6 @@ i2c4 = "/i2c@0x7000c700"; }; - chosen { - bootargs = ""; - }; - memory { device_type = "memory"; reg = <0x80000000 0xc0000000>; @@ -53,7 +46,7 @@ width = <4>; /* width of SDIO port */ removable = <1>; /* Parameter 3 bit 0:1=output, 0=input; bit 1:1=high, 0=low */ - cd-gpio = <&gpio 166 0>; /* card detect, gpio PU6 */ + cd-gpio = <&gpio 166 0>; /* card detect, gpio PU6 */ }; /* Internal eMMC - SDMMC4 */ @@ -75,7 +68,7 @@ pixel_clock = <25175000>; - /* Timing: ref_to_sync, sync_width. back_porch, front_porch */ + /* Timing: ref_to_sync, sync_width, back_porch, front_porch */ horiz_timing = <0 96 48 16>; vert_timing = <1 2 31 11>; |