Merge "mtd: msm_qpic_nand: Add support for PM disabled targets." (6192ced5) · Commits · e / devices / android_kernel_sony_msm8994

drivers/mtd/devices/msm_qpic_nand.c

+32 −0

Original line number	Diff line number	Diff line
		@@ -95,6 +95,7 @@ static dma_addr_t msm_nand_dma_map(struct device dev, void addr, size_t size,
		return dma_map_page(dev, page, offset, size, dir);
		}

		#ifdef CONFIG_MSM_BUS_SCALING
		static int msm_nand_bus_set_vote(struct msm_nand_info *info,
		unsigned int vote)
		{
		@@ -140,6 +141,13 @@ static int msm_nand_setup_clocks_and_bus_bw(struct msm_nand_info *info,
		out:
		return ret;
		}
		#else
		static int msm_nand_setup_clocks_and_bus_bw(struct msm_nand_info *info,
		bool vote)
		{
		return 0;
		}
		#endif

		#ifdef CONFIG_PM_RUNTIME
		static int msm_nand_runtime_suspend(struct device *dev)
		@@ -220,6 +228,7 @@ static int msm_nand_resume(struct device *dev)
		}
		#endif

		#ifdef CONFIG_PM_RUNTIME
		static int msm_nand_get_device(struct device *dev)
		{
		int ret = 0;
		@@ -248,7 +257,19 @@ static int msm_nand_put_device(struct device *dev)
		}
		return ret;
		}
		#else
		static int msm_nand_get_device(struct device *dev)
		{
		return 0;
		}

		static int msm_nand_put_device(struct device *dev)
		{
		return 0;
		}
		#endif

		#ifdef CONFIG_MSM_BUS_SCALING
		static int msm_nand_bus_register(struct platform_device *pdev,
		struct msm_nand_info *info)
		{
		@@ -275,6 +296,17 @@ static void msm_nand_bus_unregister(struct msm_nand_info *info)
		if (info->clk_data.client_handle)
		msm_bus_scale_unregister_client(info->clk_data.client_handle);
		}
		#else
		static int msm_nand_bus_register(struct platform_device *pdev,
		struct msm_nand_info *info)
		{
		return 0;
		}

		static void msm_nand_bus_unregister(struct msm_nand_info *info)
		{
		}
		#endif

		/*
		* Wrapper function to prepare a single SPS command element with the data

drivers/mtd/nand/nand_ids.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,9 @@ struct nand_flash_dev nand_flash_ids[] = {
		{"MT29F4G08ABBDAHC 4G 3.3V 8-bit",
		{ .id = {0x2c, 0xac, 0x90, 0x15, 0x00, 0x00, 0x00, 0x00} },
		SZ_2K, SZ_512, SZ_128K, 0, 4, 64, 4},
		{"MT29F8G08ABBCAH4 8G 3.3V 8-bit",
		{ .id = {0x2c, 0xa3, 0x90, 0x26, 0x00, 0x00, 0x00, 0x00} },
		SZ_4K, SZ_1K, SZ_256K, 0, 4, 224, 8},
		{"MT29RZ4B2DZZHGSK 4G 3.3V 8-bit",
		{ .id = {0x2c, 0xac, 0x90, 0x26, 0x00, 0x00, 0x00, 0x00} },
		SZ_4K, SZ_512, SZ_256K, 0, 4, 224, 8},