From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-lb0-x229.google.com ([2a00:1450:4010:c04::229]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VDouM-0004dq-18 for barebox@lists.infradead.org; Mon, 26 Aug 2013 05:00:07 +0000 Received: by mail-lb0-f169.google.com with SMTP id u10so2063798lbi.28 for ; Sun, 25 Aug 2013 21:59:43 -0700 (PDT) From: Antony Pavlov Date: Mon, 26 Aug 2013 08:57:13 +0400 Message-Id: <1377493037-2229-5-git-send-email-antonynpavlov@gmail.com> In-Reply-To: <1377493037-2229-1-git-send-email-antonynpavlov@gmail.com> References: <1377493037-2229-1-git-send-email-antonynpavlov@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [RFC 4/8] ARM: DIGIC: add Canon PowerShot A1100 IS support To: barebox@lists.infradead.org Signed-off-by: Antony Pavlov --- arch/arm/boards/Makefile | 1 + arch/arm/boards/canon-a1100/Makefile | 1 + arch/arm/boards/canon-a1100/env/bin/init | 15 +++++++++++++++ arch/arm/boards/canon-a1100/env/bin/zup | 11 +++++++++++ arch/arm/boards/canon-a1100/lowlevel.c | 23 +++++++++++++++++++++++ arch/arm/dts/canon-a1100.dts | 26 ++++++++++++++++++++++++++ arch/arm/mach-digic/Kconfig | 8 ++++++++ 7 files changed, 85 insertions(+) create mode 100644 arch/arm/boards/canon-a1100/Makefile create mode 100644 arch/arm/boards/canon-a1100/env/bin/init create mode 100644 arch/arm/boards/canon-a1100/env/bin/zup create mode 100644 arch/arm/boards/canon-a1100/lowlevel.c create mode 100644 arch/arm/dts/canon-a1100.dts diff --git a/arch/arm/boards/Makefile b/arch/arm/boards/Makefile index 38ef512..76f21be 100644 --- a/arch/arm/boards/Makefile +++ b/arch/arm/boards/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_MACH_AT91SAM9N12EK) += at91sam9n12ek/ obj-$(CONFIG_MACH_AT91SAM9X5EK) += at91sam9x5ek/ obj-$(CONFIG_MACH_BEAGLE) += beagle/ obj-$(CONFIG_MACH_BEAGLEBONE) += beaglebone/ +obj-$(CONFIG_MACH_CANON_A1100) += canon-a1100/ obj-$(CONFIG_MACH_CCMX51) += ccxmx51/ obj-$(CONFIG_MACH_CFA10036) += crystalfontz-cfa10036/ obj-$(CONFIG_MACH_CHUMBY) += chumby_falconwing/ diff --git a/arch/arm/boards/canon-a1100/Makefile b/arch/arm/boards/canon-a1100/Makefile new file mode 100644 index 0000000..b08c4a9 --- /dev/null +++ b/arch/arm/boards/canon-a1100/Makefile @@ -0,0 +1 @@ +lwl-y += lowlevel.o diff --git a/arch/arm/boards/canon-a1100/env/bin/init b/arch/arm/boards/canon-a1100/env/bin/init new file mode 100644 index 0000000..509643d --- /dev/null +++ b/arch/arm/boards/canon-a1100/env/bin/init @@ -0,0 +1,15 @@ +#!/bin/sh + +export PATH=/env/bin + +# use "direct print" led (blue) +LED=0 + +DELAY=300 + +for i in 1 2 3; do + led $LED 1 + msleep $DELAY + led $LED 0 + msleep $DELAY +done diff --git a/arch/arm/boards/canon-a1100/env/bin/zup b/arch/arm/boards/canon-a1100/env/bin/zup new file mode 100644 index 0000000..84bfd2f --- /dev/null +++ b/arch/arm/boards/canon-a1100/env/bin/zup @@ -0,0 +1,11 @@ +#!/bin/sh + +# on Canon PowerShot A1100 IS we can use 0x400000 +LOADADDR=0x400000 +IMGNAME=zbarebox.bin + +loady +if [ -e $IMGNAME ]; then + memcpy -s $IMGNAME 0 $LOADADDR + go $LOADADDR +fi diff --git a/arch/arm/boards/canon-a1100/lowlevel.c b/arch/arm/boards/canon-a1100/lowlevel.c new file mode 100644 index 0000000..bbae825 --- /dev/null +++ b/arch/arm/boards/canon-a1100/lowlevel.c @@ -0,0 +1,23 @@ +#include +#include +#include +#include + +void __naked barebox_arm_reset_vector(void) +{ + arm_cpu_lowlevel_init(); + + /* FIXME: can we determine RAM size using CP15 register? + * + * see http://chdk.setepontos.com/index.php?topic=5980.90 + * + * http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0363e/Bgbcdeca.html + * 4.2.19. c6, MPU memory region programming registers + * + * But the 'cpuinfo' command says that the Protection + * unit is disabled. + * The Control Register value (mrc p15, 0, %0, c0, c1, 4) + * is 0x00051078. + */ + barebox_arm_entry(0x0, SZ_64M, 0); +} diff --git a/arch/arm/dts/canon-a1100.dts b/arch/arm/dts/canon-a1100.dts new file mode 100644 index 0000000..dfa1d72 --- /dev/null +++ b/arch/arm/dts/canon-a1100.dts @@ -0,0 +1,26 @@ +/dts-v1/; + +/include/ "digic4.dtsi" + +/ { + model = "Canon PowerShot A1100 IS"; + compatible = "canon,a1100"; + + memory { + reg = <0x00000000 0x04000000>; + }; + + leds { + compatible = "gpio-leds"; + + direct_print { + label = "direct-print led (blue)"; + gpios = <&gpio 51 0>; + }; + + auto_focus { + label = "auto-focus led (red)"; + gpios = <&gpio 55 0>; + }; + }; +}; diff --git a/arch/arm/mach-digic/Kconfig b/arch/arm/mach-digic/Kconfig index 878a1a9..557cad4 100644 --- a/arch/arm/mach-digic/Kconfig +++ b/arch/arm/mach-digic/Kconfig @@ -3,8 +3,16 @@ if ARCH_DIGIC choice prompt "camera type" +config MACH_CANON_A1100 + bool "Canon PowerShot A1100 IS" + select DIGIC_CSRC_TIMER + endchoice +config ARCH_TEXT_BASE + hex + default 0x00001900 if MACH_CANON_A1100 + config DIGIC_CSRC_TIMER bool -- 1.8.4.rc3 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox