Merge tag 'omap-for-v4.6/fixes-rc1' of... (2e1d18c6) · Commits · 戴 / test

Merge tag 'omap-for-v4.6/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes Fixes for omaps against v4.6-rc1. Mostly minor fixes for the newer SoCs with few board fixes and a fix for a long time hwmod bug: - Fix cpsw_emac0 link type for baltos-ir5221 - Fix interrupt type for TWD - Fix edma memcpy channel allocation for am43x - Fix am43x-epos sycntimer32k by using the correct assigned clock - Fix interconnect barrier for dra7 - Fix a long time hwmod bug for updating sysconfig register properly - Fix flakey booting on dm814x where USB reset needs a delay And there is one minor change that is not strictly a fix, but is good to have for proper hardware detection: - Detect dra7 silicon revision 2.0 properly * tag 'omap-for-v4.6/fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap : ARM: dts: am335x-baltos-ir5221: fix cpsw_emac0 link type ARM: OMAP: Correct interrupt type for ARM TWD ARM: DRA722: Add ID detect for Silicon Rev 2.0 ARM: dts: am43xx: fix edma memcpy channel allocation ARM: dts: AM43x-epos: Fix clk parent for synctimer ARM: OMAP2: Fix up interconnect barrier initialization for DRA7 ARM: OMAP2+: hwmod: Fix updating of sysconfig register ARM: OMAP2+: Use srst_udelay for USB on dm814x Signed-off-by:

Olof Johansson <olof@lixom.net>

arch/arm/boot/dts/am335x-baltos-ir5221.dts

+4 −1

Original line number	Diff line number	Diff line
		@@ -470,9 +470,12 @@
		};

		&cpsw_emac0 {
		phy_id = <&davinci_mdio>, <0>;
		phy-mode = "rmii";
		dual_emac_res_vlan = <1>;
		fixed-link {
		speed = <100>;
		full-duplex;
		};
		};

		&cpsw_emac1 {

arch/arm/boot/dts/am4372.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -207,7 +207,7 @@
		ti,tptcs = <&edma_tptc0 7>, <&edma_tptc1 5>,
		<&edma_tptc2 0>;

		ti,edma-memcpy-channels = <32 33>;
		ti,edma-memcpy-channels = <58 59>;
		};

		edma_tptc0: tptc@49800000 {

arch/arm/boot/dts/am43x-epos-evm.dts

+5 −0

Original line number	Diff line number	Diff line
		@@ -794,3 +794,8 @@
		tx-num-evt = <32>;
		rx-num-evt = <32>;
		};

		&synctimer_32kclk {
		assigned-clocks = <&mux_synctimer32k_ck>;
		assigned-clock-parents = <&clkdiv32k_ick>;
		};

arch/arm/boot/dts/omap4.dtsi

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@
		compatible = "arm,cortex-a9-twd-timer";
		clocks = <&mpu_periphclk>;
		reg = <0x48240600 0x20>;
		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3) \| IRQ_TYPE_LEVEL_HIGH)>;
		interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(3) \| IRQ_TYPE_EDGE_RISING)>;
		interrupt-parent = <&gic>;
		};

arch/arm/mach-omap2/id.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -669,9 +669,9 @@ void __init dra7xxx_check_revision(void)
		case 0:
		omap_revision = DRA722_REV_ES1_0;
		break;
		case 1:
		default:
		/* If we have no new revisions */
		omap_revision = DRA722_REV_ES1_0;
		omap_revision = DRA722_REV_ES2_0;
		break;
		}
		break;

Admin message