Commit 602f5850 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'fixes-v3.17-rc4' of... 

Merge tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Few regression fixes for omaps for the -rc cycle:

- Fix for omap_l3_noc bus code
- Serial console fix for cm-t53
- NAND timings fix for dra7-evm

* tag 'fixes-v3.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  bus: omap_l3_noc: Fix connID for OMAP4
  ARM: dts: cm-t54: fix serial console power supply.
  ARM: dts: dra7-evm: Fix NAND GPMC timings

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3c91f97a 41fc619d

arch/arm/boot/dts/dra7-evm.dts

+12 −15
Original line number Original line Diff line number Diff line
@@ -447,22 +447,19 @@ 
		gpmc,device-width = <2>;

		gpmc,device-width = <2>;

		gpmc,sync-clk-ps = <0>;

		gpmc,sync-clk-ps = <0>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-on-ns = <0>;

		gpmc,cs-rd-off-ns = <40>;

		gpmc,cs-rd-off-ns = <80>;

		gpmc,cs-wr-off-ns = <40>;

		gpmc,cs-wr-off-ns = <80>;

		gpmc,adv-on-ns = <0>;

		gpmc,adv-on-ns = <0>;

		gpmc,adv-rd-off-ns = <30>;

		gpmc,adv-rd-off-ns = <60>;

		gpmc,adv-wr-off-ns = <30>;

		gpmc,adv-wr-off-ns = <60>;

		gpmc,we-on-ns = <5>;

		gpmc,we-on-ns = <10>;

		gpmc,we-off-ns = <25>;

		gpmc,we-off-ns = <50>;

		gpmc,oe-on-ns = <2>;

		gpmc,oe-on-ns = <4>;

		gpmc,oe-off-ns = <20>;

		gpmc,oe-off-ns = <40>;

		gpmc,access-ns = <20>;

		gpmc,access-ns = <40>;

		gpmc,wr-access-ns = <40>;

		gpmc,wr-access-ns = <80>;

		gpmc,rd-cycle-ns = <40>;

		gpmc,rd-cycle-ns = <80>;

		gpmc,wr-cycle-ns = <40>;

		gpmc,wr-cycle-ns = <80>;

		gpmc,wait-pin = <0>;

		gpmc,wait-on-read;

		gpmc,wait-on-write;

		gpmc,bus-turnaround-ns = <0>;

		gpmc,bus-turnaround-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,cycle2cycle-delay-ns = <0>;

		gpmc,clk-activation-ns = <0>;

		gpmc,clk-activation-ns = <0>;

arch/arm/boot/dts/omap5-cm-t54.dts

+2 −3
Original line number Original line Diff line number Diff line
@@ -353,13 +353,12 @@ 
				};

				};





				ldo8_reg: ldo8 {

				ldo8_reg: ldo8 {

					/* VDD_3v0: Does not go anywhere */

					/* VDD_3V_GP: act led/serial console */

					regulator-name = "ldo8";

					regulator-name = "ldo8";

					regulator-min-microvolt = <3000000>;

					regulator-min-microvolt = <3000000>;

					regulator-max-microvolt = <3000000>;

					regulator-max-microvolt = <3000000>;

					regulator-always-on;

					regulator-boot-on;

					regulator-boot-on;

					/* Unused */

					status = "disabled";

				};

				};





				ldo9_reg: ldo9 {

				ldo9_reg: ldo9 {

drivers/bus/omap_l3_noc.h

+25 −25
Original line number Original line Diff line number Diff line
@@ -188,31 +188,31 @@ static struct l3_flagmux_data omap_l3_flagmux_clk3 = { 
};

};





static struct l3_masters_data omap_l3_masters[] = {

static struct l3_masters_data omap_l3_masters[] = {

	{ 0x0 , "MPU"},

	{ 0x00, "MPU"},

	{ 0x10, "CS_ADP"},

	{ 0x04, "CS_ADP"},

	{ 0x14, "xxx"},

	{ 0x05, "xxx"},

	{ 0x20, "DSP"},

	{ 0x08, "DSP"},

	{ 0x30, "IVAHD"},

	{ 0x0C, "IVAHD"},

	{ 0x40, "ISS"},

	{ 0x10, "ISS"},

	{ 0x44, "DucatiM3"},

	{ 0x11, "DucatiM3"},

	{ 0x48, "FaceDetect"},

	{ 0x12, "FaceDetect"},

	{ 0x50, "SDMA_Rd"},

	{ 0x14, "SDMA_Rd"},

	{ 0x54, "SDMA_Wr"},

	{ 0x15, "SDMA_Wr"},

	{ 0x58, "xxx"},

	{ 0x16, "xxx"},

	{ 0x5C, "xxx"},

	{ 0x17, "xxx"},

	{ 0x60, "SGX"},

	{ 0x18, "SGX"},

	{ 0x70, "DSS"},

	{ 0x1C, "DSS"},

	{ 0x80, "C2C"},

	{ 0x20, "C2C"},

	{ 0x88, "xxx"},

	{ 0x22, "xxx"},

	{ 0x8C, "xxx"},

	{ 0x23, "xxx"},

	{ 0x90, "HSI"},

	{ 0x24, "HSI"},

	{ 0xA0, "MMC1"},

	{ 0x28, "MMC1"},

	{ 0xA4, "MMC2"},

	{ 0x29, "MMC2"},

	{ 0xA8, "MMC6"},

	{ 0x2A, "MMC6"},

	{ 0xB0, "UNIPRO1"},

	{ 0x2C, "UNIPRO1"},

	{ 0xC0, "USBHOSTHS"},

	{ 0x30, "USBHOSTHS"},

	{ 0xC4, "USBOTGHS"},

	{ 0x31, "USBOTGHS"},

	{ 0xC8, "USBHOSTFS"}

	{ 0x32, "USBHOSTFS"}

};

};





static struct l3_flagmux_data *omap_l3_flagmux[] = {

static struct l3_flagmux_data *omap_l3_flagmux[] = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE