Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb6095b2 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes 

From Nicolas Ferre:
Device tree related fixes:
- USB host numbering for 9x5 which was preventing from using all ports
- a missing UART (not USART) clock lookup table was preventing from using
  them on 9x5
- too large amount of memory was specified for 9n12ek

* tag 'at91-fixes' of git://github.com/at91linux/linux-at91

:
  ARM: at91/DT: fix at91sam9n12ek memory node
  ARM: at91: add missing uart clocks DT entries
  ARM: at91/DT: at91sam9x5ek: fix USB host property to enable port C

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3554c229 a57603ca

arch/arm/boot/dts/at91sam9n12ek.dts

+2 −2
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
	compatible = "atmel,at91sam9n12ek", "atmel,at91sam9n12", "atmel,at91sam9";



	chosen {

		bootargs = "mem=128M console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";

		bootargs = "console=ttyS0,115200 root=/dev/mtdblock1 rw rootfstype=jffs2";

	};



	memory {

		reg = <0x20000000 0x10000000>;

		reg = <0x20000000 0x8000000>;

	};



	clocks {

arch/arm/boot/dts/at91sam9x5ek.dtsi

+3 −2
Original line number Diff line number Diff line
@@ -94,8 +94,9 @@ 


		usb0: ohci@00600000 {

			status = "okay";

			num-ports = <2>;

			atmel,vbus-gpio = <&pioD 19 GPIO_ACTIVE_LOW

			num-ports = <3>;

			atmel,vbus-gpio = <0 /* &pioD 18 GPIO_ACTIVE_LOW *//* Activate to have access to port A */

					   &pioD 19 GPIO_ACTIVE_LOW

					   &pioD 20 GPIO_ACTIVE_LOW

					  >;

		};

arch/arm/mach-at91/at91sam9x5.c

+2 −0
Original line number Diff line number Diff line
@@ -227,6 +227,8 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_DEV_ID("usart", "f8020000.serial", &usart1_clk),

	CLKDEV_CON_DEV_ID("usart", "f8024000.serial", &usart2_clk),

	CLKDEV_CON_DEV_ID("usart", "f8028000.serial", &usart3_clk),

	CLKDEV_CON_DEV_ID("usart", "f8040000.serial", &uart0_clk),

	CLKDEV_CON_DEV_ID("usart", "f8044000.serial", &uart1_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "f8008000.timer", &tcb0_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "f800c000.timer", &tcb0_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "f0008000.mmc", &mmc0_clk),